diff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt index 04a60c62f..096f58fe4 100644 --- a/THIRD_PARTY_LICENSES.txt +++ b/THIRD_PARTY_LICENSES.txt @@ -1235,32 +1235,6 @@ LICENSE: https://github.com/rholder/retrying/blob/master/LICENSE =============================================================================== -six -============= -LICENSE: https://github.com/benjaminp/six/blob/master/LICENSE - -Copyright (c) 2010-2020 Benjamin Peterson - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -=============================================================================== - - terminaltables ============== LICENSE: https://github.com/Robpol86/terminaltables/blob/master/LICENSE diff --git a/requirements.txt b/requirements.txt index b8435cefd..240b6bf59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,6 @@ pytz>=2016.10 requests==2.27.0; python_version == '3.6' requests==2.31.0; python_version == '3.7' requests>=2.32.0; python_version > '3.7' -six>=1.15.0 sphinx==3.3.0 sphinx-rtd-theme==0.4.3 terminaltables==3.1.10 diff --git a/services/access_governance_cp/src/oci_cli_access_governance_cp/generated/accessgovernancecp_cli.py b/services/access_governance_cp/src/oci_cli_access_governance_cp/generated/accessgovernancecp_cli.py index ac6a31a7a..838577934 100644 --- a/services/access_governance_cp/src/oci_cli_access_governance_cp/generated/accessgovernancecp_cli.py +++ b/services/access_governance_cp/src/oci_cli_access_governance_cp/generated/accessgovernancecp_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -56,7 +55,7 @@ def governance_instance_group(): @cli_util.wrap_exceptions def change_governance_instance_compartment(ctx, from_json, governance_instance_id, compartment_id, if_match): - if isinstance(governance_instance_id, six.string_types) and len(governance_instance_id.strip()) == 0: + if isinstance(governance_instance_id, str) and len(governance_instance_id.strip()) == 0: raise click.UsageError('Parameter --governance-instance-id cannot be whitespace or empty string') kwargs = {} @@ -163,7 +162,7 @@ def create_governance_instance(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_governance_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_instance_id, if_match): - if isinstance(governance_instance_id, six.string_types) and len(governance_instance_id.strip()) == 0: + if isinstance(governance_instance_id, str) and len(governance_instance_id.strip()) == 0: raise click.UsageError('Parameter --governance-instance-id cannot be whitespace or empty string') kwargs = {} @@ -222,7 +221,7 @@ def delete_governance_instance(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_governance_instance(ctx, from_json, governance_instance_id): - if isinstance(governance_instance_id, six.string_types) and len(governance_instance_id.strip()) == 0: + if isinstance(governance_instance_id, str) and len(governance_instance_id.strip()) == 0: raise click.UsageError('Parameter --governance-instance-id cannot be whitespace or empty string') kwargs = {} @@ -336,7 +335,7 @@ def list_governance_instances(ctx, from_json, all_pages, page_size, compartment_ @cli_util.wrap_exceptions def update_governance_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_instance_id, display_name, description, license_type, defined_tags, freeform_tags, if_match): - if isinstance(governance_instance_id, six.string_types) and len(governance_instance_id.strip()) == 0: + if isinstance(governance_instance_id, str) and len(governance_instance_id.strip()) == 0: raise click.UsageError('Parameter --governance-instance-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: diff --git a/services/adm/src/oci_cli_application_dependency_management/generated/applicationdependencymanagement_cli.py b/services/adm/src/oci_cli_application_dependency_management/generated/applicationdependencymanagement_cli.py index f12561a7f..c500c80f2 100644 --- a/services/adm/src/oci_cli_application_dependency_management/generated/applicationdependencymanagement_cli.py +++ b/services/adm/src/oci_cli_application_dependency_management/generated/applicationdependencymanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -93,7 +92,7 @@ def vulnerability_audit_group(): @cli_util.wrap_exceptions def activate_remediation_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, if_match): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -148,7 +147,7 @@ def activate_remediation_recipe(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def cancel_remediation_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_run_id, if_match): - if isinstance(remediation_run_id, six.string_types) and len(remediation_run_id.strip()) == 0: + if isinstance(remediation_run_id, str) and len(remediation_run_id.strip()) == 0: raise click.UsageError('Parameter --remediation-run-id cannot be whitespace or empty string') kwargs = {} @@ -197,7 +196,7 @@ def cancel_remediation_run(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -226,7 +225,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_knowledge_base_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, compartment_id, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') kwargs = {} @@ -287,7 +286,7 @@ def change_knowledge_base_compartment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def change_remediation_recipe_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, compartment_id, if_match): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -345,7 +344,7 @@ def change_remediation_recipe_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_remediation_run_compartment(ctx, from_json, remediation_run_id, compartment_id, if_match): - if isinstance(remediation_run_id, six.string_types) and len(remediation_run_id.strip()) == 0: + if isinstance(remediation_run_id, str) and len(remediation_run_id.strip()) == 0: raise click.UsageError('Parameter --remediation-run-id cannot be whitespace or empty string') kwargs = {} @@ -376,7 +375,7 @@ def change_remediation_run_compartment(ctx, from_json, remediation_run_id, compa @cli_util.wrap_exceptions def change_vulnerability_audit_compartment(ctx, from_json, vulnerability_audit_id, compartment_id, if_match): - if isinstance(vulnerability_audit_id, six.string_types) and len(vulnerability_audit_id.strip()) == 0: + if isinstance(vulnerability_audit_id, str) and len(vulnerability_audit_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-audit-id cannot be whitespace or empty string') kwargs = {} @@ -1686,7 +1685,7 @@ def create_vulnerability_audit_external_resource_vulnerability_audit_source(ctx, @cli_util.wrap_exceptions def deactivate_remediation_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, if_match): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -1742,7 +1741,7 @@ def deactivate_remediation_recipe(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_knowledge_base(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') kwargs = {} @@ -1798,7 +1797,7 @@ def delete_knowledge_base(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_remediation_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, if_match): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -1854,7 +1853,7 @@ def delete_remediation_recipe(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_remediation_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_run_id, if_match): - if isinstance(remediation_run_id, six.string_types) and len(remediation_run_id.strip()) == 0: + if isinstance(remediation_run_id, str) and len(remediation_run_id.strip()) == 0: raise click.UsageError('Parameter --remediation-run-id cannot be whitespace or empty string') kwargs = {} @@ -1918,7 +1917,7 @@ def delete_remediation_run(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_vulnerability_audit(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vulnerability_audit_id, if_match): - if isinstance(vulnerability_audit_id, six.string_types) and len(vulnerability_audit_id.strip()) == 0: + if isinstance(vulnerability_audit_id, str) and len(vulnerability_audit_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-audit-id cannot be whitespace or empty string') kwargs = {} @@ -1977,7 +1976,7 @@ def delete_vulnerability_audit(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_knowledge_base(ctx, from_json, knowledge_base_id): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') kwargs = {} @@ -1999,7 +1998,7 @@ def get_knowledge_base(ctx, from_json, knowledge_base_id): @cli_util.wrap_exceptions def get_remediation_recipe(ctx, from_json, remediation_recipe_id): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -2021,7 +2020,7 @@ def get_remediation_recipe(ctx, from_json, remediation_recipe_id): @cli_util.wrap_exceptions def get_remediation_run(ctx, from_json, remediation_run_id): - if isinstance(remediation_run_id, six.string_types) and len(remediation_run_id.strip()) == 0: + if isinstance(remediation_run_id, str) and len(remediation_run_id.strip()) == 0: raise click.UsageError('Parameter --remediation-run-id cannot be whitespace or empty string') kwargs = {} @@ -2044,10 +2043,10 @@ def get_remediation_run(ctx, from_json, remediation_run_id): @cli_util.wrap_exceptions def get_stage(ctx, from_json, remediation_run_id, stage_type): - if isinstance(remediation_run_id, six.string_types) and len(remediation_run_id.strip()) == 0: + if isinstance(remediation_run_id, str) and len(remediation_run_id.strip()) == 0: raise click.UsageError('Parameter --remediation-run-id cannot be whitespace or empty string') - if isinstance(stage_type, six.string_types) and len(stage_type.strip()) == 0: + if isinstance(stage_type, str) and len(stage_type.strip()) == 0: raise click.UsageError('Parameter --stage-type cannot be whitespace or empty string') kwargs = {} @@ -2070,7 +2069,7 @@ def get_stage(ctx, from_json, remediation_run_id, stage_type): @cli_util.wrap_exceptions def get_vulnerability_audit(ctx, from_json, vulnerability_audit_id): - if isinstance(vulnerability_audit_id, six.string_types) and len(vulnerability_audit_id.strip()) == 0: + if isinstance(vulnerability_audit_id, str) and len(vulnerability_audit_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-audit-id cannot be whitespace or empty string') kwargs = {} @@ -2092,7 +2091,7 @@ def get_vulnerability_audit(ctx, from_json, vulnerability_audit_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2125,7 +2124,7 @@ def list_application_dependency_recommendations(ctx, from_json, all_pages, page_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(remediation_run_id, six.string_types) and len(remediation_run_id.strip()) == 0: + if isinstance(remediation_run_id, str) and len(remediation_run_id.strip()) == 0: raise click.UsageError('Parameter --remediation-run-id cannot be whitespace or empty string') kwargs = {} @@ -2194,7 +2193,7 @@ def list_application_dependency_vulnerabilities(ctx, from_json, all_pages, page_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(vulnerability_audit_id, six.string_types) and len(vulnerability_audit_id.strip()) == 0: + if isinstance(vulnerability_audit_id, str) and len(vulnerability_audit_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-audit-id cannot be whitespace or empty string') kwargs = {} @@ -2458,7 +2457,7 @@ def list_stages(ctx, from_json, all_pages, page_size, remediation_run_id, type, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(remediation_run_id, six.string_types) and len(remediation_run_id.strip()) == 0: + if isinstance(remediation_run_id, str) and len(remediation_run_id.strip()) == 0: raise click.UsageError('Parameter --remediation-run-id cannot be whitespace or empty string') kwargs = {} @@ -2596,7 +2595,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2653,7 +2652,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2771,7 +2770,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_knowledge_base(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2853,7 +2852,7 @@ def update_knowledge_base(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_remediation_recipe(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, display_name, scm_configuration, verify_configuration, detect_configuration, network_configuration, knowledge_base_id, is_run_triggered_on_kb_change, freeform_tags, defined_tags, if_match): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') if not force: if scm_configuration or verify_configuration or detect_configuration or network_configuration or freeform_tags or defined_tags: @@ -2956,7 +2955,7 @@ def update_remediation_recipe(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_remediation_recipe_oci_code_repository_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, scm_configuration_branch, scm_configuration_is_automerge_enabled, scm_configuration_oci_code_repository_id, display_name, verify_configuration, detect_configuration, network_configuration, knowledge_base_id, is_run_triggered_on_kb_change, freeform_tags, defined_tags, if_match, scm_configuration_build_file_location): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') if not force: if verify_configuration or detect_configuration or network_configuration or freeform_tags or defined_tags: @@ -3068,7 +3067,7 @@ def update_remediation_recipe_oci_code_repository_configuration(ctx, from_json, @cli_util.wrap_exceptions def update_remediation_recipe_external_scm_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, scm_configuration_branch, scm_configuration_is_automerge_enabled, scm_configuration_external_scm_type, scm_configuration_repository_url, scm_configuration_pat_secret_id, display_name, verify_configuration, detect_configuration, network_configuration, knowledge_base_id, is_run_triggered_on_kb_change, freeform_tags, defined_tags, if_match, scm_configuration_build_file_location, scm_configuration_username): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') if not force: if verify_configuration or detect_configuration or network_configuration or freeform_tags or defined_tags: @@ -3183,7 +3182,7 @@ def update_remediation_recipe_external_scm_configuration(ctx, from_json, force, @cli_util.wrap_exceptions def update_remediation_recipe_jenkins_pipeline_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, verify_configuration_username, verify_configuration_pat_secret_id, verify_configuration_jenkins_url, verify_configuration_job_name, display_name, scm_configuration, detect_configuration, network_configuration, knowledge_base_id, is_run_triggered_on_kb_change, freeform_tags, defined_tags, if_match, verify_configuration_additional_parameters): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') if not force: if scm_configuration or detect_configuration or network_configuration or freeform_tags or defined_tags: @@ -3289,7 +3288,7 @@ def update_remediation_recipe_jenkins_pipeline_configuration(ctx, from_json, for @cli_util.wrap_exceptions def update_remediation_recipe_none_verify_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, display_name, scm_configuration, detect_configuration, network_configuration, knowledge_base_id, is_run_triggered_on_kb_change, freeform_tags, defined_tags, if_match): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') if not force: if scm_configuration or detect_configuration or network_configuration or freeform_tags or defined_tags: @@ -3390,7 +3389,7 @@ def update_remediation_recipe_none_verify_configuration(ctx, from_json, force, w @cli_util.wrap_exceptions def update_remediation_recipe_oci_dev_ops_build_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, verify_configuration_pipeline_id, display_name, scm_configuration, detect_configuration, network_configuration, knowledge_base_id, is_run_triggered_on_kb_change, freeform_tags, defined_tags, if_match, verify_configuration_additional_parameters): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') if not force: if scm_configuration or detect_configuration or network_configuration or freeform_tags or defined_tags: @@ -3498,7 +3497,7 @@ def update_remediation_recipe_oci_dev_ops_build_configuration(ctx, from_json, fo @cli_util.wrap_exceptions def update_remediation_recipe_git_hub_actions_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, verify_configuration_repository_url, verify_configuration_pat_secret_id, verify_configuration_username, verify_configuration_workflow_name, display_name, scm_configuration, detect_configuration, network_configuration, knowledge_base_id, is_run_triggered_on_kb_change, freeform_tags, defined_tags, if_match, verify_configuration_additional_parameters): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') if not force: if scm_configuration or detect_configuration or network_configuration or freeform_tags or defined_tags: @@ -3609,7 +3608,7 @@ def update_remediation_recipe_git_hub_actions_configuration(ctx, from_json, forc @cli_util.wrap_exceptions def update_remediation_recipe_git_lab_pipeline_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_recipe_id, verify_configuration_repository_url, verify_configuration_username, verify_configuration_pat_secret_id, verify_configuration_trigger_secret_id, display_name, scm_configuration, detect_configuration, network_configuration, knowledge_base_id, is_run_triggered_on_kb_change, freeform_tags, defined_tags, if_match, verify_configuration_additional_parameters): - if isinstance(remediation_recipe_id, six.string_types) and len(remediation_recipe_id.strip()) == 0: + if isinstance(remediation_recipe_id, str) and len(remediation_recipe_id.strip()) == 0: raise click.UsageError('Parameter --remediation-recipe-id cannot be whitespace or empty string') if not force: if scm_configuration or detect_configuration or network_configuration or freeform_tags or defined_tags: @@ -3710,7 +3709,7 @@ def update_remediation_recipe_git_lab_pipeline_configuration(ctx, from_json, for @cli_util.wrap_exceptions def update_remediation_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remediation_run_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(remediation_run_id, six.string_types) and len(remediation_run_id.strip()) == 0: + if isinstance(remediation_run_id, str) and len(remediation_run_id.strip()) == 0: raise click.UsageError('Parameter --remediation-run-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3782,7 +3781,7 @@ def update_remediation_run(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_vulnerability_audit(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vulnerability_audit_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(vulnerability_audit_id, six.string_types) and len(vulnerability_audit_id.strip()) == 0: + if isinstance(vulnerability_audit_id, str) and len(vulnerability_audit_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-audit-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/ai_document/src/oci_cli_ai_service_document/generated/aiservicedocument_cli.py b/services/ai_document/src/oci_cli_ai_service_document/generated/aiservicedocument_cli.py index 974dadb78..54d0f9c87 100644 --- a/services/ai_document/src/oci_cli_ai_service_document/generated/aiservicedocument_cli.py +++ b/services/ai_document/src/oci_cli_ai_service_document/generated/aiservicedocument_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -97,7 +96,7 @@ def processor_job_group(): @cli_util.wrap_exceptions def add_model_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, type, related_resource_id, message, if_match, is_lock_override): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -165,7 +164,7 @@ def add_model_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def add_project_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, type, related_resource_id, message, if_match, is_lock_override): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -388,7 +387,7 @@ def analyze_document_inline_document_details(ctx, from_json, features, document_ @cli_util.wrap_exceptions def cancel_processor_job(ctx, from_json, processor_job_id, if_match): - if isinstance(processor_job_id, six.string_types) and len(processor_job_id.strip()) == 0: + if isinstance(processor_job_id, str) and len(processor_job_id.strip()) == 0: raise click.UsageError('Parameter --processor-job-id cannot be whitespace or empty string') kwargs = {} @@ -414,7 +413,7 @@ def cancel_processor_job(ctx, from_json, processor_job_id, if_match): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -441,7 +440,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match, is_lock_override): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -475,7 +474,7 @@ def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match, @cli_util.wrap_exceptions def change_project_compartment(ctx, from_json, project_id, compartment_id, if_match, is_lock_override): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -1027,7 +1026,7 @@ def create_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match, is_lock_override): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -1086,7 +1085,7 @@ def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, if_match, is_lock_override): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -1139,7 +1138,7 @@ def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_model(ctx, from_json, model_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -1163,7 +1162,7 @@ def get_model(ctx, from_json, model_id): @cli_util.wrap_exceptions def get_model_type(ctx, from_json, model_type, compartment_id, model_sub_type): - if isinstance(model_type, six.string_types) and len(model_type.strip()) == 0: + if isinstance(model_type, str) and len(model_type.strip()) == 0: raise click.UsageError('Parameter --model-type cannot be whitespace or empty string') kwargs = {} @@ -1189,7 +1188,7 @@ def get_model_type(ctx, from_json, model_type, compartment_id, model_sub_type): @cli_util.wrap_exceptions def get_processor_job(ctx, from_json, processor_job_id): - if isinstance(processor_job_id, six.string_types) and len(processor_job_id.strip()) == 0: + if isinstance(processor_job_id, str) and len(processor_job_id.strip()) == 0: raise click.UsageError('Parameter --processor-job-id cannot be whitespace or empty string') kwargs = {} @@ -1211,7 +1210,7 @@ def get_processor_job(ctx, from_json, processor_job_id): @cli_util.wrap_exceptions def get_project(ctx, from_json, project_id): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -1233,7 +1232,7 @@ def get_project(ctx, from_json, project_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1391,7 +1390,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1448,7 +1447,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1565,7 +1564,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def patch_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, operations, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -1629,7 +1628,7 @@ def patch_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def remove_model_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, type, if_match, is_lock_override): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -1689,7 +1688,7 @@ def remove_model_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def remove_project_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, type, if_match, is_lock_override): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -1754,7 +1753,7 @@ def remove_project_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, display_name, description, inference_units, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1840,7 +1839,7 @@ def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, display_name, description, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/ai_language/src/oci_cli_ai_service_language/generated/aiservicelanguage_cli.py b/services/ai_language/src/oci_cli_ai_service_language/generated/aiservicelanguage_cli.py index 868f1bd4a..06aa3dd18 100644 --- a/services/ai_language/src/oci_cli_ai_service_language/generated/aiservicelanguage_cli.py +++ b/services/ai_language/src/oci_cli_ai_service_language/generated/aiservicelanguage_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -537,7 +536,7 @@ def batch_language_translation(ctx, from_json, documents, alias, endpoint_id, no @cli_util.wrap_exceptions def cancel_job(ctx, from_json, job_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -563,7 +562,7 @@ def cancel_job(ctx, from_json, job_id, if_match): @cli_util.wrap_exceptions def change_endpoint_compartment(ctx, from_json, endpoint_id, compartment_id, if_match): - if isinstance(endpoint_id, six.string_types) and len(endpoint_id.strip()) == 0: + if isinstance(endpoint_id, str) and len(endpoint_id.strip()) == 0: raise click.UsageError('Parameter --endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -594,7 +593,7 @@ def change_endpoint_compartment(ctx, from_json, endpoint_id, compartment_id, if_ @cli_util.wrap_exceptions def change_job_compartment(ctx, from_json, job_id, compartment_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -625,7 +624,7 @@ def change_job_compartment(ctx, from_json, job_id, compartment_id, if_match): @cli_util.wrap_exceptions def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -656,7 +655,7 @@ def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match) @cli_util.wrap_exceptions def change_project_compartment(ctx, from_json, project_id, compartment_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -2662,7 +2661,7 @@ def create_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, endpoint_id, if_match): - if isinstance(endpoint_id, six.string_types) and len(endpoint_id.strip()) == 0: + if isinstance(endpoint_id, str) and len(endpoint_id.strip()) == 0: raise click.UsageError('Parameter --endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2718,7 +2717,7 @@ def delete_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2774,7 +2773,7 @@ def delete_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -2830,7 +2829,7 @@ def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -3030,7 +3029,7 @@ def detect_language_text_classification(ctx, from_json, text): @cli_util.wrap_exceptions def get_endpoint(ctx, from_json, endpoint_id): - if isinstance(endpoint_id, six.string_types) and len(endpoint_id.strip()) == 0: + if isinstance(endpoint_id, str) and len(endpoint_id.strip()) == 0: raise click.UsageError('Parameter --endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -3052,7 +3051,7 @@ def get_endpoint(ctx, from_json, endpoint_id): @cli_util.wrap_exceptions def get_job(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -3074,7 +3073,7 @@ def get_job(ctx, from_json, job_id): @cli_util.wrap_exceptions def get_model(ctx, from_json, model_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -3096,7 +3095,7 @@ def get_model(ctx, from_json, model_id): @cli_util.wrap_exceptions def get_model_type(ctx, from_json, model_type): - if isinstance(model_type, six.string_types) and len(model_type.strip()) == 0: + if isinstance(model_type, str) and len(model_type.strip()) == 0: raise click.UsageError('Parameter --model-type cannot be whitespace or empty string') kwargs = {} @@ -3118,7 +3117,7 @@ def get_model_type(ctx, from_json, model_type): @cli_util.wrap_exceptions def get_project(ctx, from_json, project_id): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -3140,7 +3139,7 @@ def get_project(ctx, from_json, project_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3238,7 +3237,7 @@ def list_evaluation_results(ctx, from_json, all_pages, page_size, model_id, limi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -3483,7 +3482,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3540,7 +3539,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3660,7 +3659,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, endpoint_id, display_name, alias, description, model_id, inference_units, freeform_tags, defined_tags, if_match): - if isinstance(endpoint_id, six.string_types) and len(endpoint_id.strip()) == 0: + if isinstance(endpoint_id, str) and len(endpoint_id.strip()) == 0: raise click.UsageError('Parameter --endpoint-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3746,7 +3745,7 @@ def update_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, display_name, description, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -3812,7 +3811,7 @@ def update_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3892,7 +3891,7 @@ def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/ai_speech/src/oci_cli_ai_service_speech/generated/aiservicespeech_cli.py b/services/ai_speech/src/oci_cli_ai_service_speech/generated/aiservicespeech_cli.py index c68956b9c..358f83aac 100644 --- a/services/ai_speech/src/oci_cli_ai_service_speech/generated/aiservicespeech_cli.py +++ b/services/ai_speech/src/oci_cli_ai_service_speech/generated/aiservicespeech_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -76,7 +75,7 @@ def synthesize_speech_group(): @cli_util.wrap_exceptions def cancel_transcription_job(ctx, from_json, transcription_job_id, if_match): - if isinstance(transcription_job_id, six.string_types) and len(transcription_job_id.strip()) == 0: + if isinstance(transcription_job_id, str) and len(transcription_job_id.strip()) == 0: raise click.UsageError('Parameter --transcription-job-id cannot be whitespace or empty string') kwargs = {} @@ -102,10 +101,10 @@ def cancel_transcription_job(ctx, from_json, transcription_job_id, if_match): @cli_util.wrap_exceptions def cancel_transcription_task(ctx, from_json, transcription_job_id, transcription_task_id, if_match): - if isinstance(transcription_job_id, six.string_types) and len(transcription_job_id.strip()) == 0: + if isinstance(transcription_job_id, str) and len(transcription_job_id.strip()) == 0: raise click.UsageError('Parameter --transcription-job-id cannot be whitespace or empty string') - if isinstance(transcription_task_id, six.string_types) and len(transcription_task_id.strip()) == 0: + if isinstance(transcription_task_id, str) and len(transcription_task_id.strip()) == 0: raise click.UsageError('Parameter --transcription-task-id cannot be whitespace or empty string') kwargs = {} @@ -132,7 +131,7 @@ def cancel_transcription_task(ctx, from_json, transcription_job_id, transcriptio @cli_util.wrap_exceptions def change_customization_compartment(ctx, from_json, customization_id, compartment_id, if_match): - if isinstance(customization_id, six.string_types) and len(customization_id.strip()) == 0: + if isinstance(customization_id, str) and len(customization_id.strip()) == 0: raise click.UsageError('Parameter --customization-id cannot be whitespace or empty string') kwargs = {} @@ -163,7 +162,7 @@ def change_customization_compartment(ctx, from_json, customization_id, compartme @cli_util.wrap_exceptions def change_transcription_job_compartment(ctx, from_json, transcription_job_id, compartment_id, if_match): - if isinstance(transcription_job_id, six.string_types) and len(transcription_job_id.strip()) == 0: + if isinstance(transcription_job_id, str) and len(transcription_job_id.strip()) == 0: raise click.UsageError('Parameter --transcription-job-id cannot be whitespace or empty string') kwargs = {} @@ -714,7 +713,7 @@ def create_transcription_job_object_list_inline_input_location(ctx, from_json, w @cli_util.wrap_exceptions def delete_customization(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, customization_id, if_match): - if isinstance(customization_id, six.string_types) and len(customization_id.strip()) == 0: + if isinstance(customization_id, str) and len(customization_id.strip()) == 0: raise click.UsageError('Parameter --customization-id cannot be whitespace or empty string') kwargs = {} @@ -778,7 +777,7 @@ def delete_customization(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_transcription_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, transcription_job_id, if_match): - if isinstance(transcription_job_id, six.string_types) and len(transcription_job_id.strip()) == 0: + if isinstance(transcription_job_id, str) and len(transcription_job_id.strip()) == 0: raise click.UsageError('Parameter --transcription-job-id cannot be whitespace or empty string') kwargs = {} @@ -837,7 +836,7 @@ def delete_transcription_job(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def get_customization(ctx, from_json, customization_id): - if isinstance(customization_id, six.string_types) and len(customization_id.strip()) == 0: + if isinstance(customization_id, str) and len(customization_id.strip()) == 0: raise click.UsageError('Parameter --customization-id cannot be whitespace or empty string') kwargs = {} @@ -859,7 +858,7 @@ def get_customization(ctx, from_json, customization_id): @cli_util.wrap_exceptions def get_transcription_job(ctx, from_json, transcription_job_id): - if isinstance(transcription_job_id, six.string_types) and len(transcription_job_id.strip()) == 0: + if isinstance(transcription_job_id, str) and len(transcription_job_id.strip()) == 0: raise click.UsageError('Parameter --transcription-job-id cannot be whitespace or empty string') kwargs = {} @@ -882,10 +881,10 @@ def get_transcription_job(ctx, from_json, transcription_job_id): @cli_util.wrap_exceptions def get_transcription_task(ctx, from_json, transcription_job_id, transcription_task_id): - if isinstance(transcription_job_id, six.string_types) and len(transcription_job_id.strip()) == 0: + if isinstance(transcription_job_id, str) and len(transcription_job_id.strip()) == 0: raise click.UsageError('Parameter --transcription-job-id cannot be whitespace or empty string') - if isinstance(transcription_task_id, six.string_types) and len(transcription_task_id.strip()) == 0: + if isinstance(transcription_task_id, str) and len(transcription_task_id.strip()) == 0: raise click.UsageError('Parameter --transcription-task-id cannot be whitespace or empty string') kwargs = {} @@ -1044,7 +1043,7 @@ def list_transcription_tasks(ctx, from_json, all_pages, page_size, transcription if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(transcription_job_id, six.string_types) and len(transcription_job_id.strip()) == 0: + if isinstance(transcription_job_id, str) and len(transcription_job_id.strip()) == 0: raise click.UsageError('Parameter --transcription-job-id cannot be whitespace or empty string') kwargs = {} @@ -1334,7 +1333,7 @@ def synthesize_speech_tts_base_audio_config(ctx, from_json, file, text, audio_co @cli_util.wrap_exceptions def update_customization(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, customization_id, alias, display_name, description, model_details, training_dataset, freeform_tags, defined_tags, if_match): - if isinstance(customization_id, six.string_types) and len(customization_id.strip()) == 0: + if isinstance(customization_id, str) and len(customization_id.strip()) == 0: raise click.UsageError('Parameter --customization-id cannot be whitespace or empty string') if not force: if model_details or training_dataset or freeform_tags or defined_tags: @@ -1423,7 +1422,7 @@ def update_customization(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_customization_object_storage_dataset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, customization_id, training_dataset_location_details, alias, display_name, description, model_details, freeform_tags, defined_tags, if_match, training_dataset_entity_type): - if isinstance(customization_id, six.string_types) and len(customization_id.strip()) == 0: + if isinstance(customization_id, str) and len(customization_id.strip()) == 0: raise click.UsageError('Parameter --customization-id cannot be whitespace or empty string') if not force: if model_details or freeform_tags or defined_tags: @@ -1518,7 +1517,7 @@ def update_customization_object_storage_dataset(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_customization_entity_list_dataset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, customization_id, alias, display_name, description, model_details, freeform_tags, defined_tags, if_match, training_dataset_reference_examples, training_dataset_entity_list): - if isinstance(customization_id, six.string_types) and len(customization_id.strip()) == 0: + if isinstance(customization_id, str) and len(customization_id.strip()) == 0: raise click.UsageError('Parameter --customization-id cannot be whitespace or empty string') if not force: if model_details or freeform_tags or defined_tags: @@ -1609,7 +1608,7 @@ def update_customization_entity_list_dataset(ctx, from_json, force, wait_for_sta @cli_util.wrap_exceptions def update_transcription_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, transcription_job_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(transcription_job_id, six.string_types) and len(transcription_job_id.strip()) == 0: + if isinstance(transcription_job_id, str) and len(transcription_job_id.strip()) == 0: raise click.UsageError('Parameter --transcription-job-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/ai_vision/src/oci_cli_ai_service_vision/generated/aiservicevision_cli.py b/services/ai_vision/src/oci_cli_ai_service_vision/generated/aiservicevision_cli.py index 25c67446c..84a0e6378 100644 --- a/services/ai_vision/src/oci_cli_ai_service_vision/generated/aiservicevision_cli.py +++ b/services/ai_vision/src/oci_cli_ai_service_vision/generated/aiservicevision_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -404,7 +403,7 @@ def analyze_image_inline_image_details(ctx, from_json, features, image_data, com @cli_util.wrap_exceptions def cancel_document_job(ctx, from_json, document_job_id, if_match): - if isinstance(document_job_id, six.string_types) and len(document_job_id.strip()) == 0: + if isinstance(document_job_id, str) and len(document_job_id.strip()) == 0: raise click.UsageError('Parameter --document-job-id cannot be whitespace or empty string') kwargs = {} @@ -429,7 +428,7 @@ def cancel_document_job(ctx, from_json, document_job_id, if_match): @cli_util.wrap_exceptions def cancel_image_job(ctx, from_json, image_job_id, if_match): - if isinstance(image_job_id, six.string_types) and len(image_job_id.strip()) == 0: + if isinstance(image_job_id, str) and len(image_job_id.strip()) == 0: raise click.UsageError('Parameter --image-job-id cannot be whitespace or empty string') kwargs = {} @@ -454,7 +453,7 @@ def cancel_image_job(ctx, from_json, image_job_id, if_match): @cli_util.wrap_exceptions def cancel_video_job(ctx, from_json, video_job_id, if_match): - if isinstance(video_job_id, six.string_types) and len(video_job_id.strip()) == 0: + if isinstance(video_job_id, str) and len(video_job_id.strip()) == 0: raise click.UsageError('Parameter --video-job-id cannot be whitespace or empty string') kwargs = {} @@ -480,7 +479,7 @@ def cancel_video_job(ctx, from_json, video_job_id, if_match): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -506,7 +505,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -537,7 +536,7 @@ def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match) @cli_util.wrap_exceptions def change_project_compartment(ctx, from_json, project_id, compartment_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -571,7 +570,7 @@ def change_project_compartment(ctx, from_json, project_id, compartment_id, if_ma @cli_util.wrap_exceptions def change_stream_group_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_group_id, compartment_id, if_match): - if isinstance(stream_group_id, six.string_types) and len(stream_group_id.strip()) == 0: + if isinstance(stream_group_id, str) and len(stream_group_id.strip()) == 0: raise click.UsageError('Parameter --stream-group-id cannot be whitespace or empty string') kwargs = {} @@ -632,7 +631,7 @@ def change_stream_group_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_stream_job_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_job_id, compartment_id, if_match): - if isinstance(stream_job_id, six.string_types) and len(stream_job_id.strip()) == 0: + if isinstance(stream_job_id, str) and len(stream_job_id.strip()) == 0: raise click.UsageError('Parameter --stream-job-id cannot be whitespace or empty string') kwargs = {} @@ -693,7 +692,7 @@ def change_stream_job_compartment(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def change_stream_source_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_source_id, compartment_id, if_match): - if isinstance(stream_source_id, six.string_types) and len(stream_source_id.strip()) == 0: + if isinstance(stream_source_id, str) and len(stream_source_id.strip()) == 0: raise click.UsageError('Parameter --stream-source-id cannot be whitespace or empty string') kwargs = {} @@ -751,7 +750,7 @@ def change_stream_source_compartment(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def change_vision_private_endpoint_compartment(ctx, from_json, vision_private_endpoint_id, compartment_id, if_match): - if isinstance(vision_private_endpoint_id, six.string_types) and len(vision_private_endpoint_id.strip()) == 0: + if isinstance(vision_private_endpoint_id, str) and len(vision_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --vision-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1814,7 +1813,7 @@ def create_vision_private_endpoint(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -1870,7 +1869,7 @@ def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -1926,7 +1925,7 @@ def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_stream_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_group_id, if_match): - if isinstance(stream_group_id, six.string_types) and len(stream_group_id.strip()) == 0: + if isinstance(stream_group_id, str) and len(stream_group_id.strip()) == 0: raise click.UsageError('Parameter --stream-group-id cannot be whitespace or empty string') kwargs = {} @@ -1982,7 +1981,7 @@ def delete_stream_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_stream_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_job_id, if_match): - if isinstance(stream_job_id, six.string_types) and len(stream_job_id.strip()) == 0: + if isinstance(stream_job_id, str) and len(stream_job_id.strip()) == 0: raise click.UsageError('Parameter --stream-job-id cannot be whitespace or empty string') kwargs = {} @@ -2038,7 +2037,7 @@ def delete_stream_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_stream_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_source_id, if_match): - if isinstance(stream_source_id, six.string_types) and len(stream_source_id.strip()) == 0: + if isinstance(stream_source_id, str) and len(stream_source_id.strip()) == 0: raise click.UsageError('Parameter --stream-source-id cannot be whitespace or empty string') kwargs = {} @@ -2094,7 +2093,7 @@ def delete_stream_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_vision_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vision_private_endpoint_id, if_match): - if isinstance(vision_private_endpoint_id, six.string_types) and len(vision_private_endpoint_id.strip()) == 0: + if isinstance(vision_private_endpoint_id, str) and len(vision_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --vision-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2145,7 +2144,7 @@ def delete_vision_private_endpoint(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def get_document_job(ctx, from_json, document_job_id): - if isinstance(document_job_id, six.string_types) and len(document_job_id.strip()) == 0: + if isinstance(document_job_id, str) and len(document_job_id.strip()) == 0: raise click.UsageError('Parameter --document-job-id cannot be whitespace or empty string') kwargs = {} @@ -2167,7 +2166,7 @@ def get_document_job(ctx, from_json, document_job_id): @cli_util.wrap_exceptions def get_image_job(ctx, from_json, image_job_id): - if isinstance(image_job_id, six.string_types) and len(image_job_id.strip()) == 0: + if isinstance(image_job_id, str) and len(image_job_id.strip()) == 0: raise click.UsageError('Parameter --image-job-id cannot be whitespace or empty string') kwargs = {} @@ -2189,7 +2188,7 @@ def get_image_job(ctx, from_json, image_job_id): @cli_util.wrap_exceptions def get_model(ctx, from_json, model_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -2211,7 +2210,7 @@ def get_model(ctx, from_json, model_id): @cli_util.wrap_exceptions def get_project(ctx, from_json, project_id): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -2233,7 +2232,7 @@ def get_project(ctx, from_json, project_id): @cli_util.wrap_exceptions def get_stream_group(ctx, from_json, stream_group_id): - if isinstance(stream_group_id, six.string_types) and len(stream_group_id.strip()) == 0: + if isinstance(stream_group_id, str) and len(stream_group_id.strip()) == 0: raise click.UsageError('Parameter --stream-group-id cannot be whitespace or empty string') kwargs = {} @@ -2255,7 +2254,7 @@ def get_stream_group(ctx, from_json, stream_group_id): @cli_util.wrap_exceptions def get_stream_job(ctx, from_json, stream_job_id): - if isinstance(stream_job_id, six.string_types) and len(stream_job_id.strip()) == 0: + if isinstance(stream_job_id, str) and len(stream_job_id.strip()) == 0: raise click.UsageError('Parameter --stream-job-id cannot be whitespace or empty string') kwargs = {} @@ -2277,7 +2276,7 @@ def get_stream_job(ctx, from_json, stream_job_id): @cli_util.wrap_exceptions def get_stream_source(ctx, from_json, stream_source_id): - if isinstance(stream_source_id, six.string_types) and len(stream_source_id.strip()) == 0: + if isinstance(stream_source_id, str) and len(stream_source_id.strip()) == 0: raise click.UsageError('Parameter --stream-source-id cannot be whitespace or empty string') kwargs = {} @@ -2299,7 +2298,7 @@ def get_stream_source(ctx, from_json, stream_source_id): @cli_util.wrap_exceptions def get_video_job(ctx, from_json, video_job_id): - if isinstance(video_job_id, six.string_types) and len(video_job_id.strip()) == 0: + if isinstance(video_job_id, str) and len(video_job_id.strip()) == 0: raise click.UsageError('Parameter --video-job-id cannot be whitespace or empty string') kwargs = {} @@ -2321,7 +2320,7 @@ def get_video_job(ctx, from_json, video_job_id): @cli_util.wrap_exceptions def get_vision_private_endpoint(ctx, from_json, vision_private_endpoint_id): - if isinstance(vision_private_endpoint_id, six.string_types) and len(vision_private_endpoint_id.strip()) == 0: + if isinstance(vision_private_endpoint_id, str) and len(vision_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --vision-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2343,7 +2342,7 @@ def get_vision_private_endpoint(ctx, from_json, vision_private_endpoint_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2746,7 +2745,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2803,7 +2802,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2917,7 +2916,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def start_stream_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_job_id, if_match): - if isinstance(stream_job_id, six.string_types) and len(stream_job_id.strip()) == 0: + if isinstance(stream_job_id, str) and len(stream_job_id.strip()) == 0: raise click.UsageError('Parameter --stream-job-id cannot be whitespace or empty string') kwargs = {} @@ -2972,7 +2971,7 @@ def start_stream_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def stop_stream_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_job_id, if_match): - if isinstance(stream_job_id, six.string_types) and len(stream_job_id.strip()) == 0: + if isinstance(stream_job_id, str) and len(stream_job_id.strip()) == 0: raise click.UsageError('Parameter --stream-job-id cannot be whitespace or empty string') kwargs = {} @@ -3032,7 +3031,7 @@ def stop_stream_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3112,7 +3111,7 @@ def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3196,7 +3195,7 @@ def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_stream_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_group_id, display_name, is_enabled, stream_source_ids, stream_overlaps, freeform_tags, defined_tags, if_match): - if isinstance(stream_group_id, six.string_types) and len(stream_group_id.strip()) == 0: + if isinstance(stream_group_id, str) and len(stream_group_id.strip()) == 0: raise click.UsageError('Parameter --stream-group-id cannot be whitespace or empty string') if not force: if stream_source_ids or stream_overlaps or freeform_tags or defined_tags: @@ -3286,7 +3285,7 @@ def update_stream_group(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_stream_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_job_id, stream_source_id, features, stream_output_location, display_name, freeform_tags, defined_tags, if_match): - if isinstance(stream_job_id, six.string_types) and len(stream_job_id.strip()) == 0: + if isinstance(stream_job_id, str) and len(stream_job_id.strip()) == 0: raise click.UsageError('Parameter --stream-job-id cannot be whitespace or empty string') if not force: if features or stream_output_location or freeform_tags or defined_tags: @@ -3378,7 +3377,7 @@ def update_stream_job(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_stream_job_object_storage_output_location(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_job_id, stream_output_location_namespace_name, stream_output_location_bucket_name, stream_output_location_prefix, stream_source_id, features, display_name, freeform_tags, defined_tags, if_match): - if isinstance(stream_job_id, six.string_types) and len(stream_job_id.strip()) == 0: + if isinstance(stream_job_id, str) and len(stream_job_id.strip()) == 0: raise click.UsageError('Parameter --stream-job-id cannot be whitespace or empty string') if not force: if features or freeform_tags or defined_tags: @@ -3467,7 +3466,7 @@ def update_stream_job_object_storage_output_location(ctx, from_json, force, wait @cli_util.wrap_exceptions def update_stream_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_source_id, stream_source_details, display_name, freeform_tags, defined_tags, if_match): - if isinstance(stream_source_id, six.string_types) and len(stream_source_id.strip()) == 0: + if isinstance(stream_source_id, str) and len(stream_source_id.strip()) == 0: raise click.UsageError('Parameter --stream-source-id cannot be whitespace or empty string') if not force: if stream_source_details or freeform_tags or defined_tags: @@ -3549,7 +3548,7 @@ def update_stream_source(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_stream_source_rtsp_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_source_id, stream_source_details_stream_network_access_details, stream_source_details_camera_url, display_name, freeform_tags, defined_tags, if_match, stream_source_details_secret_id): - if isinstance(stream_source_id, six.string_types) and len(stream_source_id.strip()) == 0: + if isinstance(stream_source_id, str) and len(stream_source_id.strip()) == 0: raise click.UsageError('Parameter --stream-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3634,7 +3633,7 @@ def update_stream_source_rtsp_source_details(ctx, from_json, force, wait_for_sta @cli_util.wrap_exceptions def update_vision_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vision_private_endpoint_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(vision_private_endpoint_id, six.string_types) and len(vision_private_endpoint_id.strip()) == 0: + if isinstance(vision_private_endpoint_id, str) and len(vision_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --vision-private-endpoint-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/analytics/src/oci_cli_analytics/generated/analytics_cli.py b/services/analytics/src/oci_cli_analytics/generated/analytics_cli.py index 2cf62729b..b70dcfb1d 100644 --- a/services/analytics/src/oci_cli_analytics/generated/analytics_cli.py +++ b/services/analytics/src/oci_cli_analytics/generated/analytics_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -66,7 +65,7 @@ def work_request_group(): @cli_util.wrap_exceptions def change_analytics_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, compartment_id, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -127,7 +126,7 @@ def change_analytics_instance_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_analytics_instance_network_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, network_endpoint_details, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -190,7 +189,7 @@ def change_analytics_instance_network_endpoint(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def change_analytics_instance_network_endpoint_private_endpoint_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, network_endpoint_details_vcn_id, network_endpoint_details_subnet_id, if_match, network_endpoint_details_network_security_group_ids): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -262,7 +261,7 @@ def change_analytics_instance_network_endpoint_private_endpoint_details(ctx, fro @cli_util.wrap_exceptions def change_analytics_instance_network_endpoint_public_endpoint_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, if_match, network_endpoint_details_whitelisted_ips, network_endpoint_details_whitelisted_vcns, network_endpoint_details_whitelisted_services): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -687,7 +686,7 @@ def create_analytics_instance_public_endpoint_details(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def create_private_access_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, display_name, vcn_id, subnet_id, private_source_dns_zones, private_source_scan_hosts, network_security_group_ids): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -759,7 +758,7 @@ def create_private_access_channel(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def create_vanity_url(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, hosts, private_key, public_certificate, ca_certificate, description, passphrase): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -827,7 +826,7 @@ def create_vanity_url(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_analytics_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -884,10 +883,10 @@ def delete_analytics_instance(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_private_access_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, private_access_channel_key, analytics_instance_id, if_match): - if isinstance(private_access_channel_key, six.string_types) and len(private_access_channel_key.strip()) == 0: + if isinstance(private_access_channel_key, str) and len(private_access_channel_key.strip()) == 0: raise click.UsageError('Parameter --private-access-channel-key cannot be whitespace or empty string') - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -945,10 +944,10 @@ def delete_private_access_channel(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_vanity_url(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, vanity_url_key, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') - if isinstance(vanity_url_key, six.string_types) and len(vanity_url_key.strip()) == 0: + if isinstance(vanity_url_key, str) and len(vanity_url_key.strip()) == 0: raise click.UsageError('Parameter --vanity-url-key cannot be whitespace or empty string') kwargs = {} @@ -1002,7 +1001,7 @@ def delete_vanity_url(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1026,7 +1025,7 @@ def delete_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def get_analytics_instance(ctx, from_json, analytics_instance_id): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1049,10 +1048,10 @@ def get_analytics_instance(ctx, from_json, analytics_instance_id): @cli_util.wrap_exceptions def get_private_access_channel(ctx, from_json, private_access_channel_key, analytics_instance_id): - if isinstance(private_access_channel_key, six.string_types) and len(private_access_channel_key.strip()) == 0: + if isinstance(private_access_channel_key, str) and len(private_access_channel_key.strip()) == 0: raise click.UsageError('Parameter --private-access-channel-key cannot be whitespace or empty string') - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1075,7 +1074,7 @@ def get_private_access_channel(ctx, from_json, private_access_channel_key, analy @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1174,7 +1173,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1227,7 +1226,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1341,7 +1340,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, res @cli_util.wrap_exceptions def scale_analytics_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, capacity, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1402,7 +1401,7 @@ def scale_analytics_instance(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def set_feature_bundle(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, feature_bundle, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1465,7 +1464,7 @@ def set_feature_bundle(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def set_kms_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, kms_key_id, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1525,7 +1524,7 @@ def set_kms_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def start_analytics_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1580,7 +1579,7 @@ def start_analytics_instance(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def stop_analytics_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1646,7 +1645,7 @@ def stop_analytics_instance(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_analytics_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, description, email_notification, license_type, defined_tags, freeform_tags, update_channel, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -1735,10 +1734,10 @@ def update_analytics_instance(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_private_access_channel(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, private_access_channel_key, analytics_instance_id, display_name, vcn_id, subnet_id, private_source_dns_zones, private_source_scan_hosts, network_security_group_ids, if_match): - if isinstance(private_access_channel_key, six.string_types) and len(private_access_channel_key.strip()) == 0: + if isinstance(private_access_channel_key, str) and len(private_access_channel_key.strip()) == 0: raise click.UsageError('Parameter --private-access-channel-key cannot be whitespace or empty string') - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') if not force: if private_source_dns_zones or private_source_scan_hosts or network_security_group_ids: @@ -1825,10 +1824,10 @@ def update_private_access_channel(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_vanity_url(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, analytics_instance_id, vanity_url_key, private_key, public_certificate, ca_certificate, passphrase, if_match): - if isinstance(analytics_instance_id, six.string_types) and len(analytics_instance_id.strip()) == 0: + if isinstance(analytics_instance_id, str) and len(analytics_instance_id.strip()) == 0: raise click.UsageError('Parameter --analytics-instance-id cannot be whitespace or empty string') - if isinstance(vanity_url_key, six.string_types) and len(vanity_url_key.strip()) == 0: + if isinstance(vanity_url_key, str) and len(vanity_url_key.strip()) == 0: raise click.UsageError('Parameter --vanity-url-key cannot be whitespace or empty string') kwargs = {} diff --git a/services/announcements_service/src/oci_cli_announcement/generated/announcement_cli.py b/services/announcements_service/src/oci_cli_announcement/generated/announcement_cli.py index 686856f45..bba0febbf 100644 --- a/services/announcements_service/src/oci_cli_announcement/generated/announcement_cli.py +++ b/services/announcements_service/src/oci_cli_announcement/generated/announcement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -64,7 +63,7 @@ def announcement_group(): @cli_util.wrap_exceptions def get_announcement(ctx, from_json, announcement_id): - if isinstance(announcement_id, six.string_types) and len(announcement_id.strip()) == 0: + if isinstance(announcement_id, str) and len(announcement_id.strip()) == 0: raise click.UsageError('Parameter --announcement-id cannot be whitespace or empty string') kwargs = {} @@ -86,7 +85,7 @@ def get_announcement(ctx, from_json, announcement_id): @cli_util.wrap_exceptions def get_announcement_compartment(ctx, from_json, announcement_id): - if isinstance(announcement_id, six.string_types) and len(announcement_id.strip()) == 0: + if isinstance(announcement_id, str) and len(announcement_id.strip()) == 0: raise click.UsageError('Parameter --announcement-id cannot be whitespace or empty string') kwargs = {} @@ -110,7 +109,7 @@ def get_announcement_compartment(ctx, from_json, announcement_id): @cli_util.wrap_exceptions def get_announcement_user_status(ctx, from_json, announcement_id): - if isinstance(announcement_id, six.string_types) and len(announcement_id.strip()) == 0: + if isinstance(announcement_id, str) and len(announcement_id.strip()) == 0: raise click.UsageError('Parameter --announcement-id cannot be whitespace or empty string') kwargs = {} @@ -227,7 +226,7 @@ def list_announcements(ctx, from_json, all_pages, page_size, compartment_id, lim @cli_util.wrap_exceptions def update_announcement_user_status(ctx, from_json, announcement_id, user_status_announcement_id, user_id, time_acknowledged, if_match): - if isinstance(announcement_id, six.string_types) and len(announcement_id.strip()) == 0: + if isinstance(announcement_id, str) and len(announcement_id.strip()) == 0: raise click.UsageError('Parameter --announcement-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/announcements_service/src/oci_cli_announcement_subscription/generated/announcementsubscription_cli.py b/services/announcements_service/src/oci_cli_announcement_subscription/generated/announcementsubscription_cli.py index b1ca5e8e9..ea2dccbdf 100644 --- a/services/announcements_service/src/oci_cli_announcement_subscription/generated/announcementsubscription_cli.py +++ b/services/announcements_service/src/oci_cli_announcement_subscription/generated/announcementsubscription_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -52,7 +51,7 @@ def announcement_subscription_collection_group(): @cli_util.wrap_exceptions def change_announcement_subscription_compartment(ctx, from_json, announcement_subscription_id, compartment_id, if_match): - if isinstance(announcement_subscription_id, six.string_types) and len(announcement_subscription_id.strip()) == 0: + if isinstance(announcement_subscription_id, str) and len(announcement_subscription_id.strip()) == 0: raise click.UsageError('Parameter --announcement-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -167,7 +166,7 @@ def create_announcement_subscription(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def create_filter_group(ctx, from_json, announcement_subscription_id, name, filters, if_match): - if isinstance(announcement_subscription_id, six.string_types) and len(announcement_subscription_id.strip()) == 0: + if isinstance(announcement_subscription_id, str) and len(announcement_subscription_id.strip()) == 0: raise click.UsageError('Parameter --announcement-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -204,7 +203,7 @@ def create_filter_group(ctx, from_json, announcement_subscription_id, name, filt @cli_util.wrap_exceptions def delete_announcement_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, announcement_subscription_id, if_match): - if isinstance(announcement_subscription_id, six.string_types) and len(announcement_subscription_id.strip()) == 0: + if isinstance(announcement_subscription_id, str) and len(announcement_subscription_id.strip()) == 0: raise click.UsageError('Parameter --announcement-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -268,10 +267,10 @@ def delete_announcement_subscription(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_filter_group(ctx, from_json, announcement_subscription_id, filter_group_name, if_match): - if isinstance(announcement_subscription_id, six.string_types) and len(announcement_subscription_id.strip()) == 0: + if isinstance(announcement_subscription_id, str) and len(announcement_subscription_id.strip()) == 0: raise click.UsageError('Parameter --announcement-subscription-id cannot be whitespace or empty string') - if isinstance(filter_group_name, six.string_types) and len(filter_group_name.strip()) == 0: + if isinstance(filter_group_name, str) and len(filter_group_name.strip()) == 0: raise click.UsageError('Parameter --filter-group-name cannot be whitespace or empty string') kwargs = {} @@ -298,7 +297,7 @@ def delete_filter_group(ctx, from_json, announcement_subscription_id, filter_gro @cli_util.wrap_exceptions def get_announcement_subscription(ctx, from_json, announcement_subscription_id): - if isinstance(announcement_subscription_id, six.string_types) and len(announcement_subscription_id.strip()) == 0: + if isinstance(announcement_subscription_id, str) and len(announcement_subscription_id.strip()) == 0: raise click.UsageError('Parameter --announcement-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -399,7 +398,7 @@ def list_announcement_subscriptions(ctx, from_json, all_pages, page_size, compar @cli_util.wrap_exceptions def update_announcement_subscription(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, announcement_subscription_id, display_name, description, ons_topic_id, preferred_language, preferred_time_zone, freeform_tags, defined_tags, if_match): - if isinstance(announcement_subscription_id, six.string_types) and len(announcement_subscription_id.strip()) == 0: + if isinstance(announcement_subscription_id, str) and len(announcement_subscription_id.strip()) == 0: raise click.UsageError('Parameter --announcement-subscription-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -481,10 +480,10 @@ def update_announcement_subscription(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_filter_group(ctx, from_json, force, announcement_subscription_id, filter_group_name, filters, if_match): - if isinstance(announcement_subscription_id, six.string_types) and len(announcement_subscription_id.strip()) == 0: + if isinstance(announcement_subscription_id, str) and len(announcement_subscription_id.strip()) == 0: raise click.UsageError('Parameter --announcement-subscription-id cannot be whitespace or empty string') - if isinstance(filter_group_name, six.string_types) and len(filter_group_name.strip()) == 0: + if isinstance(filter_group_name, str) and len(filter_group_name.strip()) == 0: raise click.UsageError('Parameter --filter-group-name cannot be whitespace or empty string') if not force: if filters: diff --git a/services/announcements_service/src/oci_cli_announcements_preferences/generated/announcementspreferences_cli.py b/services/announcements_service/src/oci_cli_announcements_preferences/generated/announcementspreferences_cli.py index 382c2f807..3c32ae075 100644 --- a/services/announcements_service/src/oci_cli_announcements_preferences/generated/announcementspreferences_cli.py +++ b/services/announcements_service/src/oci_cli_announcements_preferences/generated/announcementspreferences_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -84,7 +83,7 @@ def create_announcements_preference(ctx, from_json, type, preference_type, is_un @cli_util.wrap_exceptions def get_announcements_preference(ctx, from_json, preference_id): - if isinstance(preference_id, six.string_types) and len(preference_id.strip()) == 0: + if isinstance(preference_id, str) and len(preference_id.strip()) == 0: raise click.UsageError('Parameter --preference-id cannot be whitespace or empty string') kwargs = {} @@ -164,7 +163,7 @@ def list_announcements_preferences(ctx, from_json, all_pages, page_size, compart @cli_util.wrap_exceptions def update_announcements_preference(ctx, from_json, preference_id, type, preference_type, is_unsubscribed, compartment_id, preferred_time_zone, if_match): - if isinstance(preference_id, six.string_types) and len(preference_id.strip()) == 0: + if isinstance(preference_id, str) and len(preference_id.strip()) == 0: raise click.UsageError('Parameter --preference-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/announcements_service/src/oci_cli_service/generated/service_cli.py b/services/announcements_service/src/oci_cli_service/generated/service_cli.py index 8ebd1a643..b7eef7aa2 100644 --- a/services/announcements_service/src/oci_cli_service/generated/service_cli.py +++ b/services/announcements_service/src/oci_cli_service/generated/service_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/api_platform/src/oci_cli_api_platform/generated/apiplatform_cli.py b/services/api_platform/src/oci_cli_api_platform/generated/apiplatform_cli.py index f8c02a378..cdb0e7a7b 100644 --- a/services/api_platform/src/oci_cli_api_platform/generated/apiplatform_cli.py +++ b/services/api_platform/src/oci_cli_api_platform/generated/apiplatform_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -70,7 +69,7 @@ def work_request_group(): @cli_util.wrap_exceptions def change_api_platform_instance_compartment(ctx, from_json, api_platform_instance_id, compartment_id, if_match): - if isinstance(api_platform_instance_id, six.string_types) and len(api_platform_instance_id.strip()) == 0: + if isinstance(api_platform_instance_id, str) and len(api_platform_instance_id.strip()) == 0: raise click.UsageError('Parameter --api-platform-instance-id cannot be whitespace or empty string') kwargs = {} @@ -171,7 +170,7 @@ def create_api_platform_instance(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_api_platform_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, api_platform_instance_id, if_match): - if isinstance(api_platform_instance_id, six.string_types) and len(api_platform_instance_id.strip()) == 0: + if isinstance(api_platform_instance_id, str) and len(api_platform_instance_id.strip()) == 0: raise click.UsageError('Parameter --api-platform-instance-id cannot be whitespace or empty string') kwargs = {} @@ -222,7 +221,7 @@ def delete_api_platform_instance(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def get_api_platform_instance(ctx, from_json, api_platform_instance_id): - if isinstance(api_platform_instance_id, six.string_types) and len(api_platform_instance_id.strip()) == 0: + if isinstance(api_platform_instance_id, str) and len(api_platform_instance_id.strip()) == 0: raise click.UsageError('Parameter --api-platform-instance-id cannot be whitespace or empty string') kwargs = {} @@ -244,7 +243,7 @@ def get_api_platform_instance(ctx, from_json, api_platform_instance_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -337,7 +336,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -394,7 +393,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -512,7 +511,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_api_platform_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, api_platform_instance_id, description, freeform_tags, defined_tags, if_match): - if isinstance(api_platform_instance_id, six.string_types) and len(api_platform_instance_id.strip()) == 0: + if isinstance(api_platform_instance_id, str) and len(api_platform_instance_id.strip()) == 0: raise click.UsageError('Parameter --api-platform-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/apiaccesscontrol/src/oci_cli_api_metadata/generated/apimetadata_cli.py b/services/apiaccesscontrol/src/oci_cli_api_metadata/generated/apimetadata_cli.py index 2f84ec1b7..b10a05b3a 100644 --- a/services/apiaccesscontrol/src/oci_cli_api_metadata/generated/apimetadata_cli.py +++ b/services/apiaccesscontrol/src/oci_cli_api_metadata/generated/apimetadata_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -48,7 +47,7 @@ def api_metadata_group(): @cli_util.wrap_exceptions def get_api_metadata(ctx, from_json, api_metadata_id): - if isinstance(api_metadata_id, six.string_types) and len(api_metadata_id.strip()) == 0: + if isinstance(api_metadata_id, str) and len(api_metadata_id.strip()) == 0: raise click.UsageError('Parameter --api-metadata-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/apiaccesscontrol/src/oci_cli_privileged_api_control/generated/privilegedapicontrol_cli.py b/services/apiaccesscontrol/src/oci_cli_privileged_api_control/generated/privilegedapicontrol_cli.py index 14e213cb4..587a9c06c 100644 --- a/services/apiaccesscontrol/src/oci_cli_privileged_api_control/generated/privilegedapicontrol_cli.py +++ b/services/apiaccesscontrol/src/oci_cli_privileged_api_control/generated/privilegedapicontrol_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -60,7 +59,7 @@ def privileged_api_control_collection_group(): @cli_util.wrap_exceptions def change_privileged_api_control_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, privileged_api_control_id, compartment_id, if_match): - if isinstance(privileged_api_control_id, six.string_types) and len(privileged_api_control_id.strip()) == 0: + if isinstance(privileged_api_control_id, str) and len(privileged_api_control_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-control-id cannot be whitespace or empty string') kwargs = {} @@ -209,7 +208,7 @@ def create_privileged_api_control(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_privileged_api_control(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, privileged_api_control_id, description, if_match): - if isinstance(privileged_api_control_id, six.string_types) and len(privileged_api_control_id.strip()) == 0: + if isinstance(privileged_api_control_id, str) and len(privileged_api_control_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-control-id cannot be whitespace or empty string') kwargs = {} @@ -262,7 +261,7 @@ def delete_privileged_api_control(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def get_privileged_api_control(ctx, from_json, privileged_api_control_id): - if isinstance(privileged_api_control_id, six.string_types) and len(privileged_api_control_id.strip()) == 0: + if isinstance(privileged_api_control_id, str) and len(privileged_api_control_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-control-id cannot be whitespace or empty string') kwargs = {} @@ -370,7 +369,7 @@ def list_privileged_api_controls(ctx, from_json, all_pages, page_size, compartme @cli_util.wrap_exceptions def update_privileged_api_control(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, privileged_api_control_id, display_name, description, resource_type, resources, notification_topic_id, approver_group_id_list, privileged_operation_list, number_of_approvers, freeform_tags, defined_tags, if_match): - if isinstance(privileged_api_control_id, six.string_types) and len(privileged_api_control_id.strip()) == 0: + if isinstance(privileged_api_control_id, str) and len(privileged_api_control_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-control-id cannot be whitespace or empty string') if not force: if resources or approver_group_id_list or privileged_operation_list or freeform_tags or defined_tags: diff --git a/services/apiaccesscontrol/src/oci_cli_privileged_api_requests/generated/privilegedapirequests_cli.py b/services/apiaccesscontrol/src/oci_cli_privileged_api_requests/generated/privilegedapirequests_cli.py index 57fc08ae4..abe3dfe04 100644 --- a/services/apiaccesscontrol/src/oci_cli_privileged_api_requests/generated/privilegedapirequests_cli.py +++ b/services/apiaccesscontrol/src/oci_cli_privileged_api_requests/generated/privilegedapirequests_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -61,7 +60,7 @@ def privileged_api_request_group(): @cli_util.wrap_exceptions def approve_privileged_api_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, privileged_api_request_id, approver_comment, time_of_user_creation, if_match): - if isinstance(privileged_api_request_id, six.string_types) and len(privileged_api_request_id.strip()) == 0: + if isinstance(privileged_api_request_id, str) and len(privileged_api_request_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-request-id cannot be whitespace or empty string') kwargs = {} @@ -127,7 +126,7 @@ def approve_privileged_api_request(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def close_privileged_api_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, privileged_api_request_id, description, if_match): - if isinstance(privileged_api_request_id, six.string_types) and len(privileged_api_request_id.strip()) == 0: + if isinstance(privileged_api_request_id, str) and len(privileged_api_request_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-request-id cannot be whitespace or empty string') kwargs = {} @@ -286,7 +285,7 @@ def create_privileged_api_request(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def get_privileged_api_request(ctx, from_json, privileged_api_request_id): - if isinstance(privileged_api_request_id, six.string_types) and len(privileged_api_request_id.strip()) == 0: + if isinstance(privileged_api_request_id, str) and len(privileged_api_request_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-request-id cannot be whitespace or empty string') kwargs = {} @@ -384,7 +383,7 @@ def list_privileged_api_requests(ctx, from_json, all_pages, page_size, compartme @cli_util.wrap_exceptions def reject_privileged_api_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, privileged_api_request_id, approver_comment, if_match): - if isinstance(privileged_api_request_id, six.string_types) and len(privileged_api_request_id.strip()) == 0: + if isinstance(privileged_api_request_id, str) and len(privileged_api_request_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-request-id cannot be whitespace or empty string') kwargs = {} @@ -447,7 +446,7 @@ def reject_privileged_api_request(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def revoke_privileged_api_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, privileged_api_request_id, approver_comment, if_match): - if isinstance(privileged_api_request_id, six.string_types) and len(privileged_api_request_id.strip()) == 0: + if isinstance(privileged_api_request_id, str) and len(privileged_api_request_id.strip()) == 0: raise click.UsageError('Parameter --privileged-api-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/apiaccesscontrol/src/oci_cli_privileged_api_work_request/generated/privilegedapiworkrequest_cli.py b/services/apiaccesscontrol/src/oci_cli_privileged_api_work_request/generated/privilegedapiworkrequest_cli.py index c3eff40b7..9e8bc75c3 100644 --- a/services/apiaccesscontrol/src/oci_cli_privileged_api_work_request/generated/privilegedapiworkrequest_cli.py +++ b/services/apiaccesscontrol/src/oci_cli_privileged_api_work_request/generated/privilegedapiworkrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -62,7 +61,7 @@ def work_request_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -86,7 +85,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -117,7 +116,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -174,7 +173,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/apigateway/src/oci_cli_api_gateway/generated/apigateway_cli.py b/services/apigateway/src/oci_cli_api_gateway/generated/apigateway_cli.py index 61f5ff198..908788a23 100644 --- a/services/apigateway/src/oci_cli_api_gateway/generated/apigateway_cli.py +++ b/services/apigateway/src/oci_cli_api_gateway/generated/apigateway_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -92,7 +91,7 @@ def sdk_group(): @cli_util.wrap_exceptions def add_api_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, api_id, type, message, if_match): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') kwargs = {} @@ -153,7 +152,7 @@ def add_api_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def add_certificate_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, type, message, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -214,7 +213,7 @@ def add_certificate_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def add_sdk_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sdk_id, type, message, if_match): - if isinstance(sdk_id, six.string_types) and len(sdk_id.strip()) == 0: + if isinstance(sdk_id, str) and len(sdk_id.strip()) == 0: raise click.UsageError('Parameter --sdk-id cannot be whitespace or empty string') kwargs = {} @@ -275,7 +274,7 @@ def add_sdk_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def change_api_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, api_id, compartment_id, if_match, is_lock_override): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') kwargs = {} @@ -338,7 +337,7 @@ def change_api_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def change_certificate_compartment(ctx, from_json, certificate_id, compartment_id, if_match, is_lock_override): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -632,7 +631,7 @@ def create_sdk(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_api(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, api_id, if_match, is_lock_override): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') kwargs = {} @@ -693,7 +692,7 @@ def delete_api(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, if_match, is_lock_override): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -754,7 +753,7 @@ def delete_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_sdk(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sdk_id, if_match, is_lock_override): - if isinstance(sdk_id, six.string_types) and len(sdk_id.strip()) == 0: + if isinstance(sdk_id, str) and len(sdk_id.strip()) == 0: raise click.UsageError('Parameter --sdk-id cannot be whitespace or empty string') kwargs = {} @@ -809,7 +808,7 @@ def delete_sdk(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def get_api(ctx, from_json, api_id): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') kwargs = {} @@ -834,7 +833,7 @@ def get_api(ctx, from_json, api_id): @cli_util.wrap_exceptions def get_api_content(ctx, from_json, file, api_id, if_match, range): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') kwargs = {} @@ -883,7 +882,7 @@ def get_api_content(ctx, from_json, file, api_id, if_match, range): @cli_util.wrap_exceptions def get_api_deployment_specification(ctx, from_json, api_id, if_match): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') kwargs = {} @@ -908,7 +907,7 @@ def get_api_deployment_specification(ctx, from_json, api_id, if_match): @cli_util.wrap_exceptions def get_api_validations(ctx, from_json, api_id, if_match): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') kwargs = {} @@ -932,7 +931,7 @@ def get_api_validations(ctx, from_json, api_id, if_match): @cli_util.wrap_exceptions def get_certificate(ctx, from_json, certificate_id): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -954,7 +953,7 @@ def get_certificate(ctx, from_json, certificate_id): @cli_util.wrap_exceptions def get_sdk(ctx, from_json, sdk_id): - if isinstance(sdk_id, six.string_types) and len(sdk_id.strip()) == 0: + if isinstance(sdk_id, str) and len(sdk_id.strip()) == 0: raise click.UsageError('Parameter --sdk-id cannot be whitespace or empty string') kwargs = {} @@ -1234,7 +1233,7 @@ def list_sdks(ctx, from_json, all_pages, page_size, sdk_id, display_name, lifecy @cli_util.wrap_exceptions def remove_api_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, api_id, type, if_match): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') kwargs = {} @@ -1291,7 +1290,7 @@ def remove_api_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def remove_certificate_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, type, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -1348,7 +1347,7 @@ def remove_certificate_lock(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def remove_sdk_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sdk_id, type, if_match): - if isinstance(sdk_id, six.string_types) and len(sdk_id.strip()) == 0: + if isinstance(sdk_id, str) and len(sdk_id.strip()) == 0: raise click.UsageError('Parameter --sdk-id cannot be whitespace or empty string') kwargs = {} @@ -1416,7 +1415,7 @@ def remove_sdk_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def update_api(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, api_id, display_name, freeform_tags, defined_tags, content, if_match, is_lock_override): - if isinstance(api_id, six.string_types) and len(api_id.strip()) == 0: + if isinstance(api_id, str) and len(api_id.strip()) == 0: raise click.UsageError('Parameter --api-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1506,7 +1505,7 @@ def update_api(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_certificate(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, display_name, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1590,7 +1589,7 @@ def update_certificate(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_sdk(ctx, from_json, force, sdk_id, display_name, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(sdk_id, six.string_types) and len(sdk_id.strip()) == 0: + if isinstance(sdk_id, str) and len(sdk_id.strip()) == 0: raise click.UsageError('Parameter --sdk-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/apigateway/src/oci_cli_deployment/generated/deployment_cli.py b/services/apigateway/src/oci_cli_deployment/generated/deployment_cli.py index af7e87bda..832af38d2 100644 --- a/services/apigateway/src/oci_cli_deployment/generated/deployment_cli.py +++ b/services/apigateway/src/oci_cli_deployment/generated/deployment_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -56,7 +55,7 @@ def deployment_group(): @cli_util.wrap_exceptions def add_deployment_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, type, message, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -117,7 +116,7 @@ def add_deployment_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def change_deployment_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, compartment_id, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -268,7 +267,7 @@ def create_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -323,7 +322,7 @@ def delete_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def get_deployment(ctx, from_json, deployment_id): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -417,7 +416,7 @@ def list_deployments(ctx, from_json, all_pages, page_size, compartment_id, gatew @cli_util.wrap_exceptions def remove_deployment_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, type, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -485,7 +484,7 @@ def remove_deployment_lock(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_deployment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, display_name, specification, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') if not force: if specification or freeform_tags or defined_tags: diff --git a/services/apigateway/src/oci_cli_gateway/generated/gateway_cli.py b/services/apigateway/src/oci_cli_gateway/generated/gateway_cli.py index 5696333fe..1bba62fc0 100644 --- a/services/apigateway/src/oci_cli_gateway/generated/gateway_cli.py +++ b/services/apigateway/src/oci_cli_gateway/generated/gateway_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -56,7 +55,7 @@ def gateway_group(): @cli_util.wrap_exceptions def add_gateway_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, gateway_id, type, message, if_match): - if isinstance(gateway_id, six.string_types) and len(gateway_id.strip()) == 0: + if isinstance(gateway_id, str) and len(gateway_id.strip()) == 0: raise click.UsageError('Parameter --gateway-id cannot be whitespace or empty string') kwargs = {} @@ -117,7 +116,7 @@ def add_gateway_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def change_gateway_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, gateway_id, compartment_id, if_match, is_lock_override): - if isinstance(gateway_id, six.string_types) and len(gateway_id.strip()) == 0: + if isinstance(gateway_id, str) and len(gateway_id.strip()) == 0: raise click.UsageError('Parameter --gateway-id cannot be whitespace or empty string') kwargs = {} @@ -516,7 +515,7 @@ def create_gateway_no_cache(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, gateway_id, if_match, is_lock_override): - if isinstance(gateway_id, six.string_types) and len(gateway_id.strip()) == 0: + if isinstance(gateway_id, str) and len(gateway_id.strip()) == 0: raise click.UsageError('Parameter --gateway-id cannot be whitespace or empty string') kwargs = {} @@ -571,7 +570,7 @@ def delete_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_gateway(ctx, from_json, gateway_id): - if isinstance(gateway_id, six.string_types) and len(gateway_id.strip()) == 0: + if isinstance(gateway_id, str) and len(gateway_id.strip()) == 0: raise click.UsageError('Parameter --gateway-id cannot be whitespace or empty string') kwargs = {} @@ -665,7 +664,7 @@ def list_gateways(ctx, from_json, all_pages, page_size, compartment_id, certific @cli_util.wrap_exceptions def remove_gateway_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, gateway_id, type, if_match): - if isinstance(gateway_id, six.string_types) and len(gateway_id.strip()) == 0: + if isinstance(gateway_id, str) and len(gateway_id.strip()) == 0: raise click.UsageError('Parameter --gateway-id cannot be whitespace or empty string') kwargs = {} @@ -738,7 +737,7 @@ def remove_gateway_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_gateway(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, gateway_id, display_name, network_security_group_ids, certificate_id, response_cache_details, freeform_tags, defined_tags, ca_bundles, if_match, is_lock_override): - if isinstance(gateway_id, six.string_types) and len(gateway_id.strip()) == 0: + if isinstance(gateway_id, str) and len(gateway_id.strip()) == 0: raise click.UsageError('Parameter --gateway-id cannot be whitespace or empty string') if not force: if network_security_group_ids or response_cache_details or freeform_tags or defined_tags or ca_bundles: @@ -850,7 +849,7 @@ def update_gateway(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_gateway_external_resp_cache(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, gateway_id, response_cache_details_servers, response_cache_details_authentication_secret_id, response_cache_details_authentication_secret_version_number, display_name, network_security_group_ids, certificate_id, freeform_tags, defined_tags, ca_bundles, if_match, is_lock_override, response_cache_details_is_ssl_enabled, response_cache_details_is_ssl_verify_disabled, response_cache_details_connect_timeout_in_ms, response_cache_details_read_timeout_in_ms, response_cache_details_send_timeout_in_ms): - if isinstance(gateway_id, six.string_types) and len(gateway_id.strip()) == 0: + if isinstance(gateway_id, str) and len(gateway_id.strip()) == 0: raise click.UsageError('Parameter --gateway-id cannot be whitespace or empty string') if not force: if network_security_group_ids or freeform_tags or defined_tags or ca_bundles: @@ -972,7 +971,7 @@ def update_gateway_external_resp_cache(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_gateway_no_cache(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, gateway_id, display_name, network_security_group_ids, certificate_id, freeform_tags, defined_tags, ca_bundles, if_match, is_lock_override): - if isinstance(gateway_id, six.string_types) and len(gateway_id.strip()) == 0: + if isinstance(gateway_id, str) and len(gateway_id.strip()) == 0: raise click.UsageError('Parameter --gateway-id cannot be whitespace or empty string') if not force: if network_security_group_ids or freeform_tags or defined_tags or ca_bundles: diff --git a/services/apigateway/src/oci_cli_subscribers/generated/subscribers_cli.py b/services/apigateway/src/oci_cli_subscribers/generated/subscribers_cli.py index 7d03fdb5d..ac8f183d8 100644 --- a/services/apigateway/src/oci_cli_subscribers/generated/subscribers_cli.py +++ b/services/apigateway/src/oci_cli_subscribers/generated/subscribers_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -49,7 +48,7 @@ def subscriber_group(): @cli_util.wrap_exceptions def add_subscriber_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subscriber_id, type, message, if_match): - if isinstance(subscriber_id, six.string_types) and len(subscriber_id.strip()) == 0: + if isinstance(subscriber_id, str) and len(subscriber_id.strip()) == 0: raise click.UsageError('Parameter --subscriber-id cannot be whitespace or empty string') kwargs = {} @@ -110,7 +109,7 @@ def add_subscriber_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def change_subscriber_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subscriber_id, compartment_id, if_match, is_lock_override): - if isinstance(subscriber_id, six.string_types) and len(subscriber_id.strip()) == 0: + if isinstance(subscriber_id, str) and len(subscriber_id.strip()) == 0: raise click.UsageError('Parameter --subscriber-id cannot be whitespace or empty string') kwargs = {} @@ -259,7 +258,7 @@ def create_subscriber(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_subscriber(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subscriber_id, if_match, is_lock_override): - if isinstance(subscriber_id, six.string_types) and len(subscriber_id.strip()) == 0: + if isinstance(subscriber_id, str) and len(subscriber_id.strip()) == 0: raise click.UsageError('Parameter --subscriber-id cannot be whitespace or empty string') kwargs = {} @@ -314,7 +313,7 @@ def delete_subscriber(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def get_subscriber(ctx, from_json, subscriber_id): - if isinstance(subscriber_id, six.string_types) and len(subscriber_id.strip()) == 0: + if isinstance(subscriber_id, str) and len(subscriber_id.strip()) == 0: raise click.UsageError('Parameter --subscriber-id cannot be whitespace or empty string') kwargs = {} @@ -403,7 +402,7 @@ def list_subscribers(ctx, from_json, all_pages, page_size, compartment_id, displ @cli_util.wrap_exceptions def remove_subscriber_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subscriber_id, type, if_match): - if isinstance(subscriber_id, six.string_types) and len(subscriber_id.strip()) == 0: + if isinstance(subscriber_id, str) and len(subscriber_id.strip()) == 0: raise click.UsageError('Parameter --subscriber-id cannot be whitespace or empty string') kwargs = {} @@ -474,7 +473,7 @@ def remove_subscriber_lock(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_subscriber(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, subscriber_id, display_name, clients, usage_plans, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(subscriber_id, six.string_types) and len(subscriber_id.strip()) == 0: + if isinstance(subscriber_id, str) and len(subscriber_id.strip()) == 0: raise click.UsageError('Parameter --subscriber-id cannot be whitespace or empty string') if not force: if clients or usage_plans or freeform_tags or defined_tags: diff --git a/services/apigateway/src/oci_cli_usage_plans/generated/usageplans_cli.py b/services/apigateway/src/oci_cli_usage_plans/generated/usageplans_cli.py index 4623fbd8f..b5ba80a9e 100644 --- a/services/apigateway/src/oci_cli_usage_plans/generated/usageplans_cli.py +++ b/services/apigateway/src/oci_cli_usage_plans/generated/usageplans_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -49,7 +48,7 @@ def usage_plan_group(): @cli_util.wrap_exceptions def add_usage_plan_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, usage_plan_id, type, message, if_match): - if isinstance(usage_plan_id, six.string_types) and len(usage_plan_id.strip()) == 0: + if isinstance(usage_plan_id, str) and len(usage_plan_id.strip()) == 0: raise click.UsageError('Parameter --usage-plan-id cannot be whitespace or empty string') kwargs = {} @@ -110,7 +109,7 @@ def add_usage_plan_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def change_usage_plan_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, usage_plan_id, compartment_id, if_match, is_lock_override): - if isinstance(usage_plan_id, six.string_types) and len(usage_plan_id.strip()) == 0: + if isinstance(usage_plan_id, str) and len(usage_plan_id.strip()) == 0: raise click.UsageError('Parameter --usage-plan-id cannot be whitespace or empty string') kwargs = {} @@ -257,7 +256,7 @@ def create_usage_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_usage_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, usage_plan_id, if_match, is_lock_override): - if isinstance(usage_plan_id, six.string_types) and len(usage_plan_id.strip()) == 0: + if isinstance(usage_plan_id, str) and len(usage_plan_id.strip()) == 0: raise click.UsageError('Parameter --usage-plan-id cannot be whitespace or empty string') kwargs = {} @@ -312,7 +311,7 @@ def delete_usage_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def get_usage_plan(ctx, from_json, usage_plan_id): - if isinstance(usage_plan_id, six.string_types) and len(usage_plan_id.strip()) == 0: + if isinstance(usage_plan_id, str) and len(usage_plan_id.strip()) == 0: raise click.UsageError('Parameter --usage-plan-id cannot be whitespace or empty string') kwargs = {} @@ -401,7 +400,7 @@ def list_usage_plans(ctx, from_json, all_pages, page_size, compartment_id, displ @cli_util.wrap_exceptions def remove_usage_plan_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, usage_plan_id, type, if_match): - if isinstance(usage_plan_id, six.string_types) and len(usage_plan_id.strip()) == 0: + if isinstance(usage_plan_id, str) and len(usage_plan_id.strip()) == 0: raise click.UsageError('Parameter --usage-plan-id cannot be whitespace or empty string') kwargs = {} @@ -471,7 +470,7 @@ def remove_usage_plan_lock(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_usage_plan(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, usage_plan_id, display_name, entitlements, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(usage_plan_id, six.string_types) and len(usage_plan_id.strip()) == 0: + if isinstance(usage_plan_id, str) and len(usage_plan_id.strip()) == 0: raise click.UsageError('Parameter --usage-plan-id cannot be whitespace or empty string') if not force: if entitlements or freeform_tags or defined_tags: diff --git a/services/apigateway/src/oci_cli_work_requests/generated/workrequests_cli.py b/services/apigateway/src/oci_cli_work_requests/generated/workrequests_cli.py index ef7a8a1c6..a391093e0 100644 --- a/services/apigateway/src/oci_cli_work_requests/generated/workrequests_cli.py +++ b/services/apigateway/src/oci_cli_work_requests/generated/workrequests_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -66,7 +65,7 @@ def work_request_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -90,7 +89,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -121,7 +120,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -178,7 +177,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/apm_config/src/oci_cli_config/generated/config_cli.py b/services/apm_config/src/oci_cli_config/generated/config_cli.py index 31f7ef60c..97094d4e0 100644 --- a/services/apm_config/src/oci_cli_config/generated/config_cli.py +++ b/services/apm_config/src/oci_cli_config/generated/config_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -442,7 +441,7 @@ def create_config_create_apdex_rules_details(ctx, from_json, apm_domain_id, rule @cli_util.wrap_exceptions def delete_config(ctx, from_json, apm_domain_id, config_id, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') kwargs = {} @@ -493,7 +492,7 @@ def export_configuration(ctx, from_json, configuration_map, apm_domain_id): @cli_util.wrap_exceptions def get_config(ctx, from_json, apm_domain_id, config_id): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') kwargs = {} @@ -748,7 +747,7 @@ def test_test_span_enrichment_details(ctx, from_json, apm_domain_id, options, sp @cli_util.wrap_exceptions def update_config(ctx, from_json, force, apm_domain_id, config_id, config_type, freeform_tags, defined_tags, if_match, opc_dry_run): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -805,7 +804,7 @@ def update_config(ctx, from_json, force, apm_domain_id, config_id, config_type, @cli_util.wrap_exceptions def update_config_update_metric_group_details(ctx, from_json, force, apm_domain_id, config_id, freeform_tags, defined_tags, display_name, filter_id, namespace, dimensions, metrics, if_match, opc_dry_run): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or dimensions or metrics: @@ -871,7 +870,7 @@ def update_config_update_metric_group_details(ctx, from_json, force, apm_domain_ @cli_util.wrap_exceptions def update_config_update_agent_config_details(ctx, from_json, force, apm_domain_id, config_id, freeform_tags, defined_tags, config, overrides, if_match, opc_dry_run): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or config or overrides: @@ -932,7 +931,7 @@ def update_config_update_agent_config_details(ctx, from_json, force, apm_domain_ @cli_util.wrap_exceptions def update_config_update_macs_apm_extension_details(ctx, from_json, force, apm_domain_id, config_id, freeform_tags, defined_tags, display_name, process_filter, run_as_user, service_name, agent_version, attach_install_dir, if_match, opc_dry_run): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or process_filter: @@ -1001,7 +1000,7 @@ def update_config_update_macs_apm_extension_details(ctx, from_json, force, apm_d @cli_util.wrap_exceptions def update_config_update_apdex_rules_details(ctx, from_json, force, apm_domain_id, config_id, rules, freeform_tags, defined_tags, display_name, if_match, opc_dry_run): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or rules: @@ -1057,7 +1056,7 @@ def update_config_update_apdex_rules_details(ctx, from_json, force, apm_domain_i @cli_util.wrap_exceptions def update_config_update_span_filter_details(ctx, from_json, force, apm_domain_id, config_id, freeform_tags, defined_tags, display_name, filter_text, description, if_match, opc_dry_run): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1119,7 +1118,7 @@ def update_config_update_span_filter_details(ctx, from_json, force, apm_domain_i @cli_util.wrap_exceptions def update_config_update_options_details(ctx, from_json, force, apm_domain_id, config_id, freeform_tags, defined_tags, display_name, options, group, description, if_match, opc_dry_run): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or options: diff --git a/services/apm_control_plane/src/oci_cli_apm_domain/generated/apmdomain_cli.py b/services/apm_control_plane/src/oci_cli_apm_domain/generated/apmdomain_cli.py index 580ba93a3..ed3ce317e 100644 --- a/services/apm_control_plane/src/oci_cli_apm_domain/generated/apmdomain_cli.py +++ b/services/apm_control_plane/src/oci_cli_apm_domain/generated/apmdomain_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -74,7 +73,7 @@ def data_key_group(): @cli_util.wrap_exceptions def change_apm_domain_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, apm_domain_id, compartment_id, if_match): - if isinstance(apm_domain_id, six.string_types) and len(apm_domain_id.strip()) == 0: + if isinstance(apm_domain_id, str) and len(apm_domain_id.strip()) == 0: raise click.UsageError('Parameter --apm-domain-id cannot be whitespace or empty string') kwargs = {} @@ -206,7 +205,7 @@ def create_apm_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_apm_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, apm_domain_id, if_match): - if isinstance(apm_domain_id, six.string_types) and len(apm_domain_id.strip()) == 0: + if isinstance(apm_domain_id, str) and len(apm_domain_id.strip()) == 0: raise click.UsageError('Parameter --apm-domain-id cannot be whitespace or empty string') kwargs = {} @@ -262,7 +261,7 @@ def delete_apm_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def generate_data_keys(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, generate_data_keys_list_details, apm_domain_id, if_match): - if isinstance(apm_domain_id, six.string_types) and len(apm_domain_id.strip()) == 0: + if isinstance(apm_domain_id, str) and len(apm_domain_id.strip()) == 0: raise click.UsageError('Parameter --apm-domain-id cannot be whitespace or empty string') kwargs = {} @@ -314,7 +313,7 @@ def generate_data_keys(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_apm_domain(ctx, from_json, apm_domain_id): - if isinstance(apm_domain_id, six.string_types) and len(apm_domain_id.strip()) == 0: + if isinstance(apm_domain_id, str) and len(apm_domain_id.strip()) == 0: raise click.UsageError('Parameter --apm-domain-id cannot be whitespace or empty string') kwargs = {} @@ -336,7 +335,7 @@ def get_apm_domain(ctx, from_json, apm_domain_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -365,7 +364,7 @@ def list_apm_domain_work_requests(ctx, from_json, all_pages, page_size, apm_doma if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(apm_domain_id, six.string_types) and len(apm_domain_id.strip()) == 0: + if isinstance(apm_domain_id, str) and len(apm_domain_id.strip()) == 0: raise click.UsageError('Parameter --apm-domain-id cannot be whitespace or empty string') kwargs = {} @@ -471,7 +470,7 @@ def list_apm_domains(ctx, from_json, all_pages, page_size, compartment_id, displ @cli_util.wrap_exceptions def list_data_keys(ctx, from_json, all_pages, apm_domain_id, data_key_type): - if isinstance(apm_domain_id, six.string_types) and len(apm_domain_id.strip()) == 0: + if isinstance(apm_domain_id, str) and len(apm_domain_id.strip()) == 0: raise click.UsageError('Parameter --apm-domain-id cannot be whitespace or empty string') kwargs = {} @@ -502,7 +501,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -553,7 +552,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -650,7 +649,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def remove_data_keys(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, apm_domain_id, remove_data_keys_list_details, if_match): - if isinstance(apm_domain_id, six.string_types) and len(apm_domain_id.strip()) == 0: + if isinstance(apm_domain_id, str) and len(apm_domain_id.strip()) == 0: raise click.UsageError('Parameter --apm-domain-id cannot be whitespace or empty string') kwargs = {} @@ -711,7 +710,7 @@ def remove_data_keys(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def update_apm_domain(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, apm_domain_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(apm_domain_id, six.string_types) and len(apm_domain_id.strip()) == 0: + if isinstance(apm_domain_id, str) and len(apm_domain_id.strip()) == 0: raise click.UsageError('Parameter --apm-domain-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/apm_synthetics/src/oci_cli_apm_synthetic/generated/apmsynthetic_cli.py b/services/apm_synthetics/src/oci_cli_apm_synthetic/generated/apmsynthetic_cli.py index 89d0cc330..2c9178706 100644 --- a/services/apm_synthetics/src/oci_cli_apm_synthetic/generated/apmsynthetic_cli.py +++ b/services/apm_synthetics/src/oci_cli_apm_synthetic/generated/apmsynthetic_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -126,7 +125,7 @@ def public_vantage_point_collection_group(): @cli_util.wrap_exceptions def aggregate_network_data(ctx, from_json, apm_domain_id, monitor_id, vantage_point_execution_times): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -1642,7 +1641,7 @@ def create_script(ctx, from_json, apm_domain_id, display_name, content_type, con @cli_util.wrap_exceptions def create_worker(ctx, from_json, apm_domain_id, on_premise_vantage_point_id, name, version_parameterconflict, resource_principal_token_public_key, configuration_details, worker_type, status, priority, freeform_tags, defined_tags): - if isinstance(on_premise_vantage_point_id, six.string_types) and len(on_premise_vantage_point_id.strip()) == 0: + if isinstance(on_premise_vantage_point_id, str) and len(on_premise_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --on-premise-vantage-point-id cannot be whitespace or empty string') kwargs = {} @@ -1693,7 +1692,7 @@ def create_worker(ctx, from_json, apm_domain_id, on_premise_vantage_point_id, na @cli_util.wrap_exceptions def delete_dedicated_vantage_point(ctx, from_json, apm_domain_id, dedicated_vantage_point_id, if_match): - if isinstance(dedicated_vantage_point_id, six.string_types) and len(dedicated_vantage_point_id.strip()) == 0: + if isinstance(dedicated_vantage_point_id, str) and len(dedicated_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vantage-point-id cannot be whitespace or empty string') kwargs = {} @@ -1721,7 +1720,7 @@ def delete_dedicated_vantage_point(ctx, from_json, apm_domain_id, dedicated_vant @cli_util.wrap_exceptions def delete_monitor(ctx, from_json, apm_domain_id, monitor_id, if_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -1749,7 +1748,7 @@ def delete_monitor(ctx, from_json, apm_domain_id, monitor_id, if_match): @cli_util.wrap_exceptions def delete_on_premise_vantage_point(ctx, from_json, apm_domain_id, on_premise_vantage_point_id, if_match): - if isinstance(on_premise_vantage_point_id, six.string_types) and len(on_premise_vantage_point_id.strip()) == 0: + if isinstance(on_premise_vantage_point_id, str) and len(on_premise_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --on-premise-vantage-point-id cannot be whitespace or empty string') kwargs = {} @@ -1777,7 +1776,7 @@ def delete_on_premise_vantage_point(ctx, from_json, apm_domain_id, on_premise_va @cli_util.wrap_exceptions def delete_script(ctx, from_json, apm_domain_id, script_id, if_match): - if isinstance(script_id, six.string_types) and len(script_id.strip()) == 0: + if isinstance(script_id, str) and len(script_id.strip()) == 0: raise click.UsageError('Parameter --script-id cannot be whitespace or empty string') kwargs = {} @@ -1806,10 +1805,10 @@ def delete_script(ctx, from_json, apm_domain_id, script_id, if_match): @cli_util.wrap_exceptions def delete_worker(ctx, from_json, apm_domain_id, on_premise_vantage_point_id, worker_id, if_match): - if isinstance(on_premise_vantage_point_id, six.string_types) and len(on_premise_vantage_point_id.strip()) == 0: + if isinstance(on_premise_vantage_point_id, str) and len(on_premise_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --on-premise-vantage-point-id cannot be whitespace or empty string') - if isinstance(worker_id, six.string_types) and len(worker_id.strip()) == 0: + if isinstance(worker_id, str) and len(worker_id.strip()) == 0: raise click.UsageError('Parameter --worker-id cannot be whitespace or empty string') kwargs = {} @@ -1836,7 +1835,7 @@ def delete_worker(ctx, from_json, apm_domain_id, on_premise_vantage_point_id, wo @cli_util.wrap_exceptions def get_dedicated_vantage_point(ctx, from_json, apm_domain_id, dedicated_vantage_point_id): - if isinstance(dedicated_vantage_point_id, six.string_types) and len(dedicated_vantage_point_id.strip()) == 0: + if isinstance(dedicated_vantage_point_id, str) and len(dedicated_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vantage-point-id cannot be whitespace or empty string') kwargs = {} @@ -1860,7 +1859,7 @@ def get_dedicated_vantage_point(ctx, from_json, apm_domain_id, dedicated_vantage @cli_util.wrap_exceptions def get_monitor(ctx, from_json, apm_domain_id, monitor_id): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -1888,10 +1887,10 @@ def get_monitor(ctx, from_json, apm_domain_id, monitor_id): @cli_util.wrap_exceptions def get_monitor_result(ctx, from_json, apm_domain_id, monitor_id, vantage_point, result_type, result_content_type, execution_time): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') - if isinstance(execution_time, six.string_types) and len(execution_time.strip()) == 0: + if isinstance(execution_time, str) and len(execution_time.strip()) == 0: raise click.UsageError('Parameter --execution-time cannot be whitespace or empty string') kwargs = {} @@ -1919,7 +1918,7 @@ def get_monitor_result(ctx, from_json, apm_domain_id, monitor_id, vantage_point, @cli_util.wrap_exceptions def get_on_premise_vantage_point(ctx, from_json, apm_domain_id, on_premise_vantage_point_id): - if isinstance(on_premise_vantage_point_id, six.string_types) and len(on_premise_vantage_point_id.strip()) == 0: + if isinstance(on_premise_vantage_point_id, str) and len(on_premise_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --on-premise-vantage-point-id cannot be whitespace or empty string') kwargs = {} @@ -1943,7 +1942,7 @@ def get_on_premise_vantage_point(ctx, from_json, apm_domain_id, on_premise_vanta @cli_util.wrap_exceptions def get_script(ctx, from_json, apm_domain_id, script_id): - if isinstance(script_id, six.string_types) and len(script_id.strip()) == 0: + if isinstance(script_id, str) and len(script_id.strip()) == 0: raise click.UsageError('Parameter --script-id cannot be whitespace or empty string') kwargs = {} @@ -1968,10 +1967,10 @@ def get_script(ctx, from_json, apm_domain_id, script_id): @cli_util.wrap_exceptions def get_worker(ctx, from_json, apm_domain_id, on_premise_vantage_point_id, worker_id): - if isinstance(on_premise_vantage_point_id, six.string_types) and len(on_premise_vantage_point_id.strip()) == 0: + if isinstance(on_premise_vantage_point_id, str) and len(on_premise_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --on-premise-vantage-point-id cannot be whitespace or empty string') - if isinstance(worker_id, six.string_types) and len(worker_id.strip()) == 0: + if isinstance(worker_id, str) and len(worker_id.strip()) == 0: raise click.UsageError('Parameter --worker-id cannot be whitespace or empty string') kwargs = {} @@ -2339,7 +2338,7 @@ def list_workers(ctx, from_json, all_pages, page_size, apm_domain_id, on_premise if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(on_premise_vantage_point_id, six.string_types) and len(on_premise_vantage_point_id.strip()) == 0: + if isinstance(on_premise_vantage_point_id, str) and len(on_premise_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --on-premise-vantage-point-id cannot be whitespace or empty string') kwargs = {} @@ -2406,7 +2405,7 @@ def list_workers(ctx, from_json, all_pages, page_size, apm_domain_id, on_premise @cli_util.wrap_exceptions def update_dedicated_vantage_point(ctx, from_json, force, apm_domain_id, dedicated_vantage_point_id, status, dvp_stack_details, region_parameterconflict, freeform_tags, defined_tags, if_match): - if isinstance(dedicated_vantage_point_id, six.string_types) and len(dedicated_vantage_point_id.strip()) == 0: + if isinstance(dedicated_vantage_point_id, str) and len(dedicated_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vantage-point-id cannot be whitespace or empty string') if not force: if dvp_stack_details or freeform_tags or defined_tags: @@ -2464,7 +2463,7 @@ def update_dedicated_vantage_point(ctx, from_json, force, apm_domain_id, dedicat @cli_util.wrap_exceptions def update_dedicated_vantage_point_oracle_rm_stack(ctx, from_json, force, apm_domain_id, dedicated_vantage_point_id, dvp_stack_details_dvp_version, dvp_stack_details_dvp_stack_id, dvp_stack_details_dvp_stream_id, status, region_parameterconflict, freeform_tags, defined_tags, if_match): - if isinstance(dedicated_vantage_point_id, six.string_types) and len(dedicated_vantage_point_id.strip()) == 0: + if isinstance(dedicated_vantage_point_id, str) and len(dedicated_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vantage-point-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2538,7 +2537,7 @@ def update_dedicated_vantage_point_oracle_rm_stack(ctx, from_json, force, apm_do @cli_util.wrap_exceptions def update_monitor(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, configuration, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or configuration or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -2658,7 +2657,7 @@ def update_monitor(ctx, from_json, force, apm_domain_id, monitor_id, display_nam @cli_util.wrap_exceptions def update_monitor_ftp_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_ftp_protocol, configuration_ftp_request_type, configuration_is_active_mode, configuration_ftp_basic_authentication_details, configuration_download_size_limit_in_bytes, configuration_upload_file_size_in_bytes, configuration_network_configuration, configuration_verify_response_codes, configuration_verify_response_content): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -2804,7 +2803,7 @@ def update_monitor_ftp_monitor_configuration(ctx, from_json, force, apm_domain_i @cli_util.wrap_exceptions def update_monitor_dns_sec_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_record_type, configuration_verify_response_content): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -2930,7 +2929,7 @@ def update_monitor_dns_sec_monitor_configuration(ctx, from_json, force, apm_doma @cli_util.wrap_exceptions def update_monitor_dns_trace_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_record_type, configuration_protocol, configuration_verify_response_content): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -3063,7 +3062,7 @@ def update_monitor_dns_trace_monitor_configuration(ctx, from_json, force, apm_do @cli_util.wrap_exceptions def update_monitor_sql_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_database_type, configuration_query, configuration_database_authentication_details, configuration_database_role, configuration_database_connection_type, configuration_connection_string, configuration_database_wallet_details): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -3204,7 +3203,7 @@ def update_monitor_sql_monitor_configuration(ctx, from_json, force, apm_domain_i @cli_util.wrap_exceptions def update_monitor_scripted_rest_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_req_authentication_scheme, configuration_verify_response_codes, configuration_network_configuration): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -3336,7 +3335,7 @@ def update_monitor_scripted_rest_monitor_configuration(ctx, from_json, force, ap @cli_util.wrap_exceptions def update_monitor_dns_server_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_record_type, configuration_name_server, configuration_network_configuration, configuration_protocol, configuration_verify_response_content, configuration_is_query_recursive): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -3474,7 +3473,7 @@ def update_monitor_dns_server_monitor_configuration(ctx, from_json, force, apm_d @cli_util.wrap_exceptions def update_monitor_scripted_browser_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_is_certificate_validation_enabled, configuration_is_default_snapshot_enabled, configuration_network_configuration): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -3616,7 +3615,7 @@ def update_monitor_scripted_browser_monitor_configuration(ctx, from_json, force, @cli_util.wrap_exceptions def update_monitor_rest_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_is_redirection_enabled, configuration_is_certificate_validation_enabled, configuration_request_method, configuration_req_authentication_scheme, configuration_req_authentication_details, configuration_client_certificate_details, configuration_request_headers, configuration_request_query_params, configuration_request_post_body, configuration_verify_response_content, configuration_verify_response_codes, configuration_network_configuration): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -3776,7 +3775,7 @@ def update_monitor_rest_monitor_configuration(ctx, from_json, force, apm_domain_ @cli_util.wrap_exceptions def update_monitor_browser_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration, configuration_is_certificate_validation_enabled, configuration_is_default_snapshot_enabled, configuration_verify_texts, configuration_verify_response_codes, configuration_network_configuration): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -3909,7 +3908,7 @@ def update_monitor_browser_monitor_configuration(ctx, from_json, force, apm_doma @cli_util.wrap_exceptions def update_monitor_network_monitor_configuration(ctx, from_json, force, apm_domain_id, monitor_id, configuration_network_configuration, display_name, vantage_points, script_id, status, repeat_interval_in_seconds, is_run_once, timeout_in_seconds, target, script_parameters, availability_configuration, maintenance_window_schedule, freeform_tags, defined_tags, is_run_now, scheduling_policy, batch_interval_in_seconds, is_i_pv6, if_match, configuration_is_failure_retried, configuration_dns_configuration): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if vantage_points or script_parameters or availability_configuration or maintenance_window_schedule or freeform_tags or defined_tags: @@ -4009,7 +4008,7 @@ def update_monitor_network_monitor_configuration(ctx, from_json, force, apm_doma @cli_util.wrap_exceptions def update_on_premise_vantage_point(ctx, from_json, force, apm_domain_id, on_premise_vantage_point_id, description, freeform_tags, defined_tags, if_match): - if isinstance(on_premise_vantage_point_id, six.string_types) and len(on_premise_vantage_point_id.strip()) == 0: + if isinstance(on_premise_vantage_point_id, str) and len(on_premise_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --on-premise-vantage-point-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4063,7 +4062,7 @@ def update_on_premise_vantage_point(ctx, from_json, force, apm_domain_id, on_pre @cli_util.wrap_exceptions def update_script(ctx, from_json, force, apm_domain_id, script_id, display_name, content_type, content, content_file_name, parameters, freeform_tags, defined_tags, if_match): - if isinstance(script_id, six.string_types) and len(script_id.strip()) == 0: + if isinstance(script_id, str) and len(script_id.strip()) == 0: raise click.UsageError('Parameter --script-id cannot be whitespace or empty string') if not force: if parameters or freeform_tags or defined_tags: @@ -4126,10 +4125,10 @@ def update_script(ctx, from_json, force, apm_domain_id, script_id, display_name, @cli_util.wrap_exceptions def update_worker(ctx, from_json, force, apm_domain_id, on_premise_vantage_point_id, worker_id, configuration_details, status, priority, freeform_tags, defined_tags, if_match): - if isinstance(on_premise_vantage_point_id, six.string_types) and len(on_premise_vantage_point_id.strip()) == 0: + if isinstance(on_premise_vantage_point_id, str) and len(on_premise_vantage_point_id.strip()) == 0: raise click.UsageError('Parameter --on-premise-vantage-point-id cannot be whitespace or empty string') - if isinstance(worker_id, six.string_types) and len(worker_id.strip()) == 0: + if isinstance(worker_id, str) and len(worker_id.strip()) == 0: raise click.UsageError('Parameter --worker-id cannot be whitespace or empty string') if not force: if configuration_details or freeform_tags or defined_tags: diff --git a/services/apm_traces/src/oci_cli_attributes/generated/attributes_cli.py b/services/apm_traces/src/oci_cli_attributes/generated/attributes_cli.py index b7d8574fe..c4b29f45d 100644 --- a/services/apm_traces/src/oci_cli_attributes/generated/attributes_cli.py +++ b/services/apm_traces/src/oci_cli_attributes/generated/attributes_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/apm_traces/src/oci_cli_query/generated/query_cli.py b/services/apm_traces/src/oci_cli_query/generated/query_cli.py index e34dc09cd..847759edf 100644 --- a/services/apm_traces/src/oci_cli_query/generated/query_cli.py +++ b/services/apm_traces/src/oci_cli_query/generated/query_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/apm_traces/src/oci_cli_scheduled_query/generated/scheduledquery_cli.py b/services/apm_traces/src/oci_cli_scheduled_query/generated/scheduledquery_cli.py index e52c2fe85..1c3b2141a 100644 --- a/services/apm_traces/src/oci_cli_scheduled_query/generated/scheduledquery_cli.py +++ b/services/apm_traces/src/oci_cli_scheduled_query/generated/scheduledquery_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -154,7 +153,7 @@ def create_scheduled_query(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_scheduled_query(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, apm_domain_id, scheduled_query_id, if_match): - if isinstance(scheduled_query_id, six.string_types) and len(scheduled_query_id.strip()) == 0: + if isinstance(scheduled_query_id, str) and len(scheduled_query_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-query-id cannot be whitespace or empty string') kwargs = {} @@ -215,7 +214,7 @@ def delete_scheduled_query(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def get_scheduled_query(ctx, from_json, apm_domain_id, scheduled_query_id): - if isinstance(scheduled_query_id, six.string_types) and len(scheduled_query_id.strip()) == 0: + if isinstance(scheduled_query_id, str) and len(scheduled_query_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-query-id cannot be whitespace or empty string') kwargs = {} @@ -314,7 +313,7 @@ def list_scheduled_queries(ctx, from_json, all_pages, page_size, apm_domain_id, @cli_util.wrap_exceptions def update_scheduled_query(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, apm_domain_id, scheduled_query_id, scheduled_query_name, scheduled_query_processing_type, scheduled_query_processing_sub_type, scheduled_query_text, scheduled_query_schedule, scheduled_query_description, scheduled_query_maximum_runtime_in_seconds, scheduled_query_retention_period_in_ms, scheduled_query_processing_configuration, scheduled_query_retention_criteria, freeform_tags, defined_tags, if_match, opc_dry_run): - if isinstance(scheduled_query_id, six.string_types) and len(scheduled_query_id.strip()) == 0: + if isinstance(scheduled_query_id, str) and len(scheduled_query_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-query-id cannot be whitespace or empty string') if not force: if scheduled_query_processing_configuration or freeform_tags or defined_tags: diff --git a/services/apm_traces/src/oci_cli_trace/generated/trace_cli.py b/services/apm_traces/src/oci_cli_trace/generated/trace_cli.py index 9467e9728..8e89526e0 100644 --- a/services/apm_traces/src/oci_cli_trace/generated/trace_cli.py +++ b/services/apm_traces/src/oci_cli_trace/generated/trace_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -74,7 +73,7 @@ def span_group(): @cli_util.wrap_exceptions def get_aggregated_snapshot(ctx, from_json, apm_domain_id, trace_key, service_name, server_name, span_key, span_name): - if isinstance(trace_key, six.string_types) and len(trace_key.strip()) == 0: + if isinstance(trace_key, str) and len(trace_key.strip()) == 0: raise click.UsageError('Parameter --trace-key cannot be whitespace or empty string') kwargs = {} @@ -108,7 +107,7 @@ def get_aggregated_snapshot(ctx, from_json, apm_domain_id, trace_key, service_na @cli_util.wrap_exceptions def get_log(ctx, from_json, apm_domain_id, log_key, time_log_started_greater_than_or_equal_to, time_log_ended_less_than): - if isinstance(log_key, six.string_types) and len(log_key.strip()) == 0: + if isinstance(log_key, str) and len(log_key.strip()) == 0: raise click.UsageError('Parameter --log-key cannot be whitespace or empty string') kwargs = {} @@ -138,10 +137,10 @@ def get_log(ctx, from_json, apm_domain_id, log_key, time_log_started_greater_tha @cli_util.wrap_exceptions def get_span(ctx, from_json, apm_domain_id, span_key, trace_key, time_span_started_greater_than_or_equal_to, time_span_started_less_than, span_namespace): - if isinstance(span_key, six.string_types) and len(span_key.strip()) == 0: + if isinstance(span_key, str) and len(span_key.strip()) == 0: raise click.UsageError('Parameter --span-key cannot be whitespace or empty string') - if isinstance(trace_key, six.string_types) and len(trace_key.strip()) == 0: + if isinstance(trace_key, str) and len(trace_key.strip()) == 0: raise click.UsageError('Parameter --trace-key cannot be whitespace or empty string') kwargs = {} @@ -175,7 +174,7 @@ def get_span(ctx, from_json, apm_domain_id, span_key, trace_key, time_span_start @cli_util.wrap_exceptions def get_trace(ctx, from_json, apm_domain_id, trace_key, time_trace_started_greater_than_or_equal_to, time_trace_started_less_than, trace_namespace): - if isinstance(trace_key, six.string_types) and len(trace_key.strip()) == 0: + if isinstance(trace_key, str) and len(trace_key.strip()) == 0: raise click.UsageError('Parameter --trace-key cannot be whitespace or empty string') kwargs = {} @@ -208,7 +207,7 @@ def get_trace(ctx, from_json, apm_domain_id, trace_key, time_trace_started_great @cli_util.wrap_exceptions def get_trace_snapshot(ctx, from_json, apm_domain_id, trace_key, is_summarized, thread_id, snapshot_time): - if isinstance(trace_key, six.string_types) and len(trace_key.strip()) == 0: + if isinstance(trace_key, str) and len(trace_key.strip()) == 0: raise click.UsageError('Parameter --trace-key cannot be whitespace or empty string') kwargs = {} diff --git a/services/appmgmt_control/src/oci_cli_appmgmt_control/generated/appmgmtcontrol_cli.py b/services/appmgmt_control/src/oci_cli_appmgmt_control/generated/appmgmtcontrol_cli.py index a38d13767..3a9f7754e 100644 --- a/services/appmgmt_control/src/oci_cli_appmgmt_control/generated/appmgmtcontrol_cli.py +++ b/services/appmgmt_control/src/oci_cli_appmgmt_control/generated/appmgmtcontrol_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -72,7 +71,7 @@ def work_request_group(): @cli_util.wrap_exceptions def activate_monitoring_plugin(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_instance_id, if_match): - if isinstance(monitored_instance_id, six.string_types) and len(monitored_instance_id.strip()) == 0: + if isinstance(monitored_instance_id, str) and len(monitored_instance_id.strip()) == 0: raise click.UsageError('Parameter --monitored-instance-id cannot be whitespace or empty string') kwargs = {} @@ -123,7 +122,7 @@ def activate_monitoring_plugin(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_monitored_instance(ctx, from_json, monitored_instance_id): - if isinstance(monitored_instance_id, six.string_types) and len(monitored_instance_id.strip()) == 0: + if isinstance(monitored_instance_id, str) and len(monitored_instance_id.strip()) == 0: raise click.UsageError('Parameter --monitored-instance-id cannot be whitespace or empty string') kwargs = {} @@ -145,7 +144,7 @@ def get_monitored_instance(ctx, from_json, monitored_instance_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -231,7 +230,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -282,7 +281,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -380,7 +379,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def publish_top_processes_metrics(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_instance_id): - if isinstance(monitored_instance_id, six.string_types) and len(monitored_instance_id.strip()) == 0: + if isinstance(monitored_instance_id, str) and len(monitored_instance_id.strip()) == 0: raise click.UsageError('Parameter --monitored-instance-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/artifacts/src/oci_cli_artifacts/generated/artifacts_cli.py b/services/artifacts/src/oci_cli_artifacts/generated/artifacts_cli.py index 107d6fb32..dd3ce2cb9 100644 --- a/services/artifacts/src/oci_cli_artifacts/generated/artifacts_cli.py +++ b/services/artifacts/src/oci_cli_artifacts/generated/artifacts_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -94,7 +93,7 @@ def container_image_signature_group(): @cli_util.wrap_exceptions def change_container_repository_compartment(ctx, from_json, repository_id, compartment_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -127,7 +126,7 @@ def change_container_repository_compartment(ctx, from_json, repository_id, compa @cli_util.wrap_exceptions def change_repository_compartment(ctx, from_json, repository_id, compartment_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -466,7 +465,7 @@ def create_repository_create_generic_repository_details(ctx, from_json, wait_for @cli_util.wrap_exceptions def delete_container_image(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -532,7 +531,7 @@ def delete_container_image(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_container_image_signature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, image_signature_id, if_match): - if isinstance(image_signature_id, six.string_types) and len(image_signature_id.strip()) == 0: + if isinstance(image_signature_id, str) and len(image_signature_id.strip()) == 0: raise click.UsageError('Parameter --image-signature-id cannot be whitespace or empty string') kwargs = {} @@ -598,7 +597,7 @@ def delete_container_image_signature(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_container_repository(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -664,7 +663,7 @@ def delete_container_repository(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_generic_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') kwargs = {} @@ -733,13 +732,13 @@ def delete_generic_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_generic_artifact_by_path(ctx, from_json, repository_id, artifact_path, version_parameterconflict, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(artifact_path, six.string_types) and len(artifact_path.strip()) == 0: + if isinstance(artifact_path, str) and len(artifact_path.strip()) == 0: raise click.UsageError('Parameter --artifact-path cannot be whitespace or empty string') - if isinstance(version_parameterconflict, six.string_types) and len(version_parameterconflict.strip()) == 0: + if isinstance(version_parameterconflict, str) and len(version_parameterconflict.strip()) == 0: raise click.UsageError('Parameter --version-parameterconflict cannot be whitespace or empty string') kwargs = {} @@ -772,7 +771,7 @@ def delete_generic_artifact_by_path(ctx, from_json, repository_id, artifact_path @cli_util.wrap_exceptions def delete_repository(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -852,7 +851,7 @@ def get_container_configuration(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_container_image(ctx, from_json, image_id): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -876,7 +875,7 @@ def get_container_image(ctx, from_json, image_id): @cli_util.wrap_exceptions def get_container_image_signature(ctx, from_json, image_signature_id): - if isinstance(image_signature_id, six.string_types) and len(image_signature_id.strip()) == 0: + if isinstance(image_signature_id, str) and len(image_signature_id.strip()) == 0: raise click.UsageError('Parameter --image-signature-id cannot be whitespace or empty string') kwargs = {} @@ -900,7 +899,7 @@ def get_container_image_signature(ctx, from_json, image_signature_id): @cli_util.wrap_exceptions def get_container_repository(ctx, from_json, repository_id): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -924,7 +923,7 @@ def get_container_repository(ctx, from_json, repository_id): @cli_util.wrap_exceptions def get_generic_artifact(ctx, from_json, artifact_id): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') kwargs = {} @@ -954,13 +953,13 @@ def get_generic_artifact(ctx, from_json, artifact_id): @cli_util.wrap_exceptions def get_generic_artifact_by_path(ctx, from_json, repository_id, artifact_path, version_parameterconflict): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(artifact_path, six.string_types) and len(artifact_path.strip()) == 0: + if isinstance(artifact_path, str) and len(artifact_path.strip()) == 0: raise click.UsageError('Parameter --artifact-path cannot be whitespace or empty string') - if isinstance(version_parameterconflict, six.string_types) and len(version_parameterconflict.strip()) == 0: + if isinstance(version_parameterconflict, str) and len(version_parameterconflict.strip()) == 0: raise click.UsageError('Parameter --version-parameterconflict cannot be whitespace or empty string') kwargs = {} @@ -986,7 +985,7 @@ def get_generic_artifact_by_path(ctx, from_json, repository_id, artifact_path, v @cli_util.wrap_exceptions def get_repository(ctx, from_json, repository_id): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -1417,7 +1416,7 @@ def list_repositories(ctx, from_json, all_pages, page_size, compartment_id, id, @cli_util.wrap_exceptions def remove_container_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, version_parameterconflict, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -1476,7 +1475,7 @@ def remove_container_version(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def restore_container_image(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, version_parameterconflict, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -1573,7 +1572,7 @@ def update_container_configuration(ctx, from_json, compartment_id, is_repository @cli_util.wrap_exceptions def update_container_image(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, freeform_tags, defined_tags, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1647,7 +1646,7 @@ def update_container_image(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_container_image_signature(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, image_signature_id, freeform_tags, defined_tags, if_match): - if isinstance(image_signature_id, six.string_types) and len(image_signature_id.strip()) == 0: + if isinstance(image_signature_id, str) and len(image_signature_id.strip()) == 0: raise click.UsageError('Parameter --image-signature-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1724,7 +1723,7 @@ def update_container_image_signature(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_container_repository(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, is_immutable, is_public, readme, freeform_tags, defined_tags, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') if not force: if readme or freeform_tags or defined_tags: @@ -1807,7 +1806,7 @@ def update_container_repository(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_generic_artifact(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, freeform_tags, defined_tags, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1884,13 +1883,13 @@ def update_generic_artifact(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_generic_artifact_by_path(ctx, from_json, force, repository_id, artifact_path, version_parameterconflict, freeform_tags, defined_tags, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(artifact_path, six.string_types) and len(artifact_path.strip()) == 0: + if isinstance(artifact_path, str) and len(artifact_path.strip()) == 0: raise click.UsageError('Parameter --artifact-path cannot be whitespace or empty string') - if isinstance(version_parameterconflict, six.string_types) and len(version_parameterconflict.strip()) == 0: + if isinstance(version_parameterconflict, str) and len(version_parameterconflict.strip()) == 0: raise click.UsageError('Parameter --version-parameterconflict cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1946,7 +1945,7 @@ def update_generic_artifact_by_path(ctx, from_json, force, repository_id, artifa @cli_util.wrap_exceptions def update_repository(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, repository_type, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2029,7 +2028,7 @@ def update_repository(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_repository_update_generic_repository_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/audit/src/oci_cli_audit/generated/audit_cli.py b/services/audit/src/oci_cli_audit/generated/audit_cli.py index 328584613..6f5825a32 100644 --- a/services/audit/src/oci_cli_audit/generated/audit_cli.py +++ b/services/audit/src/oci_cli_audit/generated/audit_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 diff --git a/services/autoscaling/src/oci_cli_auto_scaling/generated/autoscaling_cli.py b/services/autoscaling/src/oci_cli_auto_scaling/generated/autoscaling_cli.py index dbdbe5b96..106b5f2d5 100644 --- a/services/autoscaling/src/oci_cli_auto_scaling/generated/autoscaling_cli.py +++ b/services/autoscaling/src/oci_cli_auto_scaling/generated/autoscaling_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -66,7 +65,7 @@ def auto_scaling_policy_group(): @cli_util.wrap_exceptions def change_auto_scaling_configuration_compartment(ctx, from_json, auto_scaling_configuration_id, compartment_id, if_match): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -214,7 +213,7 @@ def create_auto_scaling_configuration_instance_pool_resource(ctx, from_json, com @cli_util.wrap_exceptions def create_auto_scaling_policy(ctx, from_json, auto_scaling_configuration_id, policy_type, capacity, display_name, is_enabled): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -261,7 +260,7 @@ def create_auto_scaling_policy(ctx, from_json, auto_scaling_configuration_id, po @cli_util.wrap_exceptions def create_auto_scaling_policy_create_scheduled_policy_details(ctx, from_json, auto_scaling_configuration_id, execution_schedule, capacity, display_name, is_enabled, resource_action): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -312,7 +311,7 @@ def create_auto_scaling_policy_create_scheduled_policy_details(ctx, from_json, a @cli_util.wrap_exceptions def create_auto_scaling_policy_create_threshold_policy_details(ctx, from_json, auto_scaling_configuration_id, rules, capacity, display_name, is_enabled): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -352,7 +351,7 @@ def create_auto_scaling_policy_create_threshold_policy_details(ctx, from_json, a @cli_util.wrap_exceptions def delete_auto_scaling_configuration(ctx, from_json, auto_scaling_configuration_id, if_match): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -379,10 +378,10 @@ def delete_auto_scaling_configuration(ctx, from_json, auto_scaling_configuration @cli_util.wrap_exceptions def delete_auto_scaling_policy(ctx, from_json, auto_scaling_configuration_id, auto_scaling_policy_id, if_match): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') - if isinstance(auto_scaling_policy_id, six.string_types) and len(auto_scaling_policy_id.strip()) == 0: + if isinstance(auto_scaling_policy_id, str) and len(auto_scaling_policy_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-policy-id cannot be whitespace or empty string') kwargs = {} @@ -407,7 +406,7 @@ def delete_auto_scaling_policy(ctx, from_json, auto_scaling_configuration_id, au @cli_util.wrap_exceptions def get_auto_scaling_configuration(ctx, from_json, auto_scaling_configuration_id): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -430,10 +429,10 @@ def get_auto_scaling_configuration(ctx, from_json, auto_scaling_configuration_id @cli_util.wrap_exceptions def get_auto_scaling_policy(ctx, from_json, auto_scaling_configuration_id, auto_scaling_policy_id): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') - if isinstance(auto_scaling_policy_id, six.string_types) and len(auto_scaling_policy_id.strip()) == 0: + if isinstance(auto_scaling_policy_id, str) and len(auto_scaling_policy_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-policy-id cannot be whitespace or empty string') kwargs = {} @@ -527,7 +526,7 @@ def list_auto_scaling_policies(ctx, from_json, all_pages, page_size, auto_scalin if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -588,7 +587,7 @@ def list_auto_scaling_policies(ctx, from_json, all_pages, page_size, auto_scalin @cli_util.wrap_exceptions def update_auto_scaling_configuration(ctx, from_json, force, auto_scaling_configuration_id, defined_tags, display_name, freeform_tags, is_enabled, cool_down_in_seconds, if_match): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -642,10 +641,10 @@ def update_auto_scaling_configuration(ctx, from_json, force, auto_scaling_config @cli_util.wrap_exceptions def update_auto_scaling_policy(ctx, from_json, force, auto_scaling_configuration_id, auto_scaling_policy_id, policy_type, display_name, capacity, is_enabled, if_match): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') - if isinstance(auto_scaling_policy_id, six.string_types) and len(auto_scaling_policy_id.strip()) == 0: + if isinstance(auto_scaling_policy_id, str) and len(auto_scaling_policy_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-policy-id cannot be whitespace or empty string') if not force: if capacity: @@ -697,10 +696,10 @@ def update_auto_scaling_policy(ctx, from_json, force, auto_scaling_configuration @cli_util.wrap_exceptions def update_auto_scaling_policy_update_threshold_policy_details(ctx, from_json, force, auto_scaling_configuration_id, auto_scaling_policy_id, display_name, capacity, is_enabled, rules, if_match): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') - if isinstance(auto_scaling_policy_id, six.string_types) and len(auto_scaling_policy_id.strip()) == 0: + if isinstance(auto_scaling_policy_id, str) and len(auto_scaling_policy_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-policy-id cannot be whitespace or empty string') if not force: if capacity or rules: @@ -755,10 +754,10 @@ def update_auto_scaling_policy_update_threshold_policy_details(ctx, from_json, f @cli_util.wrap_exceptions def update_auto_scaling_policy_update_scheduled_policy_details(ctx, from_json, force, auto_scaling_configuration_id, auto_scaling_policy_id, display_name, capacity, is_enabled, execution_schedule, resource_action, if_match): - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') - if isinstance(auto_scaling_policy_id, six.string_types) and len(auto_scaling_policy_id.strip()) == 0: + if isinstance(auto_scaling_policy_id, str) and len(auto_scaling_policy_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-policy-id cannot be whitespace or empty string') if not force: if capacity or execution_schedule or resource_action: diff --git a/services/bastion/src/oci_cli_bastion/generated/bastion_cli.py b/services/bastion/src/oci_cli_bastion/generated/bastion_cli.py index ec9cd04d9..35431e1bd 100644 --- a/services/bastion/src/oci_cli_bastion/generated/bastion_cli.py +++ b/services/bastion/src/oci_cli_bastion/generated/bastion_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -70,7 +69,7 @@ def work_request_group(): @cli_util.wrap_exceptions def change_bastion_compartment(ctx, from_json, bastion_id, compartment_id, if_match): - if isinstance(bastion_id, six.string_types) and len(bastion_id.strip()) == 0: + if isinstance(bastion_id, str) and len(bastion_id.strip()) == 0: raise click.UsageError('Parameter --bastion-id cannot be whitespace or empty string') kwargs = {} @@ -500,7 +499,7 @@ def create_session_create_port_forwarding_session_target_resource_details(ctx, f @cli_util.wrap_exceptions def delete_bastion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bastion_id, if_match): - if isinstance(bastion_id, six.string_types) and len(bastion_id.strip()) == 0: + if isinstance(bastion_id, str) and len(bastion_id.strip()) == 0: raise click.UsageError('Parameter --bastion-id cannot be whitespace or empty string') kwargs = {} @@ -556,7 +555,7 @@ def delete_bastion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_session(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, session_id, if_match): - if isinstance(session_id, six.string_types) and len(session_id.strip()) == 0: + if isinstance(session_id, str) and len(session_id.strip()) == 0: raise click.UsageError('Parameter --session-id cannot be whitespace or empty string') kwargs = {} @@ -607,7 +606,7 @@ def delete_session(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_bastion(ctx, from_json, bastion_id): - if isinstance(bastion_id, six.string_types) and len(bastion_id.strip()) == 0: + if isinstance(bastion_id, str) and len(bastion_id.strip()) == 0: raise click.UsageError('Parameter --bastion-id cannot be whitespace or empty string') kwargs = {} @@ -629,7 +628,7 @@ def get_bastion(ctx, from_json, bastion_id): @cli_util.wrap_exceptions def get_session(ctx, from_json, session_id): - if isinstance(session_id, six.string_types) and len(session_id.strip()) == 0: + if isinstance(session_id, str) and len(session_id.strip()) == 0: raise click.UsageError('Parameter --session-id cannot be whitespace or empty string') kwargs = {} @@ -651,7 +650,7 @@ def get_session(ctx, from_json, session_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -806,7 +805,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -857,7 +856,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -959,7 +958,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def update_bastion(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bastion_id, max_session_ttl_in_seconds, static_jump_host_ip_addresses, client_cidr_block_allow_list, freeform_tags, defined_tags, if_match): - if isinstance(bastion_id, six.string_types) and len(bastion_id.strip()) == 0: + if isinstance(bastion_id, str) and len(bastion_id.strip()) == 0: raise click.UsageError('Parameter --bastion-id cannot be whitespace or empty string') if not force: if static_jump_host_ip_addresses or client_cidr_block_allow_list or freeform_tags or defined_tags: @@ -1038,7 +1037,7 @@ def update_bastion(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_session(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, session_id, display_name, if_match): - if isinstance(session_id, six.string_types) and len(session_id.strip()) == 0: + if isinstance(session_id, str) and len(session_id.strip()) == 0: raise click.UsageError('Parameter --session-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/bds/src/oci_cli_bds/generated/bds_cli.py b/services/bds/src/oci_cli_bds/generated/bds_cli.py index edf5e2c2c..573566b69 100644 --- a/services/bds/src/oci_cli_bds/generated/bds_cli.py +++ b/services/bds/src/oci_cli_bds/generated/bds_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -131,10 +130,10 @@ def node_backup_configuration_group(): @cli_util.wrap_exceptions def activate_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, metastore_config_id, cluster_admin_password, bds_api_key_passphrase, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(metastore_config_id, six.string_types) and len(metastore_config_id.strip()) == 0: + if isinstance(metastore_config_id, str) and len(metastore_config_id.strip()) == 0: raise click.UsageError('Parameter --metastore-config-id cannot be whitespace or empty string') kwargs = {} @@ -201,10 +200,10 @@ def activate_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def activate_iam_user_sync_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, identity_configuration_id, cluster_admin_password, is_posix_attributes_addition_required, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -272,10 +271,10 @@ def activate_iam_user_sync_configuration(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def activate_upst_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, identity_configuration_id, cluster_admin_password, vault_id, master_encryption_key_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -344,7 +343,7 @@ def activate_upst_configuration(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def add_auto_scaling_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_type, is_enabled, cluster_admin_password, display_name, policy, policy_details, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -422,7 +421,7 @@ def add_auto_scaling_configuration(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def add_auto_scaling_configuration_add_metric_based_horizontal_scaling_policy_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_type, is_enabled, cluster_admin_password, display_name, policy, if_match, policy_details_scale_out_config, policy_details_scale_in_config): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -508,7 +507,7 @@ def add_auto_scaling_configuration_add_metric_based_horizontal_scaling_policy_de @cli_util.wrap_exceptions def add_auto_scaling_configuration_add_schedule_based_vertical_scaling_policy_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_type, is_enabled, cluster_admin_password, display_name, policy, if_match, policy_details_timezone, policy_details_schedule_details): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -594,7 +593,7 @@ def add_auto_scaling_configuration_add_schedule_based_vertical_scaling_policy_de @cli_util.wrap_exceptions def add_auto_scaling_configuration_add_schedule_based_horizontal_scaling_policy_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_type, is_enabled, cluster_admin_password, display_name, policy, if_match, policy_details_timezone, policy_details_schedule_details): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -678,7 +677,7 @@ def add_auto_scaling_configuration_add_schedule_based_horizontal_scaling_policy_ @cli_util.wrap_exceptions def add_auto_scaling_configuration_add_metric_based_vertical_scaling_policy_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_type, is_enabled, cluster_admin_password, display_name, policy, if_match, policy_details_scale_up_config, policy_details_scale_down_config): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -758,7 +757,7 @@ def add_auto_scaling_configuration_add_metric_based_vertical_scaling_policy_deta @cli_util.wrap_exceptions def add_block_storage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, block_volume_size_in_gbs, node_type, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -824,7 +823,7 @@ def add_block_storage(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def add_cloud_sql(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, shape, cluster_admin_password, shape_config, block_volume_size_in_gbs, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -896,7 +895,7 @@ def add_cloud_sql(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def add_kafka(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, shape, number_of_kafka_nodes, cluster_admin_password, shape_config, block_volume_size_in_gbs, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -969,7 +968,7 @@ def add_kafka(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_se @cli_util.wrap_exceptions def add_master_nodes(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, number_of_master_nodes, shape, block_volume_size_in_gbs, shape_config, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1044,7 +1043,7 @@ def add_master_nodes(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def add_utility_nodes(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, number_of_utility_nodes, shape, block_volume_size_in_gbs, shape_config, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1120,7 +1119,7 @@ def add_utility_nodes(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def add_worker_nodes(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, number_of_worker_nodes, node_type, shape, block_volume_size_in_gbs, shape_config, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1193,7 +1192,7 @@ def add_worker_nodes(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def backup_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, level_type_details, backup_type, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1258,7 +1257,7 @@ def backup_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def backup_node_node_type_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, level_type_details_node_type, backup_type, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1326,7 +1325,7 @@ def backup_node_node_type_level_details(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def backup_node_node_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, level_type_details_node_host_name, backup_type, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1390,7 +1389,7 @@ def backup_node_node_level_details(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def certificate_service_info(ctx, from_json, bds_instance_id, services, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1424,7 +1423,7 @@ def certificate_service_info(ctx, from_json, bds_instance_id, services, if_match @cli_util.wrap_exceptions def change_bds_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, compartment_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1486,7 +1485,7 @@ def change_bds_instance_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_shape(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, nodes, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1551,7 +1550,7 @@ def change_shape(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def create_bds_api_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, user_id, passphrase, key_alias, default_region, domain_ocid): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1745,7 +1744,7 @@ def create_bds_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def create_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, metastore_id, bds_api_key_id, bds_api_key_passphrase, cluster_admin_password, display_name): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1814,7 +1813,7 @@ def create_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def create_identity_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, display_name, identity_domain_id, confidential_application_id, upst_configuration_details, iam_user_sync_configuration_details): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1886,7 +1885,7 @@ def create_identity_configuration(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def create_node_backup_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, level_type_details, schedule, display_name, timezone, number_of_backups_to_retain, backup_type): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1962,7 +1961,7 @@ def create_node_backup_configuration(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def create_node_backup_configuration_node_type_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, schedule, level_type_details_node_type, display_name, timezone, number_of_backups_to_retain, backup_type): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2041,7 +2040,7 @@ def create_node_backup_configuration_node_type_level_details(ctx, from_json, wai @cli_util.wrap_exceptions def create_node_backup_configuration_node_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, schedule, level_type_details_node_host_name, display_name, timezone, number_of_backups_to_retain, backup_type): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2119,7 +2118,7 @@ def create_node_backup_configuration_node_level_details(ctx, from_json, wait_for @cli_util.wrap_exceptions def create_node_replace_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, level_type_details, cluster_admin_password, metric_type, duration_in_minutes, display_name): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2187,7 +2186,7 @@ def create_node_replace_configuration(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def create_node_replace_configuration_node_type_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, metric_type, duration_in_minutes, level_type_details_node_type, display_name): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2258,7 +2257,7 @@ def create_node_replace_configuration_node_type_level_details(ctx, from_json, wa @cli_util.wrap_exceptions def create_node_replace_configuration_node_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, metric_type, duration_in_minutes, level_type_details_node_host_name, display_name): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2327,7 +2326,7 @@ def create_node_replace_configuration_node_level_details(ctx, from_json, wait_fo @cli_util.wrap_exceptions def create_resource_principal_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, display_name, cluster_admin_password, session_token_life_span_duration_in_hours): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2391,10 +2390,10 @@ def create_resource_principal_configuration(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def deactivate_iam_user_sync_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, identity_configuration_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2457,10 +2456,10 @@ def deactivate_iam_user_sync_configuration(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def deactivate_upst_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, identity_configuration_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2523,10 +2522,10 @@ def deactivate_upst_configuration(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_bds_api_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, api_key_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(api_key_id, six.string_types) and len(api_key_id.strip()) == 0: + if isinstance(api_key_id, str) and len(api_key_id.strip()) == 0: raise click.UsageError('Parameter --api-key-id cannot be whitespace or empty string') kwargs = {} @@ -2583,7 +2582,7 @@ def delete_bds_api_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_bds_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2640,10 +2639,10 @@ def delete_bds_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, metastore_config_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(metastore_config_id, six.string_types) and len(metastore_config_id.strip()) == 0: + if isinstance(metastore_config_id, str) and len(metastore_config_id.strip()) == 0: raise click.UsageError('Parameter --metastore-config-id cannot be whitespace or empty string') kwargs = {} @@ -2701,10 +2700,10 @@ def delete_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_identity_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, identity_configuration_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2762,10 +2761,10 @@ def delete_identity_configuration(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_node_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_backup_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_backup_id, six.string_types) and len(node_backup_id.strip()) == 0: + if isinstance(node_backup_id, str) and len(node_backup_id.strip()) == 0: raise click.UsageError('Parameter --node-backup-id cannot be whitespace or empty string') kwargs = {} @@ -2823,10 +2822,10 @@ def delete_node_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_node_backup_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_backup_configuration_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_backup_configuration_id, six.string_types) and len(node_backup_configuration_id.strip()) == 0: + if isinstance(node_backup_configuration_id, str) and len(node_backup_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-backup-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2884,7 +2883,7 @@ def delete_node_backup_configuration(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def disable_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, services, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2952,7 +2951,7 @@ def disable_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def enable_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, services, root_certificate, host_cert_details, server_key_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3024,7 +3023,7 @@ def enable_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def execute_bootstrap_script(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, bootstrap_script_url, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3089,10 +3088,10 @@ def execute_bootstrap_script(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def force_refresh_resource_principal(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, resource_principal_configuration_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(resource_principal_configuration_id, six.string_types) and len(resource_principal_configuration_id.strip()) == 0: + if isinstance(resource_principal_configuration_id, str) and len(resource_principal_configuration_id.strip()) == 0: raise click.UsageError('Parameter --resource-principal-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3150,10 +3149,10 @@ def force_refresh_resource_principal(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def get_auto_scaling_configuration(ctx, from_json, bds_instance_id, auto_scaling_configuration_id): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3177,10 +3176,10 @@ def get_auto_scaling_configuration(ctx, from_json, bds_instance_id, auto_scaling @cli_util.wrap_exceptions def get_bds_api_key(ctx, from_json, bds_instance_id, api_key_id): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(api_key_id, six.string_types) and len(api_key_id.strip()) == 0: + if isinstance(api_key_id, str) and len(api_key_id.strip()) == 0: raise click.UsageError('Parameter --api-key-id cannot be whitespace or empty string') kwargs = {} @@ -3203,7 +3202,7 @@ def get_bds_api_key(ctx, from_json, bds_instance_id, api_key_id): @cli_util.wrap_exceptions def get_bds_instance(ctx, from_json, bds_instance_id): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3226,10 +3225,10 @@ def get_bds_instance(ctx, from_json, bds_instance_id): @cli_util.wrap_exceptions def get_bds_metastore_configuration(ctx, from_json, bds_instance_id, metastore_config_id): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(metastore_config_id, six.string_types) and len(metastore_config_id.strip()) == 0: + if isinstance(metastore_config_id, str) and len(metastore_config_id.strip()) == 0: raise click.UsageError('Parameter --metastore-config-id cannot be whitespace or empty string') kwargs = {} @@ -3257,10 +3256,10 @@ def get_bds_metastore_configuration(ctx, from_json, bds_instance_id, metastore_c @cli_util.wrap_exceptions def get_identity_configuration(ctx, from_json, bds_instance_id, identity_configuration_id, page, limit, sort_by, sort_order): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3292,10 +3291,10 @@ def get_identity_configuration(ctx, from_json, bds_instance_id, identity_configu @cli_util.wrap_exceptions def get_node_backup(ctx, from_json, bds_instance_id, node_backup_id): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_backup_id, six.string_types) and len(node_backup_id.strip()) == 0: + if isinstance(node_backup_id, str) and len(node_backup_id.strip()) == 0: raise click.UsageError('Parameter --node-backup-id cannot be whitespace or empty string') kwargs = {} @@ -3319,10 +3318,10 @@ def get_node_backup(ctx, from_json, bds_instance_id, node_backup_id): @cli_util.wrap_exceptions def get_node_backup_configuration(ctx, from_json, bds_instance_id, node_backup_configuration_id): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_backup_configuration_id, six.string_types) and len(node_backup_configuration_id.strip()) == 0: + if isinstance(node_backup_configuration_id, str) and len(node_backup_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-backup-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3346,10 +3345,10 @@ def get_node_backup_configuration(ctx, from_json, bds_instance_id, node_backup_c @cli_util.wrap_exceptions def get_node_replace_configuration(ctx, from_json, bds_instance_id, node_replace_configuration_id): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_replace_configuration_id, six.string_types) and len(node_replace_configuration_id.strip()) == 0: + if isinstance(node_replace_configuration_id, str) and len(node_replace_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-replace-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3374,7 +3373,7 @@ def get_node_replace_configuration(ctx, from_json, bds_instance_id, node_replace @cli_util.wrap_exceptions def get_os_patch_details(ctx, from_json, bds_instance_id, os_patch_version, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3400,10 +3399,10 @@ def get_os_patch_details(ctx, from_json, bds_instance_id, os_patch_version, if_m @cli_util.wrap_exceptions def get_resource_principal_configuration(ctx, from_json, bds_instance_id, resource_principal_configuration_id): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(resource_principal_configuration_id, six.string_types) and len(resource_principal_configuration_id.strip()) == 0: + if isinstance(resource_principal_configuration_id, str) and len(resource_principal_configuration_id.strip()) == 0: raise click.UsageError('Parameter --resource-principal-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3428,10 +3427,10 @@ def get_resource_principal_configuration(ctx, from_json, bds_instance_id, resour @cli_util.wrap_exceptions def get_software_update(ctx, from_json, bds_instance_id, software_update_key, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(software_update_key, six.string_types) and len(software_update_key.strip()) == 0: + if isinstance(software_update_key, str) and len(software_update_key.strip()) == 0: raise click.UsageError('Parameter --software-update-key cannot be whitespace or empty string') kwargs = {} @@ -3456,7 +3455,7 @@ def get_software_update(ctx, from_json, bds_instance_id, software_update_key, if @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3486,7 +3485,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def install_os_patch(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, os_patch_version, cluster_admin_password, patching_configs, is_dry_run, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3559,7 +3558,7 @@ def install_os_patch(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def install_os_patch_batching_based_patching_configs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, os_patch_version, cluster_admin_password, patching_configs_batch_size, patching_configs_wait_time_between_batch_in_seconds, patching_configs_tolerance_threshold_per_batch, is_dry_run, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3632,7 +3631,7 @@ def install_os_patch_batching_based_patching_configs(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def install_os_patch_downtime_based_patching_configs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, os_patch_version, cluster_admin_password, is_dry_run, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3704,7 +3703,7 @@ def install_os_patch_downtime_based_patching_configs(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def install_os_patch_domain_based_patching_configs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, os_patch_version, cluster_admin_password, patching_configs_wait_time_between_domain_in_seconds, patching_configs_tolerance_threshold_per_domain, is_dry_run, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3776,7 +3775,7 @@ def install_os_patch_domain_based_patching_configs(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def install_patch(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, version_parameterconflict, cluster_admin_password, patching_config, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3842,7 +3841,7 @@ def install_patch(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def install_patch_downtime_based_odh_patching_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, version_parameterconflict, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3910,7 +3909,7 @@ def install_patch_downtime_based_odh_patching_config(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def install_patch_domain_based_odh_patching_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, version_parameterconflict, cluster_admin_password, patching_config_wait_time_between_domain_in_seconds, if_match, patching_config_tolerance_threshold_per_domain): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3983,7 +3982,7 @@ def install_patch_domain_based_odh_patching_config(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def install_patch_batching_based_odh_patching_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, version_parameterconflict, cluster_admin_password, patching_config_batch_size, patching_config_wait_time_between_batch_in_seconds, if_match, patching_config_tolerance_threshold_per_batch): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4053,7 +4052,7 @@ def install_patch_batching_based_odh_patching_config(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def install_software_updates(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, software_update_keys, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4121,7 +4120,7 @@ def list_auto_scaling_configurations(ctx, from_json, all_pages, page_size, compa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4188,7 +4187,7 @@ def list_bds_api_keys(ctx, from_json, all_pages, page_size, bds_instance_id, lif if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4366,7 +4365,7 @@ def list_bds_metastore_configurations(ctx, from_json, all_pages, page_size, bds_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4436,7 +4435,7 @@ def list_identity_configurations(ctx, from_json, all_pages, page_size, bds_insta if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4502,7 +4501,7 @@ def list_node_backup_configurations(ctx, from_json, all_pages, page_size, bds_in if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4566,7 +4565,7 @@ def list_node_backups(ctx, from_json, all_pages, page_size, bds_instance_id, pag if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4631,7 +4630,7 @@ def list_node_replace_configurations(ctx, from_json, all_pages, page_size, bds_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4693,7 +4692,7 @@ def list_os_patches(ctx, from_json, all_pages, page_size, bds_instance_id, page, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4755,7 +4754,7 @@ def list_patch_histories(ctx, from_json, all_pages, page_size, bds_instance_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4816,7 +4815,7 @@ def list_patches(ctx, from_json, all_pages, page_size, bds_instance_id, page, li if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4871,7 +4870,7 @@ def list_resource_principal_configurations(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4933,7 +4932,7 @@ def list_software_updates(ctx, from_json, all_pages, page_size, bds_instance_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4992,7 +4991,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -5049,7 +5048,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -5160,10 +5159,10 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, res @cli_util.wrap_exceptions def refresh_confidential_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, identity_configuration_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -5226,10 +5225,10 @@ def refresh_confidential_application(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def refresh_upst_token_exchange_keytab(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, identity_configuration_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -5292,10 +5291,10 @@ def refresh_upst_token_exchange_keytab(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def remove_auto_scaling_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, auto_scaling_configuration_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -5357,7 +5356,7 @@ def remove_auto_scaling_configuration(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def remove_cloud_sql(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -5418,7 +5417,7 @@ def remove_cloud_sql(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def remove_kafka(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -5481,7 +5480,7 @@ def remove_kafka(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def remove_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, node_id, is_force_remove_enabled, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -5547,10 +5546,10 @@ def remove_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def remove_node_replace_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_replace_configuration_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_replace_configuration_id, six.string_types) and len(node_replace_configuration_id.strip()) == 0: + if isinstance(node_replace_configuration_id, str) and len(node_replace_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-replace-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -5613,10 +5612,10 @@ def remove_node_replace_configuration(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def remove_resource_principal_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, resource_principal_configuration_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(resource_principal_configuration_id, six.string_types) and len(resource_principal_configuration_id.strip()) == 0: + if isinstance(resource_principal_configuration_id, str) and len(resource_principal_configuration_id.strip()) == 0: raise click.UsageError('Parameter --resource-principal-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -5686,7 +5685,7 @@ def remove_resource_principal_configuration(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def renew_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, services, root_certificate, host_cert_details, server_key_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -5762,7 +5761,7 @@ def renew_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def replace_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_host_name, node_backup_id, cluster_admin_password, shape, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -5828,7 +5827,7 @@ def replace_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def restart_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_id, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -5890,7 +5889,7 @@ def restart_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def start_bds_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, start_cluster_shape_configs, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -5955,7 +5954,7 @@ def start_bds_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def stop_bds_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, cluster_admin_password, is_force_stop_jobs, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') kwargs = {} @@ -6020,10 +6019,10 @@ def stop_bds_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def test_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, metastore_config_id, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(metastore_config_id, six.string_types) and len(metastore_config_id.strip()) == 0: + if isinstance(metastore_config_id, str) and len(metastore_config_id.strip()) == 0: raise click.UsageError('Parameter --metastore-config-id cannot be whitespace or empty string') kwargs = {} @@ -6087,10 +6086,10 @@ def test_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def test_bds_object_storage_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, api_key_id, object_storage_uri, passphrase, object_storage_region): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(api_key_id, six.string_types) and len(api_key_id.strip()) == 0: + if isinstance(api_key_id, str) and len(api_key_id.strip()) == 0: raise click.UsageError('Parameter --api-key-id cannot be whitespace or empty string') kwargs = {} @@ -6160,10 +6159,10 @@ def test_bds_object_storage_connection(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_auto_scaling_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, auto_scaling_configuration_id, display_name, is_enabled, cluster_admin_password, policy, policy_details, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') if not force: if policy or policy_details: @@ -6252,10 +6251,10 @@ def update_auto_scaling_configuration(ctx, from_json, force, wait_for_state, max @cli_util.wrap_exceptions def update_auto_scaling_configuration_update_schedule_based_horizontal_scaling_policy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, auto_scaling_configuration_id, display_name, is_enabled, cluster_admin_password, policy, if_match, policy_details_timezone, policy_details_schedule_details): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') if not force: if policy: @@ -6348,10 +6347,10 @@ def update_auto_scaling_configuration_update_schedule_based_horizontal_scaling_p @cli_util.wrap_exceptions def update_auto_scaling_configuration_update_metric_based_vertical_scaling_policy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, auto_scaling_configuration_id, display_name, is_enabled, cluster_admin_password, policy, if_match, policy_details_scale_up_config, policy_details_scale_down_config): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') if not force: if policy: @@ -6444,10 +6443,10 @@ def update_auto_scaling_configuration_update_metric_based_vertical_scaling_polic @cli_util.wrap_exceptions def update_auto_scaling_configuration_update_metric_based_horizontal_scaling_policy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, auto_scaling_configuration_id, display_name, is_enabled, cluster_admin_password, policy, if_match, policy_details_scale_out_config, policy_details_scale_in_config): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') if not force: if policy: @@ -6542,10 +6541,10 @@ def update_auto_scaling_configuration_update_metric_based_horizontal_scaling_pol @cli_util.wrap_exceptions def update_auto_scaling_configuration_update_schedule_based_vertical_scaling_policy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, auto_scaling_configuration_id, display_name, is_enabled, cluster_admin_password, policy, if_match, policy_details_timezone, policy_details_schedule_details): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(auto_scaling_configuration_id, six.string_types) and len(auto_scaling_configuration_id.strip()) == 0: + if isinstance(auto_scaling_configuration_id, str) and len(auto_scaling_configuration_id.strip()) == 0: raise click.UsageError('Parameter --auto-scaling-configuration-id cannot be whitespace or empty string') if not force: if policy: @@ -6637,7 +6636,7 @@ def update_auto_scaling_configuration_update_schedule_based_vertical_scaling_pol @cli_util.wrap_exceptions def update_bds_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, display_name, bootstrap_script_url, freeform_tags, defined_tags, kms_key_id, network_config, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or network_config: @@ -6723,10 +6722,10 @@ def update_bds_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, metastore_config_id, display_name, bds_api_key_id, bds_api_key_passphrase, cluster_admin_password, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(metastore_config_id, six.string_types) and len(metastore_config_id.strip()) == 0: + if isinstance(metastore_config_id, str) and len(metastore_config_id.strip()) == 0: raise click.UsageError('Parameter --metastore-config-id cannot be whitespace or empty string') kwargs = {} @@ -6803,10 +6802,10 @@ def update_bds_metastore_configuration(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_identity_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, identity_configuration_id, cluster_admin_password, upst_configuration_details, iam_user_sync_configuration_details, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(identity_configuration_id, six.string_types) and len(identity_configuration_id.strip()) == 0: + if isinstance(identity_configuration_id, str) and len(identity_configuration_id.strip()) == 0: raise click.UsageError('Parameter --identity-configuration-id cannot be whitespace or empty string') if not force: if upst_configuration_details or iam_user_sync_configuration_details: @@ -6885,10 +6884,10 @@ def update_identity_configuration(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_node_backup_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_backup_configuration_id, level_type_details, display_name, timezone, schedule, number_of_backups_to_retain, backup_type, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_backup_configuration_id, six.string_types) and len(node_backup_configuration_id.strip()) == 0: + if isinstance(node_backup_configuration_id, str) and len(node_backup_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-backup-configuration-id cannot be whitespace or empty string') if not force: if level_type_details: @@ -6977,10 +6976,10 @@ def update_node_backup_configuration(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_node_backup_configuration_node_type_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_backup_configuration_id, level_type_details_node_type, display_name, timezone, schedule, number_of_backups_to_retain, backup_type, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_backup_configuration_id, six.string_types) and len(node_backup_configuration_id.strip()) == 0: + if isinstance(node_backup_configuration_id, str) and len(node_backup_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-backup-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -7066,10 +7065,10 @@ def update_node_backup_configuration_node_type_level_details(ctx, from_json, wai @cli_util.wrap_exceptions def update_node_backup_configuration_node_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_backup_configuration_id, level_type_details_node_host_name, display_name, timezone, schedule, number_of_backups_to_retain, backup_type, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_backup_configuration_id, six.string_types) and len(node_backup_configuration_id.strip()) == 0: + if isinstance(node_backup_configuration_id, str) and len(node_backup_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-backup-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -7154,10 +7153,10 @@ def update_node_backup_configuration_node_level_details(ctx, from_json, wait_for @cli_util.wrap_exceptions def update_node_replace_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_replace_configuration_id, level_type_details, display_name, metric_type, duration_in_minutes, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_replace_configuration_id, six.string_types) and len(node_replace_configuration_id.strip()) == 0: + if isinstance(node_replace_configuration_id, str) and len(node_replace_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-replace-configuration-id cannot be whitespace or empty string') if not force: if level_type_details: @@ -7238,10 +7237,10 @@ def update_node_replace_configuration(ctx, from_json, force, wait_for_state, max @cli_util.wrap_exceptions def update_node_replace_configuration_node_type_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_replace_configuration_id, level_type_details_node_type, display_name, metric_type, duration_in_minutes, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_replace_configuration_id, six.string_types) and len(node_replace_configuration_id.strip()) == 0: + if isinstance(node_replace_configuration_id, str) and len(node_replace_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-replace-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -7319,10 +7318,10 @@ def update_node_replace_configuration_node_type_level_details(ctx, from_json, wa @cli_util.wrap_exceptions def update_node_replace_configuration_node_level_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, node_replace_configuration_id, level_type_details_node_host_name, display_name, metric_type, duration_in_minutes, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(node_replace_configuration_id, six.string_types) and len(node_replace_configuration_id.strip()) == 0: + if isinstance(node_replace_configuration_id, str) and len(node_replace_configuration_id.strip()) == 0: raise click.UsageError('Parameter --node-replace-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -7398,10 +7397,10 @@ def update_node_replace_configuration_node_level_details(ctx, from_json, wait_fo @cli_util.wrap_exceptions def update_resource_principal_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, bds_instance_id, resource_principal_configuration_id, display_name, session_token_life_span_duration_in_hours, if_match): - if isinstance(bds_instance_id, six.string_types) and len(bds_instance_id.strip()) == 0: + if isinstance(bds_instance_id, str) and len(bds_instance_id.strip()) == 0: raise click.UsageError('Parameter --bds-instance-id cannot be whitespace or empty string') - if isinstance(resource_principal_configuration_id, six.string_types) and len(resource_principal_configuration_id.strip()) == 0: + if isinstance(resource_principal_configuration_id, str) and len(resource_principal_configuration_id.strip()) == 0: raise click.UsageError('Parameter --resource-principal-configuration-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/blockchain/src/oci_cli_blockchain_platform/generated/blockchainplatform_cli.py b/services/blockchain/src/oci_cli_blockchain_platform/generated/blockchainplatform_cli.py index b2dd0b667..277ff207c 100644 --- a/services/blockchain/src/oci_cli_blockchain_platform/generated/blockchainplatform_cli.py +++ b/services/blockchain/src/oci_cli_blockchain_platform/generated/blockchainplatform_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -80,7 +79,7 @@ def work_request_group(): @cli_util.wrap_exceptions def change_blockchain_platform_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, compartment_id, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -231,7 +230,7 @@ def create_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def create_osn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, ad, ocpu_allocation_param, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -297,7 +296,7 @@ def create_osn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def create_peer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, role, ocpu_allocation_param, ad, alias): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -361,7 +360,7 @@ def create_peer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -418,10 +417,10 @@ def delete_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_osn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, osn_id, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') - if isinstance(osn_id, six.string_types) and len(osn_id.strip()) == 0: + if isinstance(osn_id, str) and len(osn_id.strip()) == 0: raise click.UsageError('Parameter --osn-id cannot be whitespace or empty string') kwargs = {} @@ -479,10 +478,10 @@ def delete_osn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_peer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, peer_id, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') - if isinstance(peer_id, six.string_types) and len(peer_id.strip()) == 0: + if isinstance(peer_id, str) and len(peer_id.strip()) == 0: raise click.UsageError('Parameter --peer-id cannot be whitespace or empty string') kwargs = {} @@ -539,7 +538,7 @@ def delete_peer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_work_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -590,7 +589,7 @@ def delete_work_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_blockchain_platform(ctx, from_json, blockchain_platform_id): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -613,10 +612,10 @@ def get_blockchain_platform(ctx, from_json, blockchain_platform_id): @cli_util.wrap_exceptions def get_osn(ctx, from_json, blockchain_platform_id, osn_id): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') - if isinstance(osn_id, six.string_types) and len(osn_id.strip()) == 0: + if isinstance(osn_id, str) and len(osn_id.strip()) == 0: raise click.UsageError('Parameter --osn-id cannot be whitespace or empty string') kwargs = {} @@ -640,10 +639,10 @@ def get_osn(ctx, from_json, blockchain_platform_id, osn_id): @cli_util.wrap_exceptions def get_peer(ctx, from_json, blockchain_platform_id, peer_id): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') - if isinstance(peer_id, six.string_types) and len(peer_id.strip()) == 0: + if isinstance(peer_id, str) and len(peer_id.strip()) == 0: raise click.UsageError('Parameter --peer-id cannot be whitespace or empty string') kwargs = {} @@ -666,7 +665,7 @@ def get_peer(ctx, from_json, blockchain_platform_id, peer_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -695,7 +694,7 @@ def list_blockchain_platform_patches(ctx, from_json, all_pages, page_size, block if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -809,7 +808,7 @@ def list_osns(ctx, from_json, all_pages, page_size, blockchain_platform_id, disp if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -869,7 +868,7 @@ def list_peers(ctx, from_json, all_pages, page_size, blockchain_platform_id, dis if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -926,7 +925,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -977,7 +976,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1093,7 +1092,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, blo @cli_util.wrap_exceptions def preview_scale_blockchain_platform(ctx, from_json, blockchain_platform_id, add_osns, add_replicas, add_peers, add_storage, modify_peers, remove_replicas, remove_osns, remove_peers): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -1161,7 +1160,7 @@ def preview_scale_blockchain_platform(ctx, from_json, blockchain_platform_id, ad @cli_util.wrap_exceptions def scale_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, add_osns, add_replicas, add_peers, add_storage, modify_peers, remove_replicas, remove_osns, remove_peers, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -1244,7 +1243,7 @@ def scale_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def start_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -1299,7 +1298,7 @@ def start_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def stop_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} @@ -1362,7 +1361,7 @@ def stop_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_blockchain_platform(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, description, storage_size_in_tbs, replicas, total_ocpu_capacity, load_balancer_shape, freeform_tags, defined_tags, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') if not force: if replicas or freeform_tags or defined_tags: @@ -1449,10 +1448,10 @@ def update_blockchain_platform(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_osn(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, osn_id, ocpu_allocation_param, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') - if isinstance(osn_id, six.string_types) and len(osn_id.strip()) == 0: + if isinstance(osn_id, str) and len(osn_id.strip()) == 0: raise click.UsageError('Parameter --osn-id cannot be whitespace or empty string') if not force: if ocpu_allocation_param: @@ -1520,10 +1519,10 @@ def update_osn(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_peer(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, blockchain_platform_id, peer_id, ocpu_allocation_param, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') - if isinstance(peer_id, six.string_types) and len(peer_id.strip()) == 0: + if isinstance(peer_id, str) and len(peer_id.strip()) == 0: raise click.UsageError('Parameter --peer-id cannot be whitespace or empty string') if not force: if ocpu_allocation_param: @@ -1589,7 +1588,7 @@ def update_peer(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def upgrade_blockchain_platform(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, patch_id, blockchain_platform_id, if_match): - if isinstance(blockchain_platform_id, six.string_types) and len(blockchain_platform_id.strip()) == 0: + if isinstance(blockchain_platform_id, str) and len(blockchain_platform_id.strip()) == 0: raise click.UsageError('Parameter --blockchain-platform-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/budget/src/oci_cli_budget/generated/budget_cli.py b/services/budget/src/oci_cli_budget/generated/budget_cli.py index 3545dea65..72ce08fbb 100644 --- a/services/budget/src/oci_cli_budget/generated/budget_cli.py +++ b/services/budget/src/oci_cli_budget/generated/budget_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -63,7 +62,7 @@ def budget_group(): @cli_util.wrap_exceptions def create_alert_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, budget_id, type, threshold, threshold_type, display_name, description, recipients, message, freeform_tags, defined_tags): - if isinstance(budget_id, six.string_types) and len(budget_id.strip()) == 0: + if isinstance(budget_id, str) and len(budget_id.strip()) == 0: raise click.UsageError('Parameter --budget-id cannot be whitespace or empty string') kwargs = {} @@ -237,10 +236,10 @@ def create_budget(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_alert_rule(ctx, from_json, budget_id, alert_rule_id, if_match): - if isinstance(budget_id, six.string_types) and len(budget_id.strip()) == 0: + if isinstance(budget_id, str) and len(budget_id.strip()) == 0: raise click.UsageError('Parameter --budget-id cannot be whitespace or empty string') - if isinstance(alert_rule_id, six.string_types) and len(alert_rule_id.strip()) == 0: + if isinstance(alert_rule_id, str) and len(alert_rule_id.strip()) == 0: raise click.UsageError('Parameter --alert-rule-id cannot be whitespace or empty string') kwargs = {} @@ -270,7 +269,7 @@ def delete_alert_rule(ctx, from_json, budget_id, alert_rule_id, if_match): @cli_util.wrap_exceptions def delete_budget(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, budget_id, if_match): - if isinstance(budget_id, six.string_types) and len(budget_id.strip()) == 0: + if isinstance(budget_id, str) and len(budget_id.strip()) == 0: raise click.UsageError('Parameter --budget-id cannot be whitespace or empty string') kwargs = {} @@ -330,10 +329,10 @@ def delete_budget(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def get_alert_rule(ctx, from_json, budget_id, alert_rule_id): - if isinstance(budget_id, six.string_types) and len(budget_id.strip()) == 0: + if isinstance(budget_id, str) and len(budget_id.strip()) == 0: raise click.UsageError('Parameter --budget-id cannot be whitespace or empty string') - if isinstance(alert_rule_id, six.string_types) and len(alert_rule_id.strip()) == 0: + if isinstance(alert_rule_id, str) and len(alert_rule_id.strip()) == 0: raise click.UsageError('Parameter --alert-rule-id cannot be whitespace or empty string') kwargs = {} @@ -356,7 +355,7 @@ def get_alert_rule(ctx, from_json, budget_id, alert_rule_id): @cli_util.wrap_exceptions def get_budget(ctx, from_json, budget_id): - if isinstance(budget_id, six.string_types) and len(budget_id.strip()) == 0: + if isinstance(budget_id, str) and len(budget_id.strip()) == 0: raise click.UsageError('Parameter --budget-id cannot be whitespace or empty string') kwargs = {} @@ -391,7 +390,7 @@ def list_alert_rules(ctx, from_json, all_pages, page_size, budget_id, limit, pag if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(budget_id, six.string_types) and len(budget_id.strip()) == 0: + if isinstance(budget_id, str) and len(budget_id.strip()) == 0: raise click.UsageError('Parameter --budget-id cannot be whitespace or empty string') kwargs = {} @@ -533,10 +532,10 @@ def list_budgets(ctx, from_json, all_pages, page_size, compartment_id, limit, pa @cli_util.wrap_exceptions def update_alert_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, budget_id, alert_rule_id, display_name, type, threshold, threshold_type, recipients, description, message, freeform_tags, defined_tags, if_match): - if isinstance(budget_id, six.string_types) and len(budget_id.strip()) == 0: + if isinstance(budget_id, str) and len(budget_id.strip()) == 0: raise click.UsageError('Parameter --budget-id cannot be whitespace or empty string') - if isinstance(alert_rule_id, six.string_types) and len(alert_rule_id.strip()) == 0: + if isinstance(alert_rule_id, str) and len(alert_rule_id.strip()) == 0: raise click.UsageError('Parameter --alert-rule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -638,7 +637,7 @@ def update_alert_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_budget(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, budget_id, display_name, description, amount, budget_processing_period_start_offset, processing_period_type, start_date, end_date, reset_period, freeform_tags, defined_tags, if_match): - if isinstance(budget_id, six.string_types) and len(budget_id.strip()) == 0: + if isinstance(budget_id, str) and len(budget_id.strip()) == 0: raise click.UsageError('Parameter --budget-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/capacity_management/src/oci_cli_capacity_management/generated/capacitymanagement_cli.py b/services/capacity_management/src/oci_cli_capacity_management/generated/capacitymanagement_cli.py index 9e6b8403e..249bb17b7 100644 --- a/services/capacity_management/src/oci_cli_capacity_management/generated/capacitymanagement_cli.py +++ b/services/capacity_management/src/oci_cli_capacity_management/generated/capacitymanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -292,7 +291,7 @@ def create_occ_capacity_request(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def create_occ_customer(ctx, from_json, tenancy_id, display_name, occ_customer_group_id, description, status): - if isinstance(occ_customer_group_id, six.string_types) and len(occ_customer_group_id.strip()) == 0: + if isinstance(occ_customer_group_id, str) and len(occ_customer_group_id.strip()) == 0: raise click.UsageError('Parameter --occ-customer-group-id cannot be whitespace or empty string') kwargs = {} @@ -408,7 +407,7 @@ def create_occ_customer_group(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_occ_availability_catalog(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, occ_availability_catalog_id, if_match): - if isinstance(occ_availability_catalog_id, six.string_types) and len(occ_availability_catalog_id.strip()) == 0: + if isinstance(occ_availability_catalog_id, str) and len(occ_availability_catalog_id.strip()) == 0: raise click.UsageError('Parameter --occ-availability-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -472,7 +471,7 @@ def delete_occ_availability_catalog(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def delete_occ_capacity_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, occ_capacity_request_id, if_match): - if isinstance(occ_capacity_request_id, six.string_types) and len(occ_capacity_request_id.strip()) == 0: + if isinstance(occ_capacity_request_id, str) and len(occ_capacity_request_id.strip()) == 0: raise click.UsageError('Parameter --occ-capacity-request-id cannot be whitespace or empty string') kwargs = {} @@ -534,10 +533,10 @@ def delete_occ_capacity_request(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_occ_customer(ctx, from_json, occ_customer_group_id, occ_customer_id, if_match): - if isinstance(occ_customer_group_id, six.string_types) and len(occ_customer_group_id.strip()) == 0: + if isinstance(occ_customer_group_id, str) and len(occ_customer_group_id.strip()) == 0: raise click.UsageError('Parameter --occ-customer-group-id cannot be whitespace or empty string') - if isinstance(occ_customer_id, six.string_types) and len(occ_customer_id.strip()) == 0: + if isinstance(occ_customer_id, str) and len(occ_customer_id.strip()) == 0: raise click.UsageError('Parameter --occ-customer-id cannot be whitespace or empty string') kwargs = {} @@ -567,7 +566,7 @@ def delete_occ_customer(ctx, from_json, occ_customer_group_id, occ_customer_id, @cli_util.wrap_exceptions def delete_occ_customer_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, occ_customer_group_id, if_match): - if isinstance(occ_customer_group_id, six.string_types) and len(occ_customer_group_id.strip()) == 0: + if isinstance(occ_customer_group_id, str) and len(occ_customer_group_id.strip()) == 0: raise click.UsageError('Parameter --occ-customer-group-id cannot be whitespace or empty string') kwargs = {} @@ -626,7 +625,7 @@ def delete_occ_customer_group(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_occ_availability_catalog(ctx, from_json, occ_availability_catalog_id): - if isinstance(occ_availability_catalog_id, six.string_types) and len(occ_availability_catalog_id.strip()) == 0: + if isinstance(occ_availability_catalog_id, str) and len(occ_availability_catalog_id.strip()) == 0: raise click.UsageError('Parameter --occ-availability-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -650,7 +649,7 @@ def get_occ_availability_catalog(ctx, from_json, occ_availability_catalog_id): @cli_util.wrap_exceptions def get_occ_availability_catalog_content(ctx, from_json, file, occ_availability_catalog_id, if_match): - if isinstance(occ_availability_catalog_id, six.string_types) and len(occ_availability_catalog_id.strip()) == 0: + if isinstance(occ_availability_catalog_id, str) and len(occ_availability_catalog_id.strip()) == 0: raise click.UsageError('Parameter --occ-availability-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -696,7 +695,7 @@ def get_occ_availability_catalog_content(ctx, from_json, file, occ_availability_ @cli_util.wrap_exceptions def get_occ_capacity_request(ctx, from_json, occ_capacity_request_id): - if isinstance(occ_capacity_request_id, six.string_types) and len(occ_capacity_request_id.strip()) == 0: + if isinstance(occ_capacity_request_id, str) and len(occ_capacity_request_id.strip()) == 0: raise click.UsageError('Parameter --occ-capacity-request-id cannot be whitespace or empty string') kwargs = {} @@ -718,7 +717,7 @@ def get_occ_capacity_request(ctx, from_json, occ_capacity_request_id): @cli_util.wrap_exceptions def get_occ_customer_group(ctx, from_json, occ_customer_group_id): - if isinstance(occ_customer_group_id, six.string_types) and len(occ_customer_group_id.strip()) == 0: + if isinstance(occ_customer_group_id, str) and len(occ_customer_group_id.strip()) == 0: raise click.UsageError('Parameter --occ-customer-group-id cannot be whitespace or empty string') kwargs = {} @@ -754,7 +753,7 @@ def list_internal_namespace_occ_overviews(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace, six.string_types) and len(namespace.strip()) == 0: + if isinstance(namespace, str) and len(namespace.strip()) == 0: raise click.UsageError('Parameter --namespace cannot be whitespace or empty string') kwargs = {} @@ -958,7 +957,7 @@ def list_occ_availabilities(ctx, from_json, all_pages, page_size, occ_availabili if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(occ_availability_catalog_id, six.string_types) and len(occ_availability_catalog_id.strip()) == 0: + if isinstance(occ_availability_catalog_id, str) and len(occ_availability_catalog_id.strip()) == 0: raise click.UsageError('Parameter --occ-availability-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -1493,7 +1492,7 @@ def list_occ_overviews(ctx, from_json, all_pages, page_size, namespace, compartm if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace, six.string_types) and len(namespace.strip()) == 0: + if isinstance(namespace, str) and len(namespace.strip()) == 0: raise click.UsageError('Parameter --namespace cannot be whitespace or empty string') kwargs = {} @@ -1554,7 +1553,7 @@ def list_occ_overviews(ctx, from_json, all_pages, page_size, namespace, compartm @cli_util.wrap_exceptions def patch_internal_occ_capacity_request(ctx, from_json, occ_capacity_request_id, items, if_match): - if isinstance(occ_capacity_request_id, six.string_types) and len(occ_capacity_request_id.strip()) == 0: + if isinstance(occ_capacity_request_id, str) and len(occ_capacity_request_id.strip()) == 0: raise click.UsageError('Parameter --occ-capacity-request-id cannot be whitespace or empty string') kwargs = {} @@ -1589,7 +1588,7 @@ def patch_internal_occ_capacity_request(ctx, from_json, occ_capacity_request_id, @cli_util.wrap_exceptions def patch_occ_capacity_request(ctx, from_json, occ_capacity_request_id, items, if_match): - if isinstance(occ_capacity_request_id, six.string_types) and len(occ_capacity_request_id.strip()) == 0: + if isinstance(occ_capacity_request_id, str) and len(occ_capacity_request_id.strip()) == 0: raise click.UsageError('Parameter --occ-capacity-request-id cannot be whitespace or empty string') kwargs = {} @@ -1621,7 +1620,7 @@ def patch_occ_capacity_request(ctx, from_json, occ_capacity_request_id, items, i @cli_util.wrap_exceptions def publish_occ_availability_catalog(ctx, from_json, occ_availability_catalog_id, if_match): - if isinstance(occ_availability_catalog_id, six.string_types) and len(occ_availability_catalog_id.strip()) == 0: + if isinstance(occ_availability_catalog_id, str) and len(occ_availability_catalog_id.strip()) == 0: raise click.UsageError('Parameter --occ-availability-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -1648,7 +1647,7 @@ def publish_occ_availability_catalog(ctx, from_json, occ_availability_catalog_id @cli_util.wrap_exceptions def update_internal_occ_capacity_request(ctx, from_json, occ_capacity_request_id, request_state, lifecycle_details, if_match): - if isinstance(occ_capacity_request_id, six.string_types) and len(occ_capacity_request_id.strip()) == 0: + if isinstance(occ_capacity_request_id, str) and len(occ_capacity_request_id.strip()) == 0: raise click.UsageError('Parameter --occ-capacity-request-id cannot be whitespace or empty string') kwargs = {} @@ -1691,7 +1690,7 @@ def update_internal_occ_capacity_request(ctx, from_json, occ_capacity_request_id @cli_util.wrap_exceptions def update_occ_availability_catalog(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, occ_availability_catalog_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(occ_availability_catalog_id, six.string_types) and len(occ_availability_catalog_id.strip()) == 0: + if isinstance(occ_availability_catalog_id, str) and len(occ_availability_catalog_id.strip()) == 0: raise click.UsageError('Parameter --occ-availability-catalog-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1767,7 +1766,7 @@ def update_occ_availability_catalog(ctx, from_json, force, wait_for_state, max_w @cli_util.wrap_exceptions def update_occ_capacity_request(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, occ_capacity_request_id, display_name, freeform_tags, defined_tags, request_state, if_match): - if isinstance(occ_capacity_request_id, six.string_types) and len(occ_capacity_request_id.strip()) == 0: + if isinstance(occ_capacity_request_id, str) and len(occ_capacity_request_id.strip()) == 0: raise click.UsageError('Parameter --occ-capacity-request-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1839,10 +1838,10 @@ def update_occ_capacity_request(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_occ_customer(ctx, from_json, occ_customer_group_id, occ_customer_id, display_name, description, status, if_match): - if isinstance(occ_customer_group_id, six.string_types) and len(occ_customer_group_id.strip()) == 0: + if isinstance(occ_customer_group_id, str) and len(occ_customer_group_id.strip()) == 0: raise click.UsageError('Parameter --occ-customer-group-id cannot be whitespace or empty string') - if isinstance(occ_customer_id, six.string_types) and len(occ_customer_id.strip()) == 0: + if isinstance(occ_customer_id, str) and len(occ_customer_id.strip()) == 0: raise click.UsageError('Parameter --occ-customer-id cannot be whitespace or empty string') kwargs = {} @@ -1890,7 +1889,7 @@ def update_occ_customer(ctx, from_json, occ_customer_group_id, occ_customer_id, @cli_util.wrap_exceptions def update_occ_customer_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, occ_customer_group_id, display_name, description, freeform_tags, defined_tags, status, if_match): - if isinstance(occ_customer_group_id, six.string_types) and len(occ_customer_group_id.strip()) == 0: + if isinstance(occ_customer_group_id, str) and len(occ_customer_group_id.strip()) == 0: raise click.UsageError('Parameter --occ-customer-group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/capacity_management/src/oci_cli_demand_signal/generated/demandsignal_cli.py b/services/capacity_management/src/oci_cli_demand_signal/generated/demandsignal_cli.py index 391fdeaad..1db3dd938 100644 --- a/services/capacity_management/src/oci_cli_demand_signal/generated/demandsignal_cli.py +++ b/services/capacity_management/src/oci_cli_demand_signal/generated/demandsignal_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -240,7 +239,7 @@ def create_occm_demand_signal_item(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_occm_demand_signal(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ds_id, if_match): - if isinstance(ds_id, six.string_types) and len(ds_id.strip()) == 0: + if isinstance(ds_id, str) and len(ds_id.strip()) == 0: raise click.UsageError('Parameter --ds-id cannot be whitespace or empty string') kwargs = {} @@ -304,7 +303,7 @@ def delete_occm_demand_signal(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_occm_demand_signal_item(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ds_item_id, if_match): - if isinstance(ds_item_id, six.string_types) and len(ds_item_id.strip()) == 0: + if isinstance(ds_item_id, str) and len(ds_item_id.strip()) == 0: raise click.UsageError('Parameter --ds-item-id cannot be whitespace or empty string') kwargs = {} @@ -363,7 +362,7 @@ def delete_occm_demand_signal_item(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def get_occm_demand_signal(ctx, from_json, ds_id): - if isinstance(ds_id, six.string_types) and len(ds_id.strip()) == 0: + if isinstance(ds_id, str) and len(ds_id.strip()) == 0: raise click.UsageError('Parameter --ds-id cannot be whitespace or empty string') kwargs = {} @@ -385,7 +384,7 @@ def get_occm_demand_signal(ctx, from_json, ds_id): @cli_util.wrap_exceptions def get_occm_demand_signal_item(ctx, from_json, ds_item_id): - if isinstance(ds_item_id, six.string_types) and len(ds_item_id.strip()) == 0: + if isinstance(ds_item_id, str) and len(ds_item_id.strip()) == 0: raise click.UsageError('Parameter --ds-item-id cannot be whitespace or empty string') kwargs = {} @@ -663,7 +662,7 @@ def list_occm_demand_signals(ctx, from_json, all_pages, page_size, compartment_i @cli_util.wrap_exceptions def update_occm_demand_signal(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ds_id, display_name, freeform_tags, defined_tags, description, lifecycle_details, if_match): - if isinstance(ds_id, six.string_types) and len(ds_id.strip()) == 0: + if isinstance(ds_id, str) and len(ds_id.strip()) == 0: raise click.UsageError('Parameter --ds-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -749,7 +748,7 @@ def update_occm_demand_signal(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_occm_demand_signal_item(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ds_item_id, region_parameterconflict, ad, target_compartment_id, demand_quantity, time_needed_before, resource_properties, notes, freeform_tags, defined_tags, if_match): - if isinstance(ds_item_id, six.string_types) and len(ds_item_id.strip()) == 0: + if isinstance(ds_item_id, str) and len(ds_item_id.strip()) == 0: raise click.UsageError('Parameter --ds-item-id cannot be whitespace or empty string') if not force: if resource_properties or freeform_tags or defined_tags: diff --git a/services/capacity_management/src/oci_cli_internal_demand_signal/generated/internaldemandsignal_cli.py b/services/capacity_management/src/oci_cli_internal_demand_signal/generated/internaldemandsignal_cli.py index 8db378491..43494eb30 100644 --- a/services/capacity_management/src/oci_cli_internal_demand_signal/generated/internaldemandsignal_cli.py +++ b/services/capacity_management/src/oci_cli_internal_demand_signal/generated/internaldemandsignal_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -154,7 +153,7 @@ def create_internal_occm_demand_signal_delivery(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def delete_internal_occm_demand_signal_delivery(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ds_delivery_id, if_match): - if isinstance(ds_delivery_id, six.string_types) and len(ds_delivery_id.strip()) == 0: + if isinstance(ds_delivery_id, str) and len(ds_delivery_id.strip()) == 0: raise click.UsageError('Parameter --ds-delivery-id cannot be whitespace or empty string') kwargs = {} @@ -213,7 +212,7 @@ def delete_internal_occm_demand_signal_delivery(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def get_internal_occm_demand_signal(ctx, from_json, ds_id): - if isinstance(ds_id, six.string_types) and len(ds_id.strip()) == 0: + if isinstance(ds_id, str) and len(ds_id.strip()) == 0: raise click.UsageError('Parameter --ds-id cannot be whitespace or empty string') kwargs = {} @@ -235,7 +234,7 @@ def get_internal_occm_demand_signal(ctx, from_json, ds_id): @cli_util.wrap_exceptions def get_internal_occm_demand_signal_catalog(ctx, from_json, ds_catalog_id): - if isinstance(ds_catalog_id, six.string_types) and len(ds_catalog_id.strip()) == 0: + if isinstance(ds_catalog_id, str) and len(ds_catalog_id.strip()) == 0: raise click.UsageError('Parameter --ds-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -257,7 +256,7 @@ def get_internal_occm_demand_signal_catalog(ctx, from_json, ds_catalog_id): @cli_util.wrap_exceptions def get_internal_occm_demand_signal_delivery(ctx, from_json, ds_delivery_id): - if isinstance(ds_delivery_id, six.string_types) and len(ds_delivery_id.strip()) == 0: + if isinstance(ds_delivery_id, str) and len(ds_delivery_id.strip()) == 0: raise click.UsageError('Parameter --ds-delivery-id cannot be whitespace or empty string') kwargs = {} @@ -610,7 +609,7 @@ def list_internal_occm_demand_signals(ctx, from_json, all_pages, page_size, comp @cli_util.wrap_exceptions def update_internal_occm_demand_signal(ctx, from_json, ds_id, lifecycle_details, if_match): - if isinstance(ds_id, six.string_types) and len(ds_id.strip()) == 0: + if isinstance(ds_id, str) and len(ds_id.strip()) == 0: raise click.UsageError('Parameter --ds-id cannot be whitespace or empty string') kwargs = {} @@ -653,7 +652,7 @@ def update_internal_occm_demand_signal(ctx, from_json, ds_id, lifecycle_details, @cli_util.wrap_exceptions def update_internal_occm_demand_signal_delivery(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ds_delivery_id, accepted_quantity, lifecycle_details, time_delivered, justification, notes, freeform_tags, defined_tags, if_match): - if isinstance(ds_delivery_id, six.string_types) and len(ds_delivery_id.strip()) == 0: + if isinstance(ds_delivery_id, str) and len(ds_delivery_id.strip()) == 0: raise click.UsageError('Parameter --ds-delivery-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/certificates/src/oci_cli_certificates/generated/certificates_cli.py b/services/certificates/src/oci_cli_certificates/generated/certificates_cli.py index bed961461..c99677f2f 100644 --- a/services/certificates/src/oci_cli_certificates/generated/certificates_cli.py +++ b/services/certificates/src/oci_cli_certificates/generated/certificates_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -68,7 +67,7 @@ def certificate_bundle_group(): @cli_util.wrap_exceptions def get_ca_bundle(ctx, from_json, ca_bundle_id): - if isinstance(ca_bundle_id, six.string_types) and len(ca_bundle_id.strip()) == 0: + if isinstance(ca_bundle_id, str) and len(ca_bundle_id.strip()) == 0: raise click.UsageError('Parameter --ca-bundle-id cannot be whitespace or empty string') kwargs = {} @@ -93,7 +92,7 @@ def get_ca_bundle(ctx, from_json, ca_bundle_id): @cli_util.wrap_exceptions def get_certificate_authority_bundle(ctx, from_json, certificate_authority_id, version_number, certificate_authority_version_name, stage): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') kwargs = {} @@ -127,7 +126,7 @@ def get_certificate_authority_bundle(ctx, from_json, certificate_authority_id, v @cli_util.wrap_exceptions def get_certificate_bundle(ctx, from_json, certificate_id, version_number, certificate_version_name, stage, certificate_bundle_type): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -160,7 +159,7 @@ def get_certificate_bundle(ctx, from_json, certificate_id, version_number, certi @cli_util.wrap_exceptions def list_certificate_authority_bundle_versions(ctx, from_json, all_pages, certificate_authority_id, sort_by, sort_order): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') kwargs = {} @@ -189,7 +188,7 @@ def list_certificate_authority_bundle_versions(ctx, from_json, all_pages, certif @cli_util.wrap_exceptions def list_certificate_bundle_versions(ctx, from_json, all_pages, certificate_id, sort_by, sort_order): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/certificates_management/src/oci_cli_certificates_management/generated/certificatesmanagement_cli.py b/services/certificates_management/src/oci_cli_certificates_management/generated/certificatesmanagement_cli.py index a90e89f1d..97cdd4d55 100644 --- a/services/certificates_management/src/oci_cli_certificates_management/generated/certificatesmanagement_cli.py +++ b/services/certificates_management/src/oci_cli_certificates_management/generated/certificatesmanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -118,7 +117,7 @@ def certificate_authority_summary_group(): @cli_util.wrap_exceptions def cancel_certificate_authority_deletion(ctx, from_json, certificate_authority_id, if_match): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') kwargs = {} @@ -144,10 +143,10 @@ def cancel_certificate_authority_deletion(ctx, from_json, certificate_authority_ @cli_util.wrap_exceptions def cancel_certificate_authority_version_deletion(ctx, from_json, certificate_authority_id, certificate_authority_version_number, if_match): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') - if isinstance(certificate_authority_version_number, six.string_types) and len(certificate_authority_version_number.strip()) == 0: + if isinstance(certificate_authority_version_number, str) and len(certificate_authority_version_number.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-version-number cannot be whitespace or empty string') kwargs = {} @@ -173,7 +172,7 @@ def cancel_certificate_authority_version_deletion(ctx, from_json, certificate_au @cli_util.wrap_exceptions def cancel_certificate_deletion(ctx, from_json, certificate_id, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -199,10 +198,10 @@ def cancel_certificate_deletion(ctx, from_json, certificate_id, if_match): @cli_util.wrap_exceptions def cancel_certificate_version_deletion(ctx, from_json, certificate_id, certificate_version_number, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') - if isinstance(certificate_version_number, six.string_types) and len(certificate_version_number.strip()) == 0: + if isinstance(certificate_version_number, str) and len(certificate_version_number.strip()) == 0: raise click.UsageError('Parameter --certificate-version-number cannot be whitespace or empty string') kwargs = {} @@ -231,7 +230,7 @@ def cancel_certificate_version_deletion(ctx, from_json, certificate_id, certific @cli_util.wrap_exceptions def change_ca_bundle_compartment(ctx, from_json, ca_bundle_id, compartment_id, if_match): - if isinstance(ca_bundle_id, six.string_types) and len(ca_bundle_id.strip()) == 0: + if isinstance(ca_bundle_id, str) and len(ca_bundle_id.strip()) == 0: raise click.UsageError('Parameter --ca-bundle-id cannot be whitespace or empty string') kwargs = {} @@ -264,7 +263,7 @@ def change_ca_bundle_compartment(ctx, from_json, ca_bundle_id, compartment_id, i @cli_util.wrap_exceptions def change_certificate_authority_compartment(ctx, from_json, certificate_authority_id, compartment_id, if_match): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') kwargs = {} @@ -297,7 +296,7 @@ def change_certificate_authority_compartment(ctx, from_json, certificate_authori @cli_util.wrap_exceptions def change_certificate_compartment(ctx, from_json, certificate_id, compartment_id, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -1000,7 +999,7 @@ def create_certificate_authority_create_subordinate_ca_issued_by_internal_ca_con @cli_util.wrap_exceptions def delete_ca_bundle(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ca_bundle_id, if_match): - if isinstance(ca_bundle_id, six.string_types) and len(ca_bundle_id.strip()) == 0: + if isinstance(ca_bundle_id, str) and len(ca_bundle_id.strip()) == 0: raise click.UsageError('Parameter --ca-bundle-id cannot be whitespace or empty string') kwargs = {} @@ -1059,7 +1058,7 @@ def delete_ca_bundle(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def get_association(ctx, from_json, association_id): - if isinstance(association_id, six.string_types) and len(association_id.strip()) == 0: + if isinstance(association_id, str) and len(association_id.strip()) == 0: raise click.UsageError('Parameter --association-id cannot be whitespace or empty string') kwargs = {} @@ -1081,7 +1080,7 @@ def get_association(ctx, from_json, association_id): @cli_util.wrap_exceptions def get_ca_bundle(ctx, from_json, ca_bundle_id): - if isinstance(ca_bundle_id, six.string_types) and len(ca_bundle_id.strip()) == 0: + if isinstance(ca_bundle_id, str) and len(ca_bundle_id.strip()) == 0: raise click.UsageError('Parameter --ca-bundle-id cannot be whitespace or empty string') kwargs = {} @@ -1103,7 +1102,7 @@ def get_ca_bundle(ctx, from_json, ca_bundle_id): @cli_util.wrap_exceptions def get_certificate(ctx, from_json, certificate_id): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -1125,7 +1124,7 @@ def get_certificate(ctx, from_json, certificate_id): @cli_util.wrap_exceptions def get_certificate_authority(ctx, from_json, certificate_authority_id): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') kwargs = {} @@ -1148,10 +1147,10 @@ def get_certificate_authority(ctx, from_json, certificate_authority_id): @cli_util.wrap_exceptions def get_certificate_authority_version(ctx, from_json, certificate_authority_id, certificate_authority_version_number): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') - if isinstance(certificate_authority_version_number, six.string_types) and len(certificate_authority_version_number.strip()) == 0: + if isinstance(certificate_authority_version_number, str) and len(certificate_authority_version_number.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-version-number cannot be whitespace or empty string') kwargs = {} @@ -1175,10 +1174,10 @@ def get_certificate_authority_version(ctx, from_json, certificate_authority_id, @cli_util.wrap_exceptions def get_certificate_version(ctx, from_json, certificate_id, certificate_version_number): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') - if isinstance(certificate_version_number, six.string_types) and len(certificate_version_number.strip()) == 0: + if isinstance(certificate_version_number, str) and len(certificate_version_number.strip()) == 0: raise click.UsageError('Parameter --certificate-version-number cannot be whitespace or empty string') kwargs = {} @@ -1406,7 +1405,7 @@ def list_certificate_authority_versions(ctx, from_json, all_pages, page_size, ce if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') kwargs = {} @@ -1466,7 +1465,7 @@ def list_certificate_versions(ctx, from_json, all_pages, page_size, certificate_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -1584,10 +1583,10 @@ def list_certificates(ctx, from_json, all_pages, page_size, compartment_id, life @cli_util.wrap_exceptions def revoke_certificate_authority_version(ctx, from_json, certificate_authority_id, certificate_authority_version_number, revocation_reason, if_match): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') - if isinstance(certificate_authority_version_number, six.string_types) and len(certificate_authority_version_number.strip()) == 0: + if isinstance(certificate_authority_version_number, str) and len(certificate_authority_version_number.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-version-number cannot be whitespace or empty string') kwargs = {} @@ -1622,10 +1621,10 @@ def revoke_certificate_authority_version(ctx, from_json, certificate_authority_i @cli_util.wrap_exceptions def revoke_certificate_version(ctx, from_json, certificate_id, certificate_version_number, revocation_reason, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') - if isinstance(certificate_version_number, six.string_types) and len(certificate_version_number.strip()) == 0: + if isinstance(certificate_version_number, str) and len(certificate_version_number.strip()) == 0: raise click.UsageError('Parameter --certificate-version-number cannot be whitespace or empty string') kwargs = {} @@ -1659,7 +1658,7 @@ def revoke_certificate_version(ctx, from_json, certificate_id, certificate_versi @cli_util.wrap_exceptions def schedule_certificate_authority_deletion(ctx, from_json, certificate_authority_id, time_of_deletion, if_match): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') kwargs = {} @@ -1693,10 +1692,10 @@ def schedule_certificate_authority_deletion(ctx, from_json, certificate_authorit @cli_util.wrap_exceptions def schedule_certificate_authority_version_deletion(ctx, from_json, certificate_authority_id, certificate_authority_version_number, time_of_deletion, if_match): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') - if isinstance(certificate_authority_version_number, six.string_types) and len(certificate_authority_version_number.strip()) == 0: + if isinstance(certificate_authority_version_number, str) and len(certificate_authority_version_number.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-version-number cannot be whitespace or empty string') kwargs = {} @@ -1730,7 +1729,7 @@ def schedule_certificate_authority_version_deletion(ctx, from_json, certificate_ @cli_util.wrap_exceptions def schedule_certificate_deletion(ctx, from_json, certificate_id, time_of_deletion, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -1766,10 +1765,10 @@ def schedule_certificate_deletion(ctx, from_json, certificate_id, time_of_deleti @cli_util.wrap_exceptions def schedule_certificate_version_deletion(ctx, from_json, certificate_id, certificate_version_number, time_of_deletion, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') - if isinstance(certificate_version_number, six.string_types) and len(certificate_version_number.strip()) == 0: + if isinstance(certificate_version_number, str) and len(certificate_version_number.strip()) == 0: raise click.UsageError('Parameter --certificate-version-number cannot be whitespace or empty string') kwargs = {} @@ -1810,7 +1809,7 @@ def schedule_certificate_version_deletion(ctx, from_json, certificate_id, certif @cli_util.wrap_exceptions def update_ca_bundle(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ca_bundle_id, description, ca_bundle_pem, freeform_tags, defined_tags, if_match): - if isinstance(ca_bundle_id, six.string_types) and len(ca_bundle_id.strip()) == 0: + if isinstance(ca_bundle_id, str) and len(ca_bundle_id.strip()) == 0: raise click.UsageError('Parameter --ca-bundle-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1890,7 +1889,7 @@ def update_ca_bundle(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_certificate(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, description, current_version_number, certificate_config, freeform_tags, defined_tags, certificate_rules, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') if not force: if certificate_config or freeform_tags or defined_tags or certificate_rules: @@ -1981,7 +1980,7 @@ def update_certificate(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_certificate_update_certificate_by_importing_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, certificate_config_cert_chain_pem, certificate_config_private_key_pem, certificate_config_certificate_pem, description, current_version_number, freeform_tags, defined_tags, certificate_rules, if_match, certificate_config_version_name, certificate_config_stage, certificate_config_private_key_pem_passphrase): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or certificate_rules: @@ -2081,7 +2080,7 @@ def update_certificate_update_certificate_by_importing_config_details(ctx, from_ @cli_util.wrap_exceptions def update_certificate_update_certificate_issued_by_internal_ca_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, description, current_version_number, freeform_tags, defined_tags, certificate_rules, if_match, certificate_config_version_name, certificate_config_stage, certificate_config_validity): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or certificate_rules: @@ -2179,7 +2178,7 @@ def update_certificate_update_certificate_issued_by_internal_ca_config_details(c @cli_util.wrap_exceptions def update_certificate_update_certificate_managed_externally_issued_by_internal_ca_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, certificate_config_csr_pem, description, current_version_number, freeform_tags, defined_tags, certificate_rules, if_match, certificate_config_version_name, certificate_config_stage, certificate_config_validity): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or certificate_rules: @@ -2276,7 +2275,7 @@ def update_certificate_update_certificate_managed_externally_issued_by_internal_ @cli_util.wrap_exceptions def update_certificate_authority(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_authority_id, description, current_version_number, certificate_authority_config, certificate_revocation_list_details, freeform_tags, defined_tags, certificate_authority_rules, if_match): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') if not force: if certificate_authority_config or certificate_revocation_list_details or freeform_tags or defined_tags or certificate_authority_rules: @@ -2368,7 +2367,7 @@ def update_certificate_authority(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_certificate_authority_update_subordinate_ca_issued_by_internal_ca_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_authority_id, description, current_version_number, certificate_revocation_list_details, freeform_tags, defined_tags, certificate_authority_rules, if_match, certificate_authority_config_version_name, certificate_authority_config_stage, certificate_authority_config_validity): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') if not force: if certificate_revocation_list_details or freeform_tags or defined_tags or certificate_authority_rules: @@ -2469,7 +2468,7 @@ def update_certificate_authority_update_subordinate_ca_issued_by_internal_ca_con @cli_util.wrap_exceptions def update_certificate_authority_update_root_ca_by_generating_internally_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_authority_id, description, current_version_number, certificate_revocation_list_details, freeform_tags, defined_tags, certificate_authority_rules, if_match, certificate_authority_config_version_name, certificate_authority_config_stage, certificate_authority_config_validity): - if isinstance(certificate_authority_id, six.string_types) and len(certificate_authority_id.strip()) == 0: + if isinstance(certificate_authority_id, str) and len(certificate_authority_id.strip()) == 0: raise click.UsageError('Parameter --certificate-authority-id cannot be whitespace or empty string') if not force: if certificate_revocation_list_details or freeform_tags or defined_tags or certificate_authority_rules: 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 6bf7ac5c9..047d9ab12 100644 --- a/services/cims/src/oci_cli_incident/generated/incident_cli.py +++ b/services/cims/src/oci_cli_incident/generated/incident_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -137,7 +136,7 @@ def create_incident(ctx, from_json, compartment_id, ticket, problem_type, csi, u @cli_util.wrap_exceptions 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: + if isinstance(incident_key, str) and len(incident_key.strip()) == 0: raise click.UsageError('Parameter --incident-key cannot be whitespace or empty string') kwargs = {} @@ -343,7 +342,7 @@ def list_incidents(ctx, from_json, all_pages, page_size, compartment_id, csi, li @cli_util.wrap_exceptions def put_attachment(ctx, from_json, put_attachment_details, incident_key, attachment_name, compartment_id, is_restricted_flag, csi, ocid, if_match, homeregion, problemtype, bearertokentype, bearertoken, idtoken, domainid): - if isinstance(incident_key, six.string_types) and len(incident_key.strip()) == 0: + if isinstance(incident_key, str) and len(incident_key.strip()) == 0: raise click.UsageError('Parameter --incident-key cannot be whitespace or empty string') kwargs = {} @@ -403,7 +402,7 @@ def put_attachment(ctx, from_json, put_attachment_details, incident_key, attachm @cli_util.wrap_exceptions 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: + if isinstance(incident_key, str) and len(incident_key.strip()) == 0: raise click.UsageError('Parameter --incident-key cannot be whitespace or empty string') if not force: if ticket: diff --git a/services/cloud_bridge/src/oci_cli_common/generated/common_cli.py b/services/cloud_bridge/src/oci_cli_common/generated/common_cli.py index 95971cba0..076794ace 100644 --- a/services/cloud_bridge/src/oci_cli_common/generated/common_cli.py +++ b/services/cloud_bridge/src/oci_cli_common/generated/common_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def work_request_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -81,7 +80,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -112,7 +111,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -169,7 +168,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/cloud_bridge/src/oci_cli_discovery/discovery_cli_extended.py b/services/cloud_bridge/src/oci_cli_discovery/discovery_cli_extended.py index a922e56c7..dfb668c12 100644 --- a/services/cloud_bridge/src/oci_cli_discovery/discovery_cli_extended.py +++ b/services/cloud_bridge/src/oci_cli_discovery/discovery_cli_extended.py @@ -3,7 +3,6 @@ # 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. import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 import click # noqa: F401 import json # noqa: F401 @@ -193,7 +192,7 @@ def update_asset_source(ctx, from_json, force, wait_for_state, max_wait_seconds, vcenter_endpoint, discovery_credentials, replication_credentials, are_historical_metrics_collected, are_realtime_metrics_collected, is_cost_information_collected, discovery_schedule_id, if_match): - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags: diff --git a/services/cloud_bridge/src/oci_cli_discovery/generated/discovery_cli.py b/services/cloud_bridge/src/oci_cli_discovery/generated/discovery_cli.py index 8367bcbb3..9a16c613b 100644 --- a/services/cloud_bridge/src/oci_cli_discovery/generated/discovery_cli.py +++ b/services/cloud_bridge/src/oci_cli_discovery/generated/discovery_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def discovery_schedule_group(): @cli_util.wrap_exceptions def change_asset_source_compartment(ctx, from_json, asset_source_id, compartment_id, if_match): - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') kwargs = {} @@ -88,7 +87,7 @@ def change_asset_source_compartment(ctx, from_json, asset_source_id, compartment @cli_util.wrap_exceptions def change_discovery_schedule_compartment(ctx, from_json, discovery_schedule_id, compartment_id, if_match): - if isinstance(discovery_schedule_id, six.string_types) and len(discovery_schedule_id.strip()) == 0: + if isinstance(discovery_schedule_id, str) and len(discovery_schedule_id.strip()) == 0: raise click.UsageError('Parameter --discovery-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -466,7 +465,7 @@ def create_discovery_schedule(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_asset_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_source_id, if_match): - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') kwargs = {} @@ -522,7 +521,7 @@ def delete_asset_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_discovery_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, discovery_schedule_id, if_match): - if isinstance(discovery_schedule_id, six.string_types) and len(discovery_schedule_id.strip()) == 0: + if isinstance(discovery_schedule_id, str) and len(discovery_schedule_id.strip()) == 0: raise click.UsageError('Parameter --discovery-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -581,7 +580,7 @@ def delete_discovery_schedule(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_asset_source(ctx, from_json, asset_source_id): - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') kwargs = {} @@ -603,7 +602,7 @@ def get_asset_source(ctx, from_json, asset_source_id): @cli_util.wrap_exceptions def get_discovery_schedule(ctx, from_json, discovery_schedule_id): - if isinstance(discovery_schedule_id, six.string_types) and len(discovery_schedule_id.strip()) == 0: + if isinstance(discovery_schedule_id, str) and len(discovery_schedule_id.strip()) == 0: raise click.UsageError('Parameter --discovery-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -632,7 +631,7 @@ def list_asset_source_connections(ctx, from_json, all_pages, page_size, asset_so if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') kwargs = {} @@ -861,7 +860,7 @@ def list_supported_cloud_regions(ctx, from_json, all_pages, page_size, asset_sou @cli_util.wrap_exceptions def refresh_asset_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_source_id): - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') kwargs = {} @@ -922,7 +921,7 @@ def refresh_asset_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_asset_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_source_id, type, display_name, assets_compartment_id, discovery_schedule_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags: @@ -1016,7 +1015,7 @@ def update_asset_source(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_asset_source_update_vm_ware_asset_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_source_id, display_name, assets_compartment_id, discovery_schedule_id, freeform_tags, defined_tags, system_tags, vcenter_endpoint, discovery_credentials, replication_credentials, are_historical_metrics_collected, are_realtime_metrics_collected, if_match): - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags or discovery_credentials or replication_credentials: @@ -1126,7 +1125,7 @@ def update_asset_source_update_vm_ware_asset_source_details(ctx, from_json, forc @cli_util.wrap_exceptions def update_asset_source_update_aws_asset_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_source_id, display_name, assets_compartment_id, discovery_schedule_id, freeform_tags, defined_tags, system_tags, discovery_credentials, replication_credentials, are_historical_metrics_collected, are_realtime_metrics_collected, is_cost_information_collected, if_match): - if isinstance(asset_source_id, six.string_types) and len(asset_source_id.strip()) == 0: + if isinstance(asset_source_id, str) and len(asset_source_id.strip()) == 0: raise click.UsageError('Parameter --asset-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags or discovery_credentials or replication_credentials: @@ -1229,7 +1228,7 @@ def update_asset_source_update_aws_asset_source_details(ctx, from_json, force, w @cli_util.wrap_exceptions def update_discovery_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, discovery_schedule_id, display_name, execution_recurrences, freeform_tags, defined_tags, if_match): - if isinstance(discovery_schedule_id, six.string_types) and len(discovery_schedule_id.strip()) == 0: + if isinstance(discovery_schedule_id, str) and len(discovery_schedule_id.strip()) == 0: raise click.UsageError('Parameter --discovery-schedule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/cloud_bridge/src/oci_cli_inventory/generated/inventory_cli.py b/services/cloud_bridge/src/oci_cli_inventory/generated/inventory_cli.py index 2ab7ba1fd..83bb82451 100644 --- a/services/cloud_bridge/src/oci_cli_inventory/generated/inventory_cli.py +++ b/services/cloud_bridge/src/oci_cli_inventory/generated/inventory_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -119,7 +118,7 @@ def analyze_assets(ctx, from_json, compartment_id, aggregation_properties, limit @cli_util.wrap_exceptions def change_asset_compartment(ctx, from_json, asset_id, compartment_id, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') kwargs = {} @@ -154,7 +153,7 @@ def change_asset_compartment(ctx, from_json, asset_id, compartment_id, if_match) @cli_util.wrap_exceptions def change_asset_tags(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_id, freeform_tags, defined_tags, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') kwargs = {} @@ -595,7 +594,7 @@ def create_inventory(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_id, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') kwargs = {} @@ -659,7 +658,7 @@ def delete_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_inventory(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, inventory_id, if_match): - if isinstance(inventory_id, six.string_types) and len(inventory_id.strip()) == 0: + if isinstance(inventory_id, str) and len(inventory_id.strip()) == 0: raise click.UsageError('Parameter --inventory-id cannot be whitespace or empty string') kwargs = {} @@ -710,7 +709,7 @@ def delete_inventory(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def get_asset(ctx, from_json, asset_id): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') kwargs = {} @@ -735,7 +734,7 @@ def get_asset(ctx, from_json, asset_id): @cli_util.wrap_exceptions def get_inventory(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, inventory_id): - if isinstance(inventory_id, six.string_types) and len(inventory_id.strip()) == 0: + if isinstance(inventory_id, str) and len(inventory_id.strip()) == 0: raise click.UsageError('Parameter --inventory-id cannot be whitespace or empty string') kwargs = {} @@ -791,7 +790,7 @@ def get_inventory(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def import_inventory(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, inventory_id, resource_type, freeform_tags, defined_tags): - if isinstance(inventory_id, six.string_types) and len(inventory_id.strip()) == 0: + if isinstance(inventory_id, str) and len(inventory_id.strip()) == 0: raise click.UsageError('Parameter --inventory-id cannot be whitespace or empty string') kwargs = {} @@ -862,7 +861,7 @@ def import_inventory(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def import_inventory_import_inventory_via_assets_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, data, asset_type, inventory_id, freeform_tags, defined_tags): - if isinstance(inventory_id, six.string_types) and len(inventory_id.strip()) == 0: + if isinstance(inventory_id, str) and len(inventory_id.strip()) == 0: raise click.UsageError('Parameter --inventory-id cannot be whitespace or empty string') kwargs = {} @@ -1010,7 +1009,7 @@ def list_historical_metrics(ctx, from_json, all_pages, page_size, asset_id, limi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') kwargs = {} @@ -1117,7 +1116,7 @@ def list_inventories(ctx, from_json, all_pages, page_size, compartment_id, sort_ @cli_util.wrap_exceptions def submit_historical_metrics(ctx, from_json, historical_metrics, asset_id, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') kwargs = {} @@ -1156,7 +1155,7 @@ def submit_historical_metrics(ctx, from_json, historical_metrics, asset_id, if_m @cli_util.wrap_exceptions def update_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_id, asset_type, display_name, asset_source_ids, freeform_tags, defined_tags, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') if not force: if asset_source_ids or freeform_tags or defined_tags: @@ -1233,7 +1232,7 @@ def update_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_asset_update_vm_asset_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_id, display_name, asset_source_ids, freeform_tags, defined_tags, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') if not force: if asset_source_ids or freeform_tags or defined_tags: @@ -1312,7 +1311,7 @@ def update_asset_update_vm_asset_details(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_asset_update_aws_ebs_asset_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_id, display_name, asset_source_ids, freeform_tags, defined_tags, aws_ebs, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') if not force: if asset_source_ids or freeform_tags or defined_tags or aws_ebs: @@ -1397,7 +1396,7 @@ def update_asset_update_aws_ebs_asset_details(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_asset_update_vmware_vm_asset_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_id, display_name, asset_source_ids, freeform_tags, defined_tags, compute, vm, vmware_vm, vmware_v_center, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') if not force: if asset_source_ids or freeform_tags or defined_tags or compute or vm or vmware_vm or vmware_v_center: @@ -1492,7 +1491,7 @@ def update_asset_update_vmware_vm_asset_details(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_asset_update_aws_ec2_asset_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_id, display_name, asset_source_ids, freeform_tags, defined_tags, compute, vm, aws_ec2, aws_ec2_cost, attached_ebs_volumes_cost, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') if not force: if asset_source_ids or freeform_tags or defined_tags or compute or vm or aws_ec2 or aws_ec2_cost or attached_ebs_volumes_cost: @@ -1584,7 +1583,7 @@ def update_asset_update_aws_ec2_asset_details(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_inventory(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, inventory_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(inventory_id, six.string_types) and len(inventory_id.strip()) == 0: + if isinstance(inventory_id, str) and len(inventory_id.strip()) == 0: raise click.UsageError('Parameter --inventory-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/cloud_bridge/src/oci_cli_inventory/inventory_cli_extended.py b/services/cloud_bridge/src/oci_cli_inventory/inventory_cli_extended.py index 770c1120a..c34e4cc0a 100644 --- a/services/cloud_bridge/src/oci_cli_inventory/inventory_cli_extended.py +++ b/services/cloud_bridge/src/oci_cli_inventory/inventory_cli_extended.py @@ -3,7 +3,6 @@ # 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. import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 import click # noqa: F401 import json # noqa: F401 @@ -278,7 +277,7 @@ def create_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval def update_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, asset_id, asset_type, display_name, asset_source_ids, freeform_tags, defined_tags, compute, vm, vmware_vm, vmware_v_center, aws_ebs, aws_ec2, aws_ec2_cost, attached_ebs_volumes_cost, if_match): - if isinstance(asset_id, six.string_types) and len(asset_id.strip()) == 0: + if isinstance(asset_id, str) and len(asset_id.strip()) == 0: raise click.UsageError('Parameter --asset-id cannot be whitespace or empty string') if not force: if asset_source_ids or freeform_tags or defined_tags: diff --git a/services/cloud_bridge/src/oci_cli_ocb_agent_svc/generated/ocbagentsvc_cli.py b/services/cloud_bridge/src/oci_cli_ocb_agent_svc/generated/ocbagentsvc_cli.py index 658ba4b27..0bfd3d31e 100644 --- a/services/cloud_bridge/src/oci_cli_ocb_agent_svc/generated/ocbagentsvc_cli.py +++ b/services/cloud_bridge/src/oci_cli_ocb_agent_svc/generated/ocbagentsvc_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -95,7 +94,7 @@ def agent_collection_group(): @cli_util.wrap_exceptions def add_agent_dependency(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, environment_id, agent_dependency_id, if_match): - if isinstance(environment_id, six.string_types) and len(environment_id.strip()) == 0: + if isinstance(environment_id, str) and len(environment_id.strip()) == 0: raise click.UsageError('Parameter --environment-id cannot be whitespace or empty string') kwargs = {} @@ -152,7 +151,7 @@ def add_agent_dependency(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def change_agent_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_id, compartment_id, if_match): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') kwargs = {} @@ -210,7 +209,7 @@ def change_agent_compartment(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def change_agent_dependency_compartment(ctx, from_json, agent_dependency_id, compartment_id, if_match): - if isinstance(agent_dependency_id, six.string_types) and len(agent_dependency_id.strip()) == 0: + if isinstance(agent_dependency_id, str) and len(agent_dependency_id.strip()) == 0: raise click.UsageError('Parameter --agent-dependency-id cannot be whitespace or empty string') kwargs = {} @@ -244,7 +243,7 @@ def change_agent_dependency_compartment(ctx, from_json, agent_dependency_id, com @cli_util.wrap_exceptions def change_environment_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, environment_id, compartment_id, if_match): - if isinstance(environment_id, six.string_types) and len(environment_id.strip()) == 0: + if isinstance(environment_id, str) and len(environment_id.strip()) == 0: raise click.UsageError('Parameter --environment-id cannot be whitespace or empty string') kwargs = {} @@ -516,7 +515,7 @@ def create_environment(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_agent(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_id, if_match): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') kwargs = {} @@ -580,7 +579,7 @@ def delete_agent(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_agent_dependency(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_dependency_id, if_match): - if isinstance(agent_dependency_id, six.string_types) and len(agent_dependency_id.strip()) == 0: + if isinstance(agent_dependency_id, str) and len(agent_dependency_id.strip()) == 0: raise click.UsageError('Parameter --agent-dependency-id cannot be whitespace or empty string') kwargs = {} @@ -644,7 +643,7 @@ def delete_agent_dependency(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_environment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, environment_id, if_match): - if isinstance(environment_id, six.string_types) and len(environment_id.strip()) == 0: + if isinstance(environment_id, str) and len(environment_id.strip()) == 0: raise click.UsageError('Parameter --environment-id cannot be whitespace or empty string') kwargs = {} @@ -703,7 +702,7 @@ def delete_environment(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_agent(ctx, from_json, agent_id): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') kwargs = {} @@ -725,7 +724,7 @@ def get_agent(ctx, from_json, agent_id): @cli_util.wrap_exceptions def get_agent_dependency(ctx, from_json, agent_dependency_id): - if isinstance(agent_dependency_id, six.string_types) and len(agent_dependency_id.strip()) == 0: + if isinstance(agent_dependency_id, str) and len(agent_dependency_id.strip()) == 0: raise click.UsageError('Parameter --agent-dependency-id cannot be whitespace or empty string') kwargs = {} @@ -747,7 +746,7 @@ def get_agent_dependency(ctx, from_json, agent_dependency_id): @cli_util.wrap_exceptions def get_environment(ctx, from_json, environment_id): - if isinstance(environment_id, six.string_types) and len(environment_id.strip()) == 0: + if isinstance(environment_id, str) and len(environment_id.strip()) == 0: raise click.UsageError('Parameter --environment-id cannot be whitespace or empty string') kwargs = {} @@ -770,10 +769,10 @@ def get_environment(ctx, from_json, environment_id): @cli_util.wrap_exceptions def get_plugin(ctx, from_json, agent_id, plugin_name): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') - if isinstance(plugin_name, six.string_types) and len(plugin_name.strip()) == 0: + if isinstance(plugin_name, str) and len(plugin_name.strip()) == 0: raise click.UsageError('Parameter --plugin-name cannot be whitespace or empty string') kwargs = {} @@ -1053,7 +1052,7 @@ def list_environments(ctx, from_json, all_pages, page_size, compartment_id, life @cli_util.wrap_exceptions def remove_agent_dependency(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, environment_id, agent_dependency_id, if_match): - if isinstance(environment_id, six.string_types) and len(environment_id.strip()) == 0: + if isinstance(environment_id, str) and len(environment_id.strip()) == 0: raise click.UsageError('Parameter --environment-id cannot be whitespace or empty string') kwargs = {} @@ -1113,7 +1112,7 @@ def remove_agent_dependency(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_agent(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1192,7 +1191,7 @@ def update_agent(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_agent_dependency(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_dependency_id, display_name, dependency_name, dependency_version, description, namespace, bucket, object_name, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(agent_dependency_id, six.string_types) and len(agent_dependency_id.strip()) == 0: + if isinstance(agent_dependency_id, str) and len(agent_dependency_id.strip()) == 0: raise click.UsageError('Parameter --agent-dependency-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags: @@ -1289,7 +1288,7 @@ def update_agent_dependency(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_environment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, environment_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(environment_id, six.string_types) and len(environment_id.strip()) == 0: + if isinstance(environment_id, str) and len(environment_id.strip()) == 0: raise click.UsageError('Parameter --environment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1359,10 +1358,10 @@ def update_environment(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_plugin(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_id, plugin_name, desired_state, if_match): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') - if isinstance(plugin_name, six.string_types) and len(plugin_name.strip()) == 0: + if isinstance(plugin_name, str) and len(plugin_name.strip()) == 0: raise click.UsageError('Parameter --plugin-name cannot be whitespace or empty string') kwargs = {} diff --git a/services/cloud_guard/src/oci_cli_cloud_guard/cloud_guard_cli_extended.py b/services/cloud_guard/src/oci_cli_cloud_guard/cloud_guard_cli_extended.py index 2f329df1c..36e75f0f4 100644 --- a/services/cloud_guard/src/oci_cli_cloud_guard/cloud_guard_cli_extended.py +++ b/services/cloud_guard/src/oci_cli_cloud_guard/cloud_guard_cli_extended.py @@ -4,7 +4,6 @@ import click import sys -import six import oci from oci_cli import cli_util from oci_cli import json_skeleton_utils @@ -306,7 +305,7 @@ def create_data_mask_rule_target_ids_selected_extended(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def update_data_mask_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, display_name, compartment_id, iam_group_id, target_selected, data_mask_categories, data_mask_rule_status, freeform_tags, defined_tags, if_match): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') if not force: if target_selected or data_mask_categories or freeform_tags or defined_tags: @@ -383,7 +382,7 @@ def update_data_mask_rule(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_data_mask_rule_all_targets_selected_extended(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, display_name, compartment_id, iam_group_id, data_mask_categories, data_mask_rule_status, freeform_tags, defined_tags, if_match): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') if not force: if data_mask_categories or freeform_tags or defined_tags: @@ -460,7 +459,7 @@ def update_data_mask_rule_all_targets_selected_extended(ctx, from_json, force, w @cli_util.wrap_exceptions def update_data_mask_rule_target_resource_types_selected_extended(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, display_name, compartment_id, iam_group_id, data_mask_categories, data_mask_rule_status, freeform_tags, defined_tags, if_match, target_selected_values): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') if not force: if data_mask_categories or freeform_tags or defined_tags: @@ -540,7 +539,7 @@ def update_data_mask_rule_target_resource_types_selected_extended(ctx, from_json @cli_util.wrap_exceptions def update_data_mask_rule_target_ids_selected_extended(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, display_name, compartment_id, iam_group_id, data_mask_categories, data_mask_rule_status, freeform_tags, defined_tags, if_match, target_selected_values): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') if not force: if data_mask_categories or freeform_tags or defined_tags: diff --git a/services/cloud_guard/src/oci_cli_cloud_guard/generated/cloudguard_cli.py b/services/cloud_guard/src/oci_cli_cloud_guard/generated/cloudguard_cli.py index 2ee26606b..9429118a0 100644 --- a/services/cloud_guard/src/oci_cli_cloud_guard/generated/cloudguard_cli.py +++ b/services/cloud_guard/src/oci_cli_cloud_guard/generated/cloudguard_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -502,7 +501,7 @@ def risk_score_aggregation_group(): @cli_util.wrap_exceptions def add_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_zone_id, compartment_id, if_match): - if isinstance(security_zone_id, six.string_types) and len(security_zone_id.strip()) == 0: + if isinstance(security_zone_id, str) and len(security_zone_id.strip()) == 0: raise click.UsageError('Parameter --security-zone-id cannot be whitespace or empty string') kwargs = {} @@ -556,7 +555,7 @@ def add_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -585,7 +584,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_data_source_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_source_id, compartment_id, if_match): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') kwargs = {} @@ -643,7 +642,7 @@ def change_data_source_compartment(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def change_detector_recipe_compartment(ctx, from_json, detector_recipe_id, compartment_id, if_match): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -674,7 +673,7 @@ def change_detector_recipe_compartment(ctx, from_json, detector_recipe_id, compa @cli_util.wrap_exceptions def change_managed_list_compartment(ctx, from_json, managed_list_id, compartment_id, if_match): - if isinstance(managed_list_id, six.string_types) and len(managed_list_id.strip()) == 0: + if isinstance(managed_list_id, str) and len(managed_list_id.strip()) == 0: raise click.UsageError('Parameter --managed-list-id cannot be whitespace or empty string') kwargs = {} @@ -705,7 +704,7 @@ def change_managed_list_compartment(ctx, from_json, managed_list_id, compartment @cli_util.wrap_exceptions def change_responder_recipe_compartment(ctx, from_json, responder_recipe_id, compartment_id, if_match): - if isinstance(responder_recipe_id, six.string_types) and len(responder_recipe_id.strip()) == 0: + if isinstance(responder_recipe_id, str) and len(responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --responder-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -736,7 +735,7 @@ def change_responder_recipe_compartment(ctx, from_json, responder_recipe_id, com @cli_util.wrap_exceptions def change_saved_query_compartment(ctx, from_json, saved_query_id, compartment_id, if_match): - if isinstance(saved_query_id, six.string_types) and len(saved_query_id.strip()) == 0: + if isinstance(saved_query_id, str) and len(saved_query_id.strip()) == 0: raise click.UsageError('Parameter --saved-query-id cannot be whitespace or empty string') kwargs = {} @@ -767,7 +766,7 @@ def change_saved_query_compartment(ctx, from_json, saved_query_id, compartment_i @cli_util.wrap_exceptions def change_security_recipe_compartment(ctx, from_json, security_recipe_id, compartment_id, if_match): - if isinstance(security_recipe_id, six.string_types) and len(security_recipe_id.strip()) == 0: + if isinstance(security_recipe_id, str) and len(security_recipe_id.strip()) == 0: raise click.UsageError('Parameter --security-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -798,7 +797,7 @@ def change_security_recipe_compartment(ctx, from_json, security_recipe_id, compa @cli_util.wrap_exceptions def change_security_zone_compartment(ctx, from_json, security_zone_id, compartment_id, if_match): - if isinstance(security_zone_id, six.string_types) and len(security_zone_id.strip()) == 0: + if isinstance(security_zone_id, str) and len(security_zone_id.strip()) == 0: raise click.UsageError('Parameter --security-zone-id cannot be whitespace or empty string') kwargs = {} @@ -1587,7 +1586,7 @@ def create_detector_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def create_detector_recipe_detector_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, detector_recipe_id, details): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -2097,7 +2096,7 @@ def create_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def create_target_detector_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_id, detector_recipe_id): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') kwargs = {} @@ -2148,7 +2147,7 @@ def create_target_detector_recipe(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def create_target_responder_recipe(ctx, from_json, target_id, responder_recipe_id): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') kwargs = {} @@ -2219,7 +2218,7 @@ def create_wlp_agent(ctx, from_json, compartment_id, agent_version, certificate_ @cli_util.wrap_exceptions def delete_adhoc_query(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, adhoc_query_id, if_match): - if isinstance(adhoc_query_id, six.string_types) and len(adhoc_query_id.strip()) == 0: + if isinstance(adhoc_query_id, str) and len(adhoc_query_id.strip()) == 0: raise click.UsageError('Parameter --adhoc-query-id cannot be whitespace or empty string') kwargs = {} @@ -2283,7 +2282,7 @@ def delete_adhoc_query(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_data_mask_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, if_match): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') kwargs = {} @@ -2347,7 +2346,7 @@ def delete_data_mask_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_source_id, if_match): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') kwargs = {} @@ -2403,7 +2402,7 @@ def delete_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_detector_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, detector_recipe_id, if_match): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -2465,10 +2464,10 @@ def delete_detector_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_detector_recipe_detector_rule(ctx, from_json, detector_recipe_id, detector_rule_id, if_match): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') - if isinstance(detector_rule_id, six.string_types) and len(detector_rule_id.strip()) == 0: + if isinstance(detector_rule_id, str) and len(detector_rule_id.strip()) == 0: raise click.UsageError('Parameter --detector-rule-id cannot be whitespace or empty string') kwargs = {} @@ -2497,13 +2496,13 @@ def delete_detector_recipe_detector_rule(ctx, from_json, detector_recipe_id, det @cli_util.wrap_exceptions def delete_detector_recipe_detector_rule_data_source(ctx, from_json, detector_recipe_id, detector_rule_id, data_source_id, if_match): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') - if isinstance(detector_rule_id, six.string_types) and len(detector_rule_id.strip()) == 0: + if isinstance(detector_rule_id, str) and len(detector_rule_id.strip()) == 0: raise click.UsageError('Parameter --detector-rule-id cannot be whitespace or empty string') - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') kwargs = {} @@ -2534,7 +2533,7 @@ def delete_detector_recipe_detector_rule_data_source(ctx, from_json, detector_re @cli_util.wrap_exceptions def delete_managed_list(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_list_id, if_match): - if isinstance(managed_list_id, six.string_types) and len(managed_list_id.strip()) == 0: + if isinstance(managed_list_id, str) and len(managed_list_id.strip()) == 0: raise click.UsageError('Parameter --managed-list-id cannot be whitespace or empty string') kwargs = {} @@ -2598,7 +2597,7 @@ def delete_managed_list(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_responder_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, responder_recipe_id, if_match): - if isinstance(responder_recipe_id, six.string_types) and len(responder_recipe_id.strip()) == 0: + if isinstance(responder_recipe_id, str) and len(responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --responder-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -2662,7 +2661,7 @@ def delete_responder_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_saved_query(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, saved_query_id, if_match): - if isinstance(saved_query_id, six.string_types) and len(saved_query_id.strip()) == 0: + if isinstance(saved_query_id, str) and len(saved_query_id.strip()) == 0: raise click.UsageError('Parameter --saved-query-id cannot be whitespace or empty string') kwargs = {} @@ -2726,7 +2725,7 @@ def delete_saved_query(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_security_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_recipe_id, if_match): - if isinstance(security_recipe_id, six.string_types) and len(security_recipe_id.strip()) == 0: + if isinstance(security_recipe_id, str) and len(security_recipe_id.strip()) == 0: raise click.UsageError('Parameter --security-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -2790,7 +2789,7 @@ def delete_security_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_security_zone(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_zone_id, if_match): - if isinstance(security_zone_id, six.string_types) and len(security_zone_id.strip()) == 0: + if isinstance(security_zone_id, str) and len(security_zone_id.strip()) == 0: raise click.UsageError('Parameter --security-zone-id cannot be whitespace or empty string') kwargs = {} @@ -2854,7 +2853,7 @@ def delete_security_zone(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_id, if_match): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') kwargs = {} @@ -2916,10 +2915,10 @@ def delete_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_target_detector_recipe(ctx, from_json, target_id, target_detector_recipe_id, if_match): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_detector_recipe_id, six.string_types) and len(target_detector_recipe_id.strip()) == 0: + if isinstance(target_detector_recipe_id, str) and len(target_detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-detector-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -2947,10 +2946,10 @@ def delete_target_detector_recipe(ctx, from_json, target_id, target_detector_rec @cli_util.wrap_exceptions def delete_target_responder_recipe(ctx, from_json, target_id, target_responder_recipe_id, if_match): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_responder_recipe_id, six.string_types) and len(target_responder_recipe_id.strip()) == 0: + if isinstance(target_responder_recipe_id, str) and len(target_responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-responder-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -2977,7 +2976,7 @@ def delete_target_responder_recipe(ctx, from_json, target_id, target_responder_r @cli_util.wrap_exceptions def delete_wlp_agent(ctx, from_json, wlp_agent_id, if_match): - if isinstance(wlp_agent_id, six.string_types) and len(wlp_agent_id.strip()) == 0: + if isinstance(wlp_agent_id, str) and len(wlp_agent_id.strip()) == 0: raise click.UsageError('Parameter --wlp-agent-id cannot be whitespace or empty string') kwargs = {} @@ -3006,7 +3005,7 @@ def delete_wlp_agent(ctx, from_json, wlp_agent_id, if_match): @cli_util.wrap_exceptions def execute_responder_execution(ctx, from_json, responder_execution_id, compartment_id, if_match, configurations): - if isinstance(responder_execution_id, six.string_types) and len(responder_execution_id.strip()) == 0: + if isinstance(responder_execution_id, str) and len(responder_execution_id.strip()) == 0: raise click.UsageError('Parameter --responder-execution-id cannot be whitespace or empty string') kwargs = {} @@ -3038,7 +3037,7 @@ def execute_responder_execution(ctx, from_json, responder_execution_id, compartm @cli_util.wrap_exceptions def get_adhoc_query(ctx, from_json, adhoc_query_id): - if isinstance(adhoc_query_id, six.string_types) and len(adhoc_query_id.strip()) == 0: + if isinstance(adhoc_query_id, str) and len(adhoc_query_id.strip()) == 0: raise click.UsageError('Parameter --adhoc-query-id cannot be whitespace or empty string') kwargs = {} @@ -3061,7 +3060,7 @@ def get_adhoc_query(ctx, from_json, adhoc_query_id): @cli_util.wrap_exceptions def get_adhoc_query_result_content(ctx, from_json, file, adhoc_query_id): - if isinstance(adhoc_query_id, six.string_types) and len(adhoc_query_id.strip()) == 0: + if isinstance(adhoc_query_id, str) and len(adhoc_query_id.strip()) == 0: raise click.UsageError('Parameter --adhoc-query-id cannot be whitespace or empty string') kwargs = {} @@ -3107,7 +3106,7 @@ def get_adhoc_query_result_content(ctx, from_json, file, adhoc_query_id): @cli_util.wrap_exceptions def get_condition_metadata_type(ctx, from_json, condition_metadata_type_id, service_type, resource_type): - if isinstance(condition_metadata_type_id, six.string_types) and len(condition_metadata_type_id.strip()) == 0: + if isinstance(condition_metadata_type_id, str) and len(condition_metadata_type_id.strip()) == 0: raise click.UsageError('Parameter --condition-metadata-type-id cannot be whitespace or empty string') kwargs = {} @@ -3152,7 +3151,7 @@ def get_configuration(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_data_mask_rule(ctx, from_json, data_mask_rule_id): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3174,7 +3173,7 @@ def get_data_mask_rule(ctx, from_json, data_mask_rule_id): @cli_util.wrap_exceptions def get_data_source(ctx, from_json, data_source_id): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') kwargs = {} @@ -3196,7 +3195,7 @@ def get_data_source(ctx, from_json, data_source_id): @cli_util.wrap_exceptions def get_detector(ctx, from_json, detector_id): - if isinstance(detector_id, six.string_types) and len(detector_id.strip()) == 0: + if isinstance(detector_id, str) and len(detector_id.strip()) == 0: raise click.UsageError('Parameter --detector-id cannot be whitespace or empty string') kwargs = {} @@ -3218,7 +3217,7 @@ def get_detector(ctx, from_json, detector_id): @cli_util.wrap_exceptions def get_detector_recipe(ctx, from_json, detector_recipe_id): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -3241,10 +3240,10 @@ def get_detector_recipe(ctx, from_json, detector_recipe_id): @cli_util.wrap_exceptions def get_detector_recipe_detector_rule(ctx, from_json, detector_recipe_id, detector_rule_id): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') - if isinstance(detector_rule_id, six.string_types) and len(detector_rule_id.strip()) == 0: + if isinstance(detector_rule_id, str) and len(detector_rule_id.strip()) == 0: raise click.UsageError('Parameter --detector-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3268,10 +3267,10 @@ def get_detector_recipe_detector_rule(ctx, from_json, detector_recipe_id, detect @cli_util.wrap_exceptions def get_detector_rule(ctx, from_json, detector_id, detector_rule_id): - if isinstance(detector_id, six.string_types) and len(detector_id.strip()) == 0: + if isinstance(detector_id, str) and len(detector_id.strip()) == 0: raise click.UsageError('Parameter --detector-id cannot be whitespace or empty string') - if isinstance(detector_rule_id, six.string_types) and len(detector_rule_id.strip()) == 0: + if isinstance(detector_rule_id, str) and len(detector_rule_id.strip()) == 0: raise click.UsageError('Parameter --detector-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3294,7 +3293,7 @@ def get_detector_rule(ctx, from_json, detector_id, detector_rule_id): @cli_util.wrap_exceptions def get_managed_list(ctx, from_json, managed_list_id): - if isinstance(managed_list_id, six.string_types) and len(managed_list_id.strip()) == 0: + if isinstance(managed_list_id, str) and len(managed_list_id.strip()) == 0: raise click.UsageError('Parameter --managed-list-id cannot be whitespace or empty string') kwargs = {} @@ -3316,7 +3315,7 @@ def get_managed_list(ctx, from_json, managed_list_id): @cli_util.wrap_exceptions def get_problem(ctx, from_json, problem_id): - if isinstance(problem_id, six.string_types) and len(problem_id.strip()) == 0: + if isinstance(problem_id, str) and len(problem_id.strip()) == 0: raise click.UsageError('Parameter --problem-id cannot be whitespace or empty string') kwargs = {} @@ -3338,7 +3337,7 @@ def get_problem(ctx, from_json, problem_id): @cli_util.wrap_exceptions def get_resource(ctx, from_json, resource_id): - if isinstance(resource_id, six.string_types) and len(resource_id.strip()) == 0: + if isinstance(resource_id, str) and len(resource_id.strip()) == 0: raise click.UsageError('Parameter --resource-id cannot be whitespace or empty string') kwargs = {} @@ -3360,7 +3359,7 @@ def get_resource(ctx, from_json, resource_id): @cli_util.wrap_exceptions def get_resource_profile(ctx, from_json, resource_profile_id): - if isinstance(resource_profile_id, six.string_types) and len(resource_profile_id.strip()) == 0: + if isinstance(resource_profile_id, str) and len(resource_profile_id.strip()) == 0: raise click.UsageError('Parameter --resource-profile-id cannot be whitespace or empty string') kwargs = {} @@ -3383,10 +3382,10 @@ def get_resource_profile(ctx, from_json, resource_profile_id): @cli_util.wrap_exceptions def get_resource_vulnerability(ctx, from_json, resource_id, vulnerability_key): - if isinstance(resource_id, six.string_types) and len(resource_id.strip()) == 0: + if isinstance(resource_id, str) and len(resource_id.strip()) == 0: raise click.UsageError('Parameter --resource-id cannot be whitespace or empty string') - if isinstance(vulnerability_key, six.string_types) and len(vulnerability_key.strip()) == 0: + if isinstance(vulnerability_key, str) and len(vulnerability_key.strip()) == 0: raise click.UsageError('Parameter --vulnerability-key cannot be whitespace or empty string') kwargs = {} @@ -3409,7 +3408,7 @@ def get_resource_vulnerability(ctx, from_json, resource_id, vulnerability_key): @cli_util.wrap_exceptions def get_responder_execution(ctx, from_json, responder_execution_id): - if isinstance(responder_execution_id, six.string_types) and len(responder_execution_id.strip()) == 0: + if isinstance(responder_execution_id, str) and len(responder_execution_id.strip()) == 0: raise click.UsageError('Parameter --responder-execution-id cannot be whitespace or empty string') kwargs = {} @@ -3431,7 +3430,7 @@ def get_responder_execution(ctx, from_json, responder_execution_id): @cli_util.wrap_exceptions def get_responder_recipe(ctx, from_json, responder_recipe_id): - if isinstance(responder_recipe_id, six.string_types) and len(responder_recipe_id.strip()) == 0: + if isinstance(responder_recipe_id, str) and len(responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --responder-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -3454,10 +3453,10 @@ def get_responder_recipe(ctx, from_json, responder_recipe_id): @cli_util.wrap_exceptions def get_responder_recipe_responder_rule(ctx, from_json, responder_recipe_id, responder_rule_id): - if isinstance(responder_recipe_id, six.string_types) and len(responder_recipe_id.strip()) == 0: + if isinstance(responder_recipe_id, str) and len(responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --responder-recipe-id cannot be whitespace or empty string') - if isinstance(responder_rule_id, six.string_types) and len(responder_rule_id.strip()) == 0: + if isinstance(responder_rule_id, str) and len(responder_rule_id.strip()) == 0: raise click.UsageError('Parameter --responder-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3480,7 +3479,7 @@ def get_responder_recipe_responder_rule(ctx, from_json, responder_recipe_id, res @cli_util.wrap_exceptions def get_responder_rule(ctx, from_json, responder_rule_id): - if isinstance(responder_rule_id, six.string_types) and len(responder_rule_id.strip()) == 0: + if isinstance(responder_rule_id, str) and len(responder_rule_id.strip()) == 0: raise click.UsageError('Parameter --responder-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3502,7 +3501,7 @@ def get_responder_rule(ctx, from_json, responder_rule_id): @cli_util.wrap_exceptions def get_saved_query(ctx, from_json, saved_query_id): - if isinstance(saved_query_id, six.string_types) and len(saved_query_id.strip()) == 0: + if isinstance(saved_query_id, str) and len(saved_query_id.strip()) == 0: raise click.UsageError('Parameter --saved-query-id cannot be whitespace or empty string') kwargs = {} @@ -3524,7 +3523,7 @@ def get_saved_query(ctx, from_json, saved_query_id): @cli_util.wrap_exceptions def get_security_policy(ctx, from_json, security_policy_id): - if isinstance(security_policy_id, six.string_types) and len(security_policy_id.strip()) == 0: + if isinstance(security_policy_id, str) and len(security_policy_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3546,7 +3545,7 @@ def get_security_policy(ctx, from_json, security_policy_id): @cli_util.wrap_exceptions def get_security_recipe(ctx, from_json, security_recipe_id): - if isinstance(security_recipe_id, six.string_types) and len(security_recipe_id.strip()) == 0: + if isinstance(security_recipe_id, str) and len(security_recipe_id.strip()) == 0: raise click.UsageError('Parameter --security-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -3568,7 +3567,7 @@ def get_security_recipe(ctx, from_json, security_recipe_id): @cli_util.wrap_exceptions def get_security_zone(ctx, from_json, security_zone_id): - if isinstance(security_zone_id, six.string_types) and len(security_zone_id.strip()) == 0: + if isinstance(security_zone_id, str) and len(security_zone_id.strip()) == 0: raise click.UsageError('Parameter --security-zone-id cannot be whitespace or empty string') kwargs = {} @@ -3590,7 +3589,7 @@ def get_security_zone(ctx, from_json, security_zone_id): @cli_util.wrap_exceptions def get_sighting(ctx, from_json, sighting_id): - if isinstance(sighting_id, six.string_types) and len(sighting_id.strip()) == 0: + if isinstance(sighting_id, str) and len(sighting_id.strip()) == 0: raise click.UsageError('Parameter --sighting-id cannot be whitespace or empty string') kwargs = {} @@ -3612,7 +3611,7 @@ def get_sighting(ctx, from_json, sighting_id): @cli_util.wrap_exceptions def get_target(ctx, from_json, target_id): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') kwargs = {} @@ -3635,10 +3634,10 @@ def get_target(ctx, from_json, target_id): @cli_util.wrap_exceptions def get_target_detector_recipe(ctx, from_json, target_id, target_detector_recipe_id): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_detector_recipe_id, six.string_types) and len(target_detector_recipe_id.strip()) == 0: + if isinstance(target_detector_recipe_id, str) and len(target_detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-detector-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -3663,13 +3662,13 @@ def get_target_detector_recipe(ctx, from_json, target_id, target_detector_recipe @cli_util.wrap_exceptions def get_target_detector_recipe_detector_rule(ctx, from_json, target_id, target_detector_recipe_id, detector_rule_id): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_detector_recipe_id, six.string_types) and len(target_detector_recipe_id.strip()) == 0: + if isinstance(target_detector_recipe_id, str) and len(target_detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-detector-recipe-id cannot be whitespace or empty string') - if isinstance(detector_rule_id, six.string_types) and len(detector_rule_id.strip()) == 0: + if isinstance(detector_rule_id, str) and len(detector_rule_id.strip()) == 0: raise click.UsageError('Parameter --detector-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3694,10 +3693,10 @@ def get_target_detector_recipe_detector_rule(ctx, from_json, target_id, target_d @cli_util.wrap_exceptions def get_target_responder_recipe(ctx, from_json, target_id, target_responder_recipe_id): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_responder_recipe_id, six.string_types) and len(target_responder_recipe_id.strip()) == 0: + if isinstance(target_responder_recipe_id, str) and len(target_responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-responder-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -3722,13 +3721,13 @@ def get_target_responder_recipe(ctx, from_json, target_id, target_responder_reci @cli_util.wrap_exceptions def get_target_responder_recipe_responder_rule(ctx, from_json, target_id, target_responder_recipe_id, responder_rule_id): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_responder_recipe_id, six.string_types) and len(target_responder_recipe_id.strip()) == 0: + if isinstance(target_responder_recipe_id, str) and len(target_responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-responder-recipe-id cannot be whitespace or empty string') - if isinstance(responder_rule_id, six.string_types) and len(responder_rule_id.strip()) == 0: + if isinstance(responder_rule_id, str) and len(responder_rule_id.strip()) == 0: raise click.UsageError('Parameter --responder-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3752,7 +3751,7 @@ def get_target_responder_recipe_responder_rule(ctx, from_json, target_id, target @cli_util.wrap_exceptions def get_wlp_agent(ctx, from_json, wlp_agent_id): - if isinstance(wlp_agent_id, six.string_types) and len(wlp_agent_id.strip()) == 0: + if isinstance(wlp_agent_id, str) and len(wlp_agent_id.strip()) == 0: raise click.UsageError('Parameter --wlp-agent-id cannot be whitespace or empty string') kwargs = {} @@ -3774,7 +3773,7 @@ def get_wlp_agent(ctx, from_json, wlp_agent_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3881,7 +3880,7 @@ def list_adhoc_query_results(ctx, from_json, all_pages, page_size, adhoc_query_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(adhoc_query_id, six.string_types) and len(adhoc_query_id.strip()) == 0: + if isinstance(adhoc_query_id, str) and len(adhoc_query_id.strip()) == 0: raise click.UsageError('Parameter --adhoc-query-id cannot be whitespace or empty string') kwargs = {} @@ -4074,7 +4073,7 @@ def list_data_source_events(ctx, from_json, all_pages, page_size, data_source_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') kwargs = {} @@ -4214,7 +4213,7 @@ def list_detector_recipe_detector_rules(ctx, from_json, all_pages, page_size, de if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -4356,7 +4355,7 @@ def list_detector_rules(ctx, from_json, all_pages, page_size, detector_id, compa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(detector_id, six.string_types) and len(detector_id.strip()) == 0: + if isinstance(detector_id, str) and len(detector_id.strip()) == 0: raise click.UsageError('Parameter --detector-id cannot be whitespace or empty string') kwargs = {} @@ -4477,7 +4476,7 @@ def list_impacted_resources(ctx, from_json, all_pages, page_size, problem_id, li if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(problem_id, six.string_types) and len(problem_id.strip()) == 0: + if isinstance(problem_id, str) and len(problem_id.strip()) == 0: raise click.UsageError('Parameter --problem-id cannot be whitespace or empty string') kwargs = {} @@ -4721,7 +4720,7 @@ def list_problem_endpoints(ctx, from_json, all_pages, page_size, problem_id, lim if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(problem_id, six.string_types) and len(problem_id.strip()) == 0: + if isinstance(problem_id, str) and len(problem_id.strip()) == 0: raise click.UsageError('Parameter --problem-id cannot be whitespace or empty string') kwargs = {} @@ -4778,7 +4777,7 @@ def list_problem_entities(ctx, from_json, all_pages, page_size, problem_id, page if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(problem_id, six.string_types) and len(problem_id.strip()) == 0: + if isinstance(problem_id, str) and len(problem_id.strip()) == 0: raise click.UsageError('Parameter --problem-id cannot be whitespace or empty string') kwargs = {} @@ -4836,7 +4835,7 @@ def list_problem_histories(ctx, from_json, all_pages, page_size, compartment_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(problem_id, six.string_types) and len(problem_id.strip()) == 0: + if isinstance(problem_id, str) and len(problem_id.strip()) == 0: raise click.UsageError('Parameter --problem-id cannot be whitespace or empty string') kwargs = {} @@ -5086,7 +5085,7 @@ def list_resource_ports(ctx, from_json, all_pages, page_size, resource_id, open_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(resource_id, six.string_types) and len(resource_id.strip()) == 0: + if isinstance(resource_id, str) and len(resource_id.strip()) == 0: raise click.UsageError('Parameter --resource-id cannot be whitespace or empty string') kwargs = {} @@ -5145,7 +5144,7 @@ def list_resource_profile_endpoints(ctx, from_json, all_pages, page_size, resour if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(resource_profile_id, six.string_types) and len(resource_profile_id.strip()) == 0: + if isinstance(resource_profile_id, str) and len(resource_profile_id.strip()) == 0: raise click.UsageError('Parameter --resource-profile-id cannot be whitespace or empty string') kwargs = {} @@ -5202,7 +5201,7 @@ def list_resource_profile_impacted_resources(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(resource_profile_id, six.string_types) and len(resource_profile_id.strip()) == 0: + if isinstance(resource_profile_id, str) and len(resource_profile_id.strip()) == 0: raise click.UsageError('Parameter --resource-profile-id cannot be whitespace or empty string') kwargs = {} @@ -5412,7 +5411,7 @@ def list_resource_vulnerabilities(ctx, from_json, all_pages, page_size, resource if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(resource_id, six.string_types) and len(resource_id.strip()) == 0: + if isinstance(resource_id, str) and len(resource_id.strip()) == 0: raise click.UsageError('Parameter --resource-id cannot be whitespace or empty string') kwargs = {} @@ -5572,7 +5571,7 @@ def list_responder_activities(ctx, from_json, all_pages, page_size, problem_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(problem_id, six.string_types) and len(problem_id.strip()) == 0: + if isinstance(problem_id, str) and len(problem_id.strip()) == 0: raise click.UsageError('Parameter --problem-id cannot be whitespace or empty string') kwargs = {} @@ -5722,7 +5721,7 @@ def list_responder_recipe_responder_rules(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(responder_recipe_id, six.string_types) and len(responder_recipe_id.strip()) == 0: + if isinstance(responder_recipe_id, str) and len(responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --responder-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -6177,7 +6176,7 @@ def list_sighting_endpoints(ctx, from_json, all_pages, page_size, sighting_id, l if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sighting_id, six.string_types) and len(sighting_id.strip()) == 0: + if isinstance(sighting_id, str) and len(sighting_id.strip()) == 0: raise click.UsageError('Parameter --sighting-id cannot be whitespace or empty string') kwargs = {} @@ -6234,7 +6233,7 @@ def list_sighting_impacted_resources(ctx, from_json, all_pages, page_size, sight if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sighting_id, six.string_types) and len(sighting_id.strip()) == 0: + if isinstance(sighting_id, str) and len(sighting_id.strip()) == 0: raise click.UsageError('Parameter --sighting-id cannot be whitespace or empty string') kwargs = {} @@ -6428,10 +6427,10 @@ def list_target_detector_recipe_detector_rules(ctx, from_json, all_pages, page_s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_detector_recipe_id, six.string_types) and len(target_detector_recipe_id.strip()) == 0: + if isinstance(target_detector_recipe_id, str) and len(target_detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-detector-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -6501,7 +6500,7 @@ def list_target_detector_recipes(ctx, from_json, all_pages, page_size, target_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') kwargs = {} @@ -6569,10 +6568,10 @@ def list_target_responder_recipe_responder_rules(ctx, from_json, all_pages, page if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_responder_recipe_id, six.string_types) and len(target_responder_recipe_id.strip()) == 0: + if isinstance(target_responder_recipe_id, str) and len(target_responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-responder-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -6642,7 +6641,7 @@ def list_target_responder_recipes(ctx, from_json, all_pages, page_size, target_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') kwargs = {} @@ -6893,7 +6892,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -6950,7 +6949,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -7063,7 +7062,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, sta @cli_util.wrap_exceptions def remove_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_zone_id, compartment_id, if_match): - if isinstance(security_zone_id, six.string_types) and len(security_zone_id.strip()) == 0: + if isinstance(security_zone_id, str) and len(security_zone_id.strip()) == 0: raise click.UsageError('Parameter --security-zone-id cannot be whitespace or empty string') kwargs = {} @@ -7592,7 +7591,7 @@ def skip_bulk_responder_execution(ctx, from_json, responder_execution_ids): @cli_util.wrap_exceptions def skip_responder_execution(ctx, from_json, responder_execution_id, compartment_id, if_match): - if isinstance(responder_execution_id, six.string_types) and len(responder_execution_id.strip()) == 0: + if isinstance(responder_execution_id, str) and len(responder_execution_id.strip()) == 0: raise click.UsageError('Parameter --responder-execution-id cannot be whitespace or empty string') kwargs = {} @@ -7622,7 +7621,7 @@ def skip_responder_execution(ctx, from_json, responder_execution_id, compartment @cli_util.wrap_exceptions def trigger_responder(ctx, from_json, problem_id, responder_rule_id, configurations, if_match): - if isinstance(problem_id, six.string_types) and len(problem_id.strip()) == 0: + if isinstance(problem_id, str) and len(problem_id.strip()) == 0: raise click.UsageError('Parameter --problem-id cannot be whitespace or empty string') kwargs = {} @@ -7745,7 +7744,7 @@ def update_configuration(ctx, from_json, force, reporting_region, status, compar @cli_util.wrap_exceptions def update_data_mask_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, display_name, compartment_id, iam_group_id, target_selected, data_mask_categories, data_mask_rule_status, freeform_tags, defined_tags, if_match): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') if not force: if target_selected or data_mask_categories or freeform_tags or defined_tags: @@ -7840,7 +7839,7 @@ def update_data_mask_rule(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_data_mask_rule_all_targets_selected(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, display_name, compartment_id, iam_group_id, data_mask_categories, data_mask_rule_status, freeform_tags, defined_tags, if_match): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') if not force: if data_mask_categories or freeform_tags or defined_tags: @@ -7936,7 +7935,7 @@ def update_data_mask_rule_all_targets_selected(ctx, from_json, force, wait_for_s @cli_util.wrap_exceptions def update_data_mask_rule_target_resource_types_selected(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, display_name, compartment_id, iam_group_id, data_mask_categories, data_mask_rule_status, freeform_tags, defined_tags, if_match, target_selected_values): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') if not force: if data_mask_categories or freeform_tags or defined_tags: @@ -8035,7 +8034,7 @@ def update_data_mask_rule_target_resource_types_selected(ctx, from_json, force, @cli_util.wrap_exceptions def update_data_mask_rule_target_ids_selected(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_mask_rule_id, display_name, compartment_id, iam_group_id, data_mask_categories, data_mask_rule_status, freeform_tags, defined_tags, if_match, target_selected_values): - if isinstance(data_mask_rule_id, six.string_types) and len(data_mask_rule_id.strip()) == 0: + if isinstance(data_mask_rule_id, str) and len(data_mask_rule_id.strip()) == 0: raise click.UsageError('Parameter --data-mask-rule-id cannot be whitespace or empty string') if not force: if data_mask_categories or freeform_tags or defined_tags: @@ -8129,7 +8128,7 @@ def update_data_mask_rule_target_ids_selected(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_data_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_source_id, display_name, status, data_source_details, freeform_tags, defined_tags, if_match): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') if not force: if data_source_details or freeform_tags or defined_tags: @@ -8220,7 +8219,7 @@ def update_data_source(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_data_source_scheduled_query_data_source_obj_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_source_id, display_name, status, freeform_tags, defined_tags, if_match, data_source_details_query, data_source_details_description, data_source_details_interval_in_seconds, data_source_details_scheduled_query_scope_details): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -8326,7 +8325,7 @@ def update_data_source_scheduled_query_data_source_obj_details(ctx, from_json, f @cli_util.wrap_exceptions def update_data_source_logging_query_data_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_source_id, display_name, status, freeform_tags, defined_tags, if_match, data_source_details_regions, data_source_details_query, data_source_details_interval_in_minutes, data_source_details_threshold, data_source_details_query_start_time, data_source_details_operator, data_source_details_logging_query_type, data_source_details_additional_entities_count, data_source_details_logging_query_details): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -8445,7 +8444,7 @@ def update_data_source_logging_query_data_source_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_detector_recipe(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, detector_recipe_id, display_name, description, detector_rules, freeform_tags, defined_tags, if_match): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') if not force: if detector_rules or freeform_tags or defined_tags: @@ -8522,10 +8521,10 @@ def update_detector_recipe(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_detector_recipe_detector_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, detector_recipe_id, detector_rule_id, details, if_match): - if isinstance(detector_recipe_id, six.string_types) and len(detector_recipe_id.strip()) == 0: + if isinstance(detector_recipe_id, str) and len(detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --detector-recipe-id cannot be whitespace or empty string') - if isinstance(detector_rule_id, six.string_types) and len(detector_rule_id.strip()) == 0: + if isinstance(detector_rule_id, str) and len(detector_rule_id.strip()) == 0: raise click.UsageError('Parameter --detector-rule-id cannot be whitespace or empty string') if not force: if details: @@ -8599,7 +8598,7 @@ def update_detector_recipe_detector_rule(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_managed_list(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_list_id, display_name, description, list_items, group, freeform_tags, defined_tags, if_match): - if isinstance(managed_list_id, six.string_types) and len(managed_list_id.strip()) == 0: + if isinstance(managed_list_id, str) and len(managed_list_id.strip()) == 0: raise click.UsageError('Parameter --managed-list-id cannot be whitespace or empty string') if not force: if list_items or freeform_tags or defined_tags: @@ -8678,7 +8677,7 @@ def update_managed_list(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_problem_status(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, problem_id, status, comment, if_match): - if isinstance(problem_id, six.string_types) and len(problem_id.strip()) == 0: + if isinstance(problem_id, str) and len(problem_id.strip()) == 0: raise click.UsageError('Parameter --problem-id cannot be whitespace or empty string') kwargs = {} @@ -8751,7 +8750,7 @@ def update_problem_status(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_responder_recipe(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, responder_recipe_id, display_name, description, responder_rules, freeform_tags, defined_tags, if_match): - if isinstance(responder_recipe_id, six.string_types) and len(responder_recipe_id.strip()) == 0: + if isinstance(responder_recipe_id, str) and len(responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --responder-recipe-id cannot be whitespace or empty string') if not force: if responder_rules or freeform_tags or defined_tags: @@ -8826,10 +8825,10 @@ def update_responder_recipe(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_responder_recipe_responder_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, responder_recipe_id, responder_rule_id, details, if_match): - if isinstance(responder_recipe_id, six.string_types) and len(responder_recipe_id.strip()) == 0: + if isinstance(responder_recipe_id, str) and len(responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --responder-recipe-id cannot be whitespace or empty string') - if isinstance(responder_rule_id, six.string_types) and len(responder_rule_id.strip()) == 0: + if isinstance(responder_rule_id, str) and len(responder_rule_id.strip()) == 0: raise click.UsageError('Parameter --responder-rule-id cannot be whitespace or empty string') if not force: if details: @@ -8898,7 +8897,7 @@ def update_responder_recipe_responder_rule(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def update_saved_query(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, saved_query_id, display_name, description, query_parameterconflict, freeform_tags, defined_tags, if_match): - if isinstance(saved_query_id, six.string_types) and len(saved_query_id.strip()) == 0: + if isinstance(saved_query_id, str) and len(saved_query_id.strip()) == 0: raise click.UsageError('Parameter --saved-query-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -8980,7 +8979,7 @@ def update_saved_query(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_security_recipe(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_recipe_id, display_name, description, security_policies, freeform_tags, defined_tags, if_match): - if isinstance(security_recipe_id, six.string_types) and len(security_recipe_id.strip()) == 0: + if isinstance(security_recipe_id, str) and len(security_recipe_id.strip()) == 0: raise click.UsageError('Parameter --security-recipe-id cannot be whitespace or empty string') if not force: if security_policies or freeform_tags or defined_tags: @@ -9060,7 +9059,7 @@ def update_security_recipe(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_security_zone(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_zone_id, display_name, description, security_zone_recipe_id, freeform_tags, defined_tags, if_match): - if isinstance(security_zone_id, six.string_types) and len(security_zone_id.strip()) == 0: + if isinstance(security_zone_id, str) and len(security_zone_id.strip()) == 0: raise click.UsageError('Parameter --security-zone-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -9147,7 +9146,7 @@ def update_security_zone(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_target(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_id, display_name, lifecycle_state, target_detector_recipes, target_responder_recipes, freeform_tags, defined_tags, if_match): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') if not force: if target_detector_recipes or target_responder_recipes or freeform_tags or defined_tags: @@ -9231,10 +9230,10 @@ def update_target(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_target_detector_recipe(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_id, target_detector_recipe_id, detector_recipe_id, is_validation_only_query, detector_rules, if_match): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_detector_recipe_id, six.string_types) and len(target_detector_recipe_id.strip()) == 0: + if isinstance(target_detector_recipe_id, str) and len(target_detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-detector-recipe-id cannot be whitespace or empty string') if not force: if detector_rules: @@ -9307,13 +9306,13 @@ def update_target_detector_recipe(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_target_detector_recipe_detector_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_id, target_detector_recipe_id, detector_rule_id, details, if_match): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_detector_recipe_id, six.string_types) and len(target_detector_recipe_id.strip()) == 0: + if isinstance(target_detector_recipe_id, str) and len(target_detector_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-detector-recipe-id cannot be whitespace or empty string') - if isinstance(detector_rule_id, six.string_types) and len(detector_rule_id.strip()) == 0: + if isinstance(detector_rule_id, str) and len(detector_rule_id.strip()) == 0: raise click.UsageError('Parameter --detector-rule-id cannot be whitespace or empty string') if not force: if details: @@ -9375,10 +9374,10 @@ def update_target_detector_recipe_detector_rule(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_target_responder_recipe(ctx, from_json, force, target_id, target_responder_recipe_id, responder_rules, if_match): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_responder_recipe_id, six.string_types) and len(target_responder_recipe_id.strip()) == 0: + if isinstance(target_responder_recipe_id, str) and len(target_responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-responder-recipe-id cannot be whitespace or empty string') if not force: if responder_rules: @@ -9420,13 +9419,13 @@ def update_target_responder_recipe(ctx, from_json, force, target_id, target_resp @cli_util.wrap_exceptions def update_target_responder_recipe_responder_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_id, target_responder_recipe_id, responder_rule_id, details, if_match): - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') - if isinstance(target_responder_recipe_id, six.string_types) and len(target_responder_recipe_id.strip()) == 0: + if isinstance(target_responder_recipe_id, str) and len(target_responder_recipe_id.strip()) == 0: raise click.UsageError('Parameter --target-responder-recipe-id cannot be whitespace or empty string') - if isinstance(responder_rule_id, six.string_types) and len(responder_rule_id.strip()) == 0: + if isinstance(responder_rule_id, str) and len(responder_rule_id.strip()) == 0: raise click.UsageError('Parameter --responder-rule-id cannot be whitespace or empty string') if not force: if details: @@ -9491,7 +9490,7 @@ def update_target_responder_recipe_responder_rule(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_wlp_agent(ctx, from_json, force, wlp_agent_id, certificate_signed_request, freeform_tags, defined_tags, if_match): - if isinstance(wlp_agent_id, six.string_types) and len(wlp_agent_id.strip()) == 0: + if isinstance(wlp_agent_id, str) and len(wlp_agent_id.strip()) == 0: raise click.UsageError('Parameter --wlp-agent-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/cloud_migrations/src/oci_cli_migration/generated/migration_cli.py b/services/cloud_migrations/src/oci_cli_migration/generated/migration_cli.py index 8b2d9c9db..a544fe56e 100644 --- a/services/cloud_migrations/src/oci_cli_migration/generated/migration_cli.py +++ b/services/cloud_migrations/src/oci_cli_migration/generated/migration_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -133,7 +132,7 @@ def available_shapes_collection_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -162,7 +161,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_migration_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, compartment_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -223,7 +222,7 @@ def change_migration_compartment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def change_migration_plan_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_plan_id, compartment_id, if_match): - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') kwargs = {} @@ -284,7 +283,7 @@ def change_migration_plan_compartment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def change_replication_schedule_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, replication_schedule_id, compartment_id, if_match): - if isinstance(replication_schedule_id, six.string_types) and len(replication_schedule_id.strip()) == 0: + if isinstance(replication_schedule_id, str) and len(replication_schedule_id.strip()) == 0: raise click.UsageError('Parameter --replication-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -757,7 +756,7 @@ def create_target_asset_create_vm_target_asset_details(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def delete_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -813,7 +812,7 @@ def delete_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_migration_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_asset_id, if_match): - if isinstance(migration_asset_id, six.string_types) and len(migration_asset_id.strip()) == 0: + if isinstance(migration_asset_id, str) and len(migration_asset_id.strip()) == 0: raise click.UsageError('Parameter --migration-asset-id cannot be whitespace or empty string') kwargs = {} @@ -869,7 +868,7 @@ def delete_migration_asset(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_migration_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_plan_id, if_match): - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') kwargs = {} @@ -925,7 +924,7 @@ def delete_migration_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_replication_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, replication_schedule_id, if_match): - if isinstance(replication_schedule_id, six.string_types) and len(replication_schedule_id.strip()) == 0: + if isinstance(replication_schedule_id, str) and len(replication_schedule_id.strip()) == 0: raise click.UsageError('Parameter --replication-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -981,7 +980,7 @@ def delete_replication_schedule(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_target_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_asset_id, if_match): - if isinstance(target_asset_id, six.string_types) and len(target_asset_id.strip()) == 0: + if isinstance(target_asset_id, str) and len(target_asset_id.strip()) == 0: raise click.UsageError('Parameter --target-asset-id cannot be whitespace or empty string') kwargs = {} @@ -1036,7 +1035,7 @@ def delete_target_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def execute_migration_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_plan_id, if_match): - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') kwargs = {} @@ -1088,7 +1087,7 @@ def execute_migration_plan(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def export_migration_plan(ctx, from_json, file, migration_plan_id): - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') kwargs = {} @@ -1132,7 +1131,7 @@ def export_migration_plan(ctx, from_json, file, migration_plan_id): @cli_util.wrap_exceptions def get_migration(ctx, from_json, migration_id): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -1154,7 +1153,7 @@ def get_migration(ctx, from_json, migration_id): @cli_util.wrap_exceptions def get_migration_asset(ctx, from_json, migration_asset_id): - if isinstance(migration_asset_id, six.string_types) and len(migration_asset_id.strip()) == 0: + if isinstance(migration_asset_id, str) and len(migration_asset_id.strip()) == 0: raise click.UsageError('Parameter --migration-asset-id cannot be whitespace or empty string') kwargs = {} @@ -1176,7 +1175,7 @@ def get_migration_asset(ctx, from_json, migration_asset_id): @cli_util.wrap_exceptions def get_migration_plan(ctx, from_json, migration_plan_id): - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') kwargs = {} @@ -1198,7 +1197,7 @@ def get_migration_plan(ctx, from_json, migration_plan_id): @cli_util.wrap_exceptions def get_replication_progress(ctx, from_json, migration_asset_id): - if isinstance(migration_asset_id, six.string_types) and len(migration_asset_id.strip()) == 0: + if isinstance(migration_asset_id, str) and len(migration_asset_id.strip()) == 0: raise click.UsageError('Parameter --migration-asset-id cannot be whitespace or empty string') kwargs = {} @@ -1220,7 +1219,7 @@ def get_replication_progress(ctx, from_json, migration_asset_id): @cli_util.wrap_exceptions def get_replication_schedule(ctx, from_json, replication_schedule_id): - if isinstance(replication_schedule_id, six.string_types) and len(replication_schedule_id.strip()) == 0: + if isinstance(replication_schedule_id, str) and len(replication_schedule_id.strip()) == 0: raise click.UsageError('Parameter --replication-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -1242,7 +1241,7 @@ def get_replication_schedule(ctx, from_json, replication_schedule_id): @cli_util.wrap_exceptions def get_target_asset(ctx, from_json, target_asset_id): - if isinstance(target_asset_id, six.string_types) and len(target_asset_id.strip()) == 0: + if isinstance(target_asset_id, str) and len(target_asset_id.strip()) == 0: raise click.UsageError('Parameter --target-asset-id cannot be whitespace or empty string') kwargs = {} @@ -1264,7 +1263,7 @@ def get_target_asset(ctx, from_json, target_asset_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1291,7 +1290,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def import_migration_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_plan_id, import_migration_plan_details, if_match): - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') kwargs = {} @@ -1362,7 +1361,7 @@ def list_available_shapes(ctx, from_json, all_pages, page_size, migration_plan_i if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') kwargs = {} @@ -1740,7 +1739,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1797,7 +1796,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1914,7 +1913,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def refresh_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -1969,7 +1968,7 @@ def refresh_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def refresh_migration_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_asset_id, if_match): - if isinstance(migration_asset_id, six.string_types) and len(migration_asset_id.strip()) == 0: + if isinstance(migration_asset_id, str) and len(migration_asset_id.strip()) == 0: raise click.UsageError('Parameter --migration-asset-id cannot be whitespace or empty string') kwargs = {} @@ -2024,7 +2023,7 @@ def refresh_migration_asset(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def refresh_migration_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_plan_id, if_match): - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') kwargs = {} @@ -2079,7 +2078,7 @@ def refresh_migration_plan(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def start_asset_replication(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_asset_id, if_match): - if isinstance(migration_asset_id, six.string_types) and len(migration_asset_id.strip()) == 0: + if isinstance(migration_asset_id, str) and len(migration_asset_id.strip()) == 0: raise click.UsageError('Parameter --migration-asset-id cannot be whitespace or empty string') kwargs = {} @@ -2134,7 +2133,7 @@ def start_asset_replication(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def start_migration_replication(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -2195,7 +2194,7 @@ def start_migration_replication(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_migration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, display_name, replication_schedule_id, is_completed, freeform_tags, defined_tags, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2273,7 +2272,7 @@ def update_migration(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_migration_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_asset_id, display_name, replication_schedule_id, depends_on, if_match): - if isinstance(migration_asset_id, six.string_types) and len(migration_asset_id.strip()) == 0: + if isinstance(migration_asset_id, str) and len(migration_asset_id.strip()) == 0: raise click.UsageError('Parameter --migration-asset-id cannot be whitespace or empty string') if not force: if depends_on: @@ -2351,7 +2350,7 @@ def update_migration_asset(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_migration_plan(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_plan_id, display_name, strategies, target_environments, freeform_tags, defined_tags, if_match): - if isinstance(migration_plan_id, six.string_types) and len(migration_plan_id.strip()) == 0: + if isinstance(migration_plan_id, str) and len(migration_plan_id.strip()) == 0: raise click.UsageError('Parameter --migration-plan-id cannot be whitespace or empty string') if not force: if strategies or target_environments or freeform_tags or defined_tags: @@ -2434,7 +2433,7 @@ def update_migration_plan(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_replication_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, replication_schedule_id, display_name, execution_recurrences, freeform_tags, defined_tags, if_match): - if isinstance(replication_schedule_id, six.string_types) and len(replication_schedule_id.strip()) == 0: + if isinstance(replication_schedule_id, str) and len(replication_schedule_id.strip()) == 0: raise click.UsageError('Parameter --replication-schedule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2511,7 +2510,7 @@ def update_replication_schedule(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_target_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_asset_id, type, is_excluded_from_execution, if_match): - if isinstance(target_asset_id, six.string_types) and len(target_asset_id.strip()) == 0: + if isinstance(target_asset_id, str) and len(target_asset_id.strip()) == 0: raise click.UsageError('Parameter --target-asset-id cannot be whitespace or empty string') kwargs = {} @@ -2580,7 +2579,7 @@ def update_target_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_target_asset_update_vm_target_asset_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_asset_id, is_excluded_from_execution, preferred_shape_type, block_volumes_performance, ms_license, user_spec, if_match): - if isinstance(target_asset_id, six.string_types) and len(target_asset_id.strip()) == 0: + if isinstance(target_asset_id, str) and len(target_asset_id.strip()) == 0: raise click.UsageError('Parameter --target-asset-id cannot be whitespace or empty string') if not force: if user_spec: diff --git a/services/cloud_migrations/src/oci_cli_migration/migration_cli_extended.py b/services/cloud_migrations/src/oci_cli_migration/migration_cli_extended.py index 7ab3ee2f9..595c1eec9 100644 --- a/services/cloud_migrations/src/oci_cli_migration/migration_cli_extended.py +++ b/services/cloud_migrations/src/oci_cli_migration/migration_cli_extended.py @@ -4,7 +4,6 @@ import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 import click # noqa: F401 import json # noqa: F401 @@ -161,7 +160,7 @@ def create_target_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_i def update_target_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_asset_id, type, is_excluded_from_execution, if_match, preferred_shape_type, block_volumes_performance, ms_license, user_spec): - if isinstance(target_asset_id, six.string_types) and len(target_asset_id.strip()) == 0: + if isinstance(target_asset_id, str) and len(target_asset_id.strip()) == 0: raise click.UsageError('Parameter --target-asset-id cannot be whitespace or empty string') if not force: diff --git a/services/cluster_placement_groups/src/oci_cli_cluster_placement_groups_cp/generated/clusterplacementgroupscp_cli.py b/services/cluster_placement_groups/src/oci_cli_cluster_placement_groups_cp/generated/clusterplacementgroupscp_cli.py index ec42aae61..55efcfe0f 100644 --- a/services/cluster_placement_groups/src/oci_cli_cluster_placement_groups_cp/generated/clusterplacementgroupscp_cli.py +++ b/services/cluster_placement_groups/src/oci_cli_cluster_placement_groups_cp/generated/clusterplacementgroupscp_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -72,7 +71,7 @@ def work_request_group(): @cli_util.wrap_exceptions def activate_cluster_placement_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_placement_group_id, if_match): - if isinstance(cluster_placement_group_id, six.string_types) and len(cluster_placement_group_id.strip()) == 0: + if isinstance(cluster_placement_group_id, str) and len(cluster_placement_group_id.strip()) == 0: raise click.UsageError('Parameter --cluster-placement-group-id cannot be whitespace or empty string') kwargs = {} @@ -121,7 +120,7 @@ def activate_cluster_placement_group(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -149,7 +148,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_cluster_placement_group_compartment(ctx, from_json, cluster_placement_group_id, compartment_id, if_match): - if isinstance(cluster_placement_group_id, six.string_types) and len(cluster_placement_group_id.strip()) == 0: + if isinstance(cluster_placement_group_id, str) and len(cluster_placement_group_id.strip()) == 0: raise click.UsageError('Parameter --cluster-placement-group-id cannot be whitespace or empty string') kwargs = {} @@ -262,7 +261,7 @@ def create_cluster_placement_group(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def deactivate_cluster_placement_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_placement_group_id, if_match): - if isinstance(cluster_placement_group_id, six.string_types) and len(cluster_placement_group_id.strip()) == 0: + if isinstance(cluster_placement_group_id, str) and len(cluster_placement_group_id.strip()) == 0: raise click.UsageError('Parameter --cluster-placement-group-id cannot be whitespace or empty string') kwargs = {} @@ -314,7 +313,7 @@ def deactivate_cluster_placement_group(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_cluster_placement_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_placement_group_id, if_match): - if isinstance(cluster_placement_group_id, six.string_types) and len(cluster_placement_group_id.strip()) == 0: + if isinstance(cluster_placement_group_id, str) and len(cluster_placement_group_id.strip()) == 0: raise click.UsageError('Parameter --cluster-placement-group-id cannot be whitespace or empty string') kwargs = {} @@ -365,7 +364,7 @@ def delete_cluster_placement_group(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def get_cluster_placement_group(ctx, from_json, cluster_placement_group_id): - if isinstance(cluster_placement_group_id, six.string_types) and len(cluster_placement_group_id.strip()) == 0: + if isinstance(cluster_placement_group_id, str) and len(cluster_placement_group_id.strip()) == 0: raise click.UsageError('Parameter --cluster-placement-group-id cannot be whitespace or empty string') kwargs = {} @@ -387,7 +386,7 @@ def get_cluster_placement_group(ctx, from_json, cluster_placement_group_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -486,7 +485,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -543,7 +542,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -661,7 +660,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_cluster_placement_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_placement_group_id, description, freeform_tags, defined_tags, if_match): - if isinstance(cluster_placement_group_id, six.string_types) and len(cluster_placement_group_id.strip()) == 0: + if isinstance(cluster_placement_group_id, str) and len(cluster_placement_group_id.strip()) == 0: raise click.UsageError('Parameter --cluster-placement-group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/compute_cloud_at_customer/src/oci_cli_compute_cloud_at_customer/generated/computecloudatcustomer_cli.py b/services/compute_cloud_at_customer/src/oci_cli_compute_cloud_at_customer/generated/computecloudatcustomer_cli.py index e3dc3da54..cab744e31 100644 --- a/services/compute_cloud_at_customer/src/oci_cli_compute_cloud_at_customer/generated/computecloudatcustomer_cli.py +++ b/services/compute_cloud_at_customer/src/oci_cli_compute_cloud_at_customer/generated/computecloudatcustomer_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -64,7 +63,7 @@ def ccc_infrastructure_collection_group(): @cli_util.wrap_exceptions def change_ccc_infrastructure_compartment(ctx, from_json, ccc_infrastructure_id, compartment_id, if_match): - if isinstance(ccc_infrastructure_id, six.string_types) and len(ccc_infrastructure_id.strip()) == 0: + if isinstance(ccc_infrastructure_id, str) and len(ccc_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --ccc-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -95,7 +94,7 @@ def change_ccc_infrastructure_compartment(ctx, from_json, ccc_infrastructure_id, @cli_util.wrap_exceptions def change_ccc_upgrade_schedule_compartment(ctx, from_json, ccc_upgrade_schedule_id, compartment_id, if_match): - if isinstance(ccc_upgrade_schedule_id, six.string_types) and len(ccc_upgrade_schedule_id.strip()) == 0: + if isinstance(ccc_upgrade_schedule_id, str) and len(ccc_upgrade_schedule_id.strip()) == 0: raise click.UsageError('Parameter --ccc-upgrade-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -271,7 +270,7 @@ def create_ccc_upgrade_schedule(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_ccc_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ccc_infrastructure_id, if_match): - if isinstance(ccc_infrastructure_id, six.string_types) and len(ccc_infrastructure_id.strip()) == 0: + if isinstance(ccc_infrastructure_id, str) and len(ccc_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --ccc-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -335,7 +334,7 @@ def delete_ccc_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_ccc_upgrade_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ccc_upgrade_schedule_id, if_match): - if isinstance(ccc_upgrade_schedule_id, six.string_types) and len(ccc_upgrade_schedule_id.strip()) == 0: + if isinstance(ccc_upgrade_schedule_id, str) and len(ccc_upgrade_schedule_id.strip()) == 0: raise click.UsageError('Parameter --ccc-upgrade-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -394,7 +393,7 @@ def delete_ccc_upgrade_schedule(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def get_ccc_infrastructure(ctx, from_json, ccc_infrastructure_id): - if isinstance(ccc_infrastructure_id, six.string_types) and len(ccc_infrastructure_id.strip()) == 0: + if isinstance(ccc_infrastructure_id, str) and len(ccc_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --ccc-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -416,7 +415,7 @@ def get_ccc_infrastructure(ctx, from_json, ccc_infrastructure_id): @cli_util.wrap_exceptions def get_ccc_upgrade_schedule(ctx, from_json, ccc_upgrade_schedule_id): - if isinstance(ccc_upgrade_schedule_id, six.string_types) and len(ccc_upgrade_schedule_id.strip()) == 0: + if isinstance(ccc_upgrade_schedule_id, str) and len(ccc_upgrade_schedule_id.strip()) == 0: raise click.UsageError('Parameter --ccc-upgrade-schedule-id cannot be whitespace or empty string') kwargs = {} @@ -593,7 +592,7 @@ def list_ccc_upgrade_schedules(ctx, from_json, all_pages, page_size, ccc_upgrade @cli_util.wrap_exceptions def update_ccc_infrastructure(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ccc_infrastructure_id, display_name, description, subnet_id, connection_state, connection_details, ccc_upgrade_schedule_id, freeform_tags, defined_tags, if_match): - if isinstance(ccc_infrastructure_id, six.string_types) and len(ccc_infrastructure_id.strip()) == 0: + if isinstance(ccc_infrastructure_id, str) and len(ccc_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --ccc-infrastructure-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -684,7 +683,7 @@ def update_ccc_infrastructure(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_ccc_upgrade_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ccc_upgrade_schedule_id, display_name, description, events, freeform_tags, defined_tags, if_match): - if isinstance(ccc_upgrade_schedule_id, six.string_types) and len(ccc_upgrade_schedule_id.strip()) == 0: + if isinstance(ccc_upgrade_schedule_id, str) and len(ccc_upgrade_schedule_id.strip()) == 0: raise click.UsageError('Parameter --ccc-upgrade-schedule-id cannot be whitespace or empty string') if not force: if events or freeform_tags or defined_tags: diff --git a/services/compute_instance_agent/src/oci_cli_compute_instance_agent/generated/computeinstanceagent_cli.py b/services/compute_instance_agent/src/oci_cli_compute_instance_agent/generated/computeinstanceagent_cli.py index e20f73433..c840611be 100644 --- a/services/compute_instance_agent/src/oci_cli_compute_instance_agent/generated/computeinstanceagent_cli.py +++ b/services/compute_instance_agent/src/oci_cli_compute_instance_agent/generated/computeinstanceagent_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -53,7 +52,7 @@ def instance_agent_command_execution_group(): @cli_util.wrap_exceptions def cancel_instance_agent_command(ctx, from_json, instance_agent_command_id, if_match): - if isinstance(instance_agent_command_id, six.string_types) and len(instance_agent_command_id.strip()) == 0: + if isinstance(instance_agent_command_id, str) and len(instance_agent_command_id.strip()) == 0: raise click.UsageError('Parameter --instance-agent-command-id cannot be whitespace or empty string') kwargs = {} @@ -116,7 +115,7 @@ def create_instance_agent_command(ctx, from_json, compartment_id, execution_time @cli_util.wrap_exceptions def get_instance_agent_command(ctx, from_json, instance_agent_command_id): - if isinstance(instance_agent_command_id, six.string_types) and len(instance_agent_command_id.strip()) == 0: + if isinstance(instance_agent_command_id, str) and len(instance_agent_command_id.strip()) == 0: raise click.UsageError('Parameter --instance-agent-command-id cannot be whitespace or empty string') kwargs = {} @@ -139,7 +138,7 @@ def get_instance_agent_command(ctx, from_json, instance_agent_command_id): @cli_util.wrap_exceptions def get_instance_agent_command_execution(ctx, from_json, instance_agent_command_id, instance_id): - if isinstance(instance_agent_command_id, six.string_types) and len(instance_agent_command_id.strip()) == 0: + if isinstance(instance_agent_command_id, str) and len(instance_agent_command_id.strip()) == 0: raise click.UsageError('Parameter --instance-agent-command-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/compute_instance_agent/src/oci_cli_plugin/generated/plugin_cli.py b/services/compute_instance_agent/src/oci_cli_plugin/generated/plugin_cli.py index 17093cf40..56e7836bc 100644 --- a/services/compute_instance_agent/src/oci_cli_plugin/generated/plugin_cli.py +++ b/services/compute_instance_agent/src/oci_cli_plugin/generated/plugin_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -44,10 +43,10 @@ def plugin_group(): @cli_util.wrap_exceptions def get_instance_agent_plugin(ctx, from_json, instanceagent_id, compartment_id, plugin_name): - if isinstance(instanceagent_id, six.string_types) and len(instanceagent_id.strip()) == 0: + if isinstance(instanceagent_id, str) and len(instanceagent_id.strip()) == 0: raise click.UsageError('Parameter --instanceagent-id cannot be whitespace or empty string') - if isinstance(plugin_name, six.string_types) and len(plugin_name.strip()) == 0: + if isinstance(plugin_name, str) and len(plugin_name.strip()) == 0: raise click.UsageError('Parameter --plugin-name cannot be whitespace or empty string') kwargs = {} @@ -85,7 +84,7 @@ def list_instance_agent_plugins(ctx, from_json, all_pages, page_size, compartmen if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(instanceagent_id, six.string_types) and len(instanceagent_id.strip()) == 0: + if isinstance(instanceagent_id, str) and len(instanceagent_id.strip()) == 0: raise click.UsageError('Parameter --instanceagent-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/compute_instance_agent/src/oci_cli_pluginconfig/generated/pluginconfig_cli.py b/services/compute_instance_agent/src/oci_cli_pluginconfig/generated/pluginconfig_cli.py index b6fff8343..f8c81e1ce 100644 --- a/services/compute_instance_agent/src/oci_cli_pluginconfig/generated/pluginconfig_cli.py +++ b/services/compute_instance_agent/src/oci_cli_pluginconfig/generated/pluginconfig_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/container_engine/src/oci_cli_container_engine/containerengine_cli_extended.py b/services/container_engine/src/oci_cli_container_engine/containerengine_cli_extended.py index 71b6572a5..c954c6684 100644 --- a/services/container_engine/src/oci_cli_container_engine/containerengine_cli_extended.py +++ b/services/container_engine/src/oci_cli_container_engine/containerengine_cli_extended.py @@ -11,7 +11,6 @@ from oci.auth.signers import InstancePrincipalsDelegationTokenSigner import click import json -import six import os import yaml import base64 @@ -36,7 +35,7 @@ @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}) @cli_util.wrap_exceptions def generate_token(ctx, from_json, cluster_id): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') client = cli_util.build_client('container_engine', 'container_engine', ctx) @@ -601,7 +600,7 @@ def update_node_pool(ctx, **kwargs): @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}) @cli_util.wrap_exceptions def create_kubeconfig(ctx, from_json, file, cluster_id, token_version, expiration, kube_endpoint, overwrite, with_auth_context): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/container_engine/src/oci_cli_container_engine/generated/containerengine_cli.py b/services/container_engine/src/oci_cli_container_engine/generated/containerengine_cli.py index 6e7993aee..a22d4380c 100644 --- a/services/container_engine/src/oci_cli_container_engine/generated/containerengine_cli.py +++ b/services/container_engine/src/oci_cli_container_engine/generated/containerengine_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -132,7 +131,7 @@ def cluster_options_group(): @cli_util.wrap_exceptions def cluster_migrate_to_native_vcn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, endpoint_config, decommission_delay_duration, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -195,7 +194,7 @@ def cluster_migrate_to_native_vcn(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def complete_credential_rotation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -343,7 +342,7 @@ def create_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def create_kubeconfig(ctx, from_json, file, cluster_id, token_version, expiration, endpoint_parameterconflict): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -741,7 +740,7 @@ def create_virtual_node_pool(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_workload_mapping(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, namespace, mapped_compartment_id, freeform_tags, defined_tags): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -803,7 +802,7 @@ def create_workload_mapping(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -863,10 +862,10 @@ def delete_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, node_pool_id, node_id, is_decrement_size, if_match, override_eviction_grace_duration, is_force_deletion_after_override_grace_duration): - if isinstance(node_pool_id, six.string_types) and len(node_pool_id.strip()) == 0: + if isinstance(node_pool_id, str) and len(node_pool_id.strip()) == 0: raise click.UsageError('Parameter --node-pool-id cannot be whitespace or empty string') - if isinstance(node_id, six.string_types) and len(node_id.strip()) == 0: + if isinstance(node_id, str) and len(node_id.strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') kwargs = {} @@ -931,7 +930,7 @@ def delete_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_node_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, node_pool_id, if_match, override_eviction_grace_duration, is_force_deletion_after_override_grace_duration): - if isinstance(node_pool_id, six.string_types) and len(node_pool_id.strip()) == 0: + if isinstance(node_pool_id, str) and len(node_pool_id.strip()) == 0: raise click.UsageError('Parameter --node-pool-id cannot be whitespace or empty string') kwargs = {} @@ -993,7 +992,7 @@ def delete_node_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_virtual_node_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, virtual_node_pool_id, if_match, override_eviction_grace_duration_vnp, is_force_deletion_after_override_grace_duration_vnp): - if isinstance(virtual_node_pool_id, six.string_types) and len(virtual_node_pool_id.strip()) == 0: + if isinstance(virtual_node_pool_id, str) and len(virtual_node_pool_id.strip()) == 0: raise click.UsageError('Parameter --virtual-node-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1050,7 +1049,7 @@ def delete_virtual_node_pool(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1077,10 +1076,10 @@ def delete_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def delete_workload_mapping(ctx, from_json, cluster_id, workload_mapping_id, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(workload_mapping_id, six.string_types) and len(workload_mapping_id.strip()) == 0: + if isinstance(workload_mapping_id, str) and len(workload_mapping_id.strip()) == 0: raise click.UsageError('Parameter --workload-mapping-id cannot be whitespace or empty string') kwargs = {} @@ -1112,10 +1111,10 @@ def delete_workload_mapping(ctx, from_json, cluster_id, workload_mapping_id, if_ @cli_util.wrap_exceptions def disable_addon(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, addon_name, is_remove_existing_add_on, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(addon_name, six.string_types) and len(addon_name.strip()) == 0: + if isinstance(addon_name, str) and len(addon_name.strip()) == 0: raise click.UsageError('Parameter --addon-name cannot be whitespace or empty string') kwargs = {} @@ -1169,10 +1168,10 @@ def disable_addon(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def get_addon(ctx, from_json, cluster_id, addon_name): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(addon_name, six.string_types) and len(addon_name.strip()) == 0: + if isinstance(addon_name, str) and len(addon_name.strip()) == 0: raise click.UsageError('Parameter --addon-name cannot be whitespace or empty string') kwargs = {} @@ -1196,7 +1195,7 @@ def get_addon(ctx, from_json, cluster_id, addon_name): @cli_util.wrap_exceptions def get_cluster(ctx, from_json, cluster_id, should_include_oidc_config_file): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1220,7 +1219,7 @@ def get_cluster(ctx, from_json, cluster_id, should_include_oidc_config_file): @cli_util.wrap_exceptions def get_cluster_migrate_to_native_vcn_status(ctx, from_json, cluster_id): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1243,7 +1242,7 @@ def get_cluster_migrate_to_native_vcn_status(ctx, from_json, cluster_id): @cli_util.wrap_exceptions def get_cluster_options(ctx, from_json, cluster_option_id, compartment_id): - if isinstance(cluster_option_id, six.string_types) and len(cluster_option_id.strip()) == 0: + if isinstance(cluster_option_id, str) and len(cluster_option_id.strip()) == 0: raise click.UsageError('Parameter --cluster-option-id cannot be whitespace or empty string') kwargs = {} @@ -1267,7 +1266,7 @@ def get_cluster_options(ctx, from_json, cluster_option_id, compartment_id): @cli_util.wrap_exceptions def get_credential_rotation_status(ctx, from_json, cluster_id): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1289,7 +1288,7 @@ def get_credential_rotation_status(ctx, from_json, cluster_id): @cli_util.wrap_exceptions def get_node_pool(ctx, from_json, node_pool_id): - if isinstance(node_pool_id, six.string_types) and len(node_pool_id.strip()) == 0: + if isinstance(node_pool_id, str) and len(node_pool_id.strip()) == 0: raise click.UsageError('Parameter --node-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1312,7 +1311,7 @@ def get_node_pool(ctx, from_json, node_pool_id): @cli_util.wrap_exceptions def get_node_pool_options(ctx, from_json, node_pool_option_id, compartment_id): - if isinstance(node_pool_option_id, six.string_types) and len(node_pool_option_id.strip()) == 0: + if isinstance(node_pool_option_id, str) and len(node_pool_option_id.strip()) == 0: raise click.UsageError('Parameter --node-pool-option-id cannot be whitespace or empty string') kwargs = {} @@ -1337,10 +1336,10 @@ def get_node_pool_options(ctx, from_json, node_pool_option_id, compartment_id): @cli_util.wrap_exceptions def get_virtual_node(ctx, from_json, virtual_node_pool_id, virtual_node_id): - if isinstance(virtual_node_pool_id, six.string_types) and len(virtual_node_pool_id.strip()) == 0: + if isinstance(virtual_node_pool_id, str) and len(virtual_node_pool_id.strip()) == 0: raise click.UsageError('Parameter --virtual-node-pool-id cannot be whitespace or empty string') - if isinstance(virtual_node_id, six.string_types) and len(virtual_node_id.strip()) == 0: + if isinstance(virtual_node_id, str) and len(virtual_node_id.strip()) == 0: raise click.UsageError('Parameter --virtual-node-id cannot be whitespace or empty string') kwargs = {} @@ -1363,7 +1362,7 @@ def get_virtual_node(ctx, from_json, virtual_node_pool_id, virtual_node_id): @cli_util.wrap_exceptions def get_virtual_node_pool(ctx, from_json, virtual_node_pool_id): - if isinstance(virtual_node_pool_id, six.string_types) and len(virtual_node_pool_id.strip()) == 0: + if isinstance(virtual_node_pool_id, str) and len(virtual_node_pool_id.strip()) == 0: raise click.UsageError('Parameter --virtual-node-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1385,7 +1384,7 @@ def get_virtual_node_pool(ctx, from_json, virtual_node_pool_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1408,10 +1407,10 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def get_workload_mapping(ctx, from_json, cluster_id, workload_mapping_id): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(workload_mapping_id, six.string_types) and len(workload_mapping_id.strip()) == 0: + if isinstance(workload_mapping_id, str) and len(workload_mapping_id.strip()) == 0: raise click.UsageError('Parameter --workload-mapping-id cannot be whitespace or empty string') kwargs = {} @@ -1444,7 +1443,7 @@ def get_workload_mapping(ctx, from_json, cluster_id, workload_mapping_id): @cli_util.wrap_exceptions def install_addon(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, addon_name, version_parameterconflict, configurations, is_override_existing, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1575,7 +1574,7 @@ def list_addons(ctx, from_json, all_pages, page_size, cluster_id, limit, page, s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1881,7 +1880,7 @@ def list_virtual_nodes(ctx, from_json, all_pages, page_size, virtual_node_pool_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(virtual_node_pool_id, six.string_types) and len(virtual_node_pool_id.strip()) == 0: + if isinstance(virtual_node_pool_id, str) and len(virtual_node_pool_id.strip()) == 0: raise click.UsageError('Parameter --virtual-node-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1933,7 +1932,7 @@ def list_virtual_nodes(ctx, from_json, all_pages, page_size, virtual_node_pool_i @cli_util.wrap_exceptions def list_work_request_errors(ctx, from_json, all_pages, compartment_id, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1958,7 +1957,7 @@ def list_work_request_errors(ctx, from_json, all_pages, compartment_id, work_req @cli_util.wrap_exceptions def list_work_request_logs(ctx, from_json, all_pages, compartment_id, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2056,7 +2055,7 @@ def list_workload_mappings(ctx, from_json, all_pages, page_size, cluster_id, lim if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -2109,10 +2108,10 @@ def list_workload_mappings(ctx, from_json, all_pages, page_size, cluster_id, lim @cli_util.wrap_exceptions def reboot_cluster_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, node_id, node_eviction_settings): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(node_id, six.string_types) and len(node_id.strip()) == 0: + if isinstance(node_id, str) and len(node_id.strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') kwargs = {} @@ -2174,10 +2173,10 @@ def reboot_cluster_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def replace_boot_volume_cluster_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, node_id, node_eviction_settings): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(node_id, six.string_types) and len(node_id.strip()) == 0: + if isinstance(node_id, str) and len(node_id.strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') kwargs = {} @@ -2239,7 +2238,7 @@ def replace_boot_volume_cluster_node(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def start_credential_rotation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, auto_completion_delay_duration, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -2305,10 +2304,10 @@ def start_credential_rotation(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_addon(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, addon_name, version_parameterconflict, configurations, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(addon_name, six.string_types) and len(addon_name.strip()) == 0: + if isinstance(addon_name, str) and len(addon_name.strip()) == 0: raise click.UsageError('Parameter --addon-name cannot be whitespace or empty string') if not force: if configurations: @@ -2386,7 +2385,7 @@ def update_addon(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, name, kubernetes_version, options, freeform_tags, defined_tags, image_policy_config, type, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') if not force: if options or freeform_tags or defined_tags or image_policy_config: @@ -2472,7 +2471,7 @@ def update_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_cluster_endpoint_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, nsg_ids, is_public_ip_enabled, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -2557,7 +2556,7 @@ def update_cluster_endpoint_config(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_node_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, node_pool_id, name, kubernetes_version, initial_node_labels, quantity_per_subnet, subnet_ids, node_config_details, node_metadata, node_source_details, ssh_public_key, node_shape, node_shape_config, freeform_tags, defined_tags, node_eviction_node_pool_settings, node_pool_cycling_details, if_match, override_eviction_grace_duration, is_force_deletion_after_override_grace_duration): - if isinstance(node_pool_id, six.string_types) and len(node_pool_id.strip()) == 0: + if isinstance(node_pool_id, str) and len(node_pool_id.strip()) == 0: raise click.UsageError('Parameter --node-pool-id cannot be whitespace or empty string') if not force: if initial_node_labels or subnet_ids or node_config_details or node_metadata or node_source_details or node_shape_config or freeform_tags or defined_tags or node_eviction_node_pool_settings or node_pool_cycling_details: @@ -2690,7 +2689,7 @@ def update_node_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_node_pool_node_source_via_image_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, node_pool_id, node_source_details_image_id, name, kubernetes_version, initial_node_labels, quantity_per_subnet, subnet_ids, node_config_details, node_metadata, ssh_public_key, node_shape, node_shape_config, freeform_tags, defined_tags, node_eviction_node_pool_settings, node_pool_cycling_details, if_match, override_eviction_grace_duration, is_force_deletion_after_override_grace_duration, node_source_details_boot_volume_size_in_gbs): - if isinstance(node_pool_id, six.string_types) and len(node_pool_id.strip()) == 0: + if isinstance(node_pool_id, str) and len(node_pool_id.strip()) == 0: raise click.UsageError('Parameter --node-pool-id cannot be whitespace or empty string') if not force: if initial_node_labels or subnet_ids or node_config_details or node_metadata or node_shape_config or freeform_tags or defined_tags or node_eviction_node_pool_settings or node_pool_cycling_details: @@ -2823,7 +2822,7 @@ def update_node_pool_node_source_via_image_details(ctx, from_json, force, wait_f @cli_util.wrap_exceptions def update_virtual_node_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, virtual_node_pool_id, display_name, initial_virtual_node_labels, taints, size, placement_configurations, nsg_ids, pod_configuration, freeform_tags, defined_tags, virtual_node_tags, if_match): - if isinstance(virtual_node_pool_id, six.string_types) and len(virtual_node_pool_id.strip()) == 0: + if isinstance(virtual_node_pool_id, str) and len(virtual_node_pool_id.strip()) == 0: raise click.UsageError('Parameter --virtual-node-pool-id cannot be whitespace or empty string') if not force: if initial_virtual_node_labels or taints or placement_configurations or nsg_ids or pod_configuration or freeform_tags or defined_tags or virtual_node_tags: @@ -2921,10 +2920,10 @@ def update_virtual_node_pool(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_workload_mapping(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, workload_mapping_id, mapped_compartment_id, freeform_tags, defined_tags, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(workload_mapping_id, six.string_types) and len(workload_mapping_id.strip()) == 0: + if isinstance(workload_mapping_id, str) and len(workload_mapping_id.strip()) == 0: raise click.UsageError('Parameter --workload-mapping-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/container_instances/src/oci_cli_container_instance/generated/containerinstance_cli.py b/services/container_instances/src/oci_cli_container_instance/generated/containerinstance_cli.py index 9a63e3887..9ec159028 100644 --- a/services/container_instances/src/oci_cli_container_instance/generated/containerinstance_cli.py +++ b/services/container_instances/src/oci_cli_container_instance/generated/containerinstance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -105,7 +104,7 @@ def work_request_log_entry_collection_group(): @cli_util.wrap_exceptions def change_container_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, container_instance_id, compartment_id, if_match): - if isinstance(container_instance_id, six.string_types) and len(container_instance_id.strip()) == 0: + if isinstance(container_instance_id, str) and len(container_instance_id.strip()) == 0: raise click.UsageError('Parameter --container-instance-id cannot be whitespace or empty string') kwargs = {} @@ -271,7 +270,7 @@ def create_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, container_instance_id, if_match): - if isinstance(container_instance_id, six.string_types) and len(container_instance_id.strip()) == 0: + if isinstance(container_instance_id, str) and len(container_instance_id.strip()) == 0: raise click.UsageError('Parameter --container-instance-id cannot be whitespace or empty string') kwargs = {} @@ -322,7 +321,7 @@ def delete_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_container(ctx, from_json, container_id): - if isinstance(container_id, six.string_types) and len(container_id.strip()) == 0: + if isinstance(container_id, str) and len(container_id.strip()) == 0: raise click.UsageError('Parameter --container-id cannot be whitespace or empty string') kwargs = {} @@ -344,7 +343,7 @@ def get_container(ctx, from_json, container_id): @cli_util.wrap_exceptions def get_container_instance(ctx, from_json, container_instance_id): - if isinstance(container_instance_id, six.string_types) and len(container_instance_id.strip()) == 0: + if isinstance(container_instance_id, str) and len(container_instance_id.strip()) == 0: raise click.UsageError('Parameter --container-instance-id cannot be whitespace or empty string') kwargs = {} @@ -366,7 +365,7 @@ def get_container_instance(ctx, from_json, container_instance_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -587,7 +586,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -644,7 +643,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -766,7 +765,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def restart_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, container_instance_id, if_match): - if isinstance(container_instance_id, six.string_types) and len(container_instance_id.strip()) == 0: + if isinstance(container_instance_id, str) and len(container_instance_id.strip()) == 0: raise click.UsageError('Parameter --container-instance-id cannot be whitespace or empty string') kwargs = {} @@ -819,7 +818,7 @@ def restart_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def retrieve_logs(ctx, from_json, file, container_id, is_previous): - if isinstance(container_id, six.string_types) and len(container_id.strip()) == 0: + if isinstance(container_id, str) and len(container_id.strip()) == 0: raise click.UsageError('Parameter --container-id cannot be whitespace or empty string') kwargs = {} @@ -869,7 +868,7 @@ def retrieve_logs(ctx, from_json, file, container_id, is_previous): @cli_util.wrap_exceptions def start_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, container_instance_id, if_match): - if isinstance(container_instance_id, six.string_types) and len(container_instance_id.strip()) == 0: + if isinstance(container_instance_id, str) and len(container_instance_id.strip()) == 0: raise click.UsageError('Parameter --container-instance-id cannot be whitespace or empty string') kwargs = {} @@ -924,7 +923,7 @@ def start_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def stop_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, container_instance_id, if_match): - if isinstance(container_instance_id, six.string_types) and len(container_instance_id.strip()) == 0: + if isinstance(container_instance_id, str) and len(container_instance_id.strip()) == 0: raise click.UsageError('Parameter --container-instance-id cannot be whitespace or empty string') kwargs = {} @@ -983,7 +982,7 @@ def stop_container_instance(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_container(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, container_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(container_id, six.string_types) and len(container_id.strip()) == 0: + if isinstance(container_id, str) and len(container_id.strip()) == 0: raise click.UsageError('Parameter --container-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1059,7 +1058,7 @@ def update_container(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_container_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, container_instance_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(container_instance_id, six.string_types) and len(container_instance_id.strip()) == 0: + if isinstance(container_instance_id, str) and len(container_instance_id.strip()) == 0: raise click.UsageError('Parameter --container-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/core/src/oci_cli_blockstorage/blockstorage_cli_extended.py b/services/core/src/oci_cli_blockstorage/blockstorage_cli_extended.py index f1ada8769..1b97b08c2 100644 --- a/services/core/src/oci_cli_blockstorage/blockstorage_cli_extended.py +++ b/services/core/src/oci_cli_blockstorage/blockstorage_cli_extended.py @@ -6,7 +6,6 @@ import click import json import oci -import six import sys from services.core.src.oci_cli_blockstorage.generated import blockstorage_cli @@ -196,7 +195,7 @@ def create_boot_volume_extended(ctx, **kwargs): @cli_util.wrap_exceptions def copy_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_backup_id, destination_region, display_name, kms_key_id): - if isinstance(volume_backup_id, six.string_types) and len(volume_backup_id.strip()) == 0: + if isinstance(volume_backup_id, str) and len(volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -253,7 +252,7 @@ def copy_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def copy_boot_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, boot_volume_backup_id, destination_region, display_name, kms_key_id): - if isinstance(boot_volume_backup_id, six.string_types) and len(boot_volume_backup_id.strip()) == 0: + if isinstance(boot_volume_backup_id, str) and len(boot_volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-backup-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/core/src/oci_cli_blockstorage/generated/blockstorage_cli.py b/services/core/src/oci_cli_blockstorage/generated/blockstorage_cli.py index 75cc73363..caa7b2f18 100644 --- a/services/core/src/oci_cli_blockstorage/generated/blockstorage_cli.py +++ b/services/core/src/oci_cli_blockstorage/generated/blockstorage_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -164,7 +163,7 @@ def volume_kms_key_group(): @cli_util.wrap_exceptions def change_boot_volume_backup_compartment(ctx, from_json, boot_volume_backup_id, compartment_id): - if isinstance(boot_volume_backup_id, six.string_types) and len(boot_volume_backup_id.strip()) == 0: + if isinstance(boot_volume_backup_id, str) and len(boot_volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -192,7 +191,7 @@ def change_boot_volume_backup_compartment(ctx, from_json, boot_volume_backup_id, @cli_util.wrap_exceptions def change_boot_volume_compartment(ctx, from_json, boot_volume_id, compartment_id): - if isinstance(boot_volume_id, six.string_types) and len(boot_volume_id.strip()) == 0: + if isinstance(boot_volume_id, str) and len(boot_volume_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-id cannot be whitespace or empty string') kwargs = {} @@ -220,7 +219,7 @@ def change_boot_volume_compartment(ctx, from_json, boot_volume_id, compartment_i @cli_util.wrap_exceptions def change_volume_backup_compartment(ctx, from_json, volume_backup_id, compartment_id): - if isinstance(volume_backup_id, six.string_types) and len(volume_backup_id.strip()) == 0: + if isinstance(volume_backup_id, str) and len(volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -248,7 +247,7 @@ def change_volume_backup_compartment(ctx, from_json, volume_backup_id, compartme @cli_util.wrap_exceptions def change_volume_compartment(ctx, from_json, volume_id, compartment_id): - if isinstance(volume_id, six.string_types) and len(volume_id.strip()) == 0: + if isinstance(volume_id, str) and len(volume_id.strip()) == 0: raise click.UsageError('Parameter --volume-id cannot be whitespace or empty string') kwargs = {} @@ -276,7 +275,7 @@ def change_volume_compartment(ctx, from_json, volume_id, compartment_id): @cli_util.wrap_exceptions def change_volume_group_backup_compartment(ctx, from_json, volume_group_backup_id, compartment_id): - if isinstance(volume_group_backup_id, six.string_types) and len(volume_group_backup_id.strip()) == 0: + if isinstance(volume_group_backup_id, str) and len(volume_group_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-backup-id cannot be whitespace or empty string') kwargs = {} @@ -304,7 +303,7 @@ def change_volume_group_backup_compartment(ctx, from_json, volume_group_backup_i @cli_util.wrap_exceptions def change_volume_group_compartment(ctx, from_json, volume_group_id, compartment_id): - if isinstance(volume_group_id, six.string_types) and len(volume_group_id.strip()) == 0: + if isinstance(volume_group_id, str) and len(volume_group_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-id cannot be whitespace or empty string') kwargs = {} @@ -341,7 +340,7 @@ def change_volume_group_compartment(ctx, from_json, volume_group_id, compartment @cli_util.wrap_exceptions def copy_boot_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, boot_volume_backup_id, destination_region, display_name, kms_key_id): - if isinstance(boot_volume_backup_id, six.string_types) and len(boot_volume_backup_id.strip()) == 0: + if isinstance(boot_volume_backup_id, str) and len(boot_volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -407,7 +406,7 @@ def copy_boot_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def copy_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_backup_id, destination_region, display_name, kms_key_id): - if isinstance(volume_backup_id, six.string_types) and len(volume_backup_id.strip()) == 0: + if isinstance(volume_backup_id, str) and len(volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -473,7 +472,7 @@ def copy_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def copy_volume_group_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_group_backup_id, destination_region, display_name, kms_key_id): - if isinstance(volume_group_backup_id, six.string_types) and len(volume_group_backup_id.strip()) == 0: + if isinstance(volume_group_backup_id, str) and len(volume_group_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-backup-id cannot be whitespace or empty string') kwargs = {} @@ -2633,7 +2632,7 @@ def create_volume_group_backup(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_boot_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, boot_volume_id, if_match): - if isinstance(boot_volume_id, six.string_types) and len(boot_volume_id.strip()) == 0: + if isinstance(boot_volume_id, str) and len(boot_volume_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-id cannot be whitespace or empty string') kwargs = {} @@ -2696,7 +2695,7 @@ def delete_boot_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_boot_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, boot_volume_backup_id, if_match): - if isinstance(boot_volume_backup_id, six.string_types) and len(boot_volume_backup_id.strip()) == 0: + if isinstance(boot_volume_backup_id, str) and len(boot_volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -2756,7 +2755,7 @@ def delete_boot_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_boot_volume_kms_key(ctx, from_json, boot_volume_id, if_match): - if isinstance(boot_volume_id, six.string_types) and len(boot_volume_id.strip()) == 0: + if isinstance(boot_volume_id, str) and len(boot_volume_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-id cannot be whitespace or empty string') kwargs = {} @@ -2784,7 +2783,7 @@ def delete_boot_volume_kms_key(ctx, from_json, boot_volume_id, if_match): @cli_util.wrap_exceptions def delete_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_id, if_match): - if isinstance(volume_id, six.string_types) and len(volume_id.strip()) == 0: + if isinstance(volume_id, str) and len(volume_id.strip()) == 0: raise click.UsageError('Parameter --volume-id cannot be whitespace or empty string') kwargs = {} @@ -2847,7 +2846,7 @@ def delete_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_backup_id, if_match): - if isinstance(volume_backup_id, six.string_types) and len(volume_backup_id.strip()) == 0: + if isinstance(volume_backup_id, str) and len(volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -2909,7 +2908,7 @@ def delete_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_volume_backup_policy(ctx, from_json, policy_id, if_match): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') kwargs = {} @@ -2935,7 +2934,7 @@ def delete_volume_backup_policy(ctx, from_json, policy_id, if_match): @cli_util.wrap_exceptions def delete_volume_backup_policy_assignment(ctx, from_json, policy_assignment_id, if_match): - if isinstance(policy_assignment_id, six.string_types) and len(policy_assignment_id.strip()) == 0: + if isinstance(policy_assignment_id, str) and len(policy_assignment_id.strip()) == 0: raise click.UsageError('Parameter --policy-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -2963,7 +2962,7 @@ def delete_volume_backup_policy_assignment(ctx, from_json, policy_assignment_id, @cli_util.wrap_exceptions def delete_volume_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_group_id, if_match): - if isinstance(volume_group_id, six.string_types) and len(volume_group_id.strip()) == 0: + if isinstance(volume_group_id, str) and len(volume_group_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-id cannot be whitespace or empty string') kwargs = {} @@ -3026,7 +3025,7 @@ def delete_volume_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_volume_group_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_group_backup_id, if_match): - if isinstance(volume_group_backup_id, six.string_types) and len(volume_group_backup_id.strip()) == 0: + if isinstance(volume_group_backup_id, str) and len(volume_group_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-backup-id cannot be whitespace or empty string') kwargs = {} @@ -3086,7 +3085,7 @@ def delete_volume_group_backup(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_volume_kms_key(ctx, from_json, volume_id, if_match): - if isinstance(volume_id, six.string_types) and len(volume_id.strip()) == 0: + if isinstance(volume_id, str) and len(volume_id.strip()) == 0: raise click.UsageError('Parameter --volume-id cannot be whitespace or empty string') kwargs = {} @@ -3109,7 +3108,7 @@ def delete_volume_kms_key(ctx, from_json, volume_id, if_match): @cli_util.wrap_exceptions def get_block_volume_replica(ctx, from_json, block_volume_replica_id): - if isinstance(block_volume_replica_id, six.string_types) and len(block_volume_replica_id.strip()) == 0: + if isinstance(block_volume_replica_id, str) and len(block_volume_replica_id.strip()) == 0: raise click.UsageError('Parameter --block-volume-replica-id cannot be whitespace or empty string') kwargs = {} @@ -3130,7 +3129,7 @@ def get_block_volume_replica(ctx, from_json, block_volume_replica_id): @cli_util.wrap_exceptions def get_boot_volume(ctx, from_json, boot_volume_id): - if isinstance(boot_volume_id, six.string_types) and len(boot_volume_id.strip()) == 0: + if isinstance(boot_volume_id, str) and len(boot_volume_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-id cannot be whitespace or empty string') kwargs = {} @@ -3151,7 +3150,7 @@ def get_boot_volume(ctx, from_json, boot_volume_id): @cli_util.wrap_exceptions def get_boot_volume_backup(ctx, from_json, boot_volume_backup_id): - if isinstance(boot_volume_backup_id, six.string_types) and len(boot_volume_backup_id.strip()) == 0: + if isinstance(boot_volume_backup_id, str) and len(boot_volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -3173,7 +3172,7 @@ def get_boot_volume_backup(ctx, from_json, boot_volume_backup_id): @cli_util.wrap_exceptions def get_boot_volume_kms_key(ctx, from_json, boot_volume_id, if_match): - if isinstance(boot_volume_id, six.string_types) and len(boot_volume_id.strip()) == 0: + if isinstance(boot_volume_id, str) and len(boot_volume_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-id cannot be whitespace or empty string') kwargs = {} @@ -3196,7 +3195,7 @@ def get_boot_volume_kms_key(ctx, from_json, boot_volume_id, if_match): @cli_util.wrap_exceptions def get_boot_volume_replica(ctx, from_json, boot_volume_replica_id): - if isinstance(boot_volume_replica_id, six.string_types) and len(boot_volume_replica_id.strip()) == 0: + if isinstance(boot_volume_replica_id, str) and len(boot_volume_replica_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-replica-id cannot be whitespace or empty string') kwargs = {} @@ -3217,7 +3216,7 @@ def get_boot_volume_replica(ctx, from_json, boot_volume_replica_id): @cli_util.wrap_exceptions def get_volume(ctx, from_json, volume_id): - if isinstance(volume_id, six.string_types) and len(volume_id.strip()) == 0: + if isinstance(volume_id, str) and len(volume_id.strip()) == 0: raise click.UsageError('Parameter --volume-id cannot be whitespace or empty string') kwargs = {} @@ -3238,7 +3237,7 @@ def get_volume(ctx, from_json, volume_id): @cli_util.wrap_exceptions def get_volume_backup(ctx, from_json, volume_backup_id): - if isinstance(volume_backup_id, six.string_types) and len(volume_backup_id.strip()) == 0: + if isinstance(volume_backup_id, str) and len(volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-backup-id cannot be whitespace or empty string') kwargs = {} @@ -3259,7 +3258,7 @@ def get_volume_backup(ctx, from_json, volume_backup_id): @cli_util.wrap_exceptions def get_volume_backup_policy(ctx, from_json, policy_id): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') kwargs = {} @@ -3306,7 +3305,7 @@ def get_volume_backup_policy_asset_assignment(ctx, from_json, asset_id, limit, p @cli_util.wrap_exceptions def get_volume_backup_policy_assignment(ctx, from_json, policy_assignment_id): - if isinstance(policy_assignment_id, six.string_types) and len(policy_assignment_id.strip()) == 0: + if isinstance(policy_assignment_id, str) and len(policy_assignment_id.strip()) == 0: raise click.UsageError('Parameter --policy-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -3327,7 +3326,7 @@ def get_volume_backup_policy_assignment(ctx, from_json, policy_assignment_id): @cli_util.wrap_exceptions def get_volume_group(ctx, from_json, volume_group_id): - if isinstance(volume_group_id, six.string_types) and len(volume_group_id.strip()) == 0: + if isinstance(volume_group_id, str) and len(volume_group_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-id cannot be whitespace or empty string') kwargs = {} @@ -3348,7 +3347,7 @@ def get_volume_group(ctx, from_json, volume_group_id): @cli_util.wrap_exceptions def get_volume_group_backup(ctx, from_json, volume_group_backup_id): - if isinstance(volume_group_backup_id, six.string_types) and len(volume_group_backup_id.strip()) == 0: + if isinstance(volume_group_backup_id, str) and len(volume_group_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-backup-id cannot be whitespace or empty string') kwargs = {} @@ -3369,7 +3368,7 @@ def get_volume_group_backup(ctx, from_json, volume_group_backup_id): @cli_util.wrap_exceptions def get_volume_group_replica(ctx, from_json, volume_group_replica_id): - if isinstance(volume_group_replica_id, six.string_types) and len(volume_group_replica_id.strip()) == 0: + if isinstance(volume_group_replica_id, str) and len(volume_group_replica_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-replica-id cannot be whitespace or empty string') kwargs = {} @@ -3391,7 +3390,7 @@ def get_volume_group_replica(ctx, from_json, volume_group_replica_id): @cli_util.wrap_exceptions def get_volume_kms_key(ctx, from_json, volume_id, if_match): - if isinstance(volume_id, six.string_types) and len(volume_id.strip()) == 0: + if isinstance(volume_id, str) and len(volume_id.strip()) == 0: raise click.UsageError('Parameter --volume-id cannot be whitespace or empty string') kwargs = {} @@ -4112,7 +4111,7 @@ def list_volumes(ctx, from_json, all_pages, page_size, availability_domain, comp @cli_util.wrap_exceptions def update_boot_volume(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, boot_volume_id, defined_tags, display_name, freeform_tags, size_in_gbs, vpus_per_gb, is_auto_tune_enabled, boot_volume_replicas, autotune_policies, if_match): - if isinstance(boot_volume_id, six.string_types) and len(boot_volume_id.strip()) == 0: + if isinstance(boot_volume_id, str) and len(boot_volume_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or boot_volume_replicas or autotune_policies: @@ -4203,7 +4202,7 @@ def update_boot_volume(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_boot_volume_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, boot_volume_backup_id, defined_tags, display_name, freeform_tags, kms_key_id, if_match): - if isinstance(boot_volume_backup_id, six.string_types) and len(boot_volume_backup_id.strip()) == 0: + if isinstance(boot_volume_backup_id, str) and len(boot_volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-backup-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -4271,7 +4270,7 @@ def update_boot_volume_backup(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_boot_volume_kms_key(ctx, from_json, boot_volume_id, kms_key_id, if_match): - if isinstance(boot_volume_id, six.string_types) and len(boot_volume_id.strip()) == 0: + if isinstance(boot_volume_id, str) and len(boot_volume_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-id cannot be whitespace or empty string') kwargs = {} @@ -4335,7 +4334,7 @@ def update_boot_volume_kms_key(ctx, from_json, boot_volume_id, kms_key_id, if_ma @cli_util.wrap_exceptions def update_volume(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_id, defined_tags, display_name, freeform_tags, vpus_per_gb, size_in_gbs, is_auto_tune_enabled, block_volume_replicas, autotune_policies, is_reservations_enabled, if_match): - if isinstance(volume_id, six.string_types) and len(volume_id.strip()) == 0: + if isinstance(volume_id, str) and len(volume_id.strip()) == 0: raise click.UsageError('Parameter --volume-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or block_volume_replicas or autotune_policies: @@ -4429,7 +4428,7 @@ def update_volume(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_volume_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_backup_id, defined_tags, display_name, freeform_tags, kms_key_id, if_match): - if isinstance(volume_backup_id, six.string_types) and len(volume_backup_id.strip()) == 0: + if isinstance(volume_backup_id, str) and len(volume_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-backup-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -4510,7 +4509,7 @@ def update_volume_backup(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_volume_backup_policy(ctx, from_json, force, policy_id, display_name, destination_region, schedules, defined_tags, freeform_tags, if_match): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') if not force: if schedules or defined_tags or freeform_tags: @@ -4576,7 +4575,7 @@ def update_volume_backup_policy(ctx, from_json, force, policy_id, display_name, @cli_util.wrap_exceptions def update_volume_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_group_id, defined_tags, display_name, freeform_tags, volume_ids, volume_group_replicas, if_match, preserve_volume_replica): - if isinstance(volume_group_id, six.string_types) and len(volume_group_id.strip()) == 0: + if isinstance(volume_group_id, str) and len(volume_group_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or volume_ids or volume_group_replicas: @@ -4659,7 +4658,7 @@ def update_volume_group(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_volume_group_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_group_backup_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(volume_group_backup_id, six.string_types) and len(volume_group_backup_id.strip()) == 0: + if isinstance(volume_group_backup_id, str) and len(volume_group_backup_id.strip()) == 0: raise click.UsageError('Parameter --volume-group-backup-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -4724,7 +4723,7 @@ def update_volume_group_backup(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_volume_kms_key(ctx, from_json, volume_id, kms_key_id, if_match): - if isinstance(volume_id, six.string_types) and len(volume_id.strip()) == 0: + if isinstance(volume_id, str) and len(volume_id.strip()) == 0: raise click.UsageError('Parameter --volume-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/core/src/oci_cli_compute/compute_cli_extended.py b/services/core/src/oci_cli_compute/compute_cli_extended.py index 60844c7c0..38d01d050 100644 --- a/services/core/src/oci_cli_compute/compute_cli_extended.py +++ b/services/core/src/oci_cli_compute/compute_cli_extended.py @@ -7,7 +7,6 @@ import click import json import re -import six import sys from services.core.src.oci_cli_compute.generated import compute_cli @@ -415,7 +414,7 @@ def export_image_to_object(ctx, from_json, image_id, if_match, namespace, bucket def instance_action_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, action, if_match, delete_local_storage, time_scheduled, allow_dense_reboot_migration): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') if delete_local_storage is not None and not action.lower() == 'rebootmigrate': raise click.UsageError('Parameter --delete-local-storage is for REBOOTMIGRATE actions only') @@ -1022,7 +1021,7 @@ def create_instance_console_connection(ctx, from_json, instance_id, ssh_public_k @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'core', 'class': 'InstanceConsoleConnection'}) @cli_util.wrap_exceptions def get_plink_connection_string(ctx, from_json, instance_console_connection_id, private_key_file, local_vnc_port, ssh_proxy_port): - if isinstance(instance_console_connection_id, six.string_types) and len(instance_console_connection_id.strip()) == 0: + if isinstance(instance_console_connection_id, str) and len(instance_console_connection_id.strip()) == 0: raise click.UsageError('Parameter --instance-console-connection-id cannot be whitespace or empty string') kwargs = {} client = cli_util.build_client('core', 'compute', ctx) @@ -1075,7 +1074,7 @@ def get_plink_connection_string(ctx, from_json, instance_console_connection_id, @cli_util.wrap_exceptions def change_instance_compartment(ctx, instance_id, compartment_id, if_match, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/core/src/oci_cli_compute/generated/compute_cli.py b/services/core/src/oci_cli_compute/generated/compute_cli.py index 2364586cd..c7a853538 100644 --- a/services/core/src/oci_cli_compute/generated/compute_cli.py +++ b/services/core/src/oci_cli_compute/generated/compute_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -357,7 +356,7 @@ def console_history_group(): @cli_util.wrap_exceptions def accept_shielded_integrity_policy(ctx, from_json, instance_id, if_match): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -385,10 +384,10 @@ def accept_shielded_integrity_policy(ctx, from_json, instance_id, if_match): @cli_util.wrap_exceptions def add_image_shape_compatibility_entry(ctx, from_json, force, image_id, shape_name, memory_constraints, ocpu_constraints): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') - if isinstance(shape_name, six.string_types) and len(shape_name.strip()) == 0: + if isinstance(shape_name, str) and len(shape_name.strip()) == 0: raise click.UsageError('Parameter --shape-name cannot be whitespace or empty string') if not force: if memory_constraints or ocpu_constraints: @@ -487,7 +486,7 @@ def attach_boot_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def attach_compute_host_group_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_host_id, compute_host_group_id, if_match): - if isinstance(compute_host_id, six.string_types) and len(compute_host_id.strip()) == 0: + if isinstance(compute_host_id, str) and len(compute_host_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-id cannot be whitespace or empty string') kwargs = {} @@ -1026,7 +1025,7 @@ def capture_console_history(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def change_compute_capacity_reservation_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, capacity_reservation_id, compartment_id, if_match): - if isinstance(capacity_reservation_id, six.string_types) and len(capacity_reservation_id.strip()) == 0: + if isinstance(capacity_reservation_id, str) and len(capacity_reservation_id.strip()) == 0: raise click.UsageError('Parameter --capacity-reservation-id cannot be whitespace or empty string') kwargs = {} @@ -1095,7 +1094,7 @@ def change_compute_capacity_reservation_compartment(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def change_compute_capacity_topology_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_capacity_topology_id, compartment_id, if_match): - if isinstance(compute_capacity_topology_id, six.string_types) and len(compute_capacity_topology_id.strip()) == 0: + if isinstance(compute_capacity_topology_id, str) and len(compute_capacity_topology_id.strip()) == 0: raise click.UsageError('Parameter --compute-capacity-topology-id cannot be whitespace or empty string') kwargs = {} @@ -1163,7 +1162,7 @@ def change_compute_capacity_topology_compartment(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_compute_cluster_compartment(ctx, from_json, compute_cluster_id, compartment_id, if_match): - if isinstance(compute_cluster_id, six.string_types) and len(compute_cluster_id.strip()) == 0: + if isinstance(compute_cluster_id, str) and len(compute_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1194,7 +1193,7 @@ def change_compute_cluster_compartment(ctx, from_json, compute_cluster_id, compa @cli_util.wrap_exceptions def change_compute_gpu_memory_cluster_compartment(ctx, from_json, compute_gpu_memory_cluster_id, compartment_id, if_match): - if isinstance(compute_gpu_memory_cluster_id, six.string_types) and len(compute_gpu_memory_cluster_id.strip()) == 0: + if isinstance(compute_gpu_memory_cluster_id, str) and len(compute_gpu_memory_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-gpu-memory-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1225,7 +1224,7 @@ def change_compute_gpu_memory_cluster_compartment(ctx, from_json, compute_gpu_me @cli_util.wrap_exceptions def change_compute_gpu_memory_fabric_compartment(ctx, from_json, compute_gpu_memory_fabric_id, compartment_id, if_match): - if isinstance(compute_gpu_memory_fabric_id, six.string_types) and len(compute_gpu_memory_fabric_id.strip()) == 0: + if isinstance(compute_gpu_memory_fabric_id, str) and len(compute_gpu_memory_fabric_id.strip()) == 0: raise click.UsageError('Parameter --compute-gpu-memory-fabric-id cannot be whitespace or empty string') kwargs = {} @@ -1259,7 +1258,7 @@ def change_compute_gpu_memory_fabric_compartment(ctx, from_json, compute_gpu_mem @cli_util.wrap_exceptions def change_compute_host_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_host_id, compartment_id, if_match): - if isinstance(compute_host_id, six.string_types) and len(compute_host_id.strip()) == 0: + if isinstance(compute_host_id, str) and len(compute_host_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-id cannot be whitespace or empty string') kwargs = {} @@ -1328,7 +1327,7 @@ def change_compute_host_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_compute_host_group_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_host_group_id, compartment_id, if_match): - if isinstance(compute_host_group_id, six.string_types) and len(compute_host_group_id.strip()) == 0: + if isinstance(compute_host_group_id, str) and len(compute_host_group_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-group-id cannot be whitespace or empty string') kwargs = {} @@ -1394,7 +1393,7 @@ def change_compute_host_group_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_compute_image_capability_schema_compartment(ctx, from_json, compute_image_capability_schema_id, compartment_id, if_match): - if isinstance(compute_image_capability_schema_id, six.string_types) and len(compute_image_capability_schema_id.strip()) == 0: + if isinstance(compute_image_capability_schema_id, str) and len(compute_image_capability_schema_id.strip()) == 0: raise click.UsageError('Parameter --compute-image-capability-schema-id cannot be whitespace or empty string') kwargs = {} @@ -1428,7 +1427,7 @@ def change_compute_image_capability_schema_compartment(ctx, from_json, compute_i @cli_util.wrap_exceptions def change_dedicated_vm_host_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dedicated_vm_host_id, compartment_id, if_match): - if isinstance(dedicated_vm_host_id, six.string_types) and len(dedicated_vm_host_id.strip()) == 0: + if isinstance(dedicated_vm_host_id, str) and len(dedicated_vm_host_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vm-host-id cannot be whitespace or empty string') kwargs = {} @@ -1494,7 +1493,7 @@ def change_dedicated_vm_host_compartment(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def change_image_compartment(ctx, from_json, image_id, compartment_id, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -1530,7 +1529,7 @@ def change_image_compartment(ctx, from_json, image_id, compartment_id, if_match) @cli_util.wrap_exceptions def change_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, compartment_id, if_match): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -2819,7 +2818,7 @@ def delete_app_catalog_subscription(ctx, from_json, listing_id, compartment_id, @cli_util.wrap_exceptions def delete_compute_capacity_reservation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, capacity_reservation_id, if_match): - if isinstance(capacity_reservation_id, six.string_types) and len(capacity_reservation_id.strip()) == 0: + if isinstance(capacity_reservation_id, str) and len(capacity_reservation_id.strip()) == 0: raise click.UsageError('Parameter --capacity-reservation-id cannot be whitespace or empty string') kwargs = {} @@ -2876,7 +2875,7 @@ def delete_compute_capacity_reservation(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def delete_compute_capacity_topology(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_capacity_topology_id, if_match): - if isinstance(compute_capacity_topology_id, six.string_types) and len(compute_capacity_topology_id.strip()) == 0: + if isinstance(compute_capacity_topology_id, str) and len(compute_capacity_topology_id.strip()) == 0: raise click.UsageError('Parameter --compute-capacity-topology-id cannot be whitespace or empty string') kwargs = {} @@ -2935,7 +2934,7 @@ def delete_compute_capacity_topology(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_compute_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_cluster_id, if_match): - if isinstance(compute_cluster_id, six.string_types) and len(compute_cluster_id.strip()) == 0: + if isinstance(compute_cluster_id, str) and len(compute_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -2999,7 +2998,7 @@ def delete_compute_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_compute_gpu_memory_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_gpu_memory_cluster_id, if_match): - if isinstance(compute_gpu_memory_cluster_id, six.string_types) and len(compute_gpu_memory_cluster_id.strip()) == 0: + if isinstance(compute_gpu_memory_cluster_id, str) and len(compute_gpu_memory_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-gpu-memory-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -3056,7 +3055,7 @@ def delete_compute_gpu_memory_cluster(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def delete_compute_host_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_host_group_id, if_match): - if isinstance(compute_host_group_id, six.string_types) and len(compute_host_group_id.strip()) == 0: + if isinstance(compute_host_group_id, str) and len(compute_host_group_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-group-id cannot be whitespace or empty string') kwargs = {} @@ -3117,7 +3116,7 @@ def delete_compute_host_group(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_compute_image_capability_schema(ctx, from_json, compute_image_capability_schema_id, if_match): - if isinstance(compute_image_capability_schema_id, six.string_types) and len(compute_image_capability_schema_id.strip()) == 0: + if isinstance(compute_image_capability_schema_id, str) and len(compute_image_capability_schema_id.strip()) == 0: raise click.UsageError('Parameter --compute-image-capability-schema-id cannot be whitespace or empty string') kwargs = {} @@ -3145,7 +3144,7 @@ def delete_compute_image_capability_schema(ctx, from_json, compute_image_capabil @cli_util.wrap_exceptions def delete_console_history(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_console_history_id, if_match): - if isinstance(instance_console_history_id, six.string_types) and len(instance_console_history_id.strip()) == 0: + if isinstance(instance_console_history_id, str) and len(instance_console_history_id.strip()) == 0: raise click.UsageError('Parameter --instance-console-history-id cannot be whitespace or empty string') kwargs = {} @@ -3209,7 +3208,7 @@ def delete_console_history(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_dedicated_vm_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dedicated_vm_host_id): - if isinstance(dedicated_vm_host_id, six.string_types) and len(dedicated_vm_host_id.strip()) == 0: + if isinstance(dedicated_vm_host_id, str) and len(dedicated_vm_host_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vm-host-id cannot be whitespace or empty string') kwargs = {} @@ -3264,7 +3263,7 @@ def delete_dedicated_vm_host(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_image(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -3327,7 +3326,7 @@ def delete_image(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_instance_console_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_console_connection_id, if_match): - if isinstance(instance_console_connection_id, six.string_types) and len(instance_console_connection_id.strip()) == 0: + if isinstance(instance_console_connection_id, str) and len(instance_console_connection_id.strip()) == 0: raise click.UsageError('Parameter --instance-console-connection-id cannot be whitespace or empty string') kwargs = {} @@ -3392,7 +3391,7 @@ def delete_instance_console_connection(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def detach_boot_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, boot_volume_attachment_id, if_match): - if isinstance(boot_volume_attachment_id, six.string_types) and len(boot_volume_attachment_id.strip()) == 0: + if isinstance(boot_volume_attachment_id, str) and len(boot_volume_attachment_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -3455,7 +3454,7 @@ def detach_boot_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def detach_compute_host_group_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_host_id, compute_host_group_id, if_match): - if isinstance(compute_host_id, six.string_types) and len(compute_host_id.strip()) == 0: + if isinstance(compute_host_id, str) and len(compute_host_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-id cannot be whitespace or empty string') kwargs = {} @@ -3526,7 +3525,7 @@ def detach_compute_host_group_host(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def detach_vnic(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vnic_attachment_id, if_match): - if isinstance(vnic_attachment_id, six.string_types) and len(vnic_attachment_id.strip()) == 0: + if isinstance(vnic_attachment_id, str) and len(vnic_attachment_id.strip()) == 0: raise click.UsageError('Parameter --vnic-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -3591,7 +3590,7 @@ def detach_vnic(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def detach_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_attachment_id, if_match): - if isinstance(volume_attachment_id, six.string_types) and len(volume_attachment_id.strip()) == 0: + if isinstance(volume_attachment_id, str) and len(volume_attachment_id.strip()) == 0: raise click.UsageError('Parameter --volume-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -3665,7 +3664,7 @@ def detach_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def export_image(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, destination_type, export_format, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -3735,7 +3734,7 @@ def export_image(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def export_image_export_image_via_object_storage_uri_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, destination_uri, export_format, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -3809,7 +3808,7 @@ def export_image_export_image_via_object_storage_uri_details(ctx, from_json, wai @cli_util.wrap_exceptions def export_image_export_image_via_object_storage_tuple_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, bucket_name, namespace_name, object_name, export_format, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -3867,7 +3866,7 @@ def export_image_export_image_via_object_storage_tuple_details(ctx, from_json, w @cli_util.wrap_exceptions def get_app_catalog_listing(ctx, from_json, listing_id): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -3889,10 +3888,10 @@ def get_app_catalog_listing(ctx, from_json, listing_id): @cli_util.wrap_exceptions def get_app_catalog_listing_agreements(ctx, from_json, listing_id, resource_version): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') - if isinstance(resource_version, six.string_types) and len(resource_version.strip()) == 0: + if isinstance(resource_version, str) and len(resource_version.strip()) == 0: raise click.UsageError('Parameter --resource-version cannot be whitespace or empty string') kwargs = {} @@ -3915,10 +3914,10 @@ def get_app_catalog_listing_agreements(ctx, from_json, listing_id, resource_vers @cli_util.wrap_exceptions def get_app_catalog_listing_resource_version(ctx, from_json, listing_id, resource_version): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') - if isinstance(resource_version, six.string_types) and len(resource_version.strip()) == 0: + if isinstance(resource_version, str) and len(resource_version.strip()) == 0: raise click.UsageError('Parameter --resource-version cannot be whitespace or empty string') kwargs = {} @@ -3940,7 +3939,7 @@ def get_app_catalog_listing_resource_version(ctx, from_json, listing_id, resourc @cli_util.wrap_exceptions def get_boot_volume_attachment(ctx, from_json, boot_volume_attachment_id): - if isinstance(boot_volume_attachment_id, six.string_types) and len(boot_volume_attachment_id.strip()) == 0: + if isinstance(boot_volume_attachment_id, str) and len(boot_volume_attachment_id.strip()) == 0: raise click.UsageError('Parameter --boot-volume-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -3961,7 +3960,7 @@ def get_boot_volume_attachment(ctx, from_json, boot_volume_attachment_id): @cli_util.wrap_exceptions def get_compute_capacity_reservation(ctx, from_json, capacity_reservation_id): - if isinstance(capacity_reservation_id, six.string_types) and len(capacity_reservation_id.strip()) == 0: + if isinstance(capacity_reservation_id, str) and len(capacity_reservation_id.strip()) == 0: raise click.UsageError('Parameter --capacity-reservation-id cannot be whitespace or empty string') kwargs = {} @@ -3983,7 +3982,7 @@ def get_compute_capacity_reservation(ctx, from_json, capacity_reservation_id): @cli_util.wrap_exceptions def get_compute_capacity_topology(ctx, from_json, compute_capacity_topology_id): - if isinstance(compute_capacity_topology_id, six.string_types) and len(compute_capacity_topology_id.strip()) == 0: + if isinstance(compute_capacity_topology_id, str) and len(compute_capacity_topology_id.strip()) == 0: raise click.UsageError('Parameter --compute-capacity-topology-id cannot be whitespace or empty string') kwargs = {} @@ -4005,7 +4004,7 @@ def get_compute_capacity_topology(ctx, from_json, compute_capacity_topology_id): @cli_util.wrap_exceptions def get_compute_cluster(ctx, from_json, compute_cluster_id): - if isinstance(compute_cluster_id, six.string_types) and len(compute_cluster_id.strip()) == 0: + if isinstance(compute_cluster_id, str) and len(compute_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -4027,7 +4026,7 @@ def get_compute_cluster(ctx, from_json, compute_cluster_id): @cli_util.wrap_exceptions def get_compute_global_image_capability_schema(ctx, from_json, compute_global_image_capability_schema_id): - if isinstance(compute_global_image_capability_schema_id, six.string_types) and len(compute_global_image_capability_schema_id.strip()) == 0: + if isinstance(compute_global_image_capability_schema_id, str) and len(compute_global_image_capability_schema_id.strip()) == 0: raise click.UsageError('Parameter --compute-global-image-capability-schema-id cannot be whitespace or empty string') kwargs = {} @@ -4049,10 +4048,10 @@ def get_compute_global_image_capability_schema(ctx, from_json, compute_global_im @cli_util.wrap_exceptions def get_compute_global_image_capability_schema_version(ctx, from_json, compute_global_image_capability_schema_id, compute_global_image_capability_schema_version_name): - if isinstance(compute_global_image_capability_schema_id, six.string_types) and len(compute_global_image_capability_schema_id.strip()) == 0: + if isinstance(compute_global_image_capability_schema_id, str) and len(compute_global_image_capability_schema_id.strip()) == 0: raise click.UsageError('Parameter --compute-global-image-capability-schema-id cannot be whitespace or empty string') - if isinstance(compute_global_image_capability_schema_version_name, six.string_types) and len(compute_global_image_capability_schema_version_name.strip()) == 0: + if isinstance(compute_global_image_capability_schema_version_name, str) and len(compute_global_image_capability_schema_version_name.strip()) == 0: raise click.UsageError('Parameter --compute-global-image-capability-schema-version-name cannot be whitespace or empty string') kwargs = {} @@ -4074,7 +4073,7 @@ def get_compute_global_image_capability_schema_version(ctx, from_json, compute_g @cli_util.wrap_exceptions def get_compute_gpu_memory_cluster(ctx, from_json, compute_gpu_memory_cluster_id): - if isinstance(compute_gpu_memory_cluster_id, six.string_types) and len(compute_gpu_memory_cluster_id.strip()) == 0: + if isinstance(compute_gpu_memory_cluster_id, str) and len(compute_gpu_memory_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-gpu-memory-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -4096,7 +4095,7 @@ def get_compute_gpu_memory_cluster(ctx, from_json, compute_gpu_memory_cluster_id @cli_util.wrap_exceptions def get_compute_gpu_memory_fabric(ctx, from_json, compute_gpu_memory_fabric_id): - if isinstance(compute_gpu_memory_fabric_id, six.string_types) and len(compute_gpu_memory_fabric_id.strip()) == 0: + if isinstance(compute_gpu_memory_fabric_id, str) and len(compute_gpu_memory_fabric_id.strip()) == 0: raise click.UsageError('Parameter --compute-gpu-memory-fabric-id cannot be whitespace or empty string') kwargs = {} @@ -4118,7 +4117,7 @@ def get_compute_gpu_memory_fabric(ctx, from_json, compute_gpu_memory_fabric_id): @cli_util.wrap_exceptions def get_compute_host(ctx, from_json, compute_host_id): - if isinstance(compute_host_id, six.string_types) and len(compute_host_id.strip()) == 0: + if isinstance(compute_host_id, str) and len(compute_host_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-id cannot be whitespace or empty string') kwargs = {} @@ -4140,7 +4139,7 @@ def get_compute_host(ctx, from_json, compute_host_id): @cli_util.wrap_exceptions def get_compute_host_group(ctx, from_json, compute_host_group_id): - if isinstance(compute_host_group_id, six.string_types) and len(compute_host_group_id.strip()) == 0: + if isinstance(compute_host_group_id, str) and len(compute_host_group_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-group-id cannot be whitespace or empty string') kwargs = {} @@ -4163,7 +4162,7 @@ def get_compute_host_group(ctx, from_json, compute_host_group_id): @cli_util.wrap_exceptions def get_compute_image_capability_schema(ctx, from_json, compute_image_capability_schema_id, is_merge_enabled): - if isinstance(compute_image_capability_schema_id, six.string_types) and len(compute_image_capability_schema_id.strip()) == 0: + if isinstance(compute_image_capability_schema_id, str) and len(compute_image_capability_schema_id.strip()) == 0: raise click.UsageError('Parameter --compute-image-capability-schema-id cannot be whitespace or empty string') kwargs = {} @@ -4186,7 +4185,7 @@ def get_compute_image_capability_schema(ctx, from_json, compute_image_capability @cli_util.wrap_exceptions def get_console_history(ctx, from_json, instance_console_history_id): - if isinstance(instance_console_history_id, six.string_types) and len(instance_console_history_id.strip()) == 0: + if isinstance(instance_console_history_id, str) and len(instance_console_history_id.strip()) == 0: raise click.UsageError('Parameter --instance-console-history-id cannot be whitespace or empty string') kwargs = {} @@ -4210,7 +4209,7 @@ def get_console_history(ctx, from_json, instance_console_history_id): @cli_util.wrap_exceptions def get_console_history_content(ctx, from_json, file, instance_console_history_id, offset, length): - if isinstance(instance_console_history_id, six.string_types) and len(instance_console_history_id.strip()) == 0: + if isinstance(instance_console_history_id, str) and len(instance_console_history_id.strip()) == 0: raise click.UsageError('Parameter --instance-console-history-id cannot be whitespace or empty string') kwargs = {} @@ -4235,7 +4234,7 @@ def get_console_history_content(ctx, from_json, file, instance_console_history_i @cli_util.wrap_exceptions def get_dedicated_vm_host(ctx, from_json, dedicated_vm_host_id): - if isinstance(dedicated_vm_host_id, six.string_types) and len(dedicated_vm_host_id.strip()) == 0: + if isinstance(dedicated_vm_host_id, str) and len(dedicated_vm_host_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vm-host-id cannot be whitespace or empty string') kwargs = {} @@ -4257,7 +4256,7 @@ def get_dedicated_vm_host(ctx, from_json, dedicated_vm_host_id): @cli_util.wrap_exceptions def get_image(ctx, from_json, image_id): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -4279,10 +4278,10 @@ def get_image(ctx, from_json, image_id): @cli_util.wrap_exceptions def get_image_shape_compatibility_entry(ctx, from_json, image_id, shape_name): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') - if isinstance(shape_name, six.string_types) and len(shape_name.strip()) == 0: + if isinstance(shape_name, str) and len(shape_name.strip()) == 0: raise click.UsageError('Parameter --shape-name cannot be whitespace or empty string') kwargs = {} @@ -4307,7 +4306,7 @@ def get_image_shape_compatibility_entry(ctx, from_json, image_id, shape_name): @cli_util.wrap_exceptions def get_instance(ctx, from_json, instance_id): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -4328,7 +4327,7 @@ def get_instance(ctx, from_json, instance_id): @cli_util.wrap_exceptions def get_instance_console_connection(ctx, from_json, instance_console_connection_id): - if isinstance(instance_console_connection_id, six.string_types) and len(instance_console_connection_id.strip()) == 0: + if isinstance(instance_console_connection_id, str) and len(instance_console_connection_id.strip()) == 0: raise click.UsageError('Parameter --instance-console-connection-id cannot be whitespace or empty string') kwargs = {} @@ -4349,7 +4348,7 @@ def get_instance_console_connection(ctx, from_json, instance_console_connection_ @cli_util.wrap_exceptions def get_instance_maintenance_event(ctx, from_json, instance_maintenance_event_id): - if isinstance(instance_maintenance_event_id, six.string_types) and len(instance_maintenance_event_id.strip()) == 0: + if isinstance(instance_maintenance_event_id, str) and len(instance_maintenance_event_id.strip()) == 0: raise click.UsageError('Parameter --instance-maintenance-event-id cannot be whitespace or empty string') kwargs = {} @@ -4371,7 +4370,7 @@ def get_instance_maintenance_event(ctx, from_json, instance_maintenance_event_id @cli_util.wrap_exceptions def get_instance_maintenance_reboot(ctx, from_json, instance_id): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -4393,7 +4392,7 @@ def get_instance_maintenance_reboot(ctx, from_json, instance_id): @cli_util.wrap_exceptions def get_measured_boot_report(ctx, from_json, instance_id): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -4415,7 +4414,7 @@ def get_measured_boot_report(ctx, from_json, instance_id): @cli_util.wrap_exceptions def get_vnic_attachment(ctx, from_json, vnic_attachment_id): - if isinstance(vnic_attachment_id, six.string_types) and len(vnic_attachment_id.strip()) == 0: + if isinstance(vnic_attachment_id, str) and len(vnic_attachment_id.strip()) == 0: raise click.UsageError('Parameter --vnic-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -4436,7 +4435,7 @@ def get_vnic_attachment(ctx, from_json, vnic_attachment_id): @cli_util.wrap_exceptions def get_volume_attachment(ctx, from_json, volume_attachment_id): - if isinstance(volume_attachment_id, six.string_types) and len(volume_attachment_id.strip()) == 0: + if isinstance(volume_attachment_id, str) and len(volume_attachment_id.strip()) == 0: raise click.UsageError('Parameter --volume-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -4457,7 +4456,7 @@ def get_volume_attachment(ctx, from_json, volume_attachment_id): @cli_util.wrap_exceptions def get_windows_instance_initial_credentials(ctx, from_json, instance_id): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -4504,7 +4503,7 @@ def get_windows_instance_initial_credentials(ctx, from_json, instance_id): @cli_util.wrap_exceptions def instance_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, action, action_type, if_match): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -4588,7 +4587,7 @@ def instance_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def instance_action_reset_action_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, action, if_match, allow_dense_reboot_migration): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -4673,7 +4672,7 @@ def instance_action_reset_action_details(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def instance_action_reboot_migrate_action_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, action, if_match, delete_local_storage, time_scheduled): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -4764,7 +4763,7 @@ def instance_action_reboot_migrate_action_details(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def instance_action_soft_reset_action_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, action, if_match, allow_dense_reboot_migration): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -8701,7 +8700,7 @@ def list_app_catalog_listing_resource_versions(ctx, from_json, all_pages, page_s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -9011,7 +9010,7 @@ def list_compute_capacity_reservation_instances(ctx, from_json, all_pages, page_ if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(capacity_reservation_id, six.string_types) and len(capacity_reservation_id.strip()) == 0: + if isinstance(capacity_reservation_id, str) and len(capacity_reservation_id.strip()) == 0: raise click.UsageError('Parameter --capacity-reservation-id cannot be whitespace or empty string') kwargs = {} @@ -9226,7 +9225,7 @@ def list_compute_capacity_topology_compute_bare_metal_hosts(ctx, from_json, all_ if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(compute_capacity_topology_id, six.string_types) and len(compute_capacity_topology_id.strip()) == 0: + if isinstance(compute_capacity_topology_id, str) and len(compute_capacity_topology_id.strip()) == 0: raise click.UsageError('Parameter --compute-capacity-topology-id cannot be whitespace or empty string') kwargs = {} @@ -9303,7 +9302,7 @@ def list_compute_capacity_topology_compute_hpc_islands(ctx, from_json, all_pages if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(compute_capacity_topology_id, six.string_types) and len(compute_capacity_topology_id.strip()) == 0: + if isinstance(compute_capacity_topology_id, str) and len(compute_capacity_topology_id.strip()) == 0: raise click.UsageError('Parameter --compute-capacity-topology-id cannot be whitespace or empty string') kwargs = {} @@ -9375,7 +9374,7 @@ def list_compute_capacity_topology_compute_network_blocks(ctx, from_json, all_pa if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(compute_capacity_topology_id, six.string_types) and len(compute_capacity_topology_id.strip()) == 0: + if isinstance(compute_capacity_topology_id, str) and len(compute_capacity_topology_id.strip()) == 0: raise click.UsageError('Parameter --compute-capacity-topology-id cannot be whitespace or empty string') kwargs = {} @@ -9511,7 +9510,7 @@ def list_compute_global_image_capability_schema_versions(ctx, from_json, all_pag if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(compute_global_image_capability_schema_id, six.string_types) and len(compute_global_image_capability_schema_id.strip()) == 0: + if isinstance(compute_global_image_capability_schema_id, str) and len(compute_global_image_capability_schema_id.strip()) == 0: raise click.UsageError('Parameter --compute-global-image-capability-schema-id cannot be whitespace or empty string') kwargs = {} @@ -9632,7 +9631,7 @@ def list_compute_gpu_memory_cluster_instances(ctx, from_json, all_pages, page_si if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(compute_gpu_memory_cluster_id, six.string_types) and len(compute_gpu_memory_cluster_id.strip()) == 0: + if isinstance(compute_gpu_memory_cluster_id, str) and len(compute_gpu_memory_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-gpu-memory-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -10176,7 +10175,7 @@ def list_dedicated_vm_host_instances(ctx, from_json, all_pages, page_size, compa if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(dedicated_vm_host_id, six.string_types) and len(dedicated_vm_host_id.strip()) == 0: + if isinstance(dedicated_vm_host_id, str) and len(dedicated_vm_host_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vm-host-id cannot be whitespace or empty string') kwargs = {} @@ -10378,7 +10377,7 @@ def list_image_shape_compatibility_entries(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') kwargs = {} @@ -10571,7 +10570,7 @@ def list_instance_devices(ctx, from_json, all_pages, page_size, instance_id, is_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -10958,10 +10957,10 @@ def list_volume_attachments(ctx, from_json, all_pages, page_size, compartment_id @cli_util.wrap_exceptions def remove_image_shape_compatibility_entry(ctx, from_json, image_id, shape_name): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') - if isinstance(shape_name, six.string_types) and len(shape_name.strip()) == 0: + if isinstance(shape_name, str) and len(shape_name.strip()) == 0: raise click.UsageError('Parameter --shape-name cannot be whitespace or empty string') kwargs = {} @@ -10997,7 +10996,7 @@ def remove_image_shape_compatibility_entry(ctx, from_json, image_id, shape_name) @cli_util.wrap_exceptions def terminate_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, if_match, preserve_boot_volume, preserve_data_volumes_created_at_launch, recycle_level): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -11079,7 +11078,7 @@ def terminate_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_compute_capacity_reservation(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, capacity_reservation_id, defined_tags, display_name, freeform_tags, is_default_reservation, instance_reservation_configs, if_match): - if isinstance(capacity_reservation_id, six.string_types) and len(capacity_reservation_id.strip()) == 0: + if isinstance(capacity_reservation_id, str) and len(capacity_reservation_id.strip()) == 0: raise click.UsageError('Parameter --capacity-reservation-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or instance_reservation_configs: @@ -11174,7 +11173,7 @@ def update_compute_capacity_reservation(ctx, from_json, force, wait_for_state, m @cli_util.wrap_exceptions def update_compute_capacity_topology(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_capacity_topology_id, capacity_source, defined_tags, display_name, freeform_tags, if_match): - if isinstance(compute_capacity_topology_id, six.string_types) and len(compute_capacity_topology_id.strip()) == 0: + if isinstance(compute_capacity_topology_id, str) and len(compute_capacity_topology_id.strip()) == 0: raise click.UsageError('Parameter --compute-capacity-topology-id cannot be whitespace or empty string') if not force: if capacity_source or defined_tags or freeform_tags: @@ -11265,7 +11264,7 @@ def update_compute_capacity_topology(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_compute_capacity_topology_update_dedicated_capacity_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_capacity_topology_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(compute_capacity_topology_id, six.string_types) and len(compute_capacity_topology_id.strip()) == 0: + if isinstance(compute_capacity_topology_id, str) and len(compute_capacity_topology_id.strip()) == 0: raise click.UsageError('Parameter --compute-capacity-topology-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11360,7 +11359,7 @@ def update_compute_capacity_topology_update_dedicated_capacity_source_details(ct @cli_util.wrap_exceptions def update_compute_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_cluster_id, display_name, defined_tags, freeform_tags, if_match): - if isinstance(compute_cluster_id, six.string_types) and len(compute_cluster_id.strip()) == 0: + if isinstance(compute_cluster_id, str) and len(compute_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-cluster-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11438,7 +11437,7 @@ def update_compute_cluster(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_compute_gpu_memory_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_gpu_memory_cluster_id, instance_configuration_id, size, defined_tags, freeform_tags, display_name, if_match): - if isinstance(compute_gpu_memory_cluster_id, six.string_types) and len(compute_gpu_memory_cluster_id.strip()) == 0: + if isinstance(compute_gpu_memory_cluster_id, str) and len(compute_gpu_memory_cluster_id.strip()) == 0: raise click.UsageError('Parameter --compute-gpu-memory-cluster-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11520,7 +11519,7 @@ def update_compute_gpu_memory_cluster(ctx, from_json, force, wait_for_state, max @cli_util.wrap_exceptions def update_compute_gpu_memory_fabric(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_gpu_memory_fabric_id, defined_tags, freeform_tags, display_name, if_match): - if isinstance(compute_gpu_memory_fabric_id, six.string_types) and len(compute_gpu_memory_fabric_id.strip()) == 0: + if isinstance(compute_gpu_memory_fabric_id, str) and len(compute_gpu_memory_fabric_id.strip()) == 0: raise click.UsageError('Parameter --compute-gpu-memory-fabric-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11596,7 +11595,7 @@ def update_compute_gpu_memory_fabric(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_compute_host(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_host_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(compute_host_id, six.string_types) and len(compute_host_id.strip()) == 0: + if isinstance(compute_host_id, str) and len(compute_host_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11688,7 +11687,7 @@ def update_compute_host(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_compute_host_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compute_host_group_id, display_name, configurations, is_targeted_placement_required, defined_tags, freeform_tags, if_match): - if isinstance(compute_host_group_id, six.string_types) and len(compute_host_group_id.strip()) == 0: + if isinstance(compute_host_group_id, str) and len(compute_host_group_id.strip()) == 0: raise click.UsageError('Parameter --compute-host-group-id cannot be whitespace or empty string') if not force: if configurations or defined_tags or freeform_tags: @@ -11770,7 +11769,7 @@ def update_compute_host_group(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_compute_image_capability_schema(ctx, from_json, force, compute_image_capability_schema_id, display_name, freeform_tags, schema_data, defined_tags, if_match): - if isinstance(compute_image_capability_schema_id, six.string_types) and len(compute_image_capability_schema_id.strip()) == 0: + if isinstance(compute_image_capability_schema_id, str) and len(compute_image_capability_schema_id.strip()) == 0: raise click.UsageError('Parameter --compute-image-capability-schema-id cannot be whitespace or empty string') if not force: if freeform_tags or schema_data or defined_tags: @@ -11825,7 +11824,7 @@ def update_compute_image_capability_schema(ctx, from_json, force, compute_image_ @cli_util.wrap_exceptions def update_console_history(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_console_history_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(instance_console_history_id, six.string_types) and len(instance_console_history_id.strip()) == 0: + if isinstance(instance_console_history_id, str) and len(instance_console_history_id.strip()) == 0: raise click.UsageError('Parameter --instance-console-history-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11900,7 +11899,7 @@ def update_console_history(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_dedicated_vm_host(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dedicated_vm_host_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(dedicated_vm_host_id, six.string_types) and len(dedicated_vm_host_id.strip()) == 0: + if isinstance(dedicated_vm_host_id, str) and len(dedicated_vm_host_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-vm-host-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11982,7 +11981,7 @@ def update_dedicated_vm_host(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_image(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, image_id, defined_tags, display_name, freeform_tags, operating_system, operating_system_version, if_match): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -12122,7 +12121,7 @@ def update_image(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, capacity_reservation_id, defined_tags, security_attributes, display_name, freeform_tags, agent_config, metadata, extended_metadata, shape, shape_config, source_details, update_operation_constraint, instance_options, fault_domain, launch_options, availability_config, time_maintenance_reboot_due, dedicated_vm_host_id, platform_config, licensing_configs, if_match): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') if not force: if defined_tags or security_attributes or freeform_tags or agent_config or metadata or extended_metadata or shape_config or source_details or instance_options or launch_options or availability_config or platform_config or licensing_configs: @@ -12308,7 +12307,7 @@ def update_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_instance_update_instance_source_via_boot_volume_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, source_details_boot_volume_id, capacity_reservation_id, defined_tags, security_attributes, display_name, freeform_tags, agent_config, metadata, extended_metadata, shape, shape_config, update_operation_constraint, instance_options, fault_domain, launch_options, availability_config, time_maintenance_reboot_due, dedicated_vm_host_id, platform_config, licensing_configs, if_match, source_details_is_preserve_boot_volume_enabled): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') if not force: if defined_tags or security_attributes or freeform_tags or agent_config or metadata or extended_metadata or shape_config or instance_options or launch_options or availability_config or platform_config or licensing_configs: @@ -12500,7 +12499,7 @@ def update_instance_update_instance_source_via_boot_volume_details(ctx, from_jso @cli_util.wrap_exceptions def update_instance_update_instance_source_via_image_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, source_details_image_id, capacity_reservation_id, defined_tags, security_attributes, display_name, freeform_tags, agent_config, metadata, extended_metadata, shape, shape_config, update_operation_constraint, instance_options, fault_domain, launch_options, availability_config, time_maintenance_reboot_due, dedicated_vm_host_id, platform_config, licensing_configs, if_match, source_details_is_preserve_boot_volume_enabled, source_details_boot_volume_size_in_gbs, source_details_kms_key_id): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') if not force: if defined_tags or security_attributes or freeform_tags or agent_config or metadata or extended_metadata or shape_config or instance_options or launch_options or availability_config or platform_config or licensing_configs: @@ -12697,7 +12696,7 @@ def update_instance_update_instance_source_via_image_details(ctx, from_json, for @cli_util.wrap_exceptions def update_instance_amd_vm_update_instance_platform_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, capacity_reservation_id, defined_tags, security_attributes, display_name, freeform_tags, agent_config, metadata, extended_metadata, shape, shape_config, source_details, update_operation_constraint, instance_options, fault_domain, launch_options, availability_config, time_maintenance_reboot_due, dedicated_vm_host_id, licensing_configs, if_match, platform_config_is_symmetric_multi_threading_enabled): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') if not force: if defined_tags or security_attributes or freeform_tags or agent_config or metadata or extended_metadata or shape_config or source_details or instance_options or launch_options or availability_config or licensing_configs: @@ -12887,7 +12886,7 @@ def update_instance_amd_vm_update_instance_platform_config(ctx, from_json, force @cli_util.wrap_exceptions def update_instance_intel_vm_update_instance_platform_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_id, capacity_reservation_id, defined_tags, security_attributes, display_name, freeform_tags, agent_config, metadata, extended_metadata, shape, shape_config, source_details, update_operation_constraint, instance_options, fault_domain, launch_options, availability_config, time_maintenance_reboot_due, dedicated_vm_host_id, licensing_configs, if_match, platform_config_is_symmetric_multi_threading_enabled): - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') if not force: if defined_tags or security_attributes or freeform_tags or agent_config or metadata or extended_metadata or shape_config or source_details or instance_options or launch_options or availability_config or licensing_configs: @@ -13015,7 +13014,7 @@ def update_instance_intel_vm_update_instance_platform_config(ctx, from_json, for @cli_util.wrap_exceptions def update_instance_console_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_console_connection_id, defined_tags, freeform_tags, if_match): - if isinstance(instance_console_connection_id, six.string_types) and len(instance_console_connection_id.strip()) == 0: + if isinstance(instance_console_connection_id, str) and len(instance_console_connection_id.strip()) == 0: raise click.UsageError('Parameter --instance-console-connection-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13097,7 +13096,7 @@ def update_instance_console_connection(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_instance_maintenance_event(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_maintenance_event_id, time_window_start, alternative_resolution_action, can_delete_local_storage, display_name, defined_tags, freeform_tags, if_match): - if isinstance(instance_maintenance_event_id, six.string_types) and len(instance_maintenance_event_id.strip()) == 0: + if isinstance(instance_maintenance_event_id, str) and len(instance_maintenance_event_id.strip()) == 0: raise click.UsageError('Parameter --instance-maintenance-event-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13187,7 +13186,7 @@ def update_instance_maintenance_event(ctx, from_json, force, wait_for_state, max @cli_util.wrap_exceptions def update_volume_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, volume_attachment_id, iscsi_login_state, if_match): - if isinstance(volume_attachment_id, six.string_types) and len(volume_attachment_id.strip()) == 0: + if isinstance(volume_attachment_id, str) and len(volume_attachment_id.strip()) == 0: raise click.UsageError('Parameter --volume-attachment-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/core/src/oci_cli_compute_management/generated/computemanagement_cli.py b/services/core/src/oci_cli_compute_management/generated/computemanagement_cli.py index 6228a8596..5e6ff92cf 100644 --- a/services/core/src/oci_cli_compute_management/generated/computemanagement_cli.py +++ b/services/core/src/oci_cli_compute_management/generated/computemanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -98,7 +97,7 @@ def instance_pool_instance_group(): @cli_util.wrap_exceptions def attach_instance_pool_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, instance_id): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -155,7 +154,7 @@ def attach_instance_pool_instance(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def attach_load_balancer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, load_balancer_id, backend_set_name, port, vnic_selection, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -213,7 +212,7 @@ def attach_load_balancer(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def change_cluster_network_compartment(ctx, from_json, cluster_network_id, compartment_id, if_match): - if isinstance(cluster_network_id, six.string_types) and len(cluster_network_id.strip()) == 0: + if isinstance(cluster_network_id, str) and len(cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -248,7 +247,7 @@ def change_cluster_network_compartment(ctx, from_json, cluster_network_id, compa @cli_util.wrap_exceptions def change_instance_configuration_compartment(ctx, from_json, instance_configuration_id, compartment_id, if_match): - if isinstance(instance_configuration_id, six.string_types) and len(instance_configuration_id.strip()) == 0: + if isinstance(instance_configuration_id, str) and len(instance_configuration_id.strip()) == 0: raise click.UsageError('Parameter --instance-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -281,7 +280,7 @@ def change_instance_configuration_compartment(ctx, from_json, instance_configura @cli_util.wrap_exceptions def change_instance_pool_compartment(ctx, from_json, instance_pool_id, compartment_id, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -616,7 +615,7 @@ def create_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_instance_configuration(ctx, from_json, instance_configuration_id, if_match): - if isinstance(instance_configuration_id, six.string_types) and len(instance_configuration_id.strip()) == 0: + if isinstance(instance_configuration_id, str) and len(instance_configuration_id.strip()) == 0: raise click.UsageError('Parameter --instance-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -645,7 +644,7 @@ def delete_instance_configuration(ctx, from_json, instance_configuration_id, if_ @cli_util.wrap_exceptions def detach_instance_pool_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, instance_id, is_decrement_size, is_auto_terminate): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -718,7 +717,7 @@ def detach_instance_pool_instance(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def detach_load_balancer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, load_balancer_id, backend_set_name, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -770,7 +769,7 @@ def detach_load_balancer(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def get_cluster_network(ctx, from_json, cluster_network_id): - if isinstance(cluster_network_id, six.string_types) and len(cluster_network_id.strip()) == 0: + if isinstance(cluster_network_id, str) and len(cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -791,7 +790,7 @@ def get_cluster_network(ctx, from_json, cluster_network_id): @cli_util.wrap_exceptions def get_instance_configuration(ctx, from_json, instance_configuration_id): - if isinstance(instance_configuration_id, six.string_types) and len(instance_configuration_id.strip()) == 0: + if isinstance(instance_configuration_id, str) and len(instance_configuration_id.strip()) == 0: raise click.UsageError('Parameter --instance-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -812,7 +811,7 @@ def get_instance_configuration(ctx, from_json, instance_configuration_id): @cli_util.wrap_exceptions def get_instance_pool(ctx, from_json, instance_pool_id): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -834,10 +833,10 @@ def get_instance_pool(ctx, from_json, instance_pool_id): @cli_util.wrap_exceptions def get_instance_pool_instance(ctx, from_json, instance_pool_id, instance_id): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') - if isinstance(instance_id, six.string_types) and len(instance_id.strip()) == 0: + if isinstance(instance_id, str) and len(instance_id.strip()) == 0: raise click.UsageError('Parameter --instance-id cannot be whitespace or empty string') kwargs = {} @@ -860,10 +859,10 @@ def get_instance_pool_instance(ctx, from_json, instance_pool_id, instance_id): @cli_util.wrap_exceptions def get_instance_pool_load_balancer_attachment(ctx, from_json, instance_pool_id, instance_pool_load_balancer_attachment_id): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') - if isinstance(instance_pool_load_balancer_attachment_id, six.string_types) and len(instance_pool_load_balancer_attachment_id.strip()) == 0: + if isinstance(instance_pool_load_balancer_attachment_id, str) and len(instance_pool_load_balancer_attachment_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-load-balancer-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -890,7 +889,7 @@ def get_instance_pool_load_balancer_attachment(ctx, from_json, instance_pool_id, @cli_util.wrap_exceptions def launch_instance_configuration(ctx, from_json, instance_configuration_id, instance_type): - if isinstance(instance_configuration_id, six.string_types) and len(instance_configuration_id.strip()) == 0: + if isinstance(instance_configuration_id, str) and len(instance_configuration_id.strip()) == 0: raise click.UsageError('Parameter --instance-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -923,7 +922,7 @@ def launch_instance_configuration(ctx, from_json, instance_configuration_id, ins @cli_util.wrap_exceptions def launch_instance_configuration_compute_instance_options(ctx, from_json, instance_configuration_id, options): - if isinstance(instance_configuration_id, six.string_types) and len(instance_configuration_id.strip()) == 0: + if isinstance(instance_configuration_id, str) and len(instance_configuration_id.strip()) == 0: raise click.UsageError('Parameter --instance-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -964,7 +963,7 @@ def launch_instance_configuration_compute_instance_options(ctx, from_json, insta @cli_util.wrap_exceptions def launch_instance_configuration_compute_instance_details(ctx, from_json, instance_configuration_id, block_volumes, launch_details, secondary_vnics): - if isinstance(instance_configuration_id, six.string_types) and len(instance_configuration_id.strip()) == 0: + if isinstance(instance_configuration_id, str) and len(instance_configuration_id.strip()) == 0: raise click.UsageError('Parameter --instance-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -1015,7 +1014,7 @@ def list_cluster_network_instances(ctx, from_json, all_pages, page_size, compart if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cluster_network_id, six.string_types) and len(cluster_network_id.strip()) == 0: + if isinstance(cluster_network_id, str) and len(cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -1202,7 +1201,7 @@ def list_instance_pool_instances(ctx, from_json, all_pages, page_size, compartme if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1321,7 +1320,7 @@ def list_instance_pools(ctx, from_json, all_pages, page_size, compartment_id, di @cli_util.wrap_exceptions def reset_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1373,7 +1372,7 @@ def reset_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def softreset_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1425,7 +1424,7 @@ def softreset_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def softstop_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1475,7 +1474,7 @@ def softstop_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def start_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1525,7 +1524,7 @@ def start_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def stop_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1578,7 +1577,7 @@ def stop_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def terminate_cluster_network(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_network_id, if_match): - if isinstance(cluster_network_id, six.string_types) and len(cluster_network_id.strip()) == 0: + if isinstance(cluster_network_id, str) and len(cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -1638,7 +1637,7 @@ def terminate_cluster_network(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def terminate_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1711,7 +1710,7 @@ def terminate_instance_pool(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_cluster_network(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_network_id, defined_tags, display_name, freeform_tags, instance_pools, if_match): - if isinstance(cluster_network_id, six.string_types) and len(cluster_network_id.strip()) == 0: + if isinstance(cluster_network_id, str) and len(cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --cluster-network-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or instance_pools: @@ -1786,7 +1785,7 @@ def update_cluster_network(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_instance_configuration(ctx, from_json, force, instance_configuration_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(instance_configuration_id, six.string_types) and len(instance_configuration_id.strip()) == 0: + if isinstance(instance_configuration_id, str) and len(instance_configuration_id.strip()) == 0: raise click.UsageError('Parameter --instance-configuration-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -1851,7 +1850,7 @@ def update_instance_configuration(ctx, from_json, force, instance_configuration_ @cli_util.wrap_exceptions def update_instance_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, instance_pool_id, defined_tags, display_name, freeform_tags, instance_configuration_id, placement_configurations, size, instance_display_name_formatter, instance_hostname_formatter, if_match): - if isinstance(instance_pool_id, six.string_types) and len(instance_pool_id.strip()) == 0: + if isinstance(instance_pool_id, str) and len(instance_pool_id.strip()) == 0: raise click.UsageError('Parameter --instance-pool-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or placement_configurations: diff --git a/services/core/src/oci_cli_virtual_network/generated/virtualnetwork_cli.py b/services/core/src/oci_cli_virtual_network/generated/virtualnetwork_cli.py index 18f61d4bc..b43c7dc39 100644 --- a/services/core/src/oci_cli_virtual_network/generated/virtualnetwork_cli.py +++ b/services/core/src/oci_cli_virtual_network/generated/virtualnetwork_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -645,7 +644,7 @@ def internal_public_ip_group(): @cli_util.wrap_exceptions def add_drg_route_distribution_statements(ctx, from_json, drg_route_distribution_id, statements): - if isinstance(drg_route_distribution_id, six.string_types) and len(drg_route_distribution_id.strip()) == 0: + if isinstance(drg_route_distribution_id, str) and len(drg_route_distribution_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-distribution-id cannot be whitespace or empty string') kwargs = {} @@ -674,7 +673,7 @@ def add_drg_route_distribution_statements(ctx, from_json, drg_route_distribution @cli_util.wrap_exceptions def add_drg_route_rules(ctx, from_json, drg_route_table_id, route_rules): - if isinstance(drg_route_table_id, six.string_types) and len(drg_route_table_id.strip()) == 0: + if isinstance(drg_route_table_id, str) and len(drg_route_table_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-table-id cannot be whitespace or empty string') kwargs = {} @@ -709,7 +708,7 @@ def add_drg_route_rules(ctx, from_json, drg_route_table_id, route_rules): @cli_util.wrap_exceptions def add_ipv6_subnet_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subnet_id, ipv6_cidr_block, if_match): - if isinstance(subnet_id, six.string_types) and len(subnet_id.strip()) == 0: + if isinstance(subnet_id, str) and len(subnet_id.strip()) == 0: raise click.UsageError('Parameter --subnet-id cannot be whitespace or empty string') kwargs = {} @@ -782,7 +781,7 @@ def add_ipv6_subnet_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def add_ipv6_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vcn_id, if_match, ipv6_private_cidr_block, is_oracle_gua_allocation_enabled, byoipv6_cidr_detail): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -857,7 +856,7 @@ def add_ipv6_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def add_network_security_group_security_rules(ctx, from_json, network_security_group_id, security_rules): - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') kwargs = {} @@ -892,7 +891,7 @@ def add_network_security_group_security_rules(ctx, from_json, network_security_g @cli_util.wrap_exceptions def add_public_ip_pool_capacity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, public_ip_pool_id, byoip_range_id, cidr_block): - if isinstance(public_ip_pool_id, six.string_types) and len(public_ip_pool_id.strip()) == 0: + if isinstance(public_ip_pool_id, str) and len(public_ip_pool_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-pool-id cannot be whitespace or empty string') kwargs = {} @@ -952,7 +951,7 @@ def add_public_ip_pool_capacity(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def add_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vcn_id, cidr_block, if_match): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -1016,7 +1015,7 @@ def add_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def advertise_byoip_range(ctx, from_json, byoip_range_id): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} @@ -1045,7 +1044,7 @@ def advertise_byoip_range(ctx, from_json, byoip_range_id): @cli_util.wrap_exceptions def attach_service_id(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_gateway_id, service_id, if_match): - if isinstance(service_gateway_id, six.string_types) and len(service_gateway_id.strip()) == 0: + if isinstance(service_gateway_id, str) and len(service_gateway_id.strip()) == 0: raise click.UsageError('Parameter --service-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -1097,7 +1096,7 @@ def attach_service_id(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def bulk_add_virtual_circuit_public_prefixes(ctx, from_json, virtual_circuit_id, public_prefixes): - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') kwargs = {} @@ -1124,7 +1123,7 @@ def bulk_add_virtual_circuit_public_prefixes(ctx, from_json, virtual_circuit_id, @cli_util.wrap_exceptions def bulk_delete_virtual_circuit_public_prefixes(ctx, from_json, virtual_circuit_id, public_prefixes): - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') kwargs = {} @@ -1152,7 +1151,7 @@ def bulk_delete_virtual_circuit_public_prefixes(ctx, from_json, virtual_circuit_ @cli_util.wrap_exceptions def change_byoasn_compartment(ctx, from_json, byoasn_id, compartment_id, if_match): - if isinstance(byoasn_id, six.string_types) and len(byoasn_id.strip()) == 0: + if isinstance(byoasn_id, str) and len(byoasn_id.strip()) == 0: raise click.UsageError('Parameter --byoasn-id cannot be whitespace or empty string') kwargs = {} @@ -1182,7 +1181,7 @@ def change_byoasn_compartment(ctx, from_json, byoasn_id, compartment_id, if_matc @cli_util.wrap_exceptions def change_byoip_range_compartment(ctx, from_json, byoip_range_id, compartment_id): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} @@ -1214,7 +1213,7 @@ def change_byoip_range_compartment(ctx, from_json, byoip_range_id, compartment_i @cli_util.wrap_exceptions def change_capture_filter_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, capture_filter_id, compartment_id, if_match): - if isinstance(capture_filter_id, six.string_types) and len(capture_filter_id.strip()) == 0: + if isinstance(capture_filter_id, str) and len(capture_filter_id.strip()) == 0: raise click.UsageError('Parameter --capture-filter-id cannot be whitespace or empty string') kwargs = {} @@ -1279,7 +1278,7 @@ def change_capture_filter_compartment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def change_cpe_compartment(ctx, from_json, cpe_id, compartment_id): - if isinstance(cpe_id, six.string_types) and len(cpe_id.strip()) == 0: + if isinstance(cpe_id, str) and len(cpe_id.strip()) == 0: raise click.UsageError('Parameter --cpe-id cannot be whitespace or empty string') kwargs = {} @@ -1307,7 +1306,7 @@ def change_cpe_compartment(ctx, from_json, cpe_id, compartment_id): @cli_util.wrap_exceptions def change_cross_connect_compartment(ctx, from_json, cross_connect_id, compartment_id): - if isinstance(cross_connect_id, six.string_types) and len(cross_connect_id.strip()) == 0: + if isinstance(cross_connect_id, str) and len(cross_connect_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-id cannot be whitespace or empty string') kwargs = {} @@ -1335,7 +1334,7 @@ def change_cross_connect_compartment(ctx, from_json, cross_connect_id, compartme @cli_util.wrap_exceptions def change_cross_connect_group_compartment(ctx, from_json, cross_connect_group_id, compartment_id): - if isinstance(cross_connect_group_id, six.string_types) and len(cross_connect_group_id.strip()) == 0: + if isinstance(cross_connect_group_id, str) and len(cross_connect_group_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-group-id cannot be whitespace or empty string') kwargs = {} @@ -1363,7 +1362,7 @@ def change_cross_connect_group_compartment(ctx, from_json, cross_connect_group_i @cli_util.wrap_exceptions def change_dhcp_options_compartment(ctx, from_json, dhcp_id, compartment_id): - if isinstance(dhcp_id, six.string_types) and len(dhcp_id.strip()) == 0: + if isinstance(dhcp_id, str) and len(dhcp_id.strip()) == 0: raise click.UsageError('Parameter --dhcp-id cannot be whitespace or empty string') kwargs = {} @@ -1394,7 +1393,7 @@ def change_dhcp_options_compartment(ctx, from_json, dhcp_id, compartment_id): @cli_util.wrap_exceptions def change_drg_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_id, compartment_id): - if isinstance(drg_id, six.string_types) and len(drg_id.strip()) == 0: + if isinstance(drg_id, str) and len(drg_id.strip()) == 0: raise click.UsageError('Parameter --drg-id cannot be whitespace or empty string') kwargs = {} @@ -1457,7 +1456,7 @@ def change_drg_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def change_internet_gateway_compartment(ctx, from_json, ig_id, compartment_id): - if isinstance(ig_id, six.string_types) and len(ig_id.strip()) == 0: + if isinstance(ig_id, str) and len(ig_id.strip()) == 0: raise click.UsageError('Parameter --ig-id cannot be whitespace or empty string') kwargs = {} @@ -1485,7 +1484,7 @@ def change_internet_gateway_compartment(ctx, from_json, ig_id, compartment_id): @cli_util.wrap_exceptions def change_ip_sec_connection_compartment(ctx, from_json, ipsc_id, compartment_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') kwargs = {} @@ -1513,7 +1512,7 @@ def change_ip_sec_connection_compartment(ctx, from_json, ipsc_id, compartment_id @cli_util.wrap_exceptions def change_local_peering_gateway_compartment(ctx, from_json, local_peering_gateway_id, compartment_id): - if isinstance(local_peering_gateway_id, six.string_types) and len(local_peering_gateway_id.strip()) == 0: + if isinstance(local_peering_gateway_id, str) and len(local_peering_gateway_id.strip()) == 0: raise click.UsageError('Parameter --local-peering-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -1541,7 +1540,7 @@ def change_local_peering_gateway_compartment(ctx, from_json, local_peering_gatew @cli_util.wrap_exceptions def change_nat_gateway_compartment(ctx, from_json, nat_gateway_id, compartment_id): - if isinstance(nat_gateway_id, six.string_types) and len(nat_gateway_id.strip()) == 0: + if isinstance(nat_gateway_id, str) and len(nat_gateway_id.strip()) == 0: raise click.UsageError('Parameter --nat-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -1569,7 +1568,7 @@ def change_nat_gateway_compartment(ctx, from_json, nat_gateway_id, compartment_i @cli_util.wrap_exceptions def change_network_security_group_compartment(ctx, from_json, network_security_group_id, compartment_id): - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') kwargs = {} @@ -1599,7 +1598,7 @@ def change_network_security_group_compartment(ctx, from_json, network_security_g @cli_util.wrap_exceptions def change_public_ip_compartment(ctx, from_json, public_ip_id, compartment_id): - if isinstance(public_ip_id, six.string_types) and len(public_ip_id.strip()) == 0: + if isinstance(public_ip_id, str) and len(public_ip_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-id cannot be whitespace or empty string') kwargs = {} @@ -1627,7 +1626,7 @@ def change_public_ip_compartment(ctx, from_json, public_ip_id, compartment_id): @cli_util.wrap_exceptions def change_public_ip_pool_compartment(ctx, from_json, public_ip_pool_id, compartment_id): - if isinstance(public_ip_pool_id, six.string_types) and len(public_ip_pool_id.strip()) == 0: + if isinstance(public_ip_pool_id, str) and len(public_ip_pool_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1655,7 +1654,7 @@ def change_public_ip_pool_compartment(ctx, from_json, public_ip_pool_id, compart @cli_util.wrap_exceptions def change_remote_peering_connection_compartment(ctx, from_json, remote_peering_connection_id, compartment_id): - if isinstance(remote_peering_connection_id, six.string_types) and len(remote_peering_connection_id.strip()) == 0: + if isinstance(remote_peering_connection_id, str) and len(remote_peering_connection_id.strip()) == 0: raise click.UsageError('Parameter --remote-peering-connection-id cannot be whitespace or empty string') kwargs = {} @@ -1683,7 +1682,7 @@ def change_remote_peering_connection_compartment(ctx, from_json, remote_peering_ @cli_util.wrap_exceptions def change_route_table_compartment(ctx, from_json, rt_id, compartment_id): - if isinstance(rt_id, six.string_types) and len(rt_id.strip()) == 0: + if isinstance(rt_id, str) and len(rt_id.strip()) == 0: raise click.UsageError('Parameter --rt-id cannot be whitespace or empty string') kwargs = {} @@ -1711,7 +1710,7 @@ def change_route_table_compartment(ctx, from_json, rt_id, compartment_id): @cli_util.wrap_exceptions def change_security_list_compartment(ctx, from_json, security_list_id, compartment_id): - if isinstance(security_list_id, six.string_types) and len(security_list_id.strip()) == 0: + if isinstance(security_list_id, str) and len(security_list_id.strip()) == 0: raise click.UsageError('Parameter --security-list-id cannot be whitespace or empty string') kwargs = {} @@ -1739,7 +1738,7 @@ def change_security_list_compartment(ctx, from_json, security_list_id, compartme @cli_util.wrap_exceptions def change_service_gateway_compartment(ctx, from_json, service_gateway_id, compartment_id): - if isinstance(service_gateway_id, six.string_types) and len(service_gateway_id.strip()) == 0: + if isinstance(service_gateway_id, str) and len(service_gateway_id.strip()) == 0: raise click.UsageError('Parameter --service-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -1770,7 +1769,7 @@ def change_service_gateway_compartment(ctx, from_json, service_gateway_id, compa @cli_util.wrap_exceptions def change_subnet_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subnet_id, compartment_id): - if isinstance(subnet_id, six.string_types) and len(subnet_id.strip()) == 0: + if isinstance(subnet_id, str) and len(subnet_id.strip()) == 0: raise click.UsageError('Parameter --subnet-id cannot be whitespace or empty string') kwargs = {} @@ -1836,7 +1835,7 @@ def change_subnet_compartment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_vcn_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vcn_id, compartment_id): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -1899,7 +1898,7 @@ def change_vcn_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def change_virtual_circuit_compartment(ctx, from_json, virtual_circuit_id, compartment_id): - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') kwargs = {} @@ -1931,7 +1930,7 @@ def change_virtual_circuit_compartment(ctx, from_json, virtual_circuit_id, compa @cli_util.wrap_exceptions def change_vlan_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vlan_id, compartment_id, if_match): - if isinstance(vlan_id, six.string_types) and len(vlan_id.strip()) == 0: + if isinstance(vlan_id, str) and len(vlan_id.strip()) == 0: raise click.UsageError('Parameter --vlan-id cannot be whitespace or empty string') kwargs = {} @@ -2000,7 +1999,7 @@ def change_vlan_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def change_vtap_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vtap_id, compartment_id, if_match): - if isinstance(vtap_id, six.string_types) and len(vtap_id.strip()) == 0: + if isinstance(vtap_id, str) and len(vtap_id.strip()) == 0: raise click.UsageError('Parameter --vtap-id cannot be whitespace or empty string') kwargs = {} @@ -2067,7 +2066,7 @@ def change_vtap_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def connect_local_peering_gateways(ctx, from_json, local_peering_gateway_id, peer_id): - if isinstance(local_peering_gateway_id, six.string_types) and len(local_peering_gateway_id.strip()) == 0: + if isinstance(local_peering_gateway_id, str) and len(local_peering_gateway_id.strip()) == 0: raise click.UsageError('Parameter --local-peering-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -2099,7 +2098,7 @@ def connect_local_peering_gateways(ctx, from_json, local_peering_gateway_id, pee @cli_util.wrap_exceptions def connect_remote_peering_connections(ctx, from_json, remote_peering_connection_id, peer_id, peer_region_name): - if isinstance(remote_peering_connection_id, six.string_types) and len(remote_peering_connection_id.strip()) == 0: + if isinstance(remote_peering_connection_id, str) and len(remote_peering_connection_id.strip()) == 0: raise click.UsageError('Parameter --remote-peering-connection-id cannot be whitespace or empty string') kwargs = {} @@ -4735,7 +4734,7 @@ def create_vtap(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_byoasn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, byoasn_id, if_match): - if isinstance(byoasn_id, six.string_types) and len(byoasn_id.strip()) == 0: + if isinstance(byoasn_id, str) and len(byoasn_id.strip()) == 0: raise click.UsageError('Parameter --byoasn-id cannot be whitespace or empty string') kwargs = {} @@ -4799,7 +4798,7 @@ def delete_byoasn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_byoip_range(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, byoip_range_id, if_match): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} @@ -4856,7 +4855,7 @@ def delete_byoip_range(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_capture_filter(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, capture_filter_id, if_match): - if isinstance(capture_filter_id, six.string_types) and len(capture_filter_id.strip()) == 0: + if isinstance(capture_filter_id, str) and len(capture_filter_id.strip()) == 0: raise click.UsageError('Parameter --capture-filter-id cannot be whitespace or empty string') kwargs = {} @@ -4917,7 +4916,7 @@ def delete_capture_filter(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_cpe(ctx, from_json, cpe_id, if_match): - if isinstance(cpe_id, six.string_types) and len(cpe_id.strip()) == 0: + if isinstance(cpe_id, str) and len(cpe_id.strip()) == 0: raise click.UsageError('Parameter --cpe-id cannot be whitespace or empty string') kwargs = {} @@ -4945,7 +4944,7 @@ def delete_cpe(ctx, from_json, cpe_id, if_match): @cli_util.wrap_exceptions def delete_cross_connect(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cross_connect_id, if_match): - if isinstance(cross_connect_id, six.string_types) and len(cross_connect_id.strip()) == 0: + if isinstance(cross_connect_id, str) and len(cross_connect_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-id cannot be whitespace or empty string') kwargs = {} @@ -5008,7 +5007,7 @@ def delete_cross_connect(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_cross_connect_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cross_connect_group_id, if_match): - if isinstance(cross_connect_group_id, six.string_types) and len(cross_connect_group_id.strip()) == 0: + if isinstance(cross_connect_group_id, str) and len(cross_connect_group_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-group-id cannot be whitespace or empty string') kwargs = {} @@ -5073,7 +5072,7 @@ def delete_cross_connect_group(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_dhcp_options(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dhcp_id, if_match): - if isinstance(dhcp_id, six.string_types) and len(dhcp_id.strip()) == 0: + if isinstance(dhcp_id, str) and len(dhcp_id.strip()) == 0: raise click.UsageError('Parameter --dhcp-id cannot be whitespace or empty string') kwargs = {} @@ -5136,7 +5135,7 @@ def delete_dhcp_options(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_drg(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_id, if_match): - if isinstance(drg_id, six.string_types) and len(drg_id.strip()) == 0: + if isinstance(drg_id, str) and len(drg_id.strip()) == 0: raise click.UsageError('Parameter --drg-id cannot be whitespace or empty string') kwargs = {} @@ -5199,7 +5198,7 @@ def delete_drg(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_drg_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_attachment_id, if_match): - if isinstance(drg_attachment_id, six.string_types) and len(drg_attachment_id.strip()) == 0: + if isinstance(drg_attachment_id, str) and len(drg_attachment_id.strip()) == 0: raise click.UsageError('Parameter --drg-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -5264,7 +5263,7 @@ def delete_drg_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_drg_route_distribution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_route_distribution_id, if_match): - if isinstance(drg_route_distribution_id, six.string_types) and len(drg_route_distribution_id.strip()) == 0: + if isinstance(drg_route_distribution_id, str) and len(drg_route_distribution_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-distribution-id cannot be whitespace or empty string') kwargs = {} @@ -5327,7 +5326,7 @@ def delete_drg_route_distribution(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_drg_route_table(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_route_table_id, if_match): - if isinstance(drg_route_table_id, six.string_types) and len(drg_route_table_id.strip()) == 0: + if isinstance(drg_route_table_id, str) and len(drg_route_table_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-table-id cannot be whitespace or empty string') kwargs = {} @@ -5392,7 +5391,7 @@ def delete_drg_route_table(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_internet_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ig_id, if_match): - if isinstance(ig_id, six.string_types) and len(ig_id.strip()) == 0: + if isinstance(ig_id, str) and len(ig_id.strip()) == 0: raise click.UsageError('Parameter --ig-id cannot be whitespace or empty string') kwargs = {} @@ -5457,7 +5456,7 @@ def delete_internet_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_ip_sec_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ipsc_id, if_match): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') kwargs = {} @@ -5520,7 +5519,7 @@ def delete_ip_sec_connection(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_ipv6(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ipv6_id, if_match): - if isinstance(ipv6_id, six.string_types) and len(ipv6_id.strip()) == 0: + if isinstance(ipv6_id, str) and len(ipv6_id.strip()) == 0: raise click.UsageError('Parameter --ipv6-id cannot be whitespace or empty string') kwargs = {} @@ -5586,7 +5585,7 @@ def delete_ipv6(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_local_peering_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, local_peering_gateway_id, if_match): - if isinstance(local_peering_gateway_id, six.string_types) and len(local_peering_gateway_id.strip()) == 0: + if isinstance(local_peering_gateway_id, str) and len(local_peering_gateway_id.strip()) == 0: raise click.UsageError('Parameter --local-peering-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -5651,7 +5650,7 @@ def delete_local_peering_gateway(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_nat_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, nat_gateway_id, if_match): - if isinstance(nat_gateway_id, six.string_types) and len(nat_gateway_id.strip()) == 0: + if isinstance(nat_gateway_id, str) and len(nat_gateway_id.strip()) == 0: raise click.UsageError('Parameter --nat-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -5716,7 +5715,7 @@ def delete_nat_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_network_security_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_security_group_id, if_match): - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') kwargs = {} @@ -5780,7 +5779,7 @@ def delete_network_security_group(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_private_ip(ctx, from_json, private_ip_id, if_match): - if isinstance(private_ip_id, six.string_types) and len(private_ip_id.strip()) == 0: + if isinstance(private_ip_id, str) and len(private_ip_id.strip()) == 0: raise click.UsageError('Parameter --private-ip-id cannot be whitespace or empty string') kwargs = {} @@ -5814,7 +5813,7 @@ def delete_private_ip(ctx, from_json, private_ip_id, if_match): @cli_util.wrap_exceptions def delete_public_ip(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, public_ip_id, if_match): - if isinstance(public_ip_id, six.string_types) and len(public_ip_id.strip()) == 0: + if isinstance(public_ip_id, str) and len(public_ip_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-id cannot be whitespace or empty string') kwargs = {} @@ -5877,7 +5876,7 @@ def delete_public_ip(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_public_ip_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, public_ip_pool_id, if_match): - if isinstance(public_ip_pool_id, six.string_types) and len(public_ip_pool_id.strip()) == 0: + if isinstance(public_ip_pool_id, str) and len(public_ip_pool_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-pool-id cannot be whitespace or empty string') kwargs = {} @@ -5943,7 +5942,7 @@ def delete_public_ip_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_remote_peering_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, remote_peering_connection_id, if_match): - if isinstance(remote_peering_connection_id, six.string_types) and len(remote_peering_connection_id.strip()) == 0: + if isinstance(remote_peering_connection_id, str) and len(remote_peering_connection_id.strip()) == 0: raise click.UsageError('Parameter --remote-peering-connection-id cannot be whitespace or empty string') kwargs = {} @@ -6008,7 +6007,7 @@ def delete_remote_peering_connection(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_route_table(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, rt_id, if_match): - if isinstance(rt_id, six.string_types) and len(rt_id.strip()) == 0: + if isinstance(rt_id, str) and len(rt_id.strip()) == 0: raise click.UsageError('Parameter --rt-id cannot be whitespace or empty string') kwargs = {} @@ -6073,7 +6072,7 @@ def delete_route_table(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_security_list(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_list_id, if_match): - if isinstance(security_list_id, six.string_types) and len(security_list_id.strip()) == 0: + if isinstance(security_list_id, str) and len(security_list_id.strip()) == 0: raise click.UsageError('Parameter --security-list-id cannot be whitespace or empty string') kwargs = {} @@ -6136,7 +6135,7 @@ def delete_security_list(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_service_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_gateway_id, if_match): - if isinstance(service_gateway_id, six.string_types) and len(service_gateway_id.strip()) == 0: + if isinstance(service_gateway_id, str) and len(service_gateway_id.strip()) == 0: raise click.UsageError('Parameter --service-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -6199,7 +6198,7 @@ def delete_service_gateway(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_subnet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subnet_id, if_match): - if isinstance(subnet_id, six.string_types) and len(subnet_id.strip()) == 0: + if isinstance(subnet_id, str) and len(subnet_id.strip()) == 0: raise click.UsageError('Parameter --subnet-id cannot be whitespace or empty string') kwargs = {} @@ -6264,7 +6263,7 @@ def delete_subnet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_vcn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vcn_id, if_match): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -6329,7 +6328,7 @@ def delete_vcn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_virtual_circuit(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, virtual_circuit_id, if_match): - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') kwargs = {} @@ -6392,7 +6391,7 @@ def delete_virtual_circuit(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_vlan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vlan_id, if_match): - if isinstance(vlan_id, six.string_types) and len(vlan_id.strip()) == 0: + if isinstance(vlan_id, str) and len(vlan_id.strip()) == 0: raise click.UsageError('Parameter --vlan-id cannot be whitespace or empty string') kwargs = {} @@ -6456,7 +6455,7 @@ def delete_vlan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_vtap(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vtap_id, if_match): - if isinstance(vtap_id, six.string_types) and len(vtap_id.strip()) == 0: + if isinstance(vtap_id, str) and len(vtap_id.strip()) == 0: raise click.UsageError('Parameter --vtap-id cannot be whitespace or empty string') kwargs = {} @@ -6515,7 +6514,7 @@ def delete_vtap(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def detach_service_id(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_gateway_id, service_id, if_match): - if isinstance(service_gateway_id, six.string_types) and len(service_gateway_id.strip()) == 0: + if isinstance(service_gateway_id, str) and len(service_gateway_id.strip()) == 0: raise click.UsageError('Parameter --service-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -6572,7 +6571,7 @@ def detach_service_id(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def get_all_drg_attachments(ctx, from_json, drg_id, limit, page, attachment_type, is_cross_tenancy): - if isinstance(drg_id, six.string_types) and len(drg_id.strip()) == 0: + if isinstance(drg_id, str) and len(drg_id.strip()) == 0: raise click.UsageError('Parameter --drg-id cannot be whitespace or empty string') kwargs = {} @@ -6619,7 +6618,7 @@ def get_allowed_ike_ip_sec_parameters(ctx, from_json, ): @cli_util.wrap_exceptions def get_byoasn(ctx, from_json, byoasn_id): - if isinstance(byoasn_id, six.string_types) and len(byoasn_id.strip()) == 0: + if isinstance(byoasn_id, str) and len(byoasn_id.strip()) == 0: raise click.UsageError('Parameter --byoasn-id cannot be whitespace or empty string') kwargs = {} @@ -6641,7 +6640,7 @@ def get_byoasn(ctx, from_json, byoasn_id): @cli_util.wrap_exceptions def get_byoip_range(ctx, from_json, byoip_range_id): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} @@ -6663,7 +6662,7 @@ def get_byoip_range(ctx, from_json, byoip_range_id): @cli_util.wrap_exceptions def get_capture_filter(ctx, from_json, capture_filter_id): - if isinstance(capture_filter_id, six.string_types) and len(capture_filter_id.strip()) == 0: + if isinstance(capture_filter_id, str) and len(capture_filter_id.strip()) == 0: raise click.UsageError('Parameter --capture-filter-id cannot be whitespace or empty string') kwargs = {} @@ -6685,7 +6684,7 @@ def get_capture_filter(ctx, from_json, capture_filter_id): @cli_util.wrap_exceptions def get_cpe(ctx, from_json, cpe_id): - if isinstance(cpe_id, six.string_types) and len(cpe_id.strip()) == 0: + if isinstance(cpe_id, str) and len(cpe_id.strip()) == 0: raise click.UsageError('Parameter --cpe-id cannot be whitespace or empty string') kwargs = {} @@ -6713,7 +6712,7 @@ def get_cpe(ctx, from_json, cpe_id): @cli_util.wrap_exceptions def get_cpe_device_config_content(ctx, from_json, file, cpe_id): - if isinstance(cpe_id, six.string_types) and len(cpe_id.strip()) == 0: + if isinstance(cpe_id, str) and len(cpe_id.strip()) == 0: raise click.UsageError('Parameter --cpe-id cannot be whitespace or empty string') kwargs = {} @@ -6759,7 +6758,7 @@ def get_cpe_device_config_content(ctx, from_json, file, cpe_id): @cli_util.wrap_exceptions def get_cpe_device_shape(ctx, from_json, cpe_device_shape_id): - if isinstance(cpe_device_shape_id, six.string_types) and len(cpe_device_shape_id.strip()) == 0: + if isinstance(cpe_device_shape_id, str) and len(cpe_device_shape_id.strip()) == 0: raise click.UsageError('Parameter --cpe-device-shape-id cannot be whitespace or empty string') kwargs = {} @@ -6781,7 +6780,7 @@ def get_cpe_device_shape(ctx, from_json, cpe_device_shape_id): @cli_util.wrap_exceptions def get_cross_connect(ctx, from_json, cross_connect_id): - if isinstance(cross_connect_id, six.string_types) and len(cross_connect_id.strip()) == 0: + if isinstance(cross_connect_id, str) and len(cross_connect_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-id cannot be whitespace or empty string') kwargs = {} @@ -6802,7 +6801,7 @@ def get_cross_connect(ctx, from_json, cross_connect_id): @cli_util.wrap_exceptions def get_cross_connect_group(ctx, from_json, cross_connect_group_id): - if isinstance(cross_connect_group_id, six.string_types) and len(cross_connect_group_id.strip()) == 0: + if isinstance(cross_connect_group_id, str) and len(cross_connect_group_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-group-id cannot be whitespace or empty string') kwargs = {} @@ -6823,7 +6822,7 @@ def get_cross_connect_group(ctx, from_json, cross_connect_group_id): @cli_util.wrap_exceptions def get_cross_connect_letter_of_authority(ctx, from_json, cross_connect_id): - if isinstance(cross_connect_id, six.string_types) and len(cross_connect_id.strip()) == 0: + if isinstance(cross_connect_id, str) and len(cross_connect_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-id cannot be whitespace or empty string') kwargs = {} @@ -6844,7 +6843,7 @@ def get_cross_connect_letter_of_authority(ctx, from_json, cross_connect_id): @cli_util.wrap_exceptions def get_cross_connect_status(ctx, from_json, cross_connect_id): - if isinstance(cross_connect_id, six.string_types) and len(cross_connect_id.strip()) == 0: + if isinstance(cross_connect_id, str) and len(cross_connect_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-id cannot be whitespace or empty string') kwargs = {} @@ -6865,7 +6864,7 @@ def get_cross_connect_status(ctx, from_json, cross_connect_id): @cli_util.wrap_exceptions def get_dhcp_options(ctx, from_json, dhcp_id): - if isinstance(dhcp_id, six.string_types) and len(dhcp_id.strip()) == 0: + if isinstance(dhcp_id, str) and len(dhcp_id.strip()) == 0: raise click.UsageError('Parameter --dhcp-id cannot be whitespace or empty string') kwargs = {} @@ -6886,7 +6885,7 @@ def get_dhcp_options(ctx, from_json, dhcp_id): @cli_util.wrap_exceptions def get_drg(ctx, from_json, drg_id): - if isinstance(drg_id, six.string_types) and len(drg_id.strip()) == 0: + if isinstance(drg_id, str) and len(drg_id.strip()) == 0: raise click.UsageError('Parameter --drg-id cannot be whitespace or empty string') kwargs = {} @@ -6907,7 +6906,7 @@ def get_drg(ctx, from_json, drg_id): @cli_util.wrap_exceptions def get_drg_attachment(ctx, from_json, drg_attachment_id): - if isinstance(drg_attachment_id, six.string_types) and len(drg_attachment_id.strip()) == 0: + if isinstance(drg_attachment_id, str) and len(drg_attachment_id.strip()) == 0: raise click.UsageError('Parameter --drg-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -6928,7 +6927,7 @@ def get_drg_attachment(ctx, from_json, drg_attachment_id): @cli_util.wrap_exceptions def get_drg_redundancy_status(ctx, from_json, drg_id): - if isinstance(drg_id, six.string_types) and len(drg_id.strip()) == 0: + if isinstance(drg_id, str) and len(drg_id.strip()) == 0: raise click.UsageError('Parameter --drg-id cannot be whitespace or empty string') kwargs = {} @@ -6950,7 +6949,7 @@ def get_drg_redundancy_status(ctx, from_json, drg_id): @cli_util.wrap_exceptions def get_drg_route_distribution(ctx, from_json, drg_route_distribution_id): - if isinstance(drg_route_distribution_id, six.string_types) and len(drg_route_distribution_id.strip()) == 0: + if isinstance(drg_route_distribution_id, str) and len(drg_route_distribution_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-distribution-id cannot be whitespace or empty string') kwargs = {} @@ -6971,7 +6970,7 @@ def get_drg_route_distribution(ctx, from_json, drg_route_distribution_id): @cli_util.wrap_exceptions def get_drg_route_table(ctx, from_json, drg_route_table_id): - if isinstance(drg_route_table_id, six.string_types) and len(drg_route_table_id.strip()) == 0: + if isinstance(drg_route_table_id, str) and len(drg_route_table_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-table-id cannot be whitespace or empty string') kwargs = {} @@ -6992,7 +6991,7 @@ def get_drg_route_table(ctx, from_json, drg_route_table_id): @cli_util.wrap_exceptions def get_fast_connect_provider_service(ctx, from_json, provider_service_id): - if isinstance(provider_service_id, six.string_types) and len(provider_service_id.strip()) == 0: + if isinstance(provider_service_id, str) and len(provider_service_id.strip()) == 0: raise click.UsageError('Parameter --provider-service-id cannot be whitespace or empty string') kwargs = {} @@ -7014,10 +7013,10 @@ def get_fast_connect_provider_service(ctx, from_json, provider_service_id): @cli_util.wrap_exceptions def get_fast_connect_provider_service_key(ctx, from_json, provider_service_id, provider_service_key_name): - if isinstance(provider_service_id, six.string_types) and len(provider_service_id.strip()) == 0: + if isinstance(provider_service_id, str) and len(provider_service_id.strip()) == 0: raise click.UsageError('Parameter --provider-service-id cannot be whitespace or empty string') - if isinstance(provider_service_key_name, six.string_types) and len(provider_service_key_name.strip()) == 0: + if isinstance(provider_service_key_name, str) and len(provider_service_key_name.strip()) == 0: raise click.UsageError('Parameter --provider-service-key-name cannot be whitespace or empty string') kwargs = {} @@ -7039,7 +7038,7 @@ def get_fast_connect_provider_service_key(ctx, from_json, provider_service_id, p @cli_util.wrap_exceptions def get_internet_gateway(ctx, from_json, ig_id): - if isinstance(ig_id, six.string_types) and len(ig_id.strip()) == 0: + if isinstance(ig_id, str) and len(ig_id.strip()) == 0: raise click.UsageError('Parameter --ig-id cannot be whitespace or empty string') kwargs = {} @@ -7060,7 +7059,7 @@ def get_internet_gateway(ctx, from_json, ig_id): @cli_util.wrap_exceptions def get_ip_sec_connection(ctx, from_json, ipsc_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') kwargs = {} @@ -7083,7 +7082,7 @@ def get_ip_sec_connection(ctx, from_json, ipsc_id): @cli_util.wrap_exceptions def get_ip_sec_connection_device_config(ctx, from_json, ipsc_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') kwargs = {} @@ -7104,7 +7103,7 @@ def get_ip_sec_connection_device_config(ctx, from_json, ipsc_id): @cli_util.wrap_exceptions def get_ip_sec_connection_device_status(ctx, from_json, ipsc_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') kwargs = {} @@ -7126,10 +7125,10 @@ def get_ip_sec_connection_device_status(ctx, from_json, ipsc_id): @cli_util.wrap_exceptions def get_ip_sec_connection_tunnel(ctx, from_json, ipsc_id, tunnel_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') kwargs = {} @@ -7152,10 +7151,10 @@ def get_ip_sec_connection_tunnel(ctx, from_json, ipsc_id, tunnel_id): @cli_util.wrap_exceptions def get_ip_sec_connection_tunnel_error(ctx, from_json, ipsc_id, tunnel_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') kwargs = {} @@ -7178,10 +7177,10 @@ def get_ip_sec_connection_tunnel_error(ctx, from_json, ipsc_id, tunnel_id): @cli_util.wrap_exceptions def get_ip_sec_connection_tunnel_shared_secret(ctx, from_json, ipsc_id, tunnel_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') kwargs = {} @@ -7210,7 +7209,7 @@ def get_ip_sec_connection_tunnel_shared_secret(ctx, from_json, ipsc_id, tunnel_i @cli_util.wrap_exceptions def get_ipsec_cpe_device_config_content(ctx, from_json, file, ipsc_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') kwargs = {} @@ -7254,7 +7253,7 @@ def get_ipsec_cpe_device_config_content(ctx, from_json, file, ipsc_id): @cli_util.wrap_exceptions def get_ipv6(ctx, from_json, ipv6_id): - if isinstance(ipv6_id, six.string_types) and len(ipv6_id.strip()) == 0: + if isinstance(ipv6_id, str) and len(ipv6_id.strip()) == 0: raise click.UsageError('Parameter --ipv6-id cannot be whitespace or empty string') kwargs = {} @@ -7276,7 +7275,7 @@ def get_ipv6(ctx, from_json, ipv6_id): @cli_util.wrap_exceptions def get_local_peering_gateway(ctx, from_json, local_peering_gateway_id): - if isinstance(local_peering_gateway_id, six.string_types) and len(local_peering_gateway_id.strip()) == 0: + if isinstance(local_peering_gateway_id, str) and len(local_peering_gateway_id.strip()) == 0: raise click.UsageError('Parameter --local-peering-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -7297,7 +7296,7 @@ def get_local_peering_gateway(ctx, from_json, local_peering_gateway_id): @cli_util.wrap_exceptions def get_nat_gateway(ctx, from_json, nat_gateway_id): - if isinstance(nat_gateway_id, six.string_types) and len(nat_gateway_id.strip()) == 0: + if isinstance(nat_gateway_id, str) and len(nat_gateway_id.strip()) == 0: raise click.UsageError('Parameter --nat-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -7322,7 +7321,7 @@ def get_nat_gateway(ctx, from_json, nat_gateway_id): @cli_util.wrap_exceptions def get_network_security_group(ctx, from_json, network_security_group_id): - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') kwargs = {} @@ -7376,7 +7375,7 @@ def get_networking_topology(ctx, from_json, compartment_id, access_level, query_ @cli_util.wrap_exceptions def get_private_ip(ctx, from_json, private_ip_id): - if isinstance(private_ip_id, six.string_types) and len(private_ip_id.strip()) == 0: + if isinstance(private_ip_id, str) and len(private_ip_id.strip()) == 0: raise click.UsageError('Parameter --private-ip-id cannot be whitespace or empty string') kwargs = {} @@ -7403,7 +7402,7 @@ def get_private_ip(ctx, from_json, private_ip_id): @cli_util.wrap_exceptions def get_public_ip(ctx, from_json, public_ip_id): - if isinstance(public_ip_id, six.string_types) and len(public_ip_id.strip()) == 0: + if isinstance(public_ip_id, str) and len(public_ip_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-id cannot be whitespace or empty string') kwargs = {} @@ -7472,7 +7471,7 @@ def get_public_ip_by_private_ip_id(ctx, from_json, private_ip_id): @cli_util.wrap_exceptions def get_public_ip_pool(ctx, from_json, public_ip_pool_id): - if isinstance(public_ip_pool_id, six.string_types) and len(public_ip_pool_id.strip()) == 0: + if isinstance(public_ip_pool_id, str) and len(public_ip_pool_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-pool-id cannot be whitespace or empty string') kwargs = {} @@ -7494,7 +7493,7 @@ def get_public_ip_pool(ctx, from_json, public_ip_pool_id): @cli_util.wrap_exceptions def get_remote_peering_connection(ctx, from_json, remote_peering_connection_id): - if isinstance(remote_peering_connection_id, six.string_types) and len(remote_peering_connection_id.strip()) == 0: + if isinstance(remote_peering_connection_id, str) and len(remote_peering_connection_id.strip()) == 0: raise click.UsageError('Parameter --remote-peering-connection-id cannot be whitespace or empty string') kwargs = {} @@ -7515,7 +7514,7 @@ def get_remote_peering_connection(ctx, from_json, remote_peering_connection_id): @cli_util.wrap_exceptions def get_resource_ip_inventory(ctx, from_json, data_request_id): - if isinstance(data_request_id, six.string_types) and len(data_request_id.strip()) == 0: + if isinstance(data_request_id, str) and len(data_request_id.strip()) == 0: raise click.UsageError('Parameter --data-request-id cannot be whitespace or empty string') kwargs = {} @@ -7537,7 +7536,7 @@ def get_resource_ip_inventory(ctx, from_json, data_request_id): @cli_util.wrap_exceptions def get_route_table(ctx, from_json, rt_id): - if isinstance(rt_id, six.string_types) and len(rt_id.strip()) == 0: + if isinstance(rt_id, str) and len(rt_id.strip()) == 0: raise click.UsageError('Parameter --rt-id cannot be whitespace or empty string') kwargs = {} @@ -7558,7 +7557,7 @@ def get_route_table(ctx, from_json, rt_id): @cli_util.wrap_exceptions def get_security_list(ctx, from_json, security_list_id): - if isinstance(security_list_id, six.string_types) and len(security_list_id.strip()) == 0: + if isinstance(security_list_id, str) and len(security_list_id.strip()) == 0: raise click.UsageError('Parameter --security-list-id cannot be whitespace or empty string') kwargs = {} @@ -7579,7 +7578,7 @@ def get_security_list(ctx, from_json, security_list_id): @cli_util.wrap_exceptions def get_service(ctx, from_json, service_id): - if isinstance(service_id, six.string_types) and len(service_id.strip()) == 0: + if isinstance(service_id, str) and len(service_id.strip()) == 0: raise click.UsageError('Parameter --service-id cannot be whitespace or empty string') kwargs = {} @@ -7600,7 +7599,7 @@ def get_service(ctx, from_json, service_id): @cli_util.wrap_exceptions def get_service_gateway(ctx, from_json, service_gateway_id): - if isinstance(service_gateway_id, six.string_types) and len(service_gateway_id.strip()) == 0: + if isinstance(service_gateway_id, str) and len(service_gateway_id.strip()) == 0: raise click.UsageError('Parameter --service-gateway-id cannot be whitespace or empty string') kwargs = {} @@ -7621,7 +7620,7 @@ def get_service_gateway(ctx, from_json, service_gateway_id): @cli_util.wrap_exceptions def get_subnet(ctx, from_json, subnet_id): - if isinstance(subnet_id, six.string_types) and len(subnet_id.strip()) == 0: + if isinstance(subnet_id, str) and len(subnet_id.strip()) == 0: raise click.UsageError('Parameter --subnet-id cannot be whitespace or empty string') kwargs = {} @@ -7642,7 +7641,7 @@ def get_subnet(ctx, from_json, subnet_id): @cli_util.wrap_exceptions def get_subnet_cidr_utilization(ctx, from_json, subnet_id): - if isinstance(subnet_id, six.string_types) and len(subnet_id.strip()) == 0: + if isinstance(subnet_id, str) and len(subnet_id.strip()) == 0: raise click.UsageError('Parameter --subnet-id cannot be whitespace or empty string') kwargs = {} @@ -7664,7 +7663,7 @@ def get_subnet_cidr_utilization(ctx, from_json, subnet_id): @cli_util.wrap_exceptions def get_subnet_ip_inventory(ctx, from_json, subnet_id): - if isinstance(subnet_id, six.string_types) and len(subnet_id.strip()) == 0: + if isinstance(subnet_id, str) and len(subnet_id.strip()) == 0: raise click.UsageError('Parameter --subnet-id cannot be whitespace or empty string') kwargs = {} @@ -7722,10 +7721,10 @@ def get_subnet_topology(ctx, from_json, compartment_id, subnet_id, access_level, @cli_util.wrap_exceptions def get_tunnel_cpe_device_config(ctx, from_json, ipsc_id, tunnel_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') kwargs = {} @@ -7756,10 +7755,10 @@ def get_tunnel_cpe_device_config(ctx, from_json, ipsc_id, tunnel_id): @cli_util.wrap_exceptions def get_tunnel_cpe_device_config_content(ctx, from_json, file, ipsc_id, tunnel_id): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') kwargs = {} @@ -7804,7 +7803,7 @@ def get_tunnel_cpe_device_config_content(ctx, from_json, file, ipsc_id, tunnel_i @cli_util.wrap_exceptions def get_upgrade_status(ctx, from_json, drg_id): - if isinstance(drg_id, six.string_types) and len(drg_id.strip()) == 0: + if isinstance(drg_id, str) and len(drg_id.strip()) == 0: raise click.UsageError('Parameter --drg-id cannot be whitespace or empty string') kwargs = {} @@ -7826,7 +7825,7 @@ def get_upgrade_status(ctx, from_json, drg_id): @cli_util.wrap_exceptions def get_vcn(ctx, from_json, vcn_id): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -7847,7 +7846,7 @@ def get_vcn(ctx, from_json, vcn_id): @cli_util.wrap_exceptions def get_vcn_dns_resolver_association(ctx, from_json, vcn_id): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -7871,7 +7870,7 @@ def get_vcn_dns_resolver_association(ctx, from_json, vcn_id): @cli_util.wrap_exceptions def get_vcn_overlap(ctx, from_json, vcn_id, region_list, compartment_list): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -7934,7 +7933,7 @@ def get_vcn_topology(ctx, from_json, compartment_id, vcn_id, access_level, query @cli_util.wrap_exceptions def get_virtual_circuit(ctx, from_json, virtual_circuit_id): - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') kwargs = {} @@ -7955,7 +7954,7 @@ def get_virtual_circuit(ctx, from_json, virtual_circuit_id): @cli_util.wrap_exceptions def get_vlan(ctx, from_json, vlan_id): - if isinstance(vlan_id, six.string_types) and len(vlan_id.strip()) == 0: + if isinstance(vlan_id, str) and len(vlan_id.strip()) == 0: raise click.UsageError('Parameter --vlan-id cannot be whitespace or empty string') kwargs = {} @@ -7977,7 +7976,7 @@ def get_vlan(ctx, from_json, vlan_id): @cli_util.wrap_exceptions def get_vnic(ctx, from_json, vnic_id): - if isinstance(vnic_id, six.string_types) and len(vnic_id.strip()) == 0: + if isinstance(vnic_id, str) and len(vnic_id.strip()) == 0: raise click.UsageError('Parameter --vnic-id cannot be whitespace or empty string') kwargs = {} @@ -7998,7 +7997,7 @@ def get_vnic(ctx, from_json, vnic_id): @cli_util.wrap_exceptions def get_vtap(ctx, from_json, vtap_id): - if isinstance(vtap_id, six.string_types) and len(vtap_id.strip()) == 0: + if isinstance(vtap_id, str) and len(vtap_id.strip()) == 0: raise click.UsageError('Parameter --vtap-id cannot be whitespace or empty string') kwargs = {} @@ -8024,7 +8023,7 @@ def get_vtap(ctx, from_json, vtap_id): @cli_util.wrap_exceptions def ipv6_vnic_detach(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ipv6_id, if_match): - if isinstance(ipv6_id, six.string_types) and len(ipv6_id.strip()) == 0: + if isinstance(ipv6_id, str) and len(ipv6_id.strip()) == 0: raise click.UsageError('Parameter --ipv6-id cannot be whitespace or empty string') kwargs = {} @@ -8159,7 +8158,7 @@ def list_byoip_allocated_ranges(ctx, from_json, all_pages, page_size, byoip_rang if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} @@ -8548,7 +8547,7 @@ def list_cross_connect_locations(ctx, from_json, all_pages, page_size, compartme @cli_util.wrap_exceptions def list_cross_connect_mappings(ctx, from_json, all_pages, virtual_circuit_id): - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') kwargs = {} @@ -8842,7 +8841,7 @@ def list_drg_route_distribution_statements(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(drg_route_distribution_id, six.string_types) and len(drg_route_distribution_id.strip()) == 0: + if isinstance(drg_route_distribution_id, str) and len(drg_route_distribution_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-distribution-id cannot be whitespace or empty string') kwargs = {} @@ -8964,7 +8963,7 @@ def list_drg_route_rules(ctx, from_json, all_pages, page_size, drg_route_table_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(drg_route_table_id, six.string_types) and len(drg_route_table_id.strip()) == 0: + if isinstance(drg_route_table_id, str) and len(drg_route_table_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-table-id cannot be whitespace or empty string') kwargs = {} @@ -9190,7 +9189,7 @@ def list_fast_connect_provider_virtual_circuit_bandwidth_shapes(ctx, from_json, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(provider_service_id, six.string_types) and len(provider_service_id.strip()) == 0: + if isinstance(provider_service_id, str) and len(provider_service_id.strip()) == 0: raise click.UsageError('Parameter --provider-service-id cannot be whitespace or empty string') kwargs = {} @@ -9380,10 +9379,10 @@ def list_ip_sec_connection_tunnel_routes(ctx, from_json, all_pages, page_size, i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') kwargs = {} @@ -9441,10 +9440,10 @@ def list_ip_sec_connection_tunnel_security_associations(ctx, from_json, all_page if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') kwargs = {} @@ -9499,7 +9498,7 @@ def list_ip_sec_connection_tunnels(ctx, from_json, all_pages, page_size, ipsc_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') kwargs = {} @@ -9790,7 +9789,7 @@ def list_network_security_group_security_rules(ctx, from_json, all_pages, page_s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') kwargs = {} @@ -9850,7 +9849,7 @@ def list_network_security_group_vnics(ctx, from_json, all_pages, page_size, netw if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') kwargs = {} @@ -10604,7 +10603,7 @@ def list_virtual_circuit_associated_tunnels(ctx, from_json, all_pages, page_size if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') kwargs = {} @@ -10700,7 +10699,7 @@ def list_virtual_circuit_bandwidth_shapes(ctx, from_json, all_pages, page_size, @cli_util.wrap_exceptions def list_virtual_circuit_public_prefixes(ctx, from_json, all_pages, virtual_circuit_id, verification_state): - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') kwargs = {} @@ -10944,7 +10943,7 @@ def list_vtaps(ctx, from_json, all_pages, page_size, compartment_id, vcn_id, sou @cli_util.wrap_exceptions def modify_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vcn_id, original_cidr_block, new_cidr_block, if_match): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -11010,7 +11009,7 @@ def modify_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def private_ip_vnic_detach(ctx, from_json, private_ip_id, if_match): - if isinstance(private_ip_id, six.string_types) and len(private_ip_id.strip()) == 0: + if isinstance(private_ip_id, str) and len(private_ip_id.strip()) == 0: raise click.UsageError('Parameter --private-ip-id cannot be whitespace or empty string') kwargs = {} @@ -11035,7 +11034,7 @@ def private_ip_vnic_detach(ctx, from_json, private_ip_id, if_match): @cli_util.wrap_exceptions def remove_drg_route_distribution_statements(ctx, from_json, drg_route_distribution_id, statement_ids): - if isinstance(drg_route_distribution_id, six.string_types) and len(drg_route_distribution_id.strip()) == 0: + if isinstance(drg_route_distribution_id, str) and len(drg_route_distribution_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-distribution-id cannot be whitespace or empty string') kwargs = {} @@ -11064,7 +11063,7 @@ def remove_drg_route_distribution_statements(ctx, from_json, drg_route_distribut @cli_util.wrap_exceptions def remove_drg_route_rules(ctx, from_json, drg_route_table_id, route_rule_ids): - if isinstance(drg_route_table_id, six.string_types) and len(drg_route_table_id.strip()) == 0: + if isinstance(drg_route_table_id, str) and len(drg_route_table_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-table-id cannot be whitespace or empty string') kwargs = {} @@ -11096,7 +11095,7 @@ def remove_drg_route_rules(ctx, from_json, drg_route_table_id, route_rule_ids): @cli_util.wrap_exceptions def remove_export_drg_route_distribution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_attachment_id, if_match): - if isinstance(drg_attachment_id, six.string_types) and len(drg_attachment_id.strip()) == 0: + if isinstance(drg_attachment_id, str) and len(drg_attachment_id.strip()) == 0: raise click.UsageError('Parameter --drg-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -11147,7 +11146,7 @@ def remove_export_drg_route_distribution(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def remove_import_drg_route_distribution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_route_table_id, if_match): - if isinstance(drg_route_table_id, six.string_types) and len(drg_route_table_id.strip()) == 0: + if isinstance(drg_route_table_id, str) and len(drg_route_table_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-table-id cannot be whitespace or empty string') kwargs = {} @@ -11201,7 +11200,7 @@ def remove_import_drg_route_distribution(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def remove_ipv6_subnet_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subnet_id, ipv6_cidr_block, if_match): - if isinstance(subnet_id, six.string_types) and len(subnet_id.strip()) == 0: + if isinstance(subnet_id, str) and len(subnet_id.strip()) == 0: raise click.UsageError('Parameter --subnet-id cannot be whitespace or empty string') kwargs = {} @@ -11272,7 +11271,7 @@ def remove_ipv6_subnet_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def remove_ipv6_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vcn_id, if_match, ipv6_cidr_block): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -11339,7 +11338,7 @@ def remove_ipv6_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def remove_network_security_group_security_rules(ctx, from_json, network_security_group_id, security_rule_ids): - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') kwargs = {} @@ -11371,7 +11370,7 @@ def remove_network_security_group_security_rules(ctx, from_json, network_securit @cli_util.wrap_exceptions def remove_public_ip_pool_capacity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, public_ip_pool_id, cidr_block): - if isinstance(public_ip_pool_id, six.string_types) and len(public_ip_pool_id.strip()) == 0: + if isinstance(public_ip_pool_id, str) and len(public_ip_pool_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-pool-id cannot be whitespace or empty string') kwargs = {} @@ -11428,7 +11427,7 @@ def remove_public_ip_pool_capacity(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def remove_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vcn_id, cidr_block, if_match): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') kwargs = {} @@ -11498,7 +11497,7 @@ def remove_vcn_cidr(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def set_origin_asn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, byoip_range_id, byoasn_id, as_path_prepend_length, if_match): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} @@ -11566,7 +11565,7 @@ def set_origin_asn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def set_origin_asn_to_oracle(ctx, from_json, byoip_range_id, if_match): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} @@ -11602,7 +11601,7 @@ def set_origin_asn_to_oracle(ctx, from_json, byoip_range_id, if_match): @cli_util.wrap_exceptions def update_byoasn(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, byoasn_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(byoasn_id, six.string_types) and len(byoasn_id.strip()) == 0: + if isinstance(byoasn_id, str) and len(byoasn_id.strip()) == 0: raise click.UsageError('Parameter --byoasn-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11678,7 +11677,7 @@ def update_byoasn(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_byoip_range(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, byoip_range_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11760,7 +11759,7 @@ def update_byoip_range(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_capture_filter(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, capture_filter_id, defined_tags, display_name, vtap_capture_filter_rules, flow_log_capture_filter_rules, freeform_tags, if_match): - if isinstance(capture_filter_id, six.string_types) and len(capture_filter_id.strip()) == 0: + if isinstance(capture_filter_id, str) and len(capture_filter_id.strip()) == 0: raise click.UsageError('Parameter --capture-filter-id cannot be whitespace or empty string') if not force: if defined_tags or vtap_capture_filter_rules or flow_log_capture_filter_rules or freeform_tags: @@ -11844,7 +11843,7 @@ def update_capture_filter(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_cpe(ctx, from_json, force, cpe_id, defined_tags, display_name, freeform_tags, cpe_device_shape_id, if_match): - if isinstance(cpe_id, six.string_types) and len(cpe_id.strip()) == 0: + if isinstance(cpe_id, str) and len(cpe_id.strip()) == 0: raise click.UsageError('Parameter --cpe-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -11904,7 +11903,7 @@ def update_cpe(ctx, from_json, force, cpe_id, defined_tags, display_name, freefo @cli_util.wrap_exceptions def update_cross_connect(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cross_connect_id, defined_tags, display_name, freeform_tags, is_active, customer_reference_name, macsec_properties, if_match): - if isinstance(cross_connect_id, six.string_types) and len(cross_connect_id.strip()) == 0: + if isinstance(cross_connect_id, str) and len(cross_connect_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or macsec_properties: @@ -11990,7 +11989,7 @@ def update_cross_connect(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_cross_connect_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cross_connect_group_id, defined_tags, display_name, customer_reference_name, freeform_tags, macsec_properties, if_match): - if isinstance(cross_connect_group_id, six.string_types) and len(cross_connect_group_id.strip()) == 0: + if isinstance(cross_connect_group_id, str) and len(cross_connect_group_id.strip()) == 0: raise click.UsageError('Parameter --cross-connect-group-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or macsec_properties: @@ -12077,7 +12076,7 @@ def update_cross_connect_group(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_dhcp_options(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dhcp_id, defined_tags, display_name, freeform_tags, options, domain_name_type, if_match): - if isinstance(dhcp_id, six.string_types) and len(dhcp_id.strip()) == 0: + if isinstance(dhcp_id, str) and len(dhcp_id.strip()) == 0: raise click.UsageError('Parameter --dhcp-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or options: @@ -12159,7 +12158,7 @@ def update_dhcp_options(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_drg(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_id, defined_tags, default_drg_route_tables, display_name, freeform_tags, if_match): - if isinstance(drg_id, six.string_types) and len(drg_id.strip()) == 0: + if isinstance(drg_id, str) and len(drg_id.strip()) == 0: raise click.UsageError('Parameter --drg-id cannot be whitespace or empty string') if not force: if defined_tags or default_drg_route_tables or freeform_tags: @@ -12249,7 +12248,7 @@ def update_drg(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_drg_attachment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_attachment_id, display_name, drg_route_table_id, network_details, defined_tags, freeform_tags, export_drg_route_distribution_id, route_table_id, if_match): - if isinstance(drg_attachment_id, six.string_types) and len(drg_attachment_id.strip()) == 0: + if isinstance(drg_attachment_id, str) and len(drg_attachment_id.strip()) == 0: raise click.UsageError('Parameter --drg-attachment-id cannot be whitespace or empty string') if not force: if network_details or defined_tags or freeform_tags: @@ -12353,7 +12352,7 @@ def update_drg_attachment(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_drg_attachment_vcn_drg_attachment_network_update_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_attachment_id, display_name, drg_route_table_id, defined_tags, freeform_tags, export_drg_route_distribution_id, route_table_id, if_match, network_details_route_table_id, network_details_vcn_route_type): - if isinstance(drg_attachment_id, six.string_types) and len(drg_attachment_id.strip()) == 0: + if isinstance(drg_attachment_id, str) and len(drg_attachment_id.strip()) == 0: raise click.UsageError('Parameter --drg-attachment-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -12446,7 +12445,7 @@ def update_drg_attachment_vcn_drg_attachment_network_update_details(ctx, from_js @cli_util.wrap_exceptions def update_drg_route_distribution(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_route_distribution_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(drg_route_distribution_id, six.string_types) and len(drg_route_distribution_id.strip()) == 0: + if isinstance(drg_route_distribution_id, str) and len(drg_route_distribution_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-distribution-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -12510,7 +12509,7 @@ def update_drg_route_distribution(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_drg_route_distribution_statements(ctx, from_json, drg_route_distribution_id, statements): - if isinstance(drg_route_distribution_id, six.string_types) and len(drg_route_distribution_id.strip()) == 0: + if isinstance(drg_route_distribution_id, str) and len(drg_route_distribution_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-distribution-id cannot be whitespace or empty string') kwargs = {} @@ -12539,7 +12538,7 @@ def update_drg_route_distribution_statements(ctx, from_json, drg_route_distribut @cli_util.wrap_exceptions def update_drg_route_rules(ctx, from_json, drg_route_table_id, route_rules): - if isinstance(drg_route_table_id, six.string_types) and len(drg_route_table_id.strip()) == 0: + if isinstance(drg_route_table_id, str) and len(drg_route_table_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-table-id cannot be whitespace or empty string') kwargs = {} @@ -12581,7 +12580,7 @@ def update_drg_route_rules(ctx, from_json, drg_route_table_id, route_rules): @cli_util.wrap_exceptions def update_drg_route_table(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_route_table_id, defined_tags, display_name, freeform_tags, import_drg_route_distribution_id, is_ecmp_enabled, if_match): - if isinstance(drg_route_table_id, six.string_types) and len(drg_route_table_id.strip()) == 0: + if isinstance(drg_route_table_id, str) and len(drg_route_table_id.strip()) == 0: raise click.UsageError('Parameter --drg-route-table-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -12666,7 +12665,7 @@ def update_drg_route_table(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_internet_gateway(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ig_id, defined_tags, display_name, freeform_tags, is_enabled, route_table_id, if_match): - if isinstance(ig_id, six.string_types) and len(ig_id.strip()) == 0: + if isinstance(ig_id, str) and len(ig_id.strip()) == 0: raise click.UsageError('Parameter --ig-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -12762,7 +12761,7 @@ def update_internet_gateway(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_ip_sec_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ipsc_id, defined_tags, display_name, freeform_tags, cpe_local_identifier, cpe_local_identifier_type, static_routes, if_match): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or static_routes: @@ -12860,10 +12859,10 @@ def update_ip_sec_connection(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_ip_sec_connection_tunnel(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ipsc_id, tunnel_id, display_name, routing, ike_version, bgp_session_config, oracle_initiation, nat_translation_enabled, phase_one_config, phase_two_config, dpd_config, encryption_domain_config, if_match): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') if not force: if bgp_session_config or phase_one_config or phase_two_config or dpd_config or encryption_domain_config: @@ -12954,10 +12953,10 @@ def update_ip_sec_connection_tunnel(ctx, from_json, force, wait_for_state, max_w @cli_util.wrap_exceptions def update_ip_sec_connection_tunnel_shared_secret(ctx, from_json, ipsc_id, tunnel_id, shared_secret, if_match): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') kwargs = {} @@ -13005,7 +13004,7 @@ def update_ip_sec_connection_tunnel_shared_secret(ctx, from_json, ipsc_id, tunne @cli_util.wrap_exceptions def update_ipv6(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ipv6_id, defined_tags, display_name, freeform_tags, vnic_id, route_table_id, lifetime, if_match): - if isinstance(ipv6_id, six.string_types) and len(ipv6_id.strip()) == 0: + if isinstance(ipv6_id, str) and len(ipv6_id.strip()) == 0: raise click.UsageError('Parameter --ipv6-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13096,7 +13095,7 @@ def update_ipv6(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_local_peering_gateway(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, local_peering_gateway_id, defined_tags, display_name, freeform_tags, security_attributes, route_table_id, if_match): - if isinstance(local_peering_gateway_id, six.string_types) and len(local_peering_gateway_id.strip()) == 0: + if isinstance(local_peering_gateway_id, str) and len(local_peering_gateway_id.strip()) == 0: raise click.UsageError('Parameter --local-peering-gateway-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or security_attributes: @@ -13183,7 +13182,7 @@ def update_local_peering_gateway(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_nat_gateway(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, nat_gateway_id, defined_tags, display_name, freeform_tags, block_traffic, route_table_id, if_match): - if isinstance(nat_gateway_id, six.string_types) and len(nat_gateway_id.strip()) == 0: + if isinstance(nat_gateway_id, str) and len(nat_gateway_id.strip()) == 0: raise click.UsageError('Parameter --nat-gateway-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13272,7 +13271,7 @@ def update_nat_gateway(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_network_security_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_security_group_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13338,7 +13337,7 @@ def update_network_security_group(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_network_security_group_security_rules(ctx, from_json, network_security_group_id, security_rules): - if isinstance(network_security_group_id, six.string_types) and len(network_security_group_id.strip()) == 0: + if isinstance(network_security_group_id, str) and len(network_security_group_id.strip()) == 0: raise click.UsageError('Parameter --network-security-group-id cannot be whitespace or empty string') kwargs = {} @@ -13387,7 +13386,7 @@ def update_network_security_group_security_rules(ctx, from_json, network_securit @cli_util.wrap_exceptions def update_private_ip(ctx, from_json, force, private_ip_id, defined_tags, display_name, freeform_tags, hostname_label, vnic_id, lifetime, route_table_id, if_match): - if isinstance(private_ip_id, six.string_types) and len(private_ip_id.strip()) == 0: + if isinstance(private_ip_id, str) and len(private_ip_id.strip()) == 0: raise click.UsageError('Parameter --private-ip-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13466,7 +13465,7 @@ def update_private_ip(ctx, from_json, force, private_ip_id, defined_tags, displa @cli_util.wrap_exceptions def update_public_ip(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, public_ip_id, defined_tags, display_name, freeform_tags, private_ip_id, if_match): - if isinstance(public_ip_id, six.string_types) and len(public_ip_id.strip()) == 0: + if isinstance(public_ip_id, str) and len(public_ip_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13544,7 +13543,7 @@ def update_public_ip(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_public_ip_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, public_ip_pool_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(public_ip_pool_id, six.string_types) and len(public_ip_pool_id.strip()) == 0: + if isinstance(public_ip_pool_id, str) and len(public_ip_pool_id.strip()) == 0: raise click.UsageError('Parameter --public-ip-pool-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13620,7 +13619,7 @@ def update_public_ip_pool(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_remote_peering_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, remote_peering_connection_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(remote_peering_connection_id, six.string_types) and len(remote_peering_connection_id.strip()) == 0: + if isinstance(remote_peering_connection_id, str) and len(remote_peering_connection_id.strip()) == 0: raise click.UsageError('Parameter --remote-peering-connection-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -13700,7 +13699,7 @@ def update_remote_peering_connection(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_route_table(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, rt_id, defined_tags, display_name, freeform_tags, route_rules, if_match): - if isinstance(rt_id, six.string_types) and len(rt_id.strip()) == 0: + if isinstance(rt_id, str) and len(rt_id.strip()) == 0: raise click.UsageError('Parameter --rt-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or route_rules: @@ -13786,7 +13785,7 @@ def update_route_table(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_security_list(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_list_id, defined_tags, display_name, egress_security_rules, freeform_tags, ingress_security_rules, if_match): - if isinstance(security_list_id, six.string_types) and len(security_list_id.strip()) == 0: + if isinstance(security_list_id, str) and len(security_list_id.strip()) == 0: raise click.UsageError('Parameter --security-list-id cannot be whitespace or empty string') if not force: if defined_tags or egress_security_rules or freeform_tags or ingress_security_rules: @@ -13878,7 +13877,7 @@ def update_security_list(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_service_gateway(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_gateway_id, block_traffic, defined_tags, display_name, freeform_tags, route_table_id, services, if_match): - if isinstance(service_gateway_id, six.string_types) and len(service_gateway_id.strip()) == 0: + if isinstance(service_gateway_id, str) and len(service_gateway_id.strip()) == 0: raise click.UsageError('Parameter --service-gateway-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or services: @@ -13978,7 +13977,7 @@ def update_service_gateway(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_subnet(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, subnet_id, defined_tags, dhcp_options_id, display_name, freeform_tags, route_table_id, security_list_ids, cidr_block, ipv6_cidr_block, ipv6_cidr_blocks, if_match): - if isinstance(subnet_id, six.string_types) and len(subnet_id.strip()) == 0: + if isinstance(subnet_id, str) and len(subnet_id.strip()) == 0: raise click.UsageError('Parameter --subnet-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or security_list_ids or ipv6_cidr_blocks: @@ -14065,10 +14064,10 @@ def update_subnet(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_tunnel_cpe_device_config(ctx, from_json, force, ipsc_id, tunnel_id, tunnel_cpe_device_config, if_match): - if isinstance(ipsc_id, six.string_types) and len(ipsc_id.strip()) == 0: + if isinstance(ipsc_id, str) and len(ipsc_id.strip()) == 0: raise click.UsageError('Parameter --ipsc-id cannot be whitespace or empty string') - if isinstance(tunnel_id, six.string_types) and len(tunnel_id.strip()) == 0: + if isinstance(tunnel_id, str) and len(tunnel_id.strip()) == 0: raise click.UsageError('Parameter --tunnel-id cannot be whitespace or empty string') if not force: if tunnel_cpe_device_config: @@ -14120,7 +14119,7 @@ def update_tunnel_cpe_device_config(ctx, from_json, force, ipsc_id, tunnel_id, t @cli_util.wrap_exceptions def update_vcn(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vcn_id, defined_tags, display_name, freeform_tags, security_attributes, is_zpr_only, if_match): - if isinstance(vcn_id, six.string_types) and len(vcn_id.strip()) == 0: + if isinstance(vcn_id, str) and len(vcn_id.strip()) == 0: raise click.UsageError('Parameter --vcn-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or security_attributes: @@ -14234,7 +14233,7 @@ def update_vcn(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_virtual_circuit(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, virtual_circuit_id, bandwidth_shape_name, cross_connect_mappings, routing_policy, bgp_admin_state, is_bfd_enabled, is_transport_mode, customer_bgp_asn, customer_asn, defined_tags, display_name, freeform_tags, gateway_id, provider_state, provider_service_key_name, reference_comment, ip_mtu, if_match): - if isinstance(virtual_circuit_id, six.string_types) and len(virtual_circuit_id.strip()) == 0: + if isinstance(virtual_circuit_id, str) and len(virtual_circuit_id.strip()) == 0: raise click.UsageError('Parameter --virtual-circuit-id cannot be whitespace or empty string') if not force: if cross_connect_mappings or routing_policy or defined_tags or freeform_tags: @@ -14355,7 +14354,7 @@ def update_virtual_circuit(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_vlan(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vlan_id, defined_tags, display_name, freeform_tags, nsg_ids, route_table_id, cidr_block, if_match): - if isinstance(vlan_id, six.string_types) and len(vlan_id.strip()) == 0: + if isinstance(vlan_id, str) and len(vlan_id.strip()) == 0: raise click.UsageError('Parameter --vlan-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or nsg_ids: @@ -14455,7 +14454,7 @@ def update_vlan(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_vnic(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vnic_id, defined_tags, display_name, freeform_tags, security_attributes, hostname_label, nsg_ids, skip_source_dest_check, route_table_id, if_match): - if isinstance(vnic_id, six.string_types) and len(vnic_id.strip()) == 0: + if isinstance(vnic_id, str) and len(vnic_id.strip()) == 0: raise click.UsageError('Parameter --vnic-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or security_attributes or nsg_ids: @@ -14560,7 +14559,7 @@ def update_vnic(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_vtap(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vtap_id, defined_tags, display_name, freeform_tags, source_id, target_id, target_ip, capture_filter_id, encapsulation_protocol, vxlan_network_identifier, is_vtap_enabled, traffic_mode, max_packet_size, source_private_endpoint_ip, source_private_endpoint_subnet_id, target_type, source_type, if_match): - if isinstance(vtap_id, six.string_types) and len(vtap_id.strip()) == 0: + if isinstance(vtap_id, str) and len(vtap_id.strip()) == 0: raise click.UsageError('Parameter --vtap-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -14666,7 +14665,7 @@ def update_vtap(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def upgrade_drg(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, drg_id): - if isinstance(drg_id, six.string_types) and len(drg_id.strip()) == 0: + if isinstance(drg_id, str) and len(drg_id.strip()) == 0: raise click.UsageError('Parameter --drg-id cannot be whitespace or empty string') kwargs = {} @@ -14727,7 +14726,7 @@ def upgrade_drg(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def validate_byoasn(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, byoasn_id, if_match): - if isinstance(byoasn_id, six.string_types) and len(byoasn_id.strip()) == 0: + if isinstance(byoasn_id, str) and len(byoasn_id.strip()) == 0: raise click.UsageError('Parameter --byoasn-id cannot be whitespace or empty string') kwargs = {} @@ -14789,7 +14788,7 @@ def validate_byoasn(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def validate_byoip_range(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, byoip_range_id): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} @@ -14846,7 +14845,7 @@ def validate_byoip_range(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def withdraw_byoip_range(ctx, from_json, byoip_range_id): - if isinstance(byoip_range_id, six.string_types) and len(byoip_range_id.strip()) == 0: + if isinstance(byoip_range_id, str) and len(byoip_range_id.strip()) == 0: raise click.UsageError('Parameter --byoip-range-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/core/src/oci_cli_virtual_network/virtualnetwork_cli_extended.py b/services/core/src/oci_cli_virtual_network/virtualnetwork_cli_extended.py index e1dd5b584..e2d492d97 100644 --- a/services/core/src/oci_cli_virtual_network/virtualnetwork_cli_extended.py +++ b/services/core/src/oci_cli_virtual_network/virtualnetwork_cli_extended.py @@ -5,7 +5,6 @@ from __future__ import print_function import click import sys -import six # noqa: F401 from services.core.src.oci_cli_virtual_network.generated import virtualnetwork_cli @@ -130,7 +129,7 @@ def assign_private_ip(ctx, from_json, vnic_id, vlan_id, ip_address, display_name def _pre_strip(string): if string is None: return "" - elif isinstance(string, six.string_types): + elif isinstance(string, str): return string.strip() else: raise click.UsageError('Unexpected format for string {} '.format(string)) @@ -517,7 +516,7 @@ def virtual_circuit_bandwidth_shape_group(): def swap_nsg_id_value(kwargs): nsg_id = kwargs.pop('nsg_id') kwargs['network_security_group_id'] = nsg_id - if isinstance(nsg_id, six.string_types) and len(nsg_id.strip()) == 0: + if isinstance(nsg_id, str) and len(nsg_id.strip()) == 0: raise click.UsageError('Parameter --nsg-id cannot be whitespace or empty string') return kwargs diff --git a/services/dashboard_service/src/oci_cli_dashboard/generated/dashboard_cli.py b/services/dashboard_service/src/oci_cli_dashboard/generated/dashboard_cli.py index dae2afdcc..95a82a5f3 100644 --- a/services/dashboard_service/src/oci_cli_dashboard/generated/dashboard_cli.py +++ b/services/dashboard_service/src/oci_cli_dashboard/generated/dashboard_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def dashboard_collection_group(): @cli_util.wrap_exceptions def change_dashboard_group(ctx, from_json, dashboard_id, dashboard_group_id, if_match): - if isinstance(dashboard_id, six.string_types) and len(dashboard_id.strip()) == 0: + if isinstance(dashboard_id, str) and len(dashboard_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-id cannot be whitespace or empty string') kwargs = {} @@ -242,7 +241,7 @@ def create_dashboard_create_v1_dashboard_details(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def delete_dashboard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dashboard_id, if_match, opc_cross_region): - if isinstance(dashboard_id, six.string_types) and len(dashboard_id.strip()) == 0: + if isinstance(dashboard_id, str) and len(dashboard_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-id cannot be whitespace or empty string') kwargs = {} @@ -304,7 +303,7 @@ def delete_dashboard(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def get_dashboard(ctx, from_json, dashboard_id, opc_cross_region): - if isinstance(dashboard_id, six.string_types) and len(dashboard_id.strip()) == 0: + if isinstance(dashboard_id, str) and len(dashboard_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-id cannot be whitespace or empty string') kwargs = {} @@ -405,7 +404,7 @@ def list_dashboards(ctx, from_json, all_pages, page_size, dashboard_group_id, li @cli_util.wrap_exceptions def update_dashboard(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dashboard_id, schema_version, display_name, description, freeform_tags, defined_tags, if_match, opc_cross_region): - if isinstance(dashboard_id, six.string_types) and len(dashboard_id.strip()) == 0: + if isinstance(dashboard_id, str) and len(dashboard_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -487,7 +486,7 @@ def update_dashboard(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_dashboard_update_v1_dashboard_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dashboard_id, display_name, description, freeform_tags, defined_tags, config, widgets, if_match, opc_cross_region): - if isinstance(dashboard_id, six.string_types) and len(dashboard_id.strip()) == 0: + if isinstance(dashboard_id, str) and len(dashboard_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or config or widgets: diff --git a/services/dashboard_service/src/oci_cli_dashboard_group/generated/dashboardgroup_cli.py b/services/dashboard_service/src/oci_cli_dashboard_group/generated/dashboardgroup_cli.py index d0bac09de..b951f033f 100644 --- a/services/dashboard_service/src/oci_cli_dashboard_group/generated/dashboardgroup_cli.py +++ b/services/dashboard_service/src/oci_cli_dashboard_group/generated/dashboardgroup_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def dashboard_group_group(): @cli_util.wrap_exceptions def change_dashboard_group_compartment(ctx, from_json, dashboard_group_id, compartment_id, if_match): - if isinstance(dashboard_group_id, six.string_types) and len(dashboard_group_id.strip()) == 0: + if isinstance(dashboard_group_id, str) and len(dashboard_group_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-group-id cannot be whitespace or empty string') kwargs = {} @@ -162,7 +161,7 @@ def create_dashboard_group(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_dashboard_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dashboard_group_id, if_match, opc_cross_region): - if isinstance(dashboard_group_id, six.string_types) and len(dashboard_group_id.strip()) == 0: + if isinstance(dashboard_group_id, str) and len(dashboard_group_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-group-id cannot be whitespace or empty string') kwargs = {} @@ -224,7 +223,7 @@ def delete_dashboard_group(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def get_dashboard_group(ctx, from_json, dashboard_group_id, opc_cross_region): - if isinstance(dashboard_group_id, six.string_types) and len(dashboard_group_id.strip()) == 0: + if isinstance(dashboard_group_id, str) and len(dashboard_group_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-group-id cannot be whitespace or empty string') kwargs = {} @@ -324,7 +323,7 @@ def list_dashboard_groups(ctx, from_json, all_pages, page_size, compartment_id, @cli_util.wrap_exceptions def update_dashboard_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dashboard_group_id, display_name, description, freeform_tags, defined_tags, if_match, opc_cross_region): - if isinstance(dashboard_group_id, six.string_types) and len(dashboard_group_id.strip()) == 0: + if isinstance(dashboard_group_id, str) and len(dashboard_group_id.strip()) == 0: raise click.UsageError('Parameter --dashboard-group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/data_catalog/src/oci_cli_data_catalog/generated/datacatalog_cli.py b/services/data_catalog/src/oci_cli_data_catalog/generated/datacatalog_cli.py index 9c6f7bbe5..14b015eb0 100644 --- a/services/data_catalog/src/oci_cli_data_catalog/generated/datacatalog_cli.py +++ b/services/data_catalog/src/oci_cli_data_catalog/generated/datacatalog_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -350,7 +349,7 @@ def job_execution_collection_group(): @cli_util.wrap_exceptions def add_catalog_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, type, related_resource_id, message, time_created, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -419,7 +418,7 @@ def add_catalog_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def add_catalog_private_endpoint_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_private_endpoint_id, type, related_resource_id, message, time_created, if_match): - if isinstance(catalog_private_endpoint_id, six.string_types) and len(catalog_private_endpoint_id.strip()) == 0: + if isinstance(catalog_private_endpoint_id, str) and len(catalog_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --catalog-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -486,10 +485,10 @@ def add_catalog_private_endpoint_lock(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def add_data_selector_patterns(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, items, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -550,7 +549,7 @@ def add_data_selector_patterns(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def add_metastore_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, metastore_id, type, related_resource_id, message, time_created, if_match): - if isinstance(metastore_id, six.string_types) and len(metastore_id.strip()) == 0: + if isinstance(metastore_id, str) and len(metastore_id.strip()) == 0: raise click.UsageError('Parameter --metastore-id cannot be whitespace or empty string') kwargs = {} @@ -618,10 +617,10 @@ def add_metastore_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def associate_custom_property(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, type_key, custom_property_ids, is_event_enabled, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(type_key, six.string_types) and len(type_key.strip()) == 0: + if isinstance(type_key, str) and len(type_key.strip()) == 0: raise click.UsageError('Parameter --type-key cannot be whitespace or empty string') kwargs = {} @@ -685,10 +684,10 @@ def associate_custom_property(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def asynchronous_export_data_asset(ctx, from_json, catalog_id, data_asset_key, export_type, export_scope, object_storage_target): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -724,10 +723,10 @@ def asynchronous_export_data_asset(ctx, from_json, catalog_id, data_asset_key, e @cli_util.wrap_exceptions def asynchronous_export_glossary(ctx, from_json, catalog_id, glossary_key, object_storage_target): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') kwargs = {} @@ -763,7 +762,7 @@ def asynchronous_export_glossary(ctx, from_json, catalog_id, glossary_key, objec @cli_util.wrap_exceptions def attach_catalog_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_private_endpoint_id, catalog_id, if_match, is_lock_override): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -827,7 +826,7 @@ def attach_catalog_private_endpoint(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_catalog_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, catalog_id, if_match, is_lock_override): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -891,7 +890,7 @@ def change_catalog_compartment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_catalog_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, catalog_private_endpoint_id, if_match, is_lock_override): - if isinstance(catalog_private_endpoint_id, six.string_types) and len(catalog_private_endpoint_id.strip()) == 0: + if isinstance(catalog_private_endpoint_id, str) and len(catalog_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --catalog-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -955,7 +954,7 @@ def change_catalog_private_endpoint_compartment(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_metastore_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, metastore_id, if_match, is_lock_override): - if isinstance(metastore_id, six.string_types) and len(metastore_id.strip()) == 0: + if isinstance(metastore_id, str) and len(metastore_id.strip()) == 0: raise click.UsageError('Parameter --metastore-id cannot be whitespace or empty string') kwargs = {} @@ -1038,13 +1037,13 @@ def change_metastore_compartment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def create_attribute(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, entity_key, display_name, external_data_type, time_external, business_name, description, is_incremental_data, is_nullable, length, position, precision, scale, min_collection_count, max_collection_count, external_datatype_entity_key, external_parent_attribute_key, custom_property_members, type_key, properties): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -1151,16 +1150,16 @@ def create_attribute(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def create_attribute_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, entity_key, attribute_key, name, term_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(attribute_key, six.string_types) and len(attribute_key.strip()) == 0: + if isinstance(attribute_key, str) and len(attribute_key.strip()) == 0: raise click.UsageError('Parameter --attribute-key cannot be whitespace or empty string') kwargs = {} @@ -1365,10 +1364,10 @@ def create_catalog_private_endpoint(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def create_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, display_name, type_key, properties, description, custom_property_members, enc_properties, is_default): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -1450,10 +1449,10 @@ def create_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def create_custom_property(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, namespace_id, display_name, description, data_type, is_sortable, is_filterable, is_multi_valued, is_hidden, is_editable, is_shown_in_list, is_hidden_in_search, is_event_enabled, allowed_values, properties): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(namespace_id, six.string_types) and len(namespace_id.strip()) == 0: + if isinstance(namespace_id, str) and len(namespace_id.strip()) == 0: raise click.UsageError('Parameter --namespace-id cannot be whitespace or empty string') kwargs = {} @@ -1550,7 +1549,7 @@ def create_custom_property(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def create_data_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, display_name, type_key, description, custom_property_members, properties): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -1616,10 +1615,10 @@ def create_data_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def create_data_asset_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, name, term_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -1695,10 +1694,10 @@ def create_data_asset_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def create_entity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, display_name, time_external, business_name, type_key, description, is_logical, is_partition, folder_key, pattern_key, realized_expression, harvest_status, last_job_key, custom_property_members, properties): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -1793,13 +1792,13 @@ def create_entity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def create_entity_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, entity_key, name, term_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -1872,10 +1871,10 @@ def create_entity_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def create_folder(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, display_name, time_external, business_name, description, custom_property_members, properties, parent_folder_key, last_job_key, harvest_status, type_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -1958,13 +1957,13 @@ def create_folder(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def create_folder_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, folder_key, name, term_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') kwargs = {} @@ -2031,7 +2030,7 @@ def create_folder_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def create_glossary(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, display_name, description, workflow_status, owner, custom_property_members): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -2103,7 +2102,7 @@ def create_glossary(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def create_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, display_name, job_definition_key, description, schedule_cron_expression, time_schedule_begin, time_schedule_end, connection_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -2182,7 +2181,7 @@ def create_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def create_job_definition(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, display_name, job_type, description, is_incremental, data_asset_key, glossary_key, connection_key, is_sample_data_extracted, sample_data_size_in_mbs, properties): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -2275,10 +2274,10 @@ def create_job_definition(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def create_job_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, job_key, sub_type, job_type, parent_key, time_started, time_ended, lifecycle_state, error_code, error_message, schedule_instance_key, process_key, external_url, event_key, data_entity_key, properties): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') kwargs = {} @@ -2445,7 +2444,7 @@ def create_metastore(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def create_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, display_name, description, is_service_defined): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -2512,7 +2511,7 @@ def create_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def create_pattern(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, display_name, description, expression, file_path_prefix, check_file_path_list, is_enable_check_failure_limit, check_failure_limit, properties): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -2596,10 +2595,10 @@ def create_pattern(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def create_term(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, glossary_key, display_name, description, is_allowed_to_have_child_terms, parent_term_key, owner, workflow_status, custom_property_members): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') kwargs = {} @@ -2676,13 +2675,13 @@ def create_term(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def create_term_relationship(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, glossary_key, term_key, display_name, related_term_key, description): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') - if isinstance(term_key, six.string_types) and len(term_key.strip()) == 0: + if isinstance(term_key, str) and len(term_key.strip()) == 0: raise click.UsageError('Parameter --term-key cannot be whitespace or empty string') kwargs = {} @@ -2743,16 +2742,16 @@ def create_term_relationship(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_attribute(ctx, from_json, catalog_id, data_asset_key, entity_key, attribute_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(attribute_key, six.string_types) and len(attribute_key.strip()) == 0: + if isinstance(attribute_key, str) and len(attribute_key.strip()) == 0: raise click.UsageError('Parameter --attribute-key cannot be whitespace or empty string') kwargs = {} @@ -2785,19 +2784,19 @@ def delete_attribute(ctx, from_json, catalog_id, data_asset_key, entity_key, att @cli_util.wrap_exceptions def delete_attribute_tag(ctx, from_json, catalog_id, data_asset_key, entity_key, attribute_key, tag_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(attribute_key, six.string_types) and len(attribute_key.strip()) == 0: + if isinstance(attribute_key, str) and len(attribute_key.strip()) == 0: raise click.UsageError('Parameter --attribute-key cannot be whitespace or empty string') - if isinstance(tag_key, six.string_types) and len(tag_key.strip()) == 0: + if isinstance(tag_key, str) and len(tag_key.strip()) == 0: raise click.UsageError('Parameter --tag-key cannot be whitespace or empty string') kwargs = {} @@ -2831,7 +2830,7 @@ def delete_attribute_tag(ctx, from_json, catalog_id, data_asset_key, entity_key, @cli_util.wrap_exceptions def delete_catalog(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, if_match, is_lock_override): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -2890,7 +2889,7 @@ def delete_catalog(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_catalog_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_private_endpoint_id, if_match, is_lock_override): - if isinstance(catalog_private_endpoint_id, six.string_types) and len(catalog_private_endpoint_id.strip()) == 0: + if isinstance(catalog_private_endpoint_id, str) and len(catalog_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --catalog-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2947,13 +2946,13 @@ def delete_catalog_private_endpoint(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def delete_connection(ctx, from_json, catalog_id, data_asset_key, connection_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') kwargs = {} @@ -2983,13 +2982,13 @@ def delete_connection(ctx, from_json, catalog_id, data_asset_key, connection_key @cli_util.wrap_exceptions def delete_custom_property(ctx, from_json, catalog_id, namespace_id, custom_property_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(namespace_id, six.string_types) and len(namespace_id.strip()) == 0: + if isinstance(namespace_id, str) and len(namespace_id.strip()) == 0: raise click.UsageError('Parameter --namespace-id cannot be whitespace or empty string') - if isinstance(custom_property_key, six.string_types) and len(custom_property_key.strip()) == 0: + if isinstance(custom_property_key, str) and len(custom_property_key.strip()) == 0: raise click.UsageError('Parameter --custom-property-key cannot be whitespace or empty string') kwargs = {} @@ -3018,10 +3017,10 @@ def delete_custom_property(ctx, from_json, catalog_id, namespace_id, custom_prop @cli_util.wrap_exceptions def delete_data_asset(ctx, from_json, catalog_id, data_asset_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -3050,13 +3049,13 @@ def delete_data_asset(ctx, from_json, catalog_id, data_asset_key, if_match): @cli_util.wrap_exceptions def delete_data_asset_tag(ctx, from_json, catalog_id, data_asset_key, tag_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(tag_key, six.string_types) and len(tag_key.strip()) == 0: + if isinstance(tag_key, str) and len(tag_key.strip()) == 0: raise click.UsageError('Parameter --tag-key cannot be whitespace or empty string') kwargs = {} @@ -3086,13 +3085,13 @@ def delete_data_asset_tag(ctx, from_json, catalog_id, data_asset_key, tag_key, i @cli_util.wrap_exceptions def delete_entity(ctx, from_json, catalog_id, data_asset_key, entity_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -3123,16 +3122,16 @@ def delete_entity(ctx, from_json, catalog_id, data_asset_key, entity_key, if_mat @cli_util.wrap_exceptions def delete_entity_tag(ctx, from_json, catalog_id, data_asset_key, entity_key, tag_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(tag_key, six.string_types) and len(tag_key.strip()) == 0: + if isinstance(tag_key, str) and len(tag_key.strip()) == 0: raise click.UsageError('Parameter --tag-key cannot be whitespace or empty string') kwargs = {} @@ -3163,13 +3162,13 @@ def delete_entity_tag(ctx, from_json, catalog_id, data_asset_key, entity_key, ta @cli_util.wrap_exceptions def delete_folder(ctx, from_json, catalog_id, data_asset_key, folder_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') kwargs = {} @@ -3200,16 +3199,16 @@ def delete_folder(ctx, from_json, catalog_id, data_asset_key, folder_key, if_mat @cli_util.wrap_exceptions def delete_folder_tag(ctx, from_json, catalog_id, data_asset_key, folder_key, tag_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') - if isinstance(tag_key, six.string_types) and len(tag_key.strip()) == 0: + if isinstance(tag_key, str) and len(tag_key.strip()) == 0: raise click.UsageError('Parameter --tag-key cannot be whitespace or empty string') kwargs = {} @@ -3239,10 +3238,10 @@ def delete_folder_tag(ctx, from_json, catalog_id, data_asset_key, folder_key, ta @cli_util.wrap_exceptions def delete_glossary(ctx, from_json, catalog_id, glossary_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') kwargs = {} @@ -3270,10 +3269,10 @@ def delete_glossary(ctx, from_json, catalog_id, glossary_key, if_match): @cli_util.wrap_exceptions def delete_job(ctx, from_json, catalog_id, job_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') kwargs = {} @@ -3301,10 +3300,10 @@ def delete_job(ctx, from_json, catalog_id, job_key, if_match): @cli_util.wrap_exceptions def delete_job_definition(ctx, from_json, catalog_id, job_definition_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_definition_key, six.string_types) and len(job_definition_key.strip()) == 0: + if isinstance(job_definition_key, str) and len(job_definition_key.strip()) == 0: raise click.UsageError('Parameter --job-definition-key cannot be whitespace or empty string') kwargs = {} @@ -3335,7 +3334,7 @@ def delete_job_definition(ctx, from_json, catalog_id, job_definition_key, if_mat @cli_util.wrap_exceptions def delete_metastore(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, metastore_id, if_match, is_lock_override): - if isinstance(metastore_id, six.string_types) and len(metastore_id.strip()) == 0: + if isinstance(metastore_id, str) and len(metastore_id.strip()) == 0: raise click.UsageError('Parameter --metastore-id cannot be whitespace or empty string') kwargs = {} @@ -3391,10 +3390,10 @@ def delete_metastore(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_namespace(ctx, from_json, catalog_id, namespace_id, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(namespace_id, six.string_types) and len(namespace_id.strip()) == 0: + if isinstance(namespace_id, str) and len(namespace_id.strip()) == 0: raise click.UsageError('Parameter --namespace-id cannot be whitespace or empty string') kwargs = {} @@ -3422,10 +3421,10 @@ def delete_namespace(ctx, from_json, catalog_id, namespace_id, if_match): @cli_util.wrap_exceptions def delete_pattern(ctx, from_json, catalog_id, pattern_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(pattern_key, six.string_types) and len(pattern_key.strip()) == 0: + if isinstance(pattern_key, str) and len(pattern_key.strip()) == 0: raise click.UsageError('Parameter --pattern-key cannot be whitespace or empty string') kwargs = {} @@ -3454,13 +3453,13 @@ def delete_pattern(ctx, from_json, catalog_id, pattern_key, if_match): @cli_util.wrap_exceptions def delete_term(ctx, from_json, catalog_id, glossary_key, term_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') - if isinstance(term_key, six.string_types) and len(term_key.strip()) == 0: + if isinstance(term_key, str) and len(term_key.strip()) == 0: raise click.UsageError('Parameter --term-key cannot be whitespace or empty string') kwargs = {} @@ -3491,16 +3490,16 @@ def delete_term(ctx, from_json, catalog_id, glossary_key, term_key, if_match): @cli_util.wrap_exceptions def delete_term_relationship(ctx, from_json, catalog_id, glossary_key, term_key, term_relationship_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') - if isinstance(term_key, six.string_types) and len(term_key.strip()) == 0: + if isinstance(term_key, str) and len(term_key.strip()) == 0: raise click.UsageError('Parameter --term-key cannot be whitespace or empty string') - if isinstance(term_relationship_key, six.string_types) and len(term_relationship_key.strip()) == 0: + if isinstance(term_relationship_key, str) and len(term_relationship_key.strip()) == 0: raise click.UsageError('Parameter --term-relationship-key cannot be whitespace or empty string') kwargs = {} @@ -3533,7 +3532,7 @@ def delete_term_relationship(ctx, from_json, catalog_id, glossary_key, term_key, @cli_util.wrap_exceptions def detach_catalog_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_private_endpoint_id, catalog_id, if_match, is_lock_override): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -3598,10 +3597,10 @@ def detach_catalog_private_endpoint(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def disassociate_custom_property(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, type_key, custom_property_ids, is_event_enabled, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(type_key, six.string_types) and len(type_key.strip()) == 0: + if isinstance(type_key, str) and len(type_key.strip()) == 0: raise click.UsageError('Parameter --type-key cannot be whitespace or empty string') kwargs = {} @@ -3660,10 +3659,10 @@ def disassociate_custom_property(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def expand_tree_for_glossary(ctx, from_json, catalog_id, glossary_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') kwargs = {} @@ -3688,10 +3687,10 @@ def expand_tree_for_glossary(ctx, from_json, catalog_id, glossary_key): @cli_util.wrap_exceptions def export_glossary(ctx, from_json, catalog_id, glossary_key, is_relationship_exported): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') kwargs = {} @@ -3725,13 +3724,13 @@ def export_glossary(ctx, from_json, catalog_id, glossary_key, is_relationship_ex @cli_util.wrap_exceptions def fetch_entity_lineage(ctx, from_json, catalog_id, data_asset_key, entity_key, level, direction, is_intra_lineage, intra_lineage_object_key, limit, page, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -3782,16 +3781,16 @@ def fetch_entity_lineage(ctx, from_json, catalog_id, data_asset_key, entity_key, @cli_util.wrap_exceptions def get_attribute(ctx, from_json, catalog_id, data_asset_key, entity_key, attribute_key, is_include_object_relationships, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(attribute_key, six.string_types) and len(attribute_key.strip()) == 0: + if isinstance(attribute_key, str) and len(attribute_key.strip()) == 0: raise click.UsageError('Parameter --attribute-key cannot be whitespace or empty string') kwargs = {} @@ -3825,19 +3824,19 @@ def get_attribute(ctx, from_json, catalog_id, data_asset_key, entity_key, attrib @cli_util.wrap_exceptions def get_attribute_tag(ctx, from_json, catalog_id, data_asset_key, entity_key, attribute_key, tag_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(attribute_key, six.string_types) and len(attribute_key.strip()) == 0: + if isinstance(attribute_key, str) and len(attribute_key.strip()) == 0: raise click.UsageError('Parameter --attribute-key cannot be whitespace or empty string') - if isinstance(tag_key, six.string_types) and len(tag_key.strip()) == 0: + if isinstance(tag_key, str) and len(tag_key.strip()) == 0: raise click.UsageError('Parameter --tag-key cannot be whitespace or empty string') kwargs = {} @@ -3865,7 +3864,7 @@ def get_attribute_tag(ctx, from_json, catalog_id, data_asset_key, entity_key, at @cli_util.wrap_exceptions def get_catalog(ctx, from_json, catalog_id): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -3887,7 +3886,7 @@ def get_catalog(ctx, from_json, catalog_id): @cli_util.wrap_exceptions def get_catalog_private_endpoint(ctx, from_json, catalog_private_endpoint_id): - if isinstance(catalog_private_endpoint_id, six.string_types) and len(catalog_private_endpoint_id.strip()) == 0: + if isinstance(catalog_private_endpoint_id, str) and len(catalog_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --catalog-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -3912,13 +3911,13 @@ def get_catalog_private_endpoint(ctx, from_json, catalog_private_endpoint_id): @cli_util.wrap_exceptions def get_connection(ctx, from_json, catalog_id, data_asset_key, connection_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') kwargs = {} @@ -3947,13 +3946,13 @@ def get_connection(ctx, from_json, catalog_id, data_asset_key, connection_key, f @cli_util.wrap_exceptions def get_custom_property(ctx, from_json, catalog_id, namespace_id, custom_property_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(namespace_id, six.string_types) and len(namespace_id.strip()) == 0: + if isinstance(namespace_id, str) and len(namespace_id.strip()) == 0: raise click.UsageError('Parameter --namespace-id cannot be whitespace or empty string') - if isinstance(custom_property_key, six.string_types) and len(custom_property_key.strip()) == 0: + if isinstance(custom_property_key, str) and len(custom_property_key.strip()) == 0: raise click.UsageError('Parameter --custom-property-key cannot be whitespace or empty string') kwargs = {} @@ -3981,10 +3980,10 @@ def get_custom_property(ctx, from_json, catalog_id, namespace_id, custom_propert @cli_util.wrap_exceptions def get_data_asset(ctx, from_json, catalog_id, data_asset_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -4012,13 +4011,13 @@ def get_data_asset(ctx, from_json, catalog_id, data_asset_key, fields): @cli_util.wrap_exceptions def get_data_asset_tag(ctx, from_json, catalog_id, data_asset_key, tag_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(tag_key, six.string_types) and len(tag_key.strip()) == 0: + if isinstance(tag_key, str) and len(tag_key.strip()) == 0: raise click.UsageError('Parameter --tag-key cannot be whitespace or empty string') kwargs = {} @@ -4048,13 +4047,13 @@ def get_data_asset_tag(ctx, from_json, catalog_id, data_asset_key, tag_key, fiel @cli_util.wrap_exceptions def get_entity(ctx, from_json, catalog_id, data_asset_key, entity_key, is_include_object_relationships, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -4086,16 +4085,16 @@ def get_entity(ctx, from_json, catalog_id, data_asset_key, entity_key, is_includ @cli_util.wrap_exceptions def get_entity_tag(ctx, from_json, catalog_id, data_asset_key, entity_key, tag_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(tag_key, six.string_types) and len(tag_key.strip()) == 0: + if isinstance(tag_key, str) and len(tag_key.strip()) == 0: raise click.UsageError('Parameter --tag-key cannot be whitespace or empty string') kwargs = {} @@ -4126,13 +4125,13 @@ def get_entity_tag(ctx, from_json, catalog_id, data_asset_key, entity_key, tag_k @cli_util.wrap_exceptions def get_folder(ctx, from_json, catalog_id, data_asset_key, folder_key, is_include_object_relationships, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') kwargs = {} @@ -4164,16 +4163,16 @@ def get_folder(ctx, from_json, catalog_id, data_asset_key, folder_key, is_includ @cli_util.wrap_exceptions def get_folder_tag(ctx, from_json, catalog_id, data_asset_key, folder_key, tag_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') - if isinstance(tag_key, six.string_types) and len(tag_key.strip()) == 0: + if isinstance(tag_key, str) and len(tag_key.strip()) == 0: raise click.UsageError('Parameter --tag-key cannot be whitespace or empty string') kwargs = {} @@ -4202,10 +4201,10 @@ def get_folder_tag(ctx, from_json, catalog_id, data_asset_key, folder_key, tag_k @cli_util.wrap_exceptions def get_glossary(ctx, from_json, catalog_id, glossary_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') kwargs = {} @@ -4232,10 +4231,10 @@ def get_glossary(ctx, from_json, catalog_id, glossary_key, fields): @cli_util.wrap_exceptions def get_job(ctx, from_json, catalog_id, job_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') kwargs = {} @@ -4262,10 +4261,10 @@ def get_job(ctx, from_json, catalog_id, job_key, fields): @cli_util.wrap_exceptions def get_job_definition(ctx, from_json, catalog_id, job_definition_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_definition_key, six.string_types) and len(job_definition_key.strip()) == 0: + if isinstance(job_definition_key, str) and len(job_definition_key.strip()) == 0: raise click.UsageError('Parameter --job-definition-key cannot be whitespace or empty string') kwargs = {} @@ -4293,13 +4292,13 @@ def get_job_definition(ctx, from_json, catalog_id, job_definition_key, fields): @cli_util.wrap_exceptions def get_job_execution(ctx, from_json, catalog_id, job_key, job_execution_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') - if isinstance(job_execution_key, six.string_types) and len(job_execution_key.strip()) == 0: + if isinstance(job_execution_key, str) and len(job_execution_key.strip()) == 0: raise click.UsageError('Parameter --job-execution-key cannot be whitespace or empty string') kwargs = {} @@ -4329,16 +4328,16 @@ def get_job_execution(ctx, from_json, catalog_id, job_key, job_execution_key, fi @cli_util.wrap_exceptions def get_job_log(ctx, from_json, catalog_id, job_key, job_execution_key, job_log_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') - if isinstance(job_execution_key, six.string_types) and len(job_execution_key.strip()) == 0: + if isinstance(job_execution_key, str) and len(job_execution_key.strip()) == 0: raise click.UsageError('Parameter --job-execution-key cannot be whitespace or empty string') - if isinstance(job_log_key, six.string_types) and len(job_log_key.strip()) == 0: + if isinstance(job_log_key, str) and len(job_log_key.strip()) == 0: raise click.UsageError('Parameter --job-log-key cannot be whitespace or empty string') kwargs = {} @@ -4369,16 +4368,16 @@ def get_job_log(ctx, from_json, catalog_id, job_key, job_execution_key, job_log_ @cli_util.wrap_exceptions def get_job_metrics(ctx, from_json, catalog_id, job_key, job_execution_key, job_metrics_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') - if isinstance(job_execution_key, six.string_types) and len(job_execution_key.strip()) == 0: + if isinstance(job_execution_key, str) and len(job_execution_key.strip()) == 0: raise click.UsageError('Parameter --job-execution-key cannot be whitespace or empty string') - if isinstance(job_metrics_key, six.string_types) and len(job_metrics_key.strip()) == 0: + if isinstance(job_metrics_key, str) and len(job_metrics_key.strip()) == 0: raise click.UsageError('Parameter --job-metrics-key cannot be whitespace or empty string') kwargs = {} @@ -4405,7 +4404,7 @@ def get_job_metrics(ctx, from_json, catalog_id, job_key, job_execution_key, job_ @cli_util.wrap_exceptions def get_metastore(ctx, from_json, metastore_id): - if isinstance(metastore_id, six.string_types) and len(metastore_id.strip()) == 0: + if isinstance(metastore_id, str) and len(metastore_id.strip()) == 0: raise click.UsageError('Parameter --metastore-id cannot be whitespace or empty string') kwargs = {} @@ -4429,10 +4428,10 @@ def get_metastore(ctx, from_json, metastore_id): @cli_util.wrap_exceptions def get_namespace(ctx, from_json, catalog_id, namespace_id, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(namespace_id, six.string_types) and len(namespace_id.strip()) == 0: + if isinstance(namespace_id, str) and len(namespace_id.strip()) == 0: raise click.UsageError('Parameter --namespace-id cannot be whitespace or empty string') kwargs = {} @@ -4459,10 +4458,10 @@ def get_namespace(ctx, from_json, catalog_id, namespace_id, fields): @cli_util.wrap_exceptions def get_pattern(ctx, from_json, catalog_id, pattern_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(pattern_key, six.string_types) and len(pattern_key.strip()) == 0: + if isinstance(pattern_key, str) and len(pattern_key.strip()) == 0: raise click.UsageError('Parameter --pattern-key cannot be whitespace or empty string') kwargs = {} @@ -4490,13 +4489,13 @@ def get_pattern(ctx, from_json, catalog_id, pattern_key, fields): @cli_util.wrap_exceptions def get_term(ctx, from_json, catalog_id, glossary_key, term_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') - if isinstance(term_key, six.string_types) and len(term_key.strip()) == 0: + if isinstance(term_key, str) and len(term_key.strip()) == 0: raise click.UsageError('Parameter --term-key cannot be whitespace or empty string') kwargs = {} @@ -4526,16 +4525,16 @@ def get_term(ctx, from_json, catalog_id, glossary_key, term_key, fields): @cli_util.wrap_exceptions def get_term_relationship(ctx, from_json, catalog_id, glossary_key, term_key, term_relationship_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') - if isinstance(term_key, six.string_types) and len(term_key.strip()) == 0: + if isinstance(term_key, str) and len(term_key.strip()) == 0: raise click.UsageError('Parameter --term-key cannot be whitespace or empty string') - if isinstance(term_relationship_key, six.string_types) and len(term_relationship_key.strip()) == 0: + if isinstance(term_relationship_key, str) and len(term_relationship_key.strip()) == 0: raise click.UsageError('Parameter --term-relationship-key cannot be whitespace or empty string') kwargs = {} @@ -4564,10 +4563,10 @@ def get_term_relationship(ctx, from_json, catalog_id, glossary_key, term_key, te @cli_util.wrap_exceptions def get_type(ctx, from_json, catalog_id, type_key, fields): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(type_key, six.string_types) and len(type_key.strip()) == 0: + if isinstance(type_key, str) and len(type_key.strip()) == 0: raise click.UsageError('Parameter --type-key cannot be whitespace or empty string') kwargs = {} @@ -4592,7 +4591,7 @@ def get_type(ctx, from_json, catalog_id, type_key, fields): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4618,10 +4617,10 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def import_connection(ctx, from_json, catalog_id, data_asset_key, connection_payload, connection_detail, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -4658,10 +4657,10 @@ def import_connection(ctx, from_json, catalog_id, data_asset_key, connection_pay @cli_util.wrap_exceptions def import_data_asset(ctx, from_json, catalog_id, data_asset_key, import_file_contents, import_type, is_missing_value_ignored): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -4695,10 +4694,10 @@ def import_data_asset(ctx, from_json, catalog_id, data_asset_key, import_file_co @cli_util.wrap_exceptions def import_glossary(ctx, from_json, catalog_id, glossary_key, glossary_file_contents, is_relationship_imported): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') kwargs = {} @@ -4732,10 +4731,10 @@ def import_glossary(ctx, from_json, catalog_id, glossary_key, glossary_file_cont @cli_util.wrap_exceptions def import_lineage(ctx, from_json, catalog_id, data_asset_key, lineage_payload): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -4777,13 +4776,13 @@ def list_aggregated_physical_entities(ctx, from_json, all_pages, page_size, cata if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -4862,16 +4861,16 @@ def list_attribute_tags(ctx, from_json, all_pages, page_size, catalog_id, data_a if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(attribute_key, six.string_types) and len(attribute_key.strip()) == 0: + if isinstance(attribute_key, str) and len(attribute_key.strip()) == 0: raise click.UsageError('Parameter --attribute-key cannot be whitespace or empty string') kwargs = {} @@ -4972,13 +4971,13 @@ def list_attributes(ctx, from_json, all_pages, page_size, catalog_id, data_asset if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -5211,10 +5210,10 @@ def list_connections(ctx, from_json, all_pages, page_size, catalog_id, data_asse if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -5307,10 +5306,10 @@ def list_custom_properties(ctx, from_json, all_pages, page_size, catalog_id, nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(namespace_id, six.string_types) and len(namespace_id.strip()) == 0: + if isinstance(namespace_id, str) and len(namespace_id.strip()) == 0: raise click.UsageError('Parameter --namespace-id cannot be whitespace or empty string') kwargs = {} @@ -5398,10 +5397,10 @@ def list_data_asset_tags(ctx, from_json, all_pages, page_size, catalog_id, data_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -5485,7 +5484,7 @@ def list_data_assets(ctx, from_json, all_pages, page_size, catalog_id, display_n if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -5565,10 +5564,10 @@ def list_derived_logical_entities(ctx, from_json, all_pages, page_size, catalog_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(pattern_key, six.string_types) and len(pattern_key.strip()) == 0: + if isinstance(pattern_key, str) and len(pattern_key.strip()) == 0: raise click.UsageError('Parameter --pattern-key cannot be whitespace or empty string') kwargs = {} @@ -5655,10 +5654,10 @@ def list_entities(ctx, from_json, all_pages, page_size, catalog_id, data_asset_k if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -5771,13 +5770,13 @@ def list_entity_tags(ctx, from_json, all_pages, page_size, catalog_id, data_asse if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -5863,13 +5862,13 @@ def list_folder_tags(ctx, from_json, all_pages, page_size, catalog_id, data_asse if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') kwargs = {} @@ -5963,10 +5962,10 @@ def list_folders(ctx, from_json, all_pages, page_size, catalog_id, data_asset_ke if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -6066,7 +6065,7 @@ def list_glossaries(ctx, from_json, all_pages, page_size, catalog_id, display_na if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -6154,7 +6153,7 @@ def list_job_definitions(ctx, from_json, all_pages, page_size, catalog_id, displ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -6259,10 +6258,10 @@ def list_job_executions(ctx, from_json, all_pages, page_size, catalog_id, job_ke if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') kwargs = {} @@ -6365,13 +6364,13 @@ def list_job_logs(ctx, from_json, all_pages, page_size, catalog_id, job_key, job if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') - if isinstance(job_execution_key, six.string_types) and len(job_execution_key.strip()) == 0: + if isinstance(job_execution_key, str) and len(job_execution_key.strip()) == 0: raise click.UsageError('Parameter --job-execution-key cannot be whitespace or empty string') kwargs = {} @@ -6463,13 +6462,13 @@ def list_job_metrics(ctx, from_json, all_pages, page_size, catalog_id, job_key, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') - if isinstance(job_execution_key, six.string_types) and len(job_execution_key.strip()) == 0: + if isinstance(job_execution_key, str) and len(job_execution_key.strip()) == 0: raise click.UsageError('Parameter --job-execution-key cannot be whitespace or empty string') kwargs = {} @@ -6577,7 +6576,7 @@ def list_jobs(ctx, from_json, all_pages, page_size, catalog_id, display_name, di if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -6740,7 +6739,7 @@ def list_namespaces(ctx, from_json, all_pages, page_size, catalog_id, display_na if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -6821,7 +6820,7 @@ def list_patterns(ctx, from_json, all_pages, page_size, catalog_id, display_name if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -6907,13 +6906,13 @@ def list_rules(ctx, from_json, all_pages, page_size, catalog_id, data_asset_key, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') kwargs = {} @@ -7002,7 +7001,7 @@ def list_tags(ctx, from_json, all_pages, page_size, catalog_id, display_name, di if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -7073,13 +7072,13 @@ def list_term_relationships(ctx, from_json, all_pages, page_size, catalog_id, gl if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') - if isinstance(term_key, six.string_types) and len(term_key.strip()) == 0: + if isinstance(term_key, str) and len(term_key.strip()) == 0: raise click.UsageError('Parameter --term-key cannot be whitespace or empty string') kwargs = {} @@ -7159,10 +7158,10 @@ def list_terms(ctx, from_json, all_pages, page_size, catalog_id, glossary_key, d if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') kwargs = {} @@ -7246,7 +7245,7 @@ def list_types(ctx, from_json, all_pages, page_size, catalog_id, name, lifecycle if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -7319,7 +7318,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -7376,7 +7375,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -7476,7 +7475,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def object_stats(ctx, from_json, catalog_id, sort_by, sort_order, limit, page): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -7512,10 +7511,10 @@ def object_stats(ctx, from_json, catalog_id, sort_by, sort_order, limit, page): @cli_util.wrap_exceptions def parse_connection(ctx, from_json, catalog_id, data_asset_key, connection_detail, connection_payload, wallet_secret_id, wallet_secret_name, connection_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -7560,7 +7559,7 @@ def parse_connection(ctx, from_json, catalog_id, data_asset_key, connection_deta @cli_util.wrap_exceptions def process_recommendation(ctx, from_json, catalog_id, recommendation_key, recommendation_status, properties, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -7597,7 +7596,7 @@ def process_recommendation(ctx, from_json, catalog_id, recommendation_key, recom @cli_util.wrap_exceptions def recommendations(ctx, from_json, catalog_id, recommendation_type, source_object_key, source_object_type, recommendation_status): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -7632,7 +7631,7 @@ def recommendations(ctx, from_json, catalog_id, recommendation_type, source_obje @cli_util.wrap_exceptions def remove_catalog_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, type, related_resource_id, message, time_created, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -7701,7 +7700,7 @@ def remove_catalog_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def remove_catalog_private_endpoint_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_private_endpoint_id, type, related_resource_id, message, time_created, if_match): - if isinstance(catalog_private_endpoint_id, six.string_types) and len(catalog_private_endpoint_id.strip()) == 0: + if isinstance(catalog_private_endpoint_id, str) and len(catalog_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --catalog-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -7768,10 +7767,10 @@ def remove_catalog_private_endpoint_lock(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def remove_data_selector_patterns(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, items, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -7832,7 +7831,7 @@ def remove_data_selector_patterns(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def remove_metastore_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, metastore_id, type, related_resource_id, message, time_created, if_match): - if isinstance(metastore_id, six.string_types) and len(metastore_id.strip()) == 0: + if isinstance(metastore_id, str) and len(metastore_id.strip()) == 0: raise click.UsageError('Parameter --metastore-id cannot be whitespace or empty string') kwargs = {} @@ -7908,7 +7907,7 @@ def remove_metastore_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def search_criteria(ctx, from_json, catalog_id, query_parameterconflict, faceted_query, dimensions, sort, filters, display_name, name, lifecycle_state, timeout, sort_by, sort_order, limit, page): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -7968,7 +7967,7 @@ def search_criteria(ctx, from_json, catalog_id, query_parameterconflict, faceted @cli_util.wrap_exceptions def suggest_matches(ctx, from_json, catalog_id, input_text, timeout, limit): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -8001,10 +8000,10 @@ def suggest_matches(ctx, from_json, catalog_id, input_text, timeout, limit): @cli_util.wrap_exceptions def synchronous_export_data_asset(ctx, from_json, file, catalog_id, data_asset_key, export_type, export_scope): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -8059,13 +8058,13 @@ def synchronous_export_data_asset(ctx, from_json, file, catalog_id, data_asset_k @cli_util.wrap_exceptions def test_connection(ctx, from_json, catalog_id, data_asset_key, connection_key): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') kwargs = {} @@ -8116,16 +8115,16 @@ def test_connection(ctx, from_json, catalog_id, data_asset_key, connection_key): @cli_util.wrap_exceptions def update_attribute(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, entity_key, attribute_key, display_name, business_name, description, external_data_type, is_incremental_data, is_nullable, length, position, precision, scale, time_external, min_collection_count, max_collection_count, external_datatype_entity_key, external_parent_attribute_key, custom_property_members, properties, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') - if isinstance(attribute_key, six.string_types) and len(attribute_key.strip()) == 0: + if isinstance(attribute_key, str) and len(attribute_key.strip()) == 0: raise click.UsageError('Parameter --attribute-key cannot be whitespace or empty string') if not force: if custom_property_members or properties: @@ -8243,7 +8242,7 @@ def update_attribute(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_catalog(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, display_name, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -8319,7 +8318,7 @@ def update_catalog(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_catalog_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_private_endpoint_id, dns_zones, freeform_tags, defined_tags, display_name, if_match, is_lock_override): - if isinstance(catalog_private_endpoint_id, six.string_types) and len(catalog_private_endpoint_id.strip()) == 0: + if isinstance(catalog_private_endpoint_id, str) and len(catalog_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --catalog-private-endpoint-id cannot be whitespace or empty string') if not force: if dns_zones or freeform_tags or defined_tags: @@ -8407,13 +8406,13 @@ def update_catalog_private_endpoint(ctx, from_json, force, wait_for_state, max_w @cli_util.wrap_exceptions def update_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, connection_key, description, display_name, custom_property_members, properties, enc_properties, is_default, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if custom_property_members or properties or enc_properties: @@ -8507,13 +8506,13 @@ def update_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_custom_property(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, namespace_id, custom_property_key, display_name, description, is_sortable, is_filterable, is_multi_valued, is_hidden, is_editable, is_shown_in_list, is_hidden_in_search, is_event_enabled, allowed_values, properties, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(namespace_id, six.string_types) and len(namespace_id.strip()) == 0: + if isinstance(namespace_id, str) and len(namespace_id.strip()) == 0: raise click.UsageError('Parameter --namespace-id cannot be whitespace or empty string') - if isinstance(custom_property_key, six.string_types) and len(custom_property_key.strip()) == 0: + if isinstance(custom_property_key, str) and len(custom_property_key.strip()) == 0: raise click.UsageError('Parameter --custom-property-key cannot be whitespace or empty string') if not force: if allowed_values or properties: @@ -8618,10 +8617,10 @@ def update_custom_property(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_data_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, display_name, description, custom_property_members, properties, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if custom_property_members or properties: @@ -8711,13 +8710,13 @@ def update_data_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_entity(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, entity_key, display_name, business_name, description, time_external, is_logical, is_partition, folder_key, pattern_key, realized_expression, harvest_status, last_job_key, custom_property_members, properties, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(entity_key, six.string_types) and len(entity_key.strip()) == 0: + if isinstance(entity_key, str) and len(entity_key.strip()) == 0: raise click.UsageError('Parameter --entity-key cannot be whitespace or empty string') if not force: if custom_property_members or properties: @@ -8831,13 +8830,13 @@ def update_entity(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_folder(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, folder_key, display_name, business_name, description, parent_folder_key, custom_property_members, properties, time_external, harvest_status, last_job_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') if not force: if custom_property_members or properties: @@ -8934,10 +8933,10 @@ def update_folder(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_glossary(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, glossary_key, display_name, description, owner, workflow_status, custom_property_members, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') if not force: if custom_property_members: @@ -9019,10 +9018,10 @@ def update_glossary(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, job_key, display_name, description, schedule_cron_expression, time_schedule_begin, time_schedule_end, connection_key, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_key, six.string_types) and len(job_key.strip()) == 0: + if isinstance(job_key, str) and len(job_key.strip()) == 0: raise click.UsageError('Parameter --job-key cannot be whitespace or empty string') kwargs = {} @@ -9107,10 +9106,10 @@ def update_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def update_job_definition(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, job_definition_key, display_name, is_incremental, data_asset_key, glossary_key, description, connection_key, is_sample_data_extracted, sample_data_size_in_mbs, properties, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(job_definition_key, six.string_types) and len(job_definition_key.strip()) == 0: + if isinstance(job_definition_key, str) and len(job_definition_key.strip()) == 0: raise click.UsageError('Parameter --job-definition-key cannot be whitespace or empty string') if not force: if properties: @@ -9202,7 +9201,7 @@ def update_job_definition(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_metastore(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, metastore_id, display_name, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(metastore_id, six.string_types) and len(metastore_id.strip()) == 0: + if isinstance(metastore_id, str) and len(metastore_id.strip()) == 0: raise click.UsageError('Parameter --metastore-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -9276,10 +9275,10 @@ def update_metastore(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, namespace_id, display_name, description, is_service_defined, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(namespace_id, six.string_types) and len(namespace_id.strip()) == 0: + if isinstance(namespace_id, str) and len(namespace_id.strip()) == 0: raise click.UsageError('Parameter --namespace-id cannot be whitespace or empty string') kwargs = {} @@ -9354,10 +9353,10 @@ def update_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def update_pattern(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, pattern_key, display_name, description, expression, file_path_prefix, check_file_path_list, is_enable_check_failure_limit, check_failure_limit, properties, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(pattern_key, six.string_types) and len(pattern_key.strip()) == 0: + if isinstance(pattern_key, str) and len(pattern_key.strip()) == 0: raise click.UsageError('Parameter --pattern-key cannot be whitespace or empty string') if not force: if check_file_path_list or properties: @@ -9452,13 +9451,13 @@ def update_pattern(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_term(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, glossary_key, term_key, display_name, description, parent_term_key, owner, workflow_status, custom_property_members, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') - if isinstance(term_key, six.string_types) and len(term_key.strip()) == 0: + if isinstance(term_key, str) and len(term_key.strip()) == 0: raise click.UsageError('Parameter --term-key cannot be whitespace or empty string') if not force: if custom_property_members: @@ -9542,16 +9541,16 @@ def update_term(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_term_relationship(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, glossary_key, term_key, term_relationship_key, display_name, description, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(glossary_key, six.string_types) and len(glossary_key.strip()) == 0: + if isinstance(glossary_key, str) and len(glossary_key.strip()) == 0: raise click.UsageError('Parameter --glossary-key cannot be whitespace or empty string') - if isinstance(term_key, six.string_types) and len(term_key.strip()) == 0: + if isinstance(term_key, str) and len(term_key.strip()) == 0: raise click.UsageError('Parameter --term-key cannot be whitespace or empty string') - if isinstance(term_relationship_key, six.string_types) and len(term_relationship_key.strip()) == 0: + if isinstance(term_relationship_key, str) and len(term_relationship_key.strip()) == 0: raise click.UsageError('Parameter --term-relationship-key cannot be whitespace or empty string') kwargs = {} @@ -9619,13 +9618,13 @@ def update_term_relationship(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def upload_credentials(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_id, data_asset_key, connection_key, credential_payload, connection_detail, if_match): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') kwargs = {} @@ -9686,7 +9685,7 @@ def upload_credentials(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def users(ctx, from_json, catalog_id, sort_by, sort_order, limit, page): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') kwargs = {} @@ -9719,10 +9718,10 @@ def users(ctx, from_json, catalog_id, sort_by, sort_order, limit, page): @cli_util.wrap_exceptions def validate_connection(ctx, from_json, catalog_id, data_asset_key, connection_detail, connection_payload): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -9764,10 +9763,10 @@ def validate_connection(ctx, from_json, catalog_id, data_asset_key, connection_d @cli_util.wrap_exceptions def validate_pattern(ctx, from_json, catalog_id, pattern_key, expression, file_path_prefix, check_file_path_list, check_failure_limit): - if isinstance(catalog_id, six.string_types) and len(catalog_id.strip()) == 0: + if isinstance(catalog_id, str) and len(catalog_id.strip()) == 0: raise click.UsageError('Parameter --catalog-id cannot be whitespace or empty string') - if isinstance(pattern_key, six.string_types) and len(pattern_key.strip()) == 0: + if isinstance(pattern_key, str) and len(pattern_key.strip()) == 0: raise click.UsageError('Parameter --pattern-key cannot be whitespace or empty string') kwargs = {} 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 d6e508c0e..dd1b2094b 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 @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -121,7 +120,7 @@ def sql_endpoint_group(): @cli_util.wrap_exceptions def cascading_delete_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, application_id, if_match): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') kwargs = {} @@ -174,7 +173,7 @@ def cascading_delete_application(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def change_application_compartment(ctx, from_json, application_id, compartment_id, if_match): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') kwargs = {} @@ -205,7 +204,7 @@ def change_application_compartment(ctx, from_json, application_id, compartment_i @cli_util.wrap_exceptions def change_pool_compartment(ctx, from_json, pool_id, compartment_id, if_match): - if isinstance(pool_id, six.string_types) and len(pool_id.strip()) == 0: + if isinstance(pool_id, str) and len(pool_id.strip()) == 0: raise click.UsageError('Parameter --pool-id cannot be whitespace or empty string') kwargs = {} @@ -239,7 +238,7 @@ def change_pool_compartment(ctx, from_json, pool_id, compartment_id, if_match): @cli_util.wrap_exceptions def change_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, private_endpoint_id, compartment_id, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -297,7 +296,7 @@ def change_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def change_run_compartment(ctx, from_json, run_id, compartment_id, if_match): - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') kwargs = {} @@ -331,7 +330,7 @@ def change_run_compartment(ctx, from_json, run_id, compartment_id, if_match): @cli_util.wrap_exceptions def change_sql_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_endpoint_id, compartment_id, if_match): - if isinstance(sql_endpoint_id, six.string_types) and len(sql_endpoint_id.strip()) == 0: + if isinstance(sql_endpoint_id, str) and len(sql_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --sql-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -947,7 +946,7 @@ def create_sql_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def create_statement(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, code, run_id): - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') kwargs = {} @@ -1002,7 +1001,7 @@ def create_statement(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, application_id, if_match): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') kwargs = {} @@ -1066,7 +1065,7 @@ def delete_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pool_id, if_match): - if isinstance(pool_id, six.string_types) and len(pool_id.strip()) == 0: + if isinstance(pool_id, str) and len(pool_id.strip()) == 0: raise click.UsageError('Parameter --pool-id cannot be whitespace or empty string') kwargs = {} @@ -1130,7 +1129,7 @@ def delete_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, private_endpoint_id, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1186,7 +1185,7 @@ def delete_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, run_id, if_match): - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') kwargs = {} @@ -1250,7 +1249,7 @@ def delete_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_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: + if isinstance(sql_endpoint_id, str) and len(sql_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --sql-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1304,10 +1303,10 @@ def delete_sql_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_statement(ctx, from_json, run_id, statement_id, if_match): - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') - if isinstance(statement_id, six.string_types) and len(statement_id.strip()) == 0: + if isinstance(statement_id, str) and len(statement_id.strip()) == 0: raise click.UsageError('Parameter --statement-id cannot be whitespace or empty string') kwargs = {} @@ -1332,7 +1331,7 @@ def delete_statement(ctx, from_json, run_id, statement_id, if_match): @cli_util.wrap_exceptions def get_application(ctx, from_json, application_id): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') kwargs = {} @@ -1354,7 +1353,7 @@ def get_application(ctx, from_json, application_id): @cli_util.wrap_exceptions def get_pool(ctx, from_json, pool_id): - if isinstance(pool_id, six.string_types) and len(pool_id.strip()) == 0: + if isinstance(pool_id, str) and len(pool_id.strip()) == 0: raise click.UsageError('Parameter --pool-id cannot be whitespace or empty string') kwargs = {} @@ -1376,7 +1375,7 @@ def get_pool(ctx, from_json, pool_id): @cli_util.wrap_exceptions def get_private_endpoint(ctx, from_json, private_endpoint_id): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1398,7 +1397,7 @@ def get_private_endpoint(ctx, from_json, private_endpoint_id): @cli_util.wrap_exceptions def get_run(ctx, from_json, run_id): - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') kwargs = {} @@ -1422,10 +1421,10 @@ def get_run(ctx, from_json, run_id): @cli_util.wrap_exceptions def get_run_log(ctx, from_json, file, run_id, name): - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') kwargs = {} @@ -1470,7 +1469,7 @@ def get_run_log(ctx, from_json, file, run_id, name): @cli_util.wrap_exceptions def get_sql_endpoint(ctx, from_json, sql_endpoint_id): - if isinstance(sql_endpoint_id, six.string_types) and len(sql_endpoint_id.strip()) == 0: + if isinstance(sql_endpoint_id, str) and len(sql_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --sql-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1493,10 +1492,10 @@ def get_sql_endpoint(ctx, from_json, sql_endpoint_id): @cli_util.wrap_exceptions def get_statement(ctx, from_json, run_id, statement_id): - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') - if isinstance(statement_id, six.string_types) and len(statement_id.strip()) == 0: + if isinstance(statement_id, str) and len(statement_id.strip()) == 0: raise click.UsageError('Parameter --statement-id cannot be whitespace or empty string') kwargs = {} @@ -1519,7 +1518,7 @@ def get_statement(ctx, from_json, run_id, statement_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1746,7 +1745,7 @@ def list_run_logs(ctx, from_json, all_pages, page_size, run_id, limit, page): if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') kwargs = {} @@ -1937,7 +1936,7 @@ def list_statements(ctx, from_json, all_pages, page_size, run_id, lifecycle_stat if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') kwargs = {} @@ -1994,7 +1993,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2045,7 +2044,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2141,7 +2140,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, lim @cli_util.wrap_exceptions def start_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pool_id, if_match): - if isinstance(pool_id, six.string_types) and len(pool_id.strip()) == 0: + if isinstance(pool_id, str) and len(pool_id.strip()) == 0: raise click.UsageError('Parameter --pool-id cannot be whitespace or empty string') kwargs = {} @@ -2196,7 +2195,7 @@ def start_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @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: + if isinstance(sql_endpoint_id, str) and len(sql_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --sql-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2251,7 +2250,7 @@ def start_sql_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def stop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pool_id, if_match): - if isinstance(pool_id, six.string_types) and len(pool_id.strip()) == 0: + if isinstance(pool_id, str) and len(pool_id.strip()) == 0: raise click.UsageError('Parameter --pool-id cannot be whitespace or empty string') kwargs = {} @@ -2306,7 +2305,7 @@ def stop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_se @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: + if isinstance(sql_endpoint_id, str) and len(sql_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --sql-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2390,7 +2389,7 @@ def stop_sql_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_application(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, application_id, class_name, file_uri, spark_version, language, application_log_config, archive_uri, arguments, configuration, defined_tags, description, display_name, driver_shape, driver_shape_config, execute, executor_shape, executor_shape_config, freeform_tags, logs_bucket_uri, metastore_id, num_executors, parameters, pool_id, private_endpoint_id, warehouse_bucket_uri, max_duration_in_minutes, idle_timeout_in_minutes, if_match): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') if not force: if application_log_config or arguments or configuration or defined_tags or driver_shape_config or executor_shape_config or freeform_tags or parameters: @@ -2539,7 +2538,7 @@ def update_application(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, pool_id, display_name, description, configurations, schedules, idle_timeout_in_minutes, freeform_tags, defined_tags, if_match): - if isinstance(pool_id, six.string_types) and len(pool_id.strip()) == 0: + if isinstance(pool_id, str) and len(pool_id.strip()) == 0: raise click.UsageError('Parameter --pool-id cannot be whitespace or empty string') if not force: if configurations or schedules or freeform_tags or defined_tags: @@ -2634,7 +2633,7 @@ def update_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, private_endpoint_id, defined_tags, description, display_name, dns_zones, freeform_tags, max_host_count, nsg_ids, scan_details, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') if not force: if defined_tags or dns_zones or freeform_tags or nsg_ids or scan_details: @@ -2726,7 +2725,7 @@ def update_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, run_id, defined_tags, freeform_tags, max_duration_in_minutes, idle_timeout_in_minutes, if_match): - if isinstance(run_id, six.string_types) and len(run_id.strip()) == 0: + if isinstance(run_id, str) and len(run_id.strip()) == 0: raise click.UsageError('Parameter --run-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -2811,7 +2810,7 @@ def update_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @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, 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: + if isinstance(sql_endpoint_id, str) 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 or driver_shape_config or executor_shape_config or spark_advanced_configurations: diff --git a/services/data_integration/src/oci_cli_data_integration/generated/dataintegration_cli.py b/services/data_integration/src/oci_cli_data_integration/generated/dataintegration_cli.py index b2d643690..e250aa5b5 100644 --- a/services/data_integration/src/oci_cli_data_integration/generated/dataintegration_cli.py +++ b/services/data_integration/src/oci_cli_data_integration/generated/dataintegration_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -325,7 +324,7 @@ def runtime_pipeline_group(): @cli_util.wrap_exceptions def change_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, compartment_id, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -387,10 +386,10 @@ def change_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def change_dis_application_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, dis_application_id, compartment_id, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(dis_application_id, six.string_types) and len(dis_application_id.strip()) == 0: + if isinstance(dis_application_id, str) and len(dis_application_id.strip()) == 0: raise click.UsageError('Parameter --dis-application-id cannot be whitespace or empty string') kwargs = {} @@ -463,7 +462,7 @@ def change_dis_application_compartment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def create_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, name, identifier, key, model_version, model_type, description, object_status, display_name, freeform_tags, defined_tags, lifecycle_state, source_application_info, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -550,10 +549,10 @@ def create_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def create_application_detailed_description(ctx, from_json, workspace_id, application_key, logo, detailed_description): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -598,7 +597,7 @@ def create_application_detailed_description(ctx, from_json, workspace_id, applic @cli_util.wrap_exceptions def create_connection(ctx, from_json, workspace_id, name, identifier, model_type, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -664,7 +663,7 @@ def create_connection(ctx, from_json, workspace_id, name, identifier, model_type @cli_util.wrap_exceptions def create_connection_create_connection_from_oracle_siebel(ctx, from_json, workspace_id, name, identifier, username, password, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -733,7 +732,7 @@ def create_connection_create_connection_from_oracle_siebel(ctx, from_json, works @cli_util.wrap_exceptions def create_connection_create_connection_from_amazon_s3(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, access_key, secret_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -804,7 +803,7 @@ def create_connection_create_connection_from_amazon_s3(ctx, from_json, workspace @cli_util.wrap_exceptions def create_connection_create_connection_from_bicc(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, username, password_secret, default_external_storage): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -880,7 +879,7 @@ def create_connection_create_connection_from_bicc(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_connection_create_connection_from_atp(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, tns_alias, tns_names, username, password, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -963,7 +962,7 @@ def create_connection_create_connection_from_atp(ctx, from_json, workspace_id, n @cli_util.wrap_exceptions def create_connection_create_connection_from_hdfs(ctx, from_json, workspace_id, name, identifier, hdfs_principal, data_node_principal, name_node_principal, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, realm, key_distribution_center, key_tab_content): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1040,7 +1039,7 @@ def create_connection_create_connection_from_hdfs(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_connection_create_connection_from_my_sql_heat_wave(ctx, from_json, workspace_id, name, identifier, username, password, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1110,7 +1109,7 @@ def create_connection_create_connection_from_my_sql_heat_wave(ctx, from_json, wo @cli_util.wrap_exceptions def create_connection_create_connection_from_rest_basic_auth(ctx, from_json, workspace_id, name, identifier, username, password_secret, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, auth_header): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1180,7 +1179,7 @@ def create_connection_create_connection_from_rest_basic_auth(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_create_connection_from_oracle(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, username, password, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1254,7 +1253,7 @@ def create_connection_create_connection_from_oracle(ctx, from_json, workspace_id @cli_util.wrap_exceptions def create_connection_create_connection_from_oracle_people_soft(ctx, from_json, workspace_id, name, identifier, username, password, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1324,7 +1323,7 @@ def create_connection_create_connection_from_oracle_people_soft(ctx, from_json, @cli_util.wrap_exceptions def create_connection_create_connection_from_oracle_ebs(ctx, from_json, workspace_id, name, identifier, username, password, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1394,7 +1393,7 @@ def create_connection_create_connection_from_oracle_ebs(ctx, from_json, workspac @cli_util.wrap_exceptions def create_connection_create_connection_from_my_sql(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, username, password, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1468,7 +1467,7 @@ def create_connection_create_connection_from_my_sql(ctx, from_json, workspace_id @cli_util.wrap_exceptions def create_connection_create_connection_from_jdbc(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, username, password, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1541,7 +1540,7 @@ def create_connection_create_connection_from_jdbc(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_connection_create_connection_from_bip(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, username, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1614,7 +1613,7 @@ def create_connection_create_connection_from_bip(ctx, from_json, workspace_id, n @cli_util.wrap_exceptions def create_connection_create_connection_from_o_auth2(ctx, from_json, workspace_id, name, identifier, access_token_url, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, client_id, client_secret, scope, grant_type): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1694,7 +1693,7 @@ def create_connection_create_connection_from_o_auth2(ctx, from_json, workspace_i @cli_util.wrap_exceptions def create_connection_create_connection_from_adwc(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, tns_alias, tns_names, username, password, password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1771,7 +1770,7 @@ def create_connection_create_connection_from_adwc(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_connection_create_connection_from_rest_no_auth(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1837,7 +1836,7 @@ def create_connection_create_connection_from_rest_no_auth(ctx, from_json, worksp @cli_util.wrap_exceptions def create_connection_create_connection_from_object_storage(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata, credential_file_content, user_id, finger_print, pass_phrase): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1911,7 +1910,7 @@ def create_connection_create_connection_from_object_storage(ctx, from_json, work @cli_util.wrap_exceptions def create_connection_create_connection_from_lake(ctx, from_json, workspace_id, name, identifier, key, model_version, parent_ref, description, object_status, connection_properties, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -1965,7 +1964,7 @@ def create_connection_create_connection_from_lake(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_connection_validation(ctx, from_json, workspace_id, data_asset, connection, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2016,7 +2015,7 @@ def create_connection_validation(ctx, from_json, workspace_id, data_asset, conne @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_hdfs(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, data_asset_host, data_asset_port, data_asset_protocol, data_asset_default_connection, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_validate_certificate): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2096,7 +2095,7 @@ def create_connection_validation_create_data_asset_from_hdfs(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_lake(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, data_asset_lake_id, data_asset_default_connection, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_metastore_id, data_asset_lake_proxy_endpoint): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2177,7 +2176,7 @@ def create_connection_validation_create_data_asset_from_lake(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_my_sql_heat_wave(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, data_asset_host, data_asset_port, data_asset_default_connection, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_service_name): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2254,7 +2253,7 @@ def create_connection_validation_create_data_asset_from_my_sql_heat_wave(ctx, fr @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_amazon_s3(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_region, data_asset_default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2332,7 +2331,7 @@ def create_connection_validation_create_data_asset_from_amazon_s3(ctx, from_json @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_rest(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, data_asset_base_url, data_asset_manifest_file_content, data_asset_default_connection, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2412,7 +2411,7 @@ def create_connection_validation_create_data_asset_from_rest(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_oracle_siebel(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, data_asset_host, data_asset_port, data_asset_default_connection, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_service_name, data_asset_driver_class, data_asset_sid, data_asset_wallet_secret, data_asset_wallet_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2503,7 +2502,7 @@ def create_connection_validation_create_data_asset_from_oracle_siebel(ctx, from_ @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_jdbc(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_host, data_asset_port, data_asset_data_asset_type, data_asset_default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2588,7 +2587,7 @@ def create_connection_validation_create_data_asset_from_jdbc(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_my_sql(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_host, data_asset_port, data_asset_service_name, data_asset_default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2678,7 +2677,7 @@ def create_connection_validation_create_data_asset_from_my_sql(ctx, from_json, w @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_oracle(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_host, data_asset_port, data_asset_service_name, data_asset_driver_class, data_asset_sid, data_asset_credential_file_content, data_asset_wallet_secret, data_asset_wallet_password_secret, data_asset_default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2787,7 +2786,7 @@ def create_connection_validation_create_data_asset_from_oracle(ctx, from_json, w @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_adwc(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_service_name, data_asset_driver_class, data_asset_credential_file_content, data_asset_wallet_secret, data_asset_wallet_password_secret, data_asset_region_id, data_asset_tenancy_id, data_asset_compartment_id, data_asset_autonomous_db_id, data_asset_default_connection, data_asset_staging_data_asset, data_asset_staging_connection, data_asset_bucket_schema): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2903,7 +2902,7 @@ def create_connection_validation_create_data_asset_from_adwc(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_oracle_ebs(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, data_asset_host, data_asset_port, data_asset_default_connection, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_service_name, data_asset_driver_class, data_asset_sid, data_asset_wallet_secret, data_asset_wallet_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -2998,7 +2997,7 @@ def create_connection_validation_create_data_asset_from_oracle_ebs(ctx, from_jso @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_oracle_people_soft(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, data_asset_host, data_asset_port, data_asset_default_connection, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_service_name, data_asset_driver_class, data_asset_sid, data_asset_wallet_secret, data_asset_wallet_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3090,7 +3089,7 @@ def create_connection_validation_create_data_asset_from_oracle_people_soft(ctx, @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_fusion_app(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_service_url, data_asset_default_connection, data_asset_staging_data_asset, data_asset_staging_connection, data_asset_bucket_schema): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3187,7 +3186,7 @@ def create_connection_validation_create_data_asset_from_fusion_app(ctx, from_jso @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_atp(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_service_name, data_asset_driver_class, data_asset_credential_file_content, data_asset_wallet_secret, data_asset_wallet_password_secret, data_asset_region_id, data_asset_tenancy_id, data_asset_compartment_id, data_asset_autonomous_db_id, data_asset_default_connection, data_asset_staging_data_asset, data_asset_staging_connection, data_asset_bucket_schema): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3300,7 +3299,7 @@ def create_connection_validation_create_data_asset_from_atp(ctx, from_json, work @cli_util.wrap_exceptions def create_connection_validation_create_data_asset_from_object_storage(ctx, from_json, workspace_id, data_asset_name, data_asset_identifier, connection, registry_metadata, data_asset_key, data_asset_model_version, data_asset_description, data_asset_object_status, data_asset_external_key, data_asset_asset_properties, data_asset_registry_metadata, data_asset_oci_region, data_asset_url, data_asset_tenancy_id, data_asset_namespace, data_asset_default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3389,7 +3388,7 @@ def create_connection_validation_create_data_asset_from_object_storage(ctx, from @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_oracle_siebel(ctx, from_json, workspace_id, connection_name, connection_identifier, connection_username, connection_password, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3467,7 +3466,7 @@ def create_connection_validation_create_connection_from_oracle_siebel(ctx, from_ @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_amazon_s3(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_access_key, connection_secret_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3547,7 +3546,7 @@ def create_connection_validation_create_connection_from_amazon_s3(ctx, from_json @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_bicc(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_username, connection_password_secret, connection_default_external_storage): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3632,7 +3631,7 @@ def create_connection_validation_create_connection_from_bicc(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_atp(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_tns_alias, connection_tns_names, connection_username, connection_password, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3724,7 +3723,7 @@ def create_connection_validation_create_connection_from_atp(ctx, from_json, work @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_hdfs(ctx, from_json, workspace_id, connection_name, connection_identifier, connection_hdfs_principal, connection_data_node_principal, connection_name_node_principal, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_realm, connection_key_distribution_center, connection_key_tab_content): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3810,7 +3809,7 @@ def create_connection_validation_create_connection_from_hdfs(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_my_sql_heat_wave(ctx, from_json, workspace_id, connection_name, connection_identifier, connection_username, connection_password, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3889,7 +3888,7 @@ def create_connection_validation_create_connection_from_my_sql_heat_wave(ctx, fr @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_rest_basic_auth(ctx, from_json, workspace_id, connection_name, connection_identifier, connection_username, connection_password_secret, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_auth_header): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -3968,7 +3967,7 @@ def create_connection_validation_create_connection_from_rest_basic_auth(ctx, fro @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_oracle(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_username, connection_password, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4051,7 +4050,7 @@ def create_connection_validation_create_connection_from_oracle(ctx, from_json, w @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_oracle_people_soft(ctx, from_json, workspace_id, connection_name, connection_identifier, connection_username, connection_password, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4130,7 +4129,7 @@ def create_connection_validation_create_connection_from_oracle_people_soft(ctx, @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_oracle_ebs(ctx, from_json, workspace_id, connection_name, connection_identifier, connection_username, connection_password, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4209,7 +4208,7 @@ def create_connection_validation_create_connection_from_oracle_ebs(ctx, from_jso @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_my_sql(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_username, connection_password, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4292,7 +4291,7 @@ def create_connection_validation_create_connection_from_my_sql(ctx, from_json, w @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_jdbc(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_username, connection_password, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4374,7 +4373,7 @@ def create_connection_validation_create_connection_from_jdbc(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_bip(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_username, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4456,7 +4455,7 @@ def create_connection_validation_create_connection_from_bip(ctx, from_json, work @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_o_auth2(ctx, from_json, workspace_id, connection_name, connection_identifier, connection_access_token_url, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_client_id, connection_client_secret, connection_scope, connection_grant_type): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4545,7 +4544,7 @@ def create_connection_validation_create_connection_from_o_auth2(ctx, from_json, @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_adwc(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_tns_alias, connection_tns_names, connection_username, connection_password, connection_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4631,7 +4630,7 @@ def create_connection_validation_create_connection_from_adwc(ctx, from_json, wor @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_rest_no_auth(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4706,7 +4705,7 @@ def create_connection_validation_create_connection_from_rest_no_auth(ctx, from_j @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_object_storage(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata, connection_credential_file_content, connection_user_id, connection_finger_print, connection_pass_phrase): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4789,7 +4788,7 @@ def create_connection_validation_create_connection_from_object_storage(ctx, from @cli_util.wrap_exceptions def create_connection_validation_create_connection_from_lake(ctx, from_json, workspace_id, connection_name, connection_identifier, data_asset, registry_metadata, connection_key, connection_model_version, connection_parent_ref, connection_description, connection_object_status, connection_connection_properties, connection_registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4853,7 +4852,7 @@ def create_connection_validation_create_connection_from_lake(ctx, from_json, wor @cli_util.wrap_exceptions def create_copy_object_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, source_workspace_id, object_keys, copy_conflict_resolution): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4919,7 +4918,7 @@ def create_copy_object_request(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def create_data_asset(ctx, from_json, workspace_id, model_type, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -4983,7 +4982,7 @@ def create_data_asset(ctx, from_json, workspace_id, model_type, name, identifier @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_hdfs(ctx, from_json, workspace_id, name, identifier, host, port, protocol, default_connection, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, validate_certificate): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5054,7 +5053,7 @@ def create_data_asset_create_data_asset_from_hdfs(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_lake(ctx, from_json, workspace_id, name, identifier, lake_id, default_connection, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, metastore_id, lake_proxy_endpoint): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5126,7 +5125,7 @@ def create_data_asset_create_data_asset_from_lake(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_my_sql_heat_wave(ctx, from_json, workspace_id, name, identifier, host, port, default_connection, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, service_name): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5194,7 +5193,7 @@ def create_data_asset_create_data_asset_from_my_sql_heat_wave(ctx, from_json, wo @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_amazon_s3(ctx, from_json, workspace_id, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, region_parameterconflict, default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5263,7 +5262,7 @@ def create_data_asset_create_data_asset_from_amazon_s3(ctx, from_json, workspace @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_rest(ctx, from_json, workspace_id, name, identifier, base_url, manifest_file_content, default_connection, key, model_version, description, object_status, external_key, asset_properties, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5334,7 +5333,7 @@ def create_data_asset_create_data_asset_from_rest(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_oracle_siebel(ctx, from_json, workspace_id, name, identifier, host, port, default_connection, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, service_name, driver_class, sid, wallet_secret, wallet_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5416,7 +5415,7 @@ def create_data_asset_create_data_asset_from_oracle_siebel(ctx, from_json, works @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_jdbc(ctx, from_json, workspace_id, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, host, port, data_asset_type, default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5492,7 +5491,7 @@ def create_data_asset_create_data_asset_from_jdbc(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_my_sql(ctx, from_json, workspace_id, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, host, port, service_name, default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5573,7 +5572,7 @@ def create_data_asset_create_data_asset_from_my_sql(ctx, from_json, workspace_id @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_oracle(ctx, from_json, workspace_id, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, host, port, service_name, driver_class, sid, credential_file_content, wallet_secret, wallet_password_secret, default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5673,7 +5672,7 @@ def create_data_asset_create_data_asset_from_oracle(ctx, from_json, workspace_id @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_adwc(ctx, from_json, workspace_id, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, service_name, driver_class, credential_file_content, wallet_secret, wallet_password_secret, region_id, tenancy_id, compartment_id, autonomous_db_id, default_connection, staging_data_asset, staging_connection, bucket_schema): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5780,7 +5779,7 @@ def create_data_asset_create_data_asset_from_adwc(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_oracle_ebs(ctx, from_json, workspace_id, name, identifier, host, port, default_connection, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, service_name, driver_class, sid, wallet_secret, wallet_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5866,7 +5865,7 @@ def create_data_asset_create_data_asset_from_oracle_ebs(ctx, from_json, workspac @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_oracle_people_soft(ctx, from_json, workspace_id, name, identifier, host, port, default_connection, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, service_name, driver_class, sid, wallet_secret, wallet_password_secret): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -5949,7 +5948,7 @@ def create_data_asset_create_data_asset_from_oracle_people_soft(ctx, from_json, @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_fusion_app(ctx, from_json, workspace_id, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, service_url, default_connection, staging_data_asset, staging_connection, bucket_schema): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -6037,7 +6036,7 @@ def create_data_asset_create_data_asset_from_fusion_app(ctx, from_json, workspac @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_atp(ctx, from_json, workspace_id, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, service_name, driver_class, credential_file_content, wallet_secret, wallet_password_secret, region_id, tenancy_id, compartment_id, autonomous_db_id, default_connection, staging_data_asset, staging_connection, bucket_schema): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -6141,7 +6140,7 @@ def create_data_asset_create_data_asset_from_atp(ctx, from_json, workspace_id, n @cli_util.wrap_exceptions def create_data_asset_create_data_asset_from_object_storage(ctx, from_json, workspace_id, name, identifier, key, model_version, description, object_status, external_key, asset_properties, registry_metadata, oci_region, url, tenancy_id, namespace, default_connection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -6222,7 +6221,7 @@ def create_data_asset_create_data_asset_from_object_storage(ctx, from_json, work @cli_util.wrap_exceptions def create_data_flow(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, nodes, parameters, description, flow_config_values, object_status): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -6299,7 +6298,7 @@ def create_data_flow(ctx, from_json, workspace_id, name, identifier, registry_me @cli_util.wrap_exceptions def create_data_flow_validation(ctx, from_json, workspace_id, key, model_type, model_version, parent_ref, name, identifier, object_version, nodes, parameters, description, flow_config_values, object_status, metadata, key_map, typed_object_map, target_field_map_summary): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -6390,7 +6389,7 @@ def create_data_flow_validation(ctx, from_json, workspace_id, key, model_type, m @cli_util.wrap_exceptions def create_dis_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, name, identifier, compartment_id, key, model_version, model_type, description, object_status, display_name, freeform_tags, defined_tags, lifecycle_state, source_application_info, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -6480,10 +6479,10 @@ def create_dis_application(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def create_dis_application_detailed_description(ctx, from_json, workspace_id, application_key, logo, detailed_description): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -6520,13 +6519,13 @@ def create_dis_application_detailed_description(ctx, from_json, workspace_id, ap @cli_util.wrap_exceptions def create_entity_shape(ctx, from_json, workspace_id, connection_key, schema_resource_name, model_type, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') - if isinstance(schema_resource_name, six.string_types) and len(schema_resource_name.strip()) == 0: + if isinstance(schema_resource_name, str) and len(schema_resource_name.strip()) == 0: raise click.UsageError('Parameter --schema-resource-name cannot be whitespace or empty string') kwargs = {} @@ -6578,13 +6577,13 @@ def create_entity_shape(ctx, from_json, workspace_id, connection_key, schema_res @cli_util.wrap_exceptions def create_entity_shape_create_entity_shape_from_object(ctx, from_json, workspace_id, connection_key, schema_resource_name, name, key, parent_ref, description, external_key, shape, shape_id, entity_type, other_type_label, unique_keys, foreign_keys, resource_name, data_format, identifier, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') - if isinstance(schema_resource_name, six.string_types) and len(schema_resource_name.strip()) == 0: + if isinstance(schema_resource_name, str) and len(schema_resource_name.strip()) == 0: raise click.UsageError('Parameter --schema-resource-name cannot be whitespace or empty string') kwargs = {} @@ -6681,13 +6680,13 @@ def create_entity_shape_create_entity_shape_from_object(ctx, from_json, workspac @cli_util.wrap_exceptions def create_entity_shape_create_entity_shape_from_sql(ctx, from_json, workspace_id, connection_key, schema_resource_name, key, model_version, parent_ref, name, description, object_version, external_key, shape, shape_id, entity_type, other_type_label, unique_keys, foreign_keys, resource_name, data_format, object_status, identifier, sql_query, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') - if isinstance(schema_resource_name, six.string_types) and len(schema_resource_name.strip()) == 0: + if isinstance(schema_resource_name, str) and len(schema_resource_name.strip()) == 0: raise click.UsageError('Parameter --schema-resource-name cannot be whitespace or empty string') kwargs = {} @@ -6798,13 +6797,13 @@ def create_entity_shape_create_entity_shape_from_sql(ctx, from_json, workspace_i @cli_util.wrap_exceptions def create_entity_shape_create_entity_shape_from_file(ctx, from_json, workspace_id, connection_key, schema_resource_name, key, model_version, parent_ref, name, description, object_version, external_key, shape, shape_id, types, entity_type, other_type_label, unique_keys, foreign_keys, resource_name, data_format, object_status, identifier, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') - if isinstance(schema_resource_name, six.string_types) and len(schema_resource_name.strip()) == 0: + if isinstance(schema_resource_name, str) and len(schema_resource_name.strip()) == 0: raise click.UsageError('Parameter --schema-resource-name cannot be whitespace or empty string') kwargs = {} @@ -6901,7 +6900,7 @@ def create_entity_shape_create_entity_shape_from_file(ctx, from_json, workspace_ @cli_util.wrap_exceptions def create_export_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, bucket_name, file_name, object_storage_tenancy_id, object_storage_region, is_object_overwrite_enabled, object_keys, are_references_included, filters): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -6983,10 +6982,10 @@ def create_export_request(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def create_external_publication(ctx, from_json, workspace_id, task_key, application_compartment_id, display_name, application_id, description, resource_configuration, configuration_details): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') kwargs = {} @@ -7029,10 +7028,10 @@ def create_external_publication(ctx, from_json, workspace_id, task_key, applicat @cli_util.wrap_exceptions def create_external_publication_validation(ctx, from_json, workspace_id, task_key, key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') kwargs = {} @@ -7070,7 +7069,7 @@ def create_external_publication_validation(ctx, from_json, workspace_id, task_ke @cli_util.wrap_exceptions def create_folder(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, description, category_name, object_status): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -7122,7 +7121,7 @@ def create_folder(ctx, from_json, workspace_id, name, identifier, registry_metad @cli_util.wrap_exceptions def create_function_library(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, description, category_name, object_status): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -7176,7 +7175,7 @@ def create_function_library(ctx, from_json, workspace_id, name, identifier, regi @cli_util.wrap_exceptions def create_import_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, bucket_name, file_name, object_storage_tenancy_id, object_storage_region, object_key_for_import, are_data_asset_references_included, import_conflict_resolution): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -7256,10 +7255,10 @@ def create_import_request(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def create_patch(ctx, from_json, workspace_id, application_key, name, identifier, patch_type, object_keys, key, model_version, description, object_status, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -7325,7 +7324,7 @@ def create_patch(ctx, from_json, workspace_id, application_key, name, identifier @cli_util.wrap_exceptions def create_pipeline(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, description, model_type, object_version, object_status, nodes, parameters, flow_config_values, variables): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -7407,7 +7406,7 @@ def create_pipeline(ctx, from_json, workspace_id, name, identifier, registry_met @cli_util.wrap_exceptions def create_pipeline_validation(ctx, from_json, workspace_id, key, model_version, parent_ref, name, description, model_type, object_version, object_status, identifier, nodes, parameters, flow_config_values, variables, metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -7482,7 +7481,7 @@ def create_pipeline_validation(ctx, from_json, workspace_id, key, model_version, @cli_util.wrap_exceptions def create_project(ctx, from_json, workspace_id, name, identifier, model_version, description, object_status, key, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -7537,10 +7536,10 @@ def create_project(ctx, from_json, workspace_id, name, identifier, model_version @cli_util.wrap_exceptions def create_schedule(ctx, from_json, workspace_id, application_key, name, identifier, key, model_version, description, object_version, object_status, frequency_details, timezone, is_daylight_adjustment_enabled, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -7611,10 +7610,10 @@ def create_schedule(ctx, from_json, workspace_id, application_key, name, identif @cli_util.wrap_exceptions def create_schedule_monthly_frequency_details(ctx, from_json, workspace_id, application_key, name, identifier, key, model_version, description, object_version, object_status, timezone, is_daylight_adjustment_enabled, registry_metadata, frequency_details_frequency, frequency_details_interval, frequency_details_time, frequency_details_days): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -7695,10 +7694,10 @@ def create_schedule_monthly_frequency_details(ctx, from_json, workspace_id, appl @cli_util.wrap_exceptions def create_schedule_custom_frequency_details(ctx, from_json, workspace_id, application_key, name, identifier, key, model_version, description, object_version, object_status, timezone, is_daylight_adjustment_enabled, registry_metadata, frequency_details_frequency, frequency_details_custom_expression): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -7774,10 +7773,10 @@ def create_schedule_custom_frequency_details(ctx, from_json, workspace_id, appli @cli_util.wrap_exceptions def create_schedule_daily_frequency_details(ctx, from_json, workspace_id, application_key, name, identifier, key, model_version, description, object_version, object_status, timezone, is_daylight_adjustment_enabled, registry_metadata, frequency_details_frequency, frequency_details_interval, frequency_details_time): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -7856,10 +7855,10 @@ def create_schedule_daily_frequency_details(ctx, from_json, workspace_id, applic @cli_util.wrap_exceptions def create_schedule_weekly_frequency_details(ctx, from_json, workspace_id, application_key, name, identifier, key, model_version, description, object_version, object_status, timezone, is_daylight_adjustment_enabled, registry_metadata, frequency_details_frequency, frequency_details_time, frequency_details_days): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -7940,10 +7939,10 @@ def create_schedule_weekly_frequency_details(ctx, from_json, workspace_id, appli @cli_util.wrap_exceptions def create_schedule_monthly_rule_frequency_details(ctx, from_json, workspace_id, application_key, name, identifier, key, model_version, description, object_version, object_status, timezone, is_daylight_adjustment_enabled, registry_metadata, frequency_details_frequency, frequency_details_week_of_month, frequency_details_interval, frequency_details_time, frequency_details_day_of_week): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -8028,10 +8027,10 @@ def create_schedule_monthly_rule_frequency_details(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_schedule_hourly_frequency_details(ctx, from_json, workspace_id, application_key, name, identifier, key, model_version, description, object_version, object_status, timezone, is_daylight_adjustment_enabled, registry_metadata, frequency_details_frequency, frequency_details_interval, frequency_details_time): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -8117,7 +8116,7 @@ def create_schedule_hourly_frequency_details(ctx, from_json, workspace_id, appli @cli_util.wrap_exceptions def create_task(ctx, from_json, workspace_id, model_type, name, identifier, registry_metadata, key, model_version, parent_ref, description, object_status, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -8201,7 +8200,7 @@ def create_task(ctx, from_json, workspace_id, model_type, name, identifier, regi @cli_util.wrap_exceptions def create_task_create_task_from_integration_task(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, description, object_status, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, data_flow): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -8292,7 +8291,7 @@ def create_task_create_task_from_integration_task(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_task_create_task_from_data_loader_task(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, description, object_status, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, data_flow, conditional_composite_field_map, is_single_load, parallel_load_limit): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -8389,7 +8388,7 @@ def create_task_create_task_from_data_loader_task(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_task_create_task_from_pipeline_task(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, description, object_status, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, pipeline): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -8479,7 +8478,7 @@ def create_task_create_task_from_pipeline_task(ctx, from_json, workspace_id, nam @cli_util.wrap_exceptions def create_task_create_task_from_oci_dataflow_task(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, description, object_status, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, dataflow_application, driver_shape_details, executor_shape_details): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -8575,7 +8574,7 @@ def create_task_create_task_from_oci_dataflow_task(ctx, from_json, workspace_id, @cli_util.wrap_exceptions def create_task_create_task_from_sql_task(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, description, object_status, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, script, sql_script_type, operation): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -8683,7 +8682,7 @@ def create_task_create_task_from_sql_task(ctx, from_json, workspace_id, name, id @cli_util.wrap_exceptions def create_task_create_task_from_rest_task(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, description, object_status, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, auth_details, auth_config, endpoint_parameterconflict, method_type, headers, json_data, api_call_mode, cancel_endpoint, cancel_method_type, execute_rest_call_config, cancel_rest_call_config, poll_rest_call_config, typed_expressions): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -8799,10 +8798,10 @@ def create_task_create_task_from_rest_task(ctx, from_json, workspace_id, name, i @cli_util.wrap_exceptions def create_task_run(ctx, from_json, workspace_id, application_key, key, model_type, model_version, name, description, config_provider, identifier, task_schedule_key, ref_task_run_id, re_run_type, step_id, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -8888,10 +8887,10 @@ def create_task_run(ctx, from_json, workspace_id, application_key, key, model_ty @cli_util.wrap_exceptions def create_task_schedule(ctx, from_json, workspace_id, application_key, name, identifier, key, model_version, parent_ref, description, object_version, object_status, schedule_ref, config_provider_delegate, is_enabled, number_of_retries, retry_delay, retry_delay_unit, start_time_millis, end_time_millis, is_concurrent_allowed, is_backfill_enabled, auth_mode, expected_duration, expected_duration_unit, registry_metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -9001,7 +9000,7 @@ def create_task_schedule(ctx, from_json, workspace_id, application_key, name, id @cli_util.wrap_exceptions def create_task_validation(ctx, from_json, workspace_id, model_type, key, model_version, parent_ref, name, description, object_version, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, metadata): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -9093,7 +9092,7 @@ def create_task_validation(ctx, from_json, workspace_id, model_type, key, model_ @cli_util.wrap_exceptions def create_task_validation_create_task_validation_from_data_loader_task(ctx, from_json, workspace_id, key, model_version, parent_ref, name, description, object_version, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, metadata, data_flow): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -9187,7 +9186,7 @@ def create_task_validation_create_task_validation_from_data_loader_task(ctx, fro @cli_util.wrap_exceptions def create_task_validation_create_task_validation_from_pipeline_task(ctx, from_json, workspace_id, key, model_version, parent_ref, name, description, object_version, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, metadata, pipeline): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -9281,7 +9280,7 @@ def create_task_validation_create_task_validation_from_pipeline_task(ctx, from_j @cli_util.wrap_exceptions def create_task_validation_create_task_validation_from_integration_task(ctx, from_json, workspace_id, key, model_version, parent_ref, name, description, object_version, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, metadata, data_flow): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -9366,7 +9365,7 @@ def create_task_validation_create_task_validation_from_integration_task(ctx, fro @cli_util.wrap_exceptions def create_user_defined_function(ctx, from_json, workspace_id, name, identifier, registry_metadata, key, model_version, parent_ref, signatures, expr, description, object_status): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -9431,7 +9430,7 @@ def create_user_defined_function(ctx, from_json, workspace_id, name, identifier, @cli_util.wrap_exceptions def create_user_defined_function_validation(ctx, from_json, workspace_id, key, model_type, model_version, parent_ref, name, identifier, object_version, signatures, expr, description, object_status, metadata, key_map): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -9614,10 +9613,10 @@ def create_workspace(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_application(ctx, from_json, workspace_id, application_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -9645,10 +9644,10 @@ def delete_application(ctx, from_json, workspace_id, application_key, if_match): @cli_util.wrap_exceptions def delete_application_detailed_description(ctx, from_json, workspace_id, application_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -9676,10 +9675,10 @@ def delete_application_detailed_description(ctx, from_json, workspace_id, applic @cli_util.wrap_exceptions def delete_connection(ctx, from_json, workspace_id, connection_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') kwargs = {} @@ -9707,10 +9706,10 @@ def delete_connection(ctx, from_json, workspace_id, connection_key, if_match): @cli_util.wrap_exceptions def delete_connection_validation(ctx, from_json, workspace_id, connection_validation_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_validation_key, six.string_types) and len(connection_validation_key.strip()) == 0: + if isinstance(connection_validation_key, str) and len(connection_validation_key.strip()) == 0: raise click.UsageError('Parameter --connection-validation-key cannot be whitespace or empty string') kwargs = {} @@ -9738,10 +9737,10 @@ def delete_connection_validation(ctx, from_json, workspace_id, connection_valida @cli_util.wrap_exceptions def delete_copy_object_request(ctx, from_json, workspace_id, copy_object_request_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(copy_object_request_key, six.string_types) and len(copy_object_request_key.strip()) == 0: + if isinstance(copy_object_request_key, str) and len(copy_object_request_key.strip()) == 0: raise click.UsageError('Parameter --copy-object-request-key cannot be whitespace or empty string') kwargs = {} @@ -9769,10 +9768,10 @@ def delete_copy_object_request(ctx, from_json, workspace_id, copy_object_request @cli_util.wrap_exceptions def delete_data_asset(ctx, from_json, workspace_id, data_asset_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -9800,10 +9799,10 @@ def delete_data_asset(ctx, from_json, workspace_id, data_asset_key, if_match): @cli_util.wrap_exceptions def delete_data_flow(ctx, from_json, workspace_id, data_flow_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_flow_key, six.string_types) and len(data_flow_key.strip()) == 0: + if isinstance(data_flow_key, str) and len(data_flow_key.strip()) == 0: raise click.UsageError('Parameter --data-flow-key cannot be whitespace or empty string') kwargs = {} @@ -9831,10 +9830,10 @@ def delete_data_flow(ctx, from_json, workspace_id, data_flow_key, if_match): @cli_util.wrap_exceptions def delete_data_flow_validation(ctx, from_json, workspace_id, data_flow_validation_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_flow_validation_key, six.string_types) and len(data_flow_validation_key.strip()) == 0: + if isinstance(data_flow_validation_key, str) and len(data_flow_validation_key.strip()) == 0: raise click.UsageError('Parameter --data-flow-validation-key cannot be whitespace or empty string') kwargs = {} @@ -9862,10 +9861,10 @@ def delete_data_flow_validation(ctx, from_json, workspace_id, data_flow_validati @cli_util.wrap_exceptions def delete_dis_application(ctx, from_json, workspace_id, dis_application_id, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(dis_application_id, six.string_types) and len(dis_application_id.strip()) == 0: + if isinstance(dis_application_id, str) and len(dis_application_id.strip()) == 0: raise click.UsageError('Parameter --dis-application-id cannot be whitespace or empty string') kwargs = {} @@ -9893,10 +9892,10 @@ def delete_dis_application(ctx, from_json, workspace_id, dis_application_id, if_ @cli_util.wrap_exceptions def delete_dis_application_detailed_description(ctx, from_json, workspace_id, application_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -9924,10 +9923,10 @@ def delete_dis_application_detailed_description(ctx, from_json, workspace_id, ap @cli_util.wrap_exceptions def delete_export_request(ctx, from_json, workspace_id, export_request_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(export_request_key, six.string_types) and len(export_request_key.strip()) == 0: + if isinstance(export_request_key, str) and len(export_request_key.strip()) == 0: raise click.UsageError('Parameter --export-request-key cannot be whitespace or empty string') kwargs = {} @@ -9956,13 +9955,13 @@ def delete_export_request(ctx, from_json, workspace_id, export_request_key, if_m @cli_util.wrap_exceptions def delete_external_publication(ctx, from_json, workspace_id, task_key, external_publications_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') - if isinstance(external_publications_key, six.string_types) and len(external_publications_key.strip()) == 0: + if isinstance(external_publications_key, str) and len(external_publications_key.strip()) == 0: raise click.UsageError('Parameter --external-publications-key cannot be whitespace or empty string') kwargs = {} @@ -9992,13 +9991,13 @@ def delete_external_publication(ctx, from_json, workspace_id, task_key, external @cli_util.wrap_exceptions def delete_external_publication_validation(ctx, from_json, workspace_id, task_key, external_publication_validation_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') - if isinstance(external_publication_validation_key, six.string_types) and len(external_publication_validation_key.strip()) == 0: + if isinstance(external_publication_validation_key, str) and len(external_publication_validation_key.strip()) == 0: raise click.UsageError('Parameter --external-publication-validation-key cannot be whitespace or empty string') kwargs = {} @@ -10027,10 +10026,10 @@ def delete_external_publication_validation(ctx, from_json, workspace_id, task_ke @cli_util.wrap_exceptions def delete_folder(ctx, from_json, workspace_id, folder_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') kwargs = {} @@ -10058,10 +10057,10 @@ def delete_folder(ctx, from_json, workspace_id, folder_key, if_match): @cli_util.wrap_exceptions def delete_function_library(ctx, from_json, workspace_id, function_library_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(function_library_key, six.string_types) and len(function_library_key.strip()) == 0: + if isinstance(function_library_key, str) and len(function_library_key.strip()) == 0: raise click.UsageError('Parameter --function-library-key cannot be whitespace or empty string') kwargs = {} @@ -10089,10 +10088,10 @@ def delete_function_library(ctx, from_json, workspace_id, function_library_key, @cli_util.wrap_exceptions def delete_import_request(ctx, from_json, import_request_key, workspace_id, if_match): - if isinstance(import_request_key, six.string_types) and len(import_request_key.strip()) == 0: + if isinstance(import_request_key, str) and len(import_request_key.strip()) == 0: raise click.UsageError('Parameter --import-request-key cannot be whitespace or empty string') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -10121,13 +10120,13 @@ def delete_import_request(ctx, from_json, import_request_key, workspace_id, if_m @cli_util.wrap_exceptions def delete_patch(ctx, from_json, workspace_id, application_key, patch_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(patch_key, six.string_types) and len(patch_key.strip()) == 0: + if isinstance(patch_key, str) and len(patch_key.strip()) == 0: raise click.UsageError('Parameter --patch-key cannot be whitespace or empty string') kwargs = {} @@ -10156,10 +10155,10 @@ def delete_patch(ctx, from_json, workspace_id, application_key, patch_key, if_ma @cli_util.wrap_exceptions def delete_pipeline(ctx, from_json, workspace_id, pipeline_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(pipeline_key, six.string_types) and len(pipeline_key.strip()) == 0: + if isinstance(pipeline_key, str) and len(pipeline_key.strip()) == 0: raise click.UsageError('Parameter --pipeline-key cannot be whitespace or empty string') kwargs = {} @@ -10187,10 +10186,10 @@ def delete_pipeline(ctx, from_json, workspace_id, pipeline_key, if_match): @cli_util.wrap_exceptions def delete_pipeline_validation(ctx, from_json, workspace_id, pipeline_validation_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(pipeline_validation_key, six.string_types) and len(pipeline_validation_key.strip()) == 0: + if isinstance(pipeline_validation_key, str) and len(pipeline_validation_key.strip()) == 0: raise click.UsageError('Parameter --pipeline-validation-key cannot be whitespace or empty string') kwargs = {} @@ -10218,10 +10217,10 @@ def delete_pipeline_validation(ctx, from_json, workspace_id, pipeline_validation @cli_util.wrap_exceptions def delete_project(ctx, from_json, workspace_id, project_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(project_key, six.string_types) and len(project_key.strip()) == 0: + if isinstance(project_key, str) and len(project_key.strip()) == 0: raise click.UsageError('Parameter --project-key cannot be whitespace or empty string') kwargs = {} @@ -10250,13 +10249,13 @@ def delete_project(ctx, from_json, workspace_id, project_key, if_match): @cli_util.wrap_exceptions def delete_schedule(ctx, from_json, workspace_id, application_key, schedule_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') kwargs = {} @@ -10285,10 +10284,10 @@ def delete_schedule(ctx, from_json, workspace_id, application_key, schedule_key, @cli_util.wrap_exceptions def delete_task(ctx, from_json, workspace_id, task_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') kwargs = {} @@ -10317,13 +10316,13 @@ def delete_task(ctx, from_json, workspace_id, task_key, if_match): @cli_util.wrap_exceptions def delete_task_run(ctx, from_json, workspace_id, application_key, task_run_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(task_run_key, six.string_types) and len(task_run_key.strip()) == 0: + if isinstance(task_run_key, str) and len(task_run_key.strip()) == 0: raise click.UsageError('Parameter --task-run-key cannot be whitespace or empty string') kwargs = {} @@ -10353,13 +10352,13 @@ def delete_task_run(ctx, from_json, workspace_id, application_key, task_run_key, @cli_util.wrap_exceptions def delete_task_schedule(ctx, from_json, workspace_id, application_key, task_schedule_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(task_schedule_key, six.string_types) and len(task_schedule_key.strip()) == 0: + if isinstance(task_schedule_key, str) and len(task_schedule_key.strip()) == 0: raise click.UsageError('Parameter --task-schedule-key cannot be whitespace or empty string') kwargs = {} @@ -10388,10 +10387,10 @@ def delete_task_schedule(ctx, from_json, workspace_id, application_key, task_sch @cli_util.wrap_exceptions def delete_task_validation(ctx, from_json, workspace_id, task_validation_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_validation_key, six.string_types) and len(task_validation_key.strip()) == 0: + if isinstance(task_validation_key, str) and len(task_validation_key.strip()) == 0: raise click.UsageError('Parameter --task-validation-key cannot be whitespace or empty string') kwargs = {} @@ -10419,10 +10418,10 @@ def delete_task_validation(ctx, from_json, workspace_id, task_validation_key, if @cli_util.wrap_exceptions def delete_user_defined_function(ctx, from_json, workspace_id, user_defined_function_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(user_defined_function_key, six.string_types) and len(user_defined_function_key.strip()) == 0: + if isinstance(user_defined_function_key, str) and len(user_defined_function_key.strip()) == 0: raise click.UsageError('Parameter --user-defined-function-key cannot be whitespace or empty string') kwargs = {} @@ -10450,10 +10449,10 @@ def delete_user_defined_function(ctx, from_json, workspace_id, user_defined_func @cli_util.wrap_exceptions def delete_user_defined_function_validation(ctx, from_json, workspace_id, user_defined_function_validation_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(user_defined_function_validation_key, six.string_types) and len(user_defined_function_validation_key.strip()) == 0: + if isinstance(user_defined_function_validation_key, str) and len(user_defined_function_validation_key.strip()) == 0: raise click.UsageError('Parameter --user-defined-function-validation-key cannot be whitespace or empty string') kwargs = {} @@ -10485,7 +10484,7 @@ def delete_user_defined_function_validation(ctx, from_json, workspace_id, user_d @cli_util.wrap_exceptions def delete_workspace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, quiesce_timeout, is_force_operation, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -10541,10 +10540,10 @@ def delete_workspace(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def get_application(ctx, from_json, workspace_id, application_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -10568,10 +10567,10 @@ def get_application(ctx, from_json, workspace_id, application_key): @cli_util.wrap_exceptions def get_application_detailed_description(ctx, from_json, workspace_id, application_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -10596,10 +10595,10 @@ def get_application_detailed_description(ctx, from_json, workspace_id, applicati @cli_util.wrap_exceptions def get_composite_state(ctx, from_json, workspace_id, application_key, aggregator_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -10624,10 +10623,10 @@ def get_composite_state(ctx, from_json, workspace_id, application_key, aggregato @cli_util.wrap_exceptions def get_connection(ctx, from_json, workspace_id, connection_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') kwargs = {} @@ -10651,10 +10650,10 @@ def get_connection(ctx, from_json, workspace_id, connection_key): @cli_util.wrap_exceptions def get_connection_validation(ctx, from_json, workspace_id, connection_validation_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_validation_key, six.string_types) and len(connection_validation_key.strip()) == 0: + if isinstance(connection_validation_key, str) and len(connection_validation_key.strip()) == 0: raise click.UsageError('Parameter --connection-validation-key cannot be whitespace or empty string') kwargs = {} @@ -10678,10 +10677,10 @@ def get_connection_validation(ctx, from_json, workspace_id, connection_validatio @cli_util.wrap_exceptions def get_copy_object_request(ctx, from_json, workspace_id, copy_object_request_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(copy_object_request_key, six.string_types) and len(copy_object_request_key.strip()) == 0: + if isinstance(copy_object_request_key, str) and len(copy_object_request_key.strip()) == 0: raise click.UsageError('Parameter --copy-object-request-key cannot be whitespace or empty string') kwargs = {} @@ -10705,10 +10704,10 @@ def get_copy_object_request(ctx, from_json, workspace_id, copy_object_request_ke @cli_util.wrap_exceptions def get_count_statistic(ctx, from_json, workspace_id, count_statistic_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(count_statistic_key, six.string_types) and len(count_statistic_key.strip()) == 0: + if isinstance(count_statistic_key, str) and len(count_statistic_key.strip()) == 0: raise click.UsageError('Parameter --count-statistic-key cannot be whitespace or empty string') kwargs = {} @@ -10732,10 +10731,10 @@ def get_count_statistic(ctx, from_json, workspace_id, count_statistic_key): @cli_util.wrap_exceptions def get_data_asset(ctx, from_json, workspace_id, data_asset_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') kwargs = {} @@ -10761,16 +10760,16 @@ def get_data_asset(ctx, from_json, workspace_id, data_asset_key): @cli_util.wrap_exceptions def get_data_entity(ctx, from_json, workspace_id, connection_key, schema_resource_name, data_entity_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') - if isinstance(schema_resource_name, six.string_types) and len(schema_resource_name.strip()) == 0: + if isinstance(schema_resource_name, str) and len(schema_resource_name.strip()) == 0: raise click.UsageError('Parameter --schema-resource-name cannot be whitespace or empty string') - if isinstance(data_entity_key, six.string_types) and len(data_entity_key.strip()) == 0: + if isinstance(data_entity_key, str) and len(data_entity_key.strip()) == 0: raise click.UsageError('Parameter --data-entity-key cannot be whitespace or empty string') kwargs = {} @@ -10797,10 +10796,10 @@ def get_data_entity(ctx, from_json, workspace_id, connection_key, schema_resourc @cli_util.wrap_exceptions def get_data_flow(ctx, from_json, workspace_id, data_flow_key, expand_references): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_flow_key, six.string_types) and len(data_flow_key.strip()) == 0: + if isinstance(data_flow_key, str) and len(data_flow_key.strip()) == 0: raise click.UsageError('Parameter --data-flow-key cannot be whitespace or empty string') kwargs = {} @@ -10826,10 +10825,10 @@ def get_data_flow(ctx, from_json, workspace_id, data_flow_key, expand_references @cli_util.wrap_exceptions def get_data_flow_validation(ctx, from_json, workspace_id, data_flow_validation_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_flow_validation_key, six.string_types) and len(data_flow_validation_key.strip()) == 0: + if isinstance(data_flow_validation_key, str) and len(data_flow_validation_key.strip()) == 0: raise click.UsageError('Parameter --data-flow-validation-key cannot be whitespace or empty string') kwargs = {} @@ -10854,13 +10853,13 @@ def get_data_flow_validation(ctx, from_json, workspace_id, data_flow_validation_ @cli_util.wrap_exceptions def get_dependent_object(ctx, from_json, workspace_id, application_key, dependent_object_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(dependent_object_key, six.string_types) and len(dependent_object_key.strip()) == 0: + if isinstance(dependent_object_key, str) and len(dependent_object_key.strip()) == 0: raise click.UsageError('Parameter --dependent-object-key cannot be whitespace or empty string') kwargs = {} @@ -10885,10 +10884,10 @@ def get_dependent_object(ctx, from_json, workspace_id, application_key, dependen @cli_util.wrap_exceptions def get_dis_application(ctx, from_json, workspace_id, dis_application_id): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(dis_application_id, six.string_types) and len(dis_application_id.strip()) == 0: + if isinstance(dis_application_id, str) and len(dis_application_id.strip()) == 0: raise click.UsageError('Parameter --dis-application-id cannot be whitespace or empty string') kwargs = {} @@ -10912,10 +10911,10 @@ def get_dis_application(ctx, from_json, workspace_id, dis_application_id): @cli_util.wrap_exceptions def get_dis_application_detailed_description(ctx, from_json, workspace_id, application_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -10939,10 +10938,10 @@ def get_dis_application_detailed_description(ctx, from_json, workspace_id, appli @cli_util.wrap_exceptions def get_export_request(ctx, from_json, workspace_id, export_request_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(export_request_key, six.string_types) and len(export_request_key.strip()) == 0: + if isinstance(export_request_key, str) and len(export_request_key.strip()) == 0: raise click.UsageError('Parameter --export-request-key cannot be whitespace or empty string') kwargs = {} @@ -10967,13 +10966,13 @@ def get_export_request(ctx, from_json, workspace_id, export_request_key): @cli_util.wrap_exceptions def get_external_publication(ctx, from_json, workspace_id, task_key, external_publications_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') - if isinstance(external_publications_key, six.string_types) and len(external_publications_key.strip()) == 0: + if isinstance(external_publications_key, str) and len(external_publications_key.strip()) == 0: raise click.UsageError('Parameter --external-publications-key cannot be whitespace or empty string') kwargs = {} @@ -10999,13 +10998,13 @@ def get_external_publication(ctx, from_json, workspace_id, task_key, external_pu @cli_util.wrap_exceptions def get_external_publication_validation(ctx, from_json, workspace_id, task_key, external_publication_validation_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') - if isinstance(external_publication_validation_key, six.string_types) and len(external_publication_validation_key.strip()) == 0: + if isinstance(external_publication_validation_key, str) and len(external_publication_validation_key.strip()) == 0: raise click.UsageError('Parameter --external-publication-validation-key cannot be whitespace or empty string') kwargs = {} @@ -11031,10 +11030,10 @@ def get_external_publication_validation(ctx, from_json, workspace_id, task_key, @cli_util.wrap_exceptions def get_folder(ctx, from_json, workspace_id, folder_key, projection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') kwargs = {} @@ -11061,10 +11060,10 @@ def get_folder(ctx, from_json, workspace_id, folder_key, projection): @cli_util.wrap_exceptions def get_function_library(ctx, from_json, workspace_id, function_library_key, projection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(function_library_key, six.string_types) and len(function_library_key.strip()) == 0: + if isinstance(function_library_key, str) and len(function_library_key.strip()) == 0: raise click.UsageError('Parameter --function-library-key cannot be whitespace or empty string') kwargs = {} @@ -11092,10 +11091,10 @@ def get_function_library(ctx, from_json, workspace_id, function_library_key, pro @cli_util.wrap_exceptions def get_import_request(ctx, from_json, workspace_id, import_request_key, limit, page): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(import_request_key, six.string_types) and len(import_request_key.strip()) == 0: + if isinstance(import_request_key, str) and len(import_request_key.strip()) == 0: raise click.UsageError('Parameter --import-request-key cannot be whitespace or empty string') kwargs = {} @@ -11124,13 +11123,13 @@ def get_import_request(ctx, from_json, workspace_id, import_request_key, limit, @cli_util.wrap_exceptions def get_patch(ctx, from_json, workspace_id, application_key, patch_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(patch_key, six.string_types) and len(patch_key.strip()) == 0: + if isinstance(patch_key, str) and len(patch_key.strip()) == 0: raise click.UsageError('Parameter --patch-key cannot be whitespace or empty string') kwargs = {} @@ -11156,10 +11155,10 @@ def get_patch(ctx, from_json, workspace_id, application_key, patch_key): @cli_util.wrap_exceptions def get_pipeline(ctx, from_json, workspace_id, pipeline_key, expand_references): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(pipeline_key, six.string_types) and len(pipeline_key.strip()) == 0: + if isinstance(pipeline_key, str) and len(pipeline_key.strip()) == 0: raise click.UsageError('Parameter --pipeline-key cannot be whitespace or empty string') kwargs = {} @@ -11185,10 +11184,10 @@ def get_pipeline(ctx, from_json, workspace_id, pipeline_key, expand_references): @cli_util.wrap_exceptions def get_pipeline_validation(ctx, from_json, workspace_id, pipeline_validation_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(pipeline_validation_key, six.string_types) and len(pipeline_validation_key.strip()) == 0: + if isinstance(pipeline_validation_key, str) and len(pipeline_validation_key.strip()) == 0: raise click.UsageError('Parameter --pipeline-validation-key cannot be whitespace or empty string') kwargs = {} @@ -11213,10 +11212,10 @@ def get_pipeline_validation(ctx, from_json, workspace_id, pipeline_validation_ke @cli_util.wrap_exceptions def get_project(ctx, from_json, workspace_id, project_key, projection): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(project_key, six.string_types) and len(project_key.strip()) == 0: + if isinstance(project_key, str) and len(project_key.strip()) == 0: raise click.UsageError('Parameter --project-key cannot be whitespace or empty string') kwargs = {} @@ -11244,13 +11243,13 @@ def get_project(ctx, from_json, workspace_id, project_key, projection): @cli_util.wrap_exceptions def get_published_object(ctx, from_json, workspace_id, application_key, published_object_key, expand_references): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(published_object_key, six.string_types) and len(published_object_key.strip()) == 0: + if isinstance(published_object_key, str) and len(published_object_key.strip()) == 0: raise click.UsageError('Parameter --published-object-key cannot be whitespace or empty string') kwargs = {} @@ -11278,13 +11277,13 @@ def get_published_object(ctx, from_json, workspace_id, application_key, publishe @cli_util.wrap_exceptions def get_reference(ctx, from_json, workspace_id, application_key, reference_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(reference_key, six.string_types) and len(reference_key.strip()) == 0: + if isinstance(reference_key, str) and len(reference_key.strip()) == 0: raise click.UsageError('Parameter --reference-key cannot be whitespace or empty string') kwargs = {} @@ -11311,16 +11310,16 @@ def get_reference(ctx, from_json, workspace_id, application_key, reference_key): @cli_util.wrap_exceptions def get_runtime_operator(ctx, from_json, workspace_id, application_key, runtime_pipeline_key, runtime_operator_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(runtime_pipeline_key, six.string_types) and len(runtime_pipeline_key.strip()) == 0: + if isinstance(runtime_pipeline_key, str) and len(runtime_pipeline_key.strip()) == 0: raise click.UsageError('Parameter --runtime-pipeline-key cannot be whitespace or empty string') - if isinstance(runtime_operator_key, six.string_types) and len(runtime_operator_key.strip()) == 0: + if isinstance(runtime_operator_key, str) and len(runtime_operator_key.strip()) == 0: raise click.UsageError('Parameter --runtime-operator-key cannot be whitespace or empty string') kwargs = {} @@ -11348,13 +11347,13 @@ def get_runtime_operator(ctx, from_json, workspace_id, application_key, runtime_ @cli_util.wrap_exceptions def get_runtime_pipeline(ctx, from_json, workspace_id, application_key, runtime_pipeline_key, expand_references): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(runtime_pipeline_key, six.string_types) and len(runtime_pipeline_key.strip()) == 0: + if isinstance(runtime_pipeline_key, str) and len(runtime_pipeline_key.strip()) == 0: raise click.UsageError('Parameter --runtime-pipeline-key cannot be whitespace or empty string') kwargs = {} @@ -11382,13 +11381,13 @@ def get_runtime_pipeline(ctx, from_json, workspace_id, application_key, runtime_ @cli_util.wrap_exceptions def get_schedule(ctx, from_json, workspace_id, application_key, schedule_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') kwargs = {} @@ -11414,13 +11413,13 @@ def get_schedule(ctx, from_json, workspace_id, application_key, schedule_key): @cli_util.wrap_exceptions def get_schema(ctx, from_json, workspace_id, connection_key, schema_resource_name): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') - if isinstance(schema_resource_name, six.string_types) and len(schema_resource_name.strip()) == 0: + if isinstance(schema_resource_name, str) and len(schema_resource_name.strip()) == 0: raise click.UsageError('Parameter --schema-resource-name cannot be whitespace or empty string') kwargs = {} @@ -11446,10 +11445,10 @@ def get_schema(ctx, from_json, workspace_id, connection_key, schema_resource_nam @cli_util.wrap_exceptions def get_task(ctx, from_json, workspace_id, task_key, expand_references): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') kwargs = {} @@ -11476,13 +11475,13 @@ def get_task(ctx, from_json, workspace_id, task_key, expand_references): @cli_util.wrap_exceptions def get_task_run(ctx, from_json, workspace_id, application_key, task_run_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(task_run_key, six.string_types) and len(task_run_key.strip()) == 0: + if isinstance(task_run_key, str) and len(task_run_key.strip()) == 0: raise click.UsageError('Parameter --task-run-key cannot be whitespace or empty string') kwargs = {} @@ -11508,13 +11507,13 @@ def get_task_run(ctx, from_json, workspace_id, application_key, task_run_key): @cli_util.wrap_exceptions def get_task_schedule(ctx, from_json, workspace_id, application_key, task_schedule_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(task_schedule_key, six.string_types) and len(task_schedule_key.strip()) == 0: + if isinstance(task_schedule_key, str) and len(task_schedule_key.strip()) == 0: raise click.UsageError('Parameter --task-schedule-key cannot be whitespace or empty string') kwargs = {} @@ -11539,10 +11538,10 @@ def get_task_schedule(ctx, from_json, workspace_id, application_key, task_schedu @cli_util.wrap_exceptions def get_task_validation(ctx, from_json, workspace_id, task_validation_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_validation_key, six.string_types) and len(task_validation_key.strip()) == 0: + if isinstance(task_validation_key, str) and len(task_validation_key.strip()) == 0: raise click.UsageError('Parameter --task-validation-key cannot be whitespace or empty string') kwargs = {} @@ -11566,10 +11565,10 @@ def get_task_validation(ctx, from_json, workspace_id, task_validation_key): @cli_util.wrap_exceptions def get_template(ctx, from_json, workspace_id, template_id): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') kwargs = {} @@ -11593,10 +11592,10 @@ def get_template(ctx, from_json, workspace_id, template_id): @cli_util.wrap_exceptions def get_user_defined_function(ctx, from_json, workspace_id, user_defined_function_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(user_defined_function_key, six.string_types) and len(user_defined_function_key.strip()) == 0: + if isinstance(user_defined_function_key, str) and len(user_defined_function_key.strip()) == 0: raise click.UsageError('Parameter --user-defined-function-key cannot be whitespace or empty string') kwargs = {} @@ -11620,10 +11619,10 @@ def get_user_defined_function(ctx, from_json, workspace_id, user_defined_functio @cli_util.wrap_exceptions def get_user_defined_function_validation(ctx, from_json, workspace_id, user_defined_function_validation_key): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(user_defined_function_validation_key, six.string_types) and len(user_defined_function_validation_key.strip()) == 0: + if isinstance(user_defined_function_validation_key, str) and len(user_defined_function_validation_key.strip()) == 0: raise click.UsageError('Parameter --user-defined-function-validation-key cannot be whitespace or empty string') kwargs = {} @@ -11646,7 +11645,7 @@ def get_user_defined_function_validation(ctx, from_json, workspace_id, user_defi @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -11668,7 +11667,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def get_workspace(ctx, from_json, workspace_id): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -11703,7 +11702,7 @@ def list_applications(ctx, from_json, all_pages, page_size, workspace_id, name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -11772,7 +11771,7 @@ def list_connection_validations(ctx, from_json, all_pages, page_size, workspace_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -11841,7 +11840,7 @@ def list_connections(ctx, from_json, all_pages, page_size, workspace_id, data_as if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -11912,7 +11911,7 @@ def list_copy_object_requests(ctx, from_json, all_pages, page_size, workspace_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -11982,7 +11981,7 @@ def list_data_assets(ctx, from_json, all_pages, page_size, workspace_id, page, l if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -12053,13 +12052,13 @@ def list_data_entities(ctx, from_json, all_pages, page_size, workspace_id, conne if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') - if isinstance(schema_resource_name, six.string_types) and len(schema_resource_name.strip()) == 0: + if isinstance(schema_resource_name, str) and len(schema_resource_name.strip()) == 0: raise click.UsageError('Parameter --schema-resource-name cannot be whitespace or empty string') kwargs = {} @@ -12138,7 +12137,7 @@ def list_data_flow_validations(ctx, from_json, all_pages, page_size, workspace_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -12207,7 +12206,7 @@ def list_data_flows(ctx, from_json, all_pages, page_size, workspace_id, folder_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -12279,10 +12278,10 @@ def list_dependent_objects(ctx, from_json, all_pages, page_size, workspace_id, a if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -12361,10 +12360,10 @@ def list_dis_application_task_run_lineages(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(dis_application_id, six.string_types) and len(dis_application_id.strip()) == 0: + if isinstance(dis_application_id, str) and len(dis_application_id.strip()) == 0: raise click.UsageError('Parameter --dis-application-id cannot be whitespace or empty string') kwargs = {} @@ -12441,7 +12440,7 @@ def list_dis_applications(ctx, from_json, all_pages, page_size, workspace_id, co if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -12514,7 +12513,7 @@ def list_export_requests(ctx, from_json, all_pages, page_size, workspace_id, pag if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -12585,10 +12584,10 @@ def list_external_publication_validations(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') kwargs = {} @@ -12657,10 +12656,10 @@ def list_external_publications(ctx, from_json, all_pages, page_size, workspace_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') kwargs = {} @@ -12729,7 +12728,7 @@ def list_folders(ctx, from_json, all_pages, page_size, workspace_id, aggregator_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -12800,7 +12799,7 @@ def list_function_libraries(ctx, from_json, all_pages, page_size, workspace_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -12870,7 +12869,7 @@ def list_import_requests(ctx, from_json, all_pages, page_size, workspace_id, pag if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -12941,10 +12940,10 @@ def list_patch_changes(ctx, from_json, all_pages, page_size, workspace_id, appli if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -13014,10 +13013,10 @@ def list_patches(ctx, from_json, all_pages, page_size, workspace_id, application if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -13087,7 +13086,7 @@ def list_pipeline_validations(ctx, from_json, all_pages, page_size, workspace_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -13156,7 +13155,7 @@ def list_pipelines(ctx, from_json, all_pages, page_size, workspace_id, aggregato if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -13225,7 +13224,7 @@ def list_projects(ctx, from_json, all_pages, page_size, workspace_id, fields, na if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -13298,10 +13297,10 @@ def list_published_objects(ctx, from_json, all_pages, page_size, workspace_id, a if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -13377,10 +13376,10 @@ def list_references(ctx, from_json, all_pages, page_size, workspace_id, applicat if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -13449,13 +13448,13 @@ def list_runtime_operators(ctx, from_json, all_pages, page_size, workspace_id, a if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(runtime_pipeline_key, six.string_types) and len(runtime_pipeline_key.strip()) == 0: + if isinstance(runtime_pipeline_key, str) and len(runtime_pipeline_key.strip()) == 0: raise click.UsageError('Parameter --runtime-pipeline-key cannot be whitespace or empty string') kwargs = {} @@ -13536,10 +13535,10 @@ def list_runtime_pipelines(ctx, from_json, all_pages, page_size, workspace_id, a if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -13618,10 +13617,10 @@ def list_schedules(ctx, from_json, all_pages, page_size, workspace_id, applicati if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -13695,10 +13694,10 @@ def list_schemas(ctx, from_json, all_pages, page_size, workspace_id, connection_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') kwargs = {} @@ -13776,10 +13775,10 @@ def list_task_run_lineages(ctx, from_json, all_pages, page_size, workspace_id, a if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -13853,13 +13852,13 @@ def list_task_run_logs(ctx, from_json, all_pages, page_size, workspace_id, appli if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(task_run_key, six.string_types) and len(task_run_key.strip()) == 0: + if isinstance(task_run_key, str) and len(task_run_key.strip()) == 0: raise click.UsageError('Parameter --task-run-key cannot be whitespace or empty string') kwargs = {} @@ -13931,10 +13930,10 @@ def list_task_runs(ctx, from_json, all_pages, page_size, workspace_id, applicati if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -14016,10 +14015,10 @@ def list_task_schedules(ctx, from_json, all_pages, page_size, workspace_id, appl if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -14093,7 +14092,7 @@ def list_task_validations(ctx, from_json, all_pages, page_size, workspace_id, ke if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -14164,7 +14163,7 @@ def list_tasks(ctx, from_json, all_pages, page_size, workspace_id, folder_id, fi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -14236,7 +14235,7 @@ def list_templates(ctx, from_json, all_pages, page_size, workspace_id, name, ide if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -14303,7 +14302,7 @@ def list_user_defined_function_validations(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -14372,7 +14371,7 @@ def list_user_defined_functions(ctx, from_json, all_pages, page_size, workspace_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -14437,7 +14436,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -14494,7 +14493,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -14666,7 +14665,7 @@ def list_workspaces(ctx, from_json, all_pages, page_size, compartment_id, name, @cli_util.wrap_exceptions def start_workspace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -14723,7 +14722,7 @@ def start_workspace(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def stop_workspace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, quiesce_timeout, is_force_operation, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') kwargs = {} @@ -14799,10 +14798,10 @@ def stop_workspace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def update_application(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, application_key, key, model_type, object_version, model_version, name, description, application_version, object_status, identifier, parent_ref, metadata, display_name, freeform_tags, defined_tags, lifecycle_state, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') if not force: if parent_ref or metadata or freeform_tags or defined_tags: @@ -14901,10 +14900,10 @@ def update_application(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_application_detailed_description(ctx, from_json, workspace_id, application_key, logo, detailed_description, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -14955,10 +14954,10 @@ def update_application_detailed_description(ctx, from_json, workspace_id, applic @cli_util.wrap_exceptions def update_connection(ctx, from_json, force, workspace_id, connection_key, model_type, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata: @@ -15033,10 +15032,10 @@ def update_connection(ctx, from_json, force, workspace_id, connection_key, model @cli_util.wrap_exceptions def update_connection_update_connection_from_lake(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata: @@ -15115,10 +15114,10 @@ def update_connection_update_connection_from_lake(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_connection_update_connection_from_oracle_ebs(ctx, from_json, force, workspace_id, connection_key, key, object_version, username, password, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -15203,10 +15202,10 @@ def update_connection_update_connection_from_oracle_ebs(ctx, from_json, force, w @cli_util.wrap_exceptions def update_connection_update_connection_from_object_storage(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, credential_file_content, user_id, finger_print, pass_phrase, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata: @@ -15297,10 +15296,10 @@ def update_connection_update_connection_from_object_storage(ctx, from_json, forc @cli_util.wrap_exceptions def update_connection_update_connection_from_bicc(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, username, password_secret, default_external_storage, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret or default_external_storage: @@ -15385,10 +15384,10 @@ def update_connection_update_connection_from_bicc(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_connection_update_connection_from_rest_no_auth(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata: @@ -15470,10 +15469,10 @@ def update_connection_update_connection_from_rest_no_auth(ctx, from_json, force, @cli_util.wrap_exceptions def update_connection_update_connection_from_hdfs(ctx, from_json, force, workspace_id, connection_key, key, object_version, hdfs_principal, data_node_principal, name_node_principal, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, realm, key_distribution_center, key_tab_content, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or key_tab_content: @@ -15566,10 +15565,10 @@ def update_connection_update_connection_from_hdfs(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_connection_update_connection_from_o_auth2(ctx, from_json, force, workspace_id, connection_key, key, object_version, access_token_url, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, client_id, client_secret, scope, grant_type, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or client_secret: @@ -15661,10 +15660,10 @@ def update_connection_update_connection_from_o_auth2(ctx, from_json, force, work @cli_util.wrap_exceptions def update_connection_update_connection_from_rest_basic_auth(ctx, from_json, force, workspace_id, connection_key, key, object_version, username, password_secret, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, auth_header, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -15748,10 +15747,10 @@ def update_connection_update_connection_from_rest_basic_auth(ctx, from_json, for @cli_util.wrap_exceptions def update_connection_update_connection_from_oracle_siebel(ctx, from_json, force, workspace_id, connection_key, key, object_version, username, password, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -15835,10 +15834,10 @@ def update_connection_update_connection_from_oracle_siebel(ctx, from_json, force @cli_util.wrap_exceptions def update_connection_update_connection_from_my_sql_heat_wave(ctx, from_json, force, workspace_id, connection_key, key, object_version, username, password, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -15921,10 +15920,10 @@ def update_connection_update_connection_from_my_sql_heat_wave(ctx, from_json, fo @cli_util.wrap_exceptions def update_connection_update_connection_from_bip(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, username, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -16009,10 +16008,10 @@ def update_connection_update_connection_from_bip(ctx, from_json, force, workspac @cli_util.wrap_exceptions def update_connection_update_connection_from_my_sql(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, username, password, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -16100,10 +16099,10 @@ def update_connection_update_connection_from_my_sql(ctx, from_json, force, works @cli_util.wrap_exceptions def update_connection_update_connection_from_jdbc(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, username, password, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -16190,10 +16189,10 @@ def update_connection_update_connection_from_jdbc(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_connection_update_connection_from_amazon_s3(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, access_key, secret_key, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or access_key or secret_key: @@ -16280,10 +16279,10 @@ def update_connection_update_connection_from_amazon_s3(ctx, from_json, force, wo @cli_util.wrap_exceptions def update_connection_update_connection_from_atp(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, tns_alias, tns_names, username, password, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or tns_names or password_secret: @@ -16377,10 +16376,10 @@ def update_connection_update_connection_from_atp(ctx, from_json, force, workspac @cli_util.wrap_exceptions def update_connection_update_connection_from_oracle(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, username, password, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -16470,10 +16469,10 @@ def update_connection_update_connection_from_oracle(ctx, from_json, force, works @cli_util.wrap_exceptions def update_connection_update_connection_from_adwc(ctx, from_json, force, workspace_id, connection_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, tns_alias, tns_names, username, password, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or tns_names or password_secret: @@ -16567,10 +16566,10 @@ def update_connection_update_connection_from_adwc(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_connection_update_connection_from_oracle_people_soft(ctx, from_json, force, workspace_id, connection_key, key, object_version, username, password, model_version, parent_ref, name, description, object_status, identifier, connection_properties, registry_metadata, password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(connection_key, six.string_types) and len(connection_key.strip()) == 0: + if isinstance(connection_key, str) and len(connection_key.strip()) == 0: raise click.UsageError('Parameter --connection-key cannot be whitespace or empty string') if not force: if parent_ref or connection_properties or registry_metadata or password_secret: @@ -16639,10 +16638,10 @@ def update_connection_update_connection_from_oracle_people_soft(ctx, from_json, @cli_util.wrap_exceptions def update_copy_object_request(ctx, from_json, workspace_id, copy_object_request_key, status, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(copy_object_request_key, six.string_types) and len(copy_object_request_key.strip()) == 0: + if isinstance(copy_object_request_key, str) and len(copy_object_request_key.strip()) == 0: raise click.UsageError('Parameter --copy-object-request-key cannot be whitespace or empty string') kwargs = {} @@ -16688,10 +16687,10 @@ def update_copy_object_request(ctx, from_json, workspace_id, copy_object_request @cli_util.wrap_exceptions def update_data_asset(ctx, from_json, force, workspace_id, data_asset_key, model_type, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata: @@ -16767,10 +16766,10 @@ def update_data_asset(ctx, from_json, force, workspace_id, data_asset_key, model @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_rest(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, base_url, manifest_file_content, default_connection, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or default_connection: @@ -16851,10 +16850,10 @@ def update_data_asset_update_data_asset_from_rest(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_my_sql_heat_wave(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, host, port, default_connection, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, service_name, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or default_connection: @@ -16942,10 +16941,10 @@ def update_data_asset_update_data_asset_from_my_sql_heat_wave(ctx, from_json, fo @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_oracle_ebs(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, host, port, default_connection, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, service_name, driver_class, sid, wallet_secret, wallet_password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or wallet_secret or wallet_password_secret or default_connection: @@ -17047,10 +17046,10 @@ def update_data_asset_update_data_asset_from_oracle_ebs(ctx, from_json, force, w @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_adwc(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, service_name, driver_class, credential_file_content, wallet_secret, wallet_password_secret, region_id, tenancy_id, compartment_id, autonomous_db_id, default_connection, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or wallet_secret or wallet_password_secret or default_connection: @@ -17159,10 +17158,10 @@ def update_data_asset_update_data_asset_from_adwc(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_hdfs(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, host, port, protocol, default_connection, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, validate_certificate, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or default_connection: @@ -17251,10 +17250,10 @@ def update_data_asset_update_data_asset_from_hdfs(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_oracle_people_soft(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, host, port, default_connection, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, service_name, driver_class, sid, wallet_secret, wallet_password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or wallet_secret or wallet_password_secret or default_connection: @@ -17351,10 +17350,10 @@ def update_data_asset_update_data_asset_from_oracle_people_soft(ctx, from_json, @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_object_storage(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, oci_region, url, tenancy_id, namespace, default_connection, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or default_connection: @@ -17444,10 +17443,10 @@ def update_data_asset_update_data_asset_from_object_storage(ctx, from_json, forc @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_amazon_s3(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, region_parameterconflict, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata: @@ -17528,10 +17527,10 @@ def update_data_asset_update_data_asset_from_amazon_s3(ctx, from_json, force, wo @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_my_sql(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, host, port, service_name, default_connection, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or default_connection: @@ -17625,10 +17624,10 @@ def update_data_asset_update_data_asset_from_my_sql(ctx, from_json, force, works @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_oracle_siebel(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, host, port, default_connection, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, service_name, driver_class, sid, wallet_secret, wallet_password_secret, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or wallet_secret or wallet_password_secret or default_connection: @@ -17724,10 +17723,10 @@ def update_data_asset_update_data_asset_from_oracle_siebel(ctx, from_json, force @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_lake(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, lake_id, default_connection, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, metastore_id, lake_proxy_endpoint, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or default_connection: @@ -17819,10 +17818,10 @@ def update_data_asset_update_data_asset_from_lake(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_atp(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, service_name, driver_class, credential_file_content, wallet_secret, wallet_password_secret, region_id, tenancy_id, compartment_id, autonomous_db_id, default_connection, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or wallet_secret or wallet_password_secret or default_connection: @@ -17930,10 +17929,10 @@ def update_data_asset_update_data_asset_from_atp(ctx, from_json, force, workspac @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_jdbc(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, host, port, data_asset_type, default_connection, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or default_connection: @@ -18020,10 +18019,10 @@ def update_data_asset_update_data_asset_from_jdbc(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_fusion_app(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, service_url, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata: @@ -18109,10 +18108,10 @@ def update_data_asset_update_data_asset_from_fusion_app(ctx, from_json, force, w @cli_util.wrap_exceptions def update_data_asset_update_data_asset_from_oracle(ctx, from_json, force, workspace_id, data_asset_key, key, object_version, model_version, name, description, object_status, identifier, external_key, asset_properties, registry_metadata, host, port, service_name, driver_class, sid, credential_file_content, wallet_secret, wallet_password_secret, default_connection, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_asset_key, six.string_types) and len(data_asset_key.strip()) == 0: + if isinstance(data_asset_key, str) and len(data_asset_key.strip()) == 0: raise click.UsageError('Parameter --data-asset-key cannot be whitespace or empty string') if not force: if asset_properties or registry_metadata or wallet_secret or wallet_password_secret or default_connection: @@ -18220,10 +18219,10 @@ def update_data_asset_update_data_asset_from_oracle(ctx, from_json, force, works @cli_util.wrap_exceptions def update_data_flow(ctx, from_json, force, workspace_id, data_flow_key, key, model_type, object_version, model_version, parent_ref, name, identifier, nodes, parameters, description, flow_config_values, object_status, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(data_flow_key, six.string_types) and len(data_flow_key.strip()) == 0: + if isinstance(data_flow_key, str) and len(data_flow_key.strip()) == 0: raise click.UsageError('Parameter --data-flow-key cannot be whitespace or empty string') if not force: if parent_ref or nodes or parameters or flow_config_values or registry_metadata: @@ -18310,10 +18309,10 @@ def update_data_flow(ctx, from_json, force, workspace_id, data_flow_key, key, mo @cli_util.wrap_exceptions def update_dis_application(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, dis_application_id, key, model_type, object_version, model_version, name, description, application_version, object_status, identifier, parent_ref, metadata, display_name, freeform_tags, defined_tags, lifecycle_state, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(dis_application_id, six.string_types) and len(dis_application_id.strip()) == 0: + if isinstance(dis_application_id, str) and len(dis_application_id.strip()) == 0: raise click.UsageError('Parameter --dis-application-id cannot be whitespace or empty string') if not force: if parent_ref or metadata or freeform_tags or defined_tags: @@ -18412,10 +18411,10 @@ def update_dis_application(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_dis_application_detailed_description(ctx, from_json, workspace_id, application_key, logo, detailed_description, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') kwargs = {} @@ -18453,10 +18452,10 @@ def update_dis_application_detailed_description(ctx, from_json, workspace_id, ap @cli_util.wrap_exceptions def update_export_request(ctx, from_json, workspace_id, export_request_key, status, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(export_request_key, six.string_types) and len(export_request_key.strip()) == 0: + if isinstance(export_request_key, str) and len(export_request_key.strip()) == 0: raise click.UsageError('Parameter --export-request-key cannot be whitespace or empty string') kwargs = {} @@ -18498,13 +18497,13 @@ def update_export_request(ctx, from_json, workspace_id, export_request_key, stat @cli_util.wrap_exceptions def update_external_publication(ctx, from_json, force, workspace_id, task_key, external_publications_key, application_compartment_id, display_name, application_id, description, resource_configuration, configuration_details, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') - if isinstance(external_publications_key, six.string_types) and len(external_publications_key.strip()) == 0: + if isinstance(external_publications_key, str) and len(external_publications_key.strip()) == 0: raise click.UsageError('Parameter --external-publications-key cannot be whitespace or empty string') if not force: if resource_configuration or configuration_details: @@ -18566,10 +18565,10 @@ def update_external_publication(ctx, from_json, force, workspace_id, task_key, e @cli_util.wrap_exceptions def update_folder(ctx, from_json, force, workspace_id, folder_key, key, model_type, object_version, model_version, name, description, category_name, object_status, identifier, parent_ref, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(folder_key, six.string_types) and len(folder_key.strip()) == 0: + if isinstance(folder_key, str) and len(folder_key.strip()) == 0: raise click.UsageError('Parameter --folder-key cannot be whitespace or empty string') if not force: if parent_ref or registry_metadata: @@ -18640,10 +18639,10 @@ def update_folder(ctx, from_json, force, workspace_id, folder_key, key, model_ty @cli_util.wrap_exceptions def update_function_library(ctx, from_json, force, workspace_id, function_library_key, name, description, category_name, object_status, identifier, model_version, object_version, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(function_library_key, six.string_types) and len(function_library_key.strip()) == 0: + if isinstance(function_library_key, str) and len(function_library_key.strip()) == 0: raise click.UsageError('Parameter --function-library-key cannot be whitespace or empty string') if not force: if registry_metadata: @@ -18703,10 +18702,10 @@ def update_function_library(ctx, from_json, force, workspace_id, function_librar @cli_util.wrap_exceptions def update_import_request(ctx, from_json, workspace_id, import_request_key, status, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(import_request_key, six.string_types) and len(import_request_key.strip()) == 0: + if isinstance(import_request_key, str) and len(import_request_key.strip()) == 0: raise click.UsageError('Parameter --import-request-key cannot be whitespace or empty string') kwargs = {} @@ -18761,10 +18760,10 @@ def update_import_request(ctx, from_json, workspace_id, import_request_key, stat @cli_util.wrap_exceptions def update_pipeline(ctx, from_json, force, workspace_id, pipeline_key, key, model_type, object_version, model_version, parent_ref, name, description, object_status, identifier, nodes, parameters, flow_config_values, variables, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(pipeline_key, six.string_types) and len(pipeline_key.strip()) == 0: + if isinstance(pipeline_key, str) and len(pipeline_key.strip()) == 0: raise click.UsageError('Parameter --pipeline-key cannot be whitespace or empty string') if not force: if parent_ref or nodes or parameters or flow_config_values or variables or registry_metadata: @@ -18846,10 +18845,10 @@ def update_pipeline(ctx, from_json, force, workspace_id, pipeline_key, key, mode @cli_util.wrap_exceptions def update_project(ctx, from_json, force, workspace_id, project_key, key, model_type, object_version, model_version, name, description, object_status, identifier, parent_ref, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(project_key, six.string_types) and len(project_key.strip()) == 0: + if isinstance(project_key, str) and len(project_key.strip()) == 0: raise click.UsageError('Parameter --project-key cannot be whitespace or empty string') if not force: if parent_ref or registry_metadata: @@ -18915,13 +18914,13 @@ def update_project(ctx, from_json, force, workspace_id, project_key, key, model_ @cli_util.wrap_exceptions def update_reference(ctx, from_json, force, workspace_id, application_key, reference_key, options, target_object, child_references, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(reference_key, six.string_types) and len(reference_key.strip()) == 0: + if isinstance(reference_key, str) and len(reference_key.strip()) == 0: raise click.UsageError('Parameter --reference-key cannot be whitespace or empty string') if not force: if options or target_object or child_references: @@ -18981,13 +18980,13 @@ def update_reference(ctx, from_json, force, workspace_id, application_key, refer @cli_util.wrap_exceptions def update_schedule(ctx, from_json, force, workspace_id, application_key, schedule_key, key, object_version, model_version, model_type, parent_ref, name, description, object_status, identifier, frequency_details, timezone, is_daylight_adjustment_enabled, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') if not force: if parent_ref or frequency_details or registry_metadata: @@ -19076,13 +19075,13 @@ def update_schedule(ctx, from_json, force, workspace_id, application_key, schedu @cli_util.wrap_exceptions def update_schedule_monthly_frequency_details(ctx, from_json, force, workspace_id, application_key, schedule_key, key, object_version, model_version, model_type, parent_ref, name, description, object_status, identifier, timezone, is_daylight_adjustment_enabled, registry_metadata, if_match, frequency_details_frequency, frequency_details_interval, frequency_details_time, frequency_details_days): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') if not force: if parent_ref or registry_metadata: @@ -19181,13 +19180,13 @@ def update_schedule_monthly_frequency_details(ctx, from_json, force, workspace_i @cli_util.wrap_exceptions def update_schedule_custom_frequency_details(ctx, from_json, force, workspace_id, application_key, schedule_key, key, object_version, model_version, model_type, parent_ref, name, description, object_status, identifier, timezone, is_daylight_adjustment_enabled, registry_metadata, if_match, frequency_details_frequency, frequency_details_custom_expression): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') if not force: if parent_ref or registry_metadata: @@ -19281,13 +19280,13 @@ def update_schedule_custom_frequency_details(ctx, from_json, force, workspace_id @cli_util.wrap_exceptions def update_schedule_daily_frequency_details(ctx, from_json, force, workspace_id, application_key, schedule_key, key, object_version, model_version, model_type, parent_ref, name, description, object_status, identifier, timezone, is_daylight_adjustment_enabled, registry_metadata, if_match, frequency_details_frequency, frequency_details_interval, frequency_details_time): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') if not force: if parent_ref or registry_metadata: @@ -19384,13 +19383,13 @@ def update_schedule_daily_frequency_details(ctx, from_json, force, workspace_id, @cli_util.wrap_exceptions def update_schedule_weekly_frequency_details(ctx, from_json, force, workspace_id, application_key, schedule_key, key, object_version, model_version, model_type, parent_ref, name, description, object_status, identifier, timezone, is_daylight_adjustment_enabled, registry_metadata, if_match, frequency_details_frequency, frequency_details_time, frequency_details_days): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') if not force: if parent_ref or registry_metadata: @@ -19489,13 +19488,13 @@ def update_schedule_weekly_frequency_details(ctx, from_json, force, workspace_id @cli_util.wrap_exceptions def update_schedule_monthly_rule_frequency_details(ctx, from_json, force, workspace_id, application_key, schedule_key, key, object_version, model_version, model_type, parent_ref, name, description, object_status, identifier, timezone, is_daylight_adjustment_enabled, registry_metadata, if_match, frequency_details_frequency, frequency_details_week_of_month, frequency_details_interval, frequency_details_time, frequency_details_day_of_week): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') if not force: if parent_ref or registry_metadata: @@ -19598,13 +19597,13 @@ def update_schedule_monthly_rule_frequency_details(ctx, from_json, force, worksp @cli_util.wrap_exceptions def update_schedule_hourly_frequency_details(ctx, from_json, force, workspace_id, application_key, schedule_key, key, object_version, model_version, model_type, parent_ref, name, description, object_status, identifier, timezone, is_daylight_adjustment_enabled, registry_metadata, if_match, frequency_details_frequency, frequency_details_interval, frequency_details_time): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(schedule_key, six.string_types) and len(schedule_key.strip()) == 0: + if isinstance(schedule_key, str) and len(schedule_key.strip()) == 0: raise click.UsageError('Parameter --schedule-key cannot be whitespace or empty string') if not force: if parent_ref or registry_metadata: @@ -19707,10 +19706,10 @@ def update_schedule_hourly_frequency_details(ctx, from_json, force, workspace_id @cli_util.wrap_exceptions def update_task(ctx, from_json, force, workspace_id, task_key, model_type, key, object_version, model_version, parent_ref, name, description, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') if not force: if parent_ref or input_ports or output_ports or parameters or op_config_values or config_provider_delegate or registry_metadata: @@ -19825,10 +19824,10 @@ def update_task(ctx, from_json, force, workspace_id, task_key, model_type, key, @cli_util.wrap_exceptions def update_task_update_task_from_rest_task(ctx, from_json, force, workspace_id, task_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, registry_metadata, auth_details, auth_config, endpoint_parameterconflict, method_type, headers, additional_properties, json_data, api_call_mode, cancel_endpoint, cancel_method_type, execute_rest_call_config, cancel_rest_call_config, poll_rest_call_config, typed_expressions, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') if not force: if parent_ref or input_ports or output_ports or parameters or op_config_values or config_provider_delegate or registry_metadata or auth_details or auth_config or endpoint_parameterconflict or headers or cancel_endpoint or execute_rest_call_config or cancel_rest_call_config or poll_rest_call_config or typed_expressions: @@ -19971,10 +19970,10 @@ def update_task_update_task_from_rest_task(ctx, from_json, force, workspace_id, @cli_util.wrap_exceptions def update_task_update_task_from_pipeline_task(ctx, from_json, force, workspace_id, task_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, registry_metadata, pipeline, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') if not force: if parent_ref or input_ports or output_ports or parameters or op_config_values or config_provider_delegate or registry_metadata or pipeline: @@ -20080,10 +20079,10 @@ def update_task_update_task_from_pipeline_task(ctx, from_json, force, workspace_ @cli_util.wrap_exceptions def update_task_update_task_from_oci_dataflow_task(ctx, from_json, force, workspace_id, task_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, registry_metadata, dataflow_application, driver_shape_details, executor_shape_details, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') if not force: if parent_ref or input_ports or output_ports or parameters or op_config_values or config_provider_delegate or registry_metadata or dataflow_application or driver_shape_details or executor_shape_details: @@ -20195,10 +20194,10 @@ def update_task_update_task_from_oci_dataflow_task(ctx, from_json, force, worksp @cli_util.wrap_exceptions def update_task_update_task_from_sql_task(ctx, from_json, force, workspace_id, task_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, registry_metadata, script, sql_script_type, operation, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') if not force: if parent_ref or input_ports or output_ports or parameters or op_config_values or config_provider_delegate or registry_metadata or script or operation: @@ -20311,10 +20310,10 @@ def update_task_update_task_from_sql_task(ctx, from_json, force, workspace_id, t @cli_util.wrap_exceptions def update_task_update_task_from_data_loader_task(ctx, from_json, force, workspace_id, task_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, registry_metadata, data_flow, conditional_composite_field_map, is_single_load, parallel_load_limit, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') if not force: if parent_ref or input_ports or output_ports or parameters or op_config_values or config_provider_delegate or registry_metadata or data_flow or conditional_composite_field_map: @@ -20427,10 +20426,10 @@ def update_task_update_task_from_data_loader_task(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_task_update_task_from_integration_task(ctx, from_json, force, workspace_id, task_key, key, object_version, model_version, parent_ref, name, description, object_status, identifier, input_ports, output_ports, parameters, op_config_values, config_provider_delegate, is_concurrent_allowed, registry_metadata, data_flow, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(task_key, six.string_types) and len(task_key.strip()) == 0: + if isinstance(task_key, str) and len(task_key.strip()) == 0: raise click.UsageError('Parameter --task-key cannot be whitespace or empty string') if not force: if parent_ref or input_ports or output_ports or parameters or op_config_values or config_provider_delegate or registry_metadata or data_flow: @@ -20522,13 +20521,13 @@ def update_task_update_task_from_integration_task(ctx, from_json, force, workspa @cli_util.wrap_exceptions def update_task_run(ctx, from_json, force, workspace_id, application_key, task_run_key, key, status, model_type, model_version, name, description, object_version, task_schedule_key, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(task_run_key, six.string_types) and len(task_run_key.strip()) == 0: + if isinstance(task_run_key, str) and len(task_run_key.strip()) == 0: raise click.UsageError('Parameter --task-run-key cannot be whitespace or empty string') if not force: if registry_metadata: @@ -20616,13 +20615,13 @@ def update_task_run(ctx, from_json, force, workspace_id, application_key, task_r @cli_util.wrap_exceptions def update_task_schedule(ctx, from_json, force, workspace_id, application_key, task_schedule_key, key, object_version, model_version, model_type, parent_ref, name, description, object_status, identifier, schedule_ref, config_provider_delegate, is_enabled, number_of_retries, retry_delay, retry_delay_unit, start_time_millis, end_time_millis, is_concurrent_allowed, is_backfill_enabled, auth_mode, expected_duration, expected_duration_unit, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(application_key, six.string_types) and len(application_key.strip()) == 0: + if isinstance(application_key, str) and len(application_key.strip()) == 0: raise click.UsageError('Parameter --application-key cannot be whitespace or empty string') - if isinstance(task_schedule_key, six.string_types) and len(task_schedule_key.strip()) == 0: + if isinstance(task_schedule_key, str) and len(task_schedule_key.strip()) == 0: raise click.UsageError('Parameter --task-schedule-key cannot be whitespace or empty string') if not force: if parent_ref or schedule_ref or config_provider_delegate or registry_metadata: @@ -20736,10 +20735,10 @@ def update_task_schedule(ctx, from_json, force, workspace_id, application_key, t @cli_util.wrap_exceptions def update_user_defined_function(ctx, from_json, force, workspace_id, user_defined_function_key, parent_ref, name, identifier, model_version, object_version, signatures, expr, description, object_status, registry_metadata, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') - if isinstance(user_defined_function_key, six.string_types) and len(user_defined_function_key.strip()) == 0: + if isinstance(user_defined_function_key, str) and len(user_defined_function_key.strip()) == 0: raise click.UsageError('Parameter --user-defined-function-key cannot be whitespace or empty string') if not force: if parent_ref or signatures or expr or registry_metadata: @@ -20812,7 +20811,7 @@ def update_user_defined_function(ctx, from_json, force, workspace_id, user_defin @cli_util.wrap_exceptions def update_workspace(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, workspace_id, freeform_tags, defined_tags, description, display_name, workspace_properties, if_match): - if isinstance(workspace_id, six.string_types) and len(workspace_id.strip()) == 0: + if isinstance(workspace_id, str) and len(workspace_id.strip()) == 0: raise click.UsageError('Parameter --workspace-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or workspace_properties: diff --git a/services/data_labeling_service/src/oci_cli_data_labeling_management/generated/datalabelingmanagement_cli.py b/services/data_labeling_service/src/oci_cli_data_labeling_management/generated/datalabelingmanagement_cli.py index 37931a140..8c273293f 100644 --- a/services/data_labeling_service/src/oci_cli_data_labeling_management/generated/datalabelingmanagement_cli.py +++ b/services/data_labeling_service/src/oci_cli_data_labeling_management/generated/datalabelingmanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -66,7 +65,7 @@ def annotation_format_group(): @cli_util.wrap_exceptions def add_dataset_labels(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, label_set, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -129,7 +128,7 @@ def add_dataset_labels(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def change_dataset_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, compartment_id, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -651,7 +650,7 @@ def create_dataset_text_dataset_format_details(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def delete_dataset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -707,7 +706,7 @@ def delete_dataset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def generate_dataset_records(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, limit, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -765,7 +764,7 @@ def generate_dataset_records(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def get_dataset(ctx, from_json, dataset_id): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -787,7 +786,7 @@ def get_dataset(ctx, from_json, dataset_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -815,7 +814,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def import_pre_annotated_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, import_format, import_metadata_path, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -884,7 +883,7 @@ def import_pre_annotated_data(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def import_pre_annotated_data_object_storage_import_metadata_path(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, import_metadata_path_namespace, import_metadata_path_bucket, import_metadata_path_path, import_format, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -1072,7 +1071,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1123,7 +1122,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1223,7 +1222,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def remove_dataset_labels(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, label_set, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -1287,7 +1286,7 @@ def remove_dataset_labels(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def rename_dataset_labels(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, source_label_set, target_label_set, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -1356,7 +1355,7 @@ def rename_dataset_labels(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def snapshot_dataset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, are_annotations_included, are_unannotated_records_included, export_details, export_format, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -1427,7 +1426,7 @@ def snapshot_dataset(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def update_dataset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dataset_id, display_name, description, labeling_instructions, freeform_tags, defined_tags, if_match): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated/datalabeling_cli.py b/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated/datalabeling_cli.py index b148363a7..0a93ead88 100644 --- a/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated/datalabeling_cli.py +++ b/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated/datalabeling_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -507,7 +506,7 @@ def create_record_text_metadata(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_annotation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, annotation_id, if_match): - if isinstance(annotation_id, six.string_types) and len(annotation_id.strip()) == 0: + if isinstance(annotation_id, str) and len(annotation_id.strip()) == 0: raise click.UsageError('Parameter --annotation-id cannot be whitespace or empty string') kwargs = {} @@ -571,7 +570,7 @@ def delete_annotation(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_record(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, record_id, if_match): - if isinstance(record_id, six.string_types) and len(record_id.strip()) == 0: + if isinstance(record_id, str) and len(record_id.strip()) == 0: raise click.UsageError('Parameter --record-id cannot be whitespace or empty string') kwargs = {} @@ -630,7 +629,7 @@ def delete_record(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def get_annotation(ctx, from_json, annotation_id): - if isinstance(annotation_id, six.string_types) and len(annotation_id.strip()) == 0: + if isinstance(annotation_id, str) and len(annotation_id.strip()) == 0: raise click.UsageError('Parameter --annotation-id cannot be whitespace or empty string') kwargs = {} @@ -652,7 +651,7 @@ def get_annotation(ctx, from_json, annotation_id): @cli_util.wrap_exceptions def get_dataset(ctx, from_json, dataset_id): - if isinstance(dataset_id, six.string_types) and len(dataset_id.strip()) == 0: + if isinstance(dataset_id, str) and len(dataset_id.strip()) == 0: raise click.UsageError('Parameter --dataset-id cannot be whitespace or empty string') kwargs = {} @@ -674,7 +673,7 @@ def get_dataset(ctx, from_json, dataset_id): @cli_util.wrap_exceptions def get_record(ctx, from_json, record_id): - if isinstance(record_id, six.string_types) and len(record_id.strip()) == 0: + if isinstance(record_id, str) and len(record_id.strip()) == 0: raise click.UsageError('Parameter --record-id cannot be whitespace or empty string') kwargs = {} @@ -698,7 +697,7 @@ def get_record(ctx, from_json, record_id): @cli_util.wrap_exceptions def get_record_content(ctx, from_json, file, record_id, if_none_match): - if isinstance(record_id, six.string_types) and len(record_id.strip()) == 0: + if isinstance(record_id, str) and len(record_id.strip()) == 0: raise click.UsageError('Parameter --record-id cannot be whitespace or empty string') kwargs = {} @@ -746,7 +745,7 @@ def get_record_content(ctx, from_json, file, record_id, if_none_match): @cli_util.wrap_exceptions def get_record_preview_content(ctx, from_json, file, record_id, if_none_match): - if isinstance(record_id, six.string_types) and len(record_id.strip()) == 0: + if isinstance(record_id, str) and len(record_id.strip()) == 0: raise click.UsageError('Parameter --record-id cannot be whitespace or empty string') kwargs = {} @@ -1032,7 +1031,7 @@ def summarize_record_analytics(ctx, from_json, compartment_id, dataset_id, lifec @cli_util.wrap_exceptions def update_annotation(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, annotation_id, entities, freeform_tags, defined_tags, if_match): - if isinstance(annotation_id, six.string_types) and len(annotation_id.strip()) == 0: + if isinstance(annotation_id, str) and len(annotation_id.strip()) == 0: raise click.UsageError('Parameter --annotation-id cannot be whitespace or empty string') if not force: if entities or freeform_tags or defined_tags: @@ -1104,7 +1103,7 @@ def update_annotation(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_record(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, record_id, freeform_tags, defined_tags, record_metadata, if_match): - if isinstance(record_id, six.string_types) and len(record_id.strip()) == 0: + if isinstance(record_id, str) and len(record_id.strip()) == 0: raise click.UsageError('Parameter --record-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or record_metadata: @@ -1176,7 +1175,7 @@ def update_record(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_record_document_metadata(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, record_id, freeform_tags, defined_tags, if_match, record_metadata_job_id): - if isinstance(record_id, six.string_types) and len(record_id.strip()) == 0: + if isinstance(record_id, str) and len(record_id.strip()) == 0: raise click.UsageError('Parameter --record-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1253,7 +1252,7 @@ def update_record_document_metadata(ctx, from_json, force, wait_for_state, max_w @cli_util.wrap_exceptions def update_record_image_metadata(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, record_id, freeform_tags, defined_tags, if_match, record_metadata_height, record_metadata_width, record_metadata_depth): - if isinstance(record_id, six.string_types) and len(record_id.strip()) == 0: + if isinstance(record_id, str) and len(record_id.strip()) == 0: raise click.UsageError('Parameter --record-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1333,7 +1332,7 @@ def update_record_image_metadata(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_record_text_metadata(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, record_id, freeform_tags, defined_tags, if_match): - if isinstance(record_id, six.string_types) and len(record_id.strip()) == 0: + if isinstance(record_id, str) and len(record_id.strip()) == 0: raise click.UsageError('Parameter --record-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/data_safe/src/oci_cli_data_safe/generated/datasafe_cli.py b/services/data_safe/src/oci_cli_data_safe/generated/datasafe_cli.py index 945986410..936cba814 100644 --- a/services/data_safe/src/oci_cli_data_safe/generated/datasafe_cli.py +++ b/services/data_safe/src/oci_cli_data_safe/generated/datasafe_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -677,7 +676,7 @@ def target_alert_policy_association_summary_group(): @cli_util.wrap_exceptions def activate_target_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, credentials, target_database_id, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -737,7 +736,7 @@ def activate_target_database(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def add_masking_columns_from_sdm(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -861,7 +860,7 @@ def alerts_update(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def apply_discovery_job_results(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, discovery_job_id, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -922,7 +921,7 @@ def apply_discovery_job_results(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def apply_sdm_masking_policy_difference(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, sdm_masking_policy_difference_id, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -983,7 +982,7 @@ def apply_sdm_masking_policy_difference(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def apply_security_assessment_template(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, template_assessment_id, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -1524,7 +1523,7 @@ def bulk_delete_sql_firewall_allowed_sqls_scim_query_selection_mode(ctx, from_js @cli_util.wrap_exceptions def calculate_audit_volume_available(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_profile_id, audit_collection_start_time, trail_locations, database_unique_name, if_match): - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -1594,7 +1593,7 @@ def calculate_audit_volume_available(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def calculate_audit_volume_collected(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_profile_id, time_from_month, time_to_month, if_match): - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -1655,7 +1654,7 @@ def calculate_audit_volume_collected(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1681,7 +1680,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_alert_compartment(ctx, from_json, alert_id, compartment_id, if_match): - if isinstance(alert_id, six.string_types) and len(alert_id.strip()) == 0: + if isinstance(alert_id, str) and len(alert_id.strip()) == 0: raise click.UsageError('Parameter --alert-id cannot be whitespace or empty string') kwargs = {} @@ -1715,7 +1714,7 @@ def change_alert_compartment(ctx, from_json, alert_id, compartment_id, if_match) @cli_util.wrap_exceptions def change_alert_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, alert_policy_id, compartment_id, if_match): - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1776,7 +1775,7 @@ def change_alert_policy_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_attribute_set_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, attribute_set_id, compartment_id, if_match): - if isinstance(attribute_set_id, six.string_types) and len(attribute_set_id.strip()) == 0: + if isinstance(attribute_set_id, str) and len(attribute_set_id.strip()) == 0: raise click.UsageError('Parameter --attribute-set-id cannot be whitespace or empty string') kwargs = {} @@ -1837,7 +1836,7 @@ def change_attribute_set_compartment(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def change_audit_archive_retrieval_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_archive_retrieval_id, compartment_id, if_match): - if isinstance(audit_archive_retrieval_id, six.string_types) and len(audit_archive_retrieval_id.strip()) == 0: + if isinstance(audit_archive_retrieval_id, str) and len(audit_archive_retrieval_id.strip()) == 0: raise click.UsageError('Parameter --audit-archive-retrieval-id cannot be whitespace or empty string') kwargs = {} @@ -1898,7 +1897,7 @@ def change_audit_archive_retrieval_compartment(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def change_audit_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_policy_id, compartment_id, if_match): - if isinstance(audit_policy_id, six.string_types) and len(audit_policy_id.strip()) == 0: + if isinstance(audit_policy_id, str) and len(audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --audit-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1959,7 +1958,7 @@ def change_audit_policy_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_audit_profile_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_profile_id, compartment_id, if_match): - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -2020,7 +2019,7 @@ def change_audit_profile_compartment(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def change_data_safe_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_safe_private_endpoint_id, compartment_id, if_match): - if isinstance(data_safe_private_endpoint_id, six.string_types) and len(data_safe_private_endpoint_id.strip()) == 0: + if isinstance(data_safe_private_endpoint_id, str) and len(data_safe_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --data-safe-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2083,7 +2082,7 @@ def change_data_safe_private_endpoint_compartment(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def change_database_security_config_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_security_config_id, compartment_id, if_match): - if isinstance(database_security_config_id, six.string_types) and len(database_security_config_id.strip()) == 0: + if isinstance(database_security_config_id, str) and len(database_security_config_id.strip()) == 0: raise click.UsageError('Parameter --database-security-config-id cannot be whitespace or empty string') kwargs = {} @@ -2141,7 +2140,7 @@ def change_database_security_config_compartment(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_discovery_job_compartment(ctx, from_json, discovery_job_id, compartment_id, if_match): - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') kwargs = {} @@ -2172,7 +2171,7 @@ def change_discovery_job_compartment(ctx, from_json, discovery_job_id, compartme @cli_util.wrap_exceptions def change_library_masking_format_compartment(ctx, from_json, library_masking_format_id, compartment_id, if_match): - if isinstance(library_masking_format_id, six.string_types) and len(library_masking_format_id.strip()) == 0: + if isinstance(library_masking_format_id, str) and len(library_masking_format_id.strip()) == 0: raise click.UsageError('Parameter --library-masking-format-id cannot be whitespace or empty string') kwargs = {} @@ -2203,7 +2202,7 @@ def change_library_masking_format_compartment(ctx, from_json, library_masking_fo @cli_util.wrap_exceptions def change_masking_policy_compartment(ctx, from_json, masking_policy_id, compartment_id, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2234,7 +2233,7 @@ def change_masking_policy_compartment(ctx, from_json, masking_policy_id, compart @cli_util.wrap_exceptions def change_masking_policy_health_report_compartment(ctx, from_json, masking_policy_health_report_id, compartment_id, if_match): - if isinstance(masking_policy_health_report_id, six.string_types) and len(masking_policy_health_report_id.strip()) == 0: + if isinstance(masking_policy_health_report_id, str) and len(masking_policy_health_report_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-health-report-id cannot be whitespace or empty string') kwargs = {} @@ -2265,7 +2264,7 @@ def change_masking_policy_health_report_compartment(ctx, from_json, masking_poli @cli_util.wrap_exceptions def change_on_prem_connector_compartment(ctx, from_json, on_prem_connector_id, compartment_id, if_match): - if isinstance(on_prem_connector_id, six.string_types) and len(on_prem_connector_id.strip()) == 0: + if isinstance(on_prem_connector_id, str) and len(on_prem_connector_id.strip()) == 0: raise click.UsageError('Parameter --on-prem-connector-id cannot be whitespace or empty string') kwargs = {} @@ -2299,7 +2298,7 @@ def change_on_prem_connector_compartment(ctx, from_json, on_prem_connector_id, c @cli_util.wrap_exceptions def change_report_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, report_id, compartment_id, if_match): - if isinstance(report_id, six.string_types) and len(report_id.strip()) == 0: + if isinstance(report_id, str) and len(report_id.strip()) == 0: raise click.UsageError('Parameter --report-id cannot be whitespace or empty string') kwargs = {} @@ -2360,7 +2359,7 @@ def change_report_compartment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_report_definition_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, report_definition_id, compartment_id, if_match): - if isinstance(report_definition_id, six.string_types) and len(report_definition_id.strip()) == 0: + if isinstance(report_definition_id, str) and len(report_definition_id.strip()) == 0: raise click.UsageError('Parameter --report-definition-id cannot be whitespace or empty string') kwargs = {} @@ -2423,7 +2422,7 @@ def change_report_definition_compartment(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def change_retention(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_profile_id, online_months, offline_months, is_override_global_retention_setting, if_match): - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -2489,7 +2488,7 @@ def change_retention(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def change_sdm_masking_policy_difference_compartment(ctx, from_json, sdm_masking_policy_difference_id, compartment_id, if_match): - if isinstance(sdm_masking_policy_difference_id, six.string_types) and len(sdm_masking_policy_difference_id.strip()) == 0: + if isinstance(sdm_masking_policy_difference_id, str) and len(sdm_masking_policy_difference_id.strip()) == 0: raise click.UsageError('Parameter --sdm-masking-policy-difference-id cannot be whitespace or empty string') kwargs = {} @@ -2524,7 +2523,7 @@ def change_sdm_masking_policy_difference_compartment(ctx, from_json, sdm_masking @cli_util.wrap_exceptions def change_security_assessment_compartment(ctx, from_json, security_assessment_id, compartment_id, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -2558,7 +2557,7 @@ def change_security_assessment_compartment(ctx, from_json, security_assessment_i @cli_util.wrap_exceptions def change_security_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_id, compartment_id, if_match): - if isinstance(security_policy_id, six.string_types) and len(security_policy_id.strip()) == 0: + if isinstance(security_policy_id, str) and len(security_policy_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2619,7 +2618,7 @@ def change_security_policy_compartment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def change_security_policy_config_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_config_id, compartment_id, if_match): - if isinstance(security_policy_config_id, six.string_types) and len(security_policy_config_id.strip()) == 0: + if isinstance(security_policy_config_id, str) and len(security_policy_config_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-config-id cannot be whitespace or empty string') kwargs = {} @@ -2680,7 +2679,7 @@ def change_security_policy_config_compartment(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def change_security_policy_deployment_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_deployment_id, compartment_id, if_match): - if isinstance(security_policy_deployment_id, six.string_types) and len(security_policy_deployment_id.strip()) == 0: + if isinstance(security_policy_deployment_id, str) and len(security_policy_deployment_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -2738,7 +2737,7 @@ def change_security_policy_deployment_compartment(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def change_sensitive_data_model_compartment(ctx, from_json, sensitive_data_model_id, compartment_id, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -2769,7 +2768,7 @@ def change_sensitive_data_model_compartment(ctx, from_json, sensitive_data_model @cli_util.wrap_exceptions def change_sensitive_type_compartment(ctx, from_json, sensitive_type_id, compartment_id, if_match): - if isinstance(sensitive_type_id, six.string_types) and len(sensitive_type_id.strip()) == 0: + if isinstance(sensitive_type_id, str) and len(sensitive_type_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-id cannot be whitespace or empty string') kwargs = {} @@ -2800,7 +2799,7 @@ def change_sensitive_type_compartment(ctx, from_json, sensitive_type_id, compart @cli_util.wrap_exceptions def change_sensitive_type_group_compartment(ctx, from_json, sensitive_type_group_id, compartment_id, if_match): - if isinstance(sensitive_type_group_id, six.string_types) and len(sensitive_type_group_id.strip()) == 0: + if isinstance(sensitive_type_group_id, str) and len(sensitive_type_group_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-group-id cannot be whitespace or empty string') kwargs = {} @@ -2831,7 +2830,7 @@ def change_sensitive_type_group_compartment(ctx, from_json, sensitive_type_group @cli_util.wrap_exceptions def change_sensitive_types_export_compartment(ctx, from_json, sensitive_types_export_id, compartment_id, if_match): - if isinstance(sensitive_types_export_id, six.string_types) and len(sensitive_types_export_id.strip()) == 0: + if isinstance(sensitive_types_export_id, str) and len(sensitive_types_export_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-types-export-id cannot be whitespace or empty string') kwargs = {} @@ -2865,7 +2864,7 @@ def change_sensitive_types_export_compartment(ctx, from_json, sensitive_types_ex @cli_util.wrap_exceptions def change_sql_collection_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_collection_id, compartment_id, if_match): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -2926,7 +2925,7 @@ def change_sql_collection_compartment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def change_sql_firewall_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_firewall_policy_id, compartment_id, if_match): - if isinstance(sql_firewall_policy_id, six.string_types) and len(sql_firewall_policy_id.strip()) == 0: + if isinstance(sql_firewall_policy_id, str) and len(sql_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --sql-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2984,7 +2983,7 @@ def change_sql_firewall_policy_compartment(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def change_target_alert_policy_association_compartment(ctx, from_json, target_alert_policy_association_id, compartment_id, if_match): - if isinstance(target_alert_policy_association_id, six.string_types) and len(target_alert_policy_association_id.strip()) == 0: + if isinstance(target_alert_policy_association_id, str) and len(target_alert_policy_association_id.strip()) == 0: raise click.UsageError('Parameter --target-alert-policy-association-id cannot be whitespace or empty string') kwargs = {} @@ -3015,7 +3014,7 @@ def change_target_alert_policy_association_compartment(ctx, from_json, target_al @cli_util.wrap_exceptions def change_target_database_compartment(ctx, from_json, target_database_id, compartment_id, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -3049,7 +3048,7 @@ def change_target_database_compartment(ctx, from_json, target_database_id, compa @cli_util.wrap_exceptions def change_target_database_group_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_group_id, compartment_id, if_match): - if isinstance(target_database_group_id, six.string_types) and len(target_database_group_id.strip()) == 0: + if isinstance(target_database_group_id, str) and len(target_database_group_id.strip()) == 0: raise click.UsageError('Parameter --target-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -3110,7 +3109,7 @@ def change_target_database_group_compartment(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def change_unified_audit_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_audit_policy_id, compartment_id, if_match): - if isinstance(unified_audit_policy_id, six.string_types) and len(unified_audit_policy_id.strip()) == 0: + if isinstance(unified_audit_policy_id, str) and len(unified_audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --unified-audit-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3171,7 +3170,7 @@ def change_unified_audit_policy_compartment(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def change_unified_audit_policy_definition_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_audit_policy_definition_id, compartment_id, if_match): - if isinstance(unified_audit_policy_definition_id, six.string_types) and len(unified_audit_policy_definition_id.strip()) == 0: + if isinstance(unified_audit_policy_definition_id, str) and len(unified_audit_policy_definition_id.strip()) == 0: raise click.UsageError('Parameter --unified-audit-policy-definition-id cannot be whitespace or empty string') kwargs = {} @@ -3229,7 +3228,7 @@ def change_unified_audit_policy_definition_compartment(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def change_user_assessment_compartment(ctx, from_json, user_assessment_id, compartment_id, if_match): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -3263,7 +3262,7 @@ def change_user_assessment_compartment(ctx, from_json, user_assessment_id, compa @cli_util.wrap_exceptions def compare_security_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, comparison_security_assessment_id, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -3324,7 +3323,7 @@ def compare_security_assessment(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def compare_to_template_baseline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, comparison_security_assessment_id, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -3385,7 +3384,7 @@ def compare_to_template_baseline(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def compare_user_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_assessment_id, comparison_user_assessment_id, if_match): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -3528,7 +3527,7 @@ def create_alert_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def create_alert_policy_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, expression, alert_policy_id, description, display_name): - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') kwargs = {} @@ -4111,7 +4110,7 @@ def create_library_masking_format(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def create_masking_column(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schema_name, object_name, column_name, masking_policy_id, object_type, masking_column_group, sensitive_type_id, is_masking_enabled, masking_formats): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -4589,7 +4588,7 @@ def create_on_prem_connector(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_peer_target_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, database_details, display_name, description, dataguard_association_id, tls_config, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -4670,7 +4669,7 @@ def create_peer_target_database(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def create_peer_target_database_installed_database_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, database_details_infrastructure_type, database_details_listener_port, database_details_service_name, display_name, description, dataguard_association_id, tls_config, if_match, database_details_instance_id, database_details_ip_addresses): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -4759,7 +4758,7 @@ def create_peer_target_database_installed_database_details(ctx, from_json, wait_ @cli_util.wrap_exceptions def create_peer_target_database_autonomous_database_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, database_details_infrastructure_type, database_details_autonomous_database_id, display_name, description, dataguard_association_id, tls_config, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -4845,7 +4844,7 @@ def create_peer_target_database_autonomous_database_details(ctx, from_json, wait @cli_util.wrap_exceptions def create_peer_target_database_database_cloud_service_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, database_details_infrastructure_type, display_name, description, dataguard_association_id, tls_config, if_match, database_details_vm_cluster_id, database_details_db_system_id, database_details_pluggable_database_id, database_details_listener_port, database_details_service_name): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -4938,7 +4937,7 @@ def create_peer_target_database_database_cloud_service_details(ctx, from_json, w @cli_util.wrap_exceptions def create_referential_relation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, relation_type, parent, child, is_sensitive): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -5494,7 +5493,7 @@ def create_security_policy_deployment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def create_sensitive_column(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, schema_name, object_name, column_name, app_name, object_type, data_type, status, sensitive_type_id, parent_column_keys, relation_type, app_defined_child_column_keys, db_defined_child_column_keys): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -7093,7 +7092,7 @@ def create_user_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def deactivate_target_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -7149,7 +7148,7 @@ def deactivate_target_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_alert_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, alert_policy_id, if_match): - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') kwargs = {} @@ -7206,10 +7205,10 @@ def delete_alert_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_alert_policy_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, alert_policy_id, rule_key, if_match): - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') - if isinstance(rule_key, six.string_types) and len(rule_key.strip()) == 0: + if isinstance(rule_key, str) and len(rule_key.strip()) == 0: raise click.UsageError('Parameter --rule-key cannot be whitespace or empty string') kwargs = {} @@ -7266,7 +7265,7 @@ def delete_alert_policy_rule(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_attribute_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, attribute_set_id, if_match): - if isinstance(attribute_set_id, six.string_types) and len(attribute_set_id.strip()) == 0: + if isinstance(attribute_set_id, str) and len(attribute_set_id.strip()) == 0: raise click.UsageError('Parameter --attribute-set-id cannot be whitespace or empty string') kwargs = {} @@ -7322,7 +7321,7 @@ def delete_attribute_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_audit_archive_retrieval(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_archive_retrieval_id, if_match): - if isinstance(audit_archive_retrieval_id, six.string_types) and len(audit_archive_retrieval_id.strip()) == 0: + if isinstance(audit_archive_retrieval_id, str) and len(audit_archive_retrieval_id.strip()) == 0: raise click.UsageError('Parameter --audit-archive-retrieval-id cannot be whitespace or empty string') kwargs = {} @@ -7378,7 +7377,7 @@ def delete_audit_archive_retrieval(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_audit_profile(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_profile_id, if_match): - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -7434,7 +7433,7 @@ def delete_audit_profile(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_audit_trail(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_trail_id, if_match): - if isinstance(audit_trail_id, six.string_types) and len(audit_trail_id.strip()) == 0: + if isinstance(audit_trail_id, str) and len(audit_trail_id.strip()) == 0: raise click.UsageError('Parameter --audit-trail-id cannot be whitespace or empty string') kwargs = {} @@ -7490,7 +7489,7 @@ def delete_audit_trail(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_data_safe_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_safe_private_endpoint_id, if_match): - if isinstance(data_safe_private_endpoint_id, six.string_types) and len(data_safe_private_endpoint_id.strip()) == 0: + if isinstance(data_safe_private_endpoint_id, str) and len(data_safe_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --data-safe-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -7546,7 +7545,7 @@ def delete_data_safe_private_endpoint(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def delete_discovery_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, discovery_job_id, if_match): - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') kwargs = {} @@ -7600,10 +7599,10 @@ def delete_discovery_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_discovery_job_result(ctx, from_json, discovery_job_id, result_key, if_match): - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') - if isinstance(result_key, six.string_types) and len(result_key.strip()) == 0: + if isinstance(result_key, str) and len(result_key.strip()) == 0: raise click.UsageError('Parameter --result-key cannot be whitespace or empty string') kwargs = {} @@ -7633,7 +7632,7 @@ def delete_discovery_job_result(ctx, from_json, discovery_job_id, result_key, if @cli_util.wrap_exceptions def delete_library_masking_format(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, library_masking_format_id, if_match): - if isinstance(library_masking_format_id, six.string_types) and len(library_masking_format_id.strip()) == 0: + if isinstance(library_masking_format_id, str) and len(library_masking_format_id.strip()) == 0: raise click.UsageError('Parameter --library-masking-format-id cannot be whitespace or empty string') kwargs = {} @@ -7695,10 +7694,10 @@ def delete_library_masking_format(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_masking_column(ctx, from_json, masking_column_key, masking_policy_id, if_match): - if isinstance(masking_column_key, six.string_types) and len(masking_column_key.strip()) == 0: + if isinstance(masking_column_key, str) and len(masking_column_key.strip()) == 0: raise click.UsageError('Parameter --masking-column-key cannot be whitespace or empty string') - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -7728,7 +7727,7 @@ def delete_masking_column(ctx, from_json, masking_column_key, masking_policy_id, @cli_util.wrap_exceptions def delete_masking_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -7784,7 +7783,7 @@ def delete_masking_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_masking_policy_health_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_health_report_id, if_match): - if isinstance(masking_policy_health_report_id, six.string_types) and len(masking_policy_health_report_id.strip()) == 0: + if isinstance(masking_policy_health_report_id, str) and len(masking_policy_health_report_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-health-report-id cannot be whitespace or empty string') kwargs = {} @@ -7840,7 +7839,7 @@ def delete_masking_policy_health_report(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def delete_masking_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_report_id, if_match): - if isinstance(masking_report_id, six.string_types) and len(masking_report_id.strip()) == 0: + if isinstance(masking_report_id, str) and len(masking_report_id.strip()) == 0: raise click.UsageError('Parameter --masking-report-id cannot be whitespace or empty string') kwargs = {} @@ -7896,7 +7895,7 @@ def delete_masking_report(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_on_prem_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, on_prem_connector_id, if_match): - if isinstance(on_prem_connector_id, six.string_types) and len(on_prem_connector_id.strip()) == 0: + if isinstance(on_prem_connector_id, str) and len(on_prem_connector_id.strip()) == 0: raise click.UsageError('Parameter --on-prem-connector-id cannot be whitespace or empty string') kwargs = {} @@ -7953,10 +7952,10 @@ def delete_on_prem_connector(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_peer_target_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, peer_target_database_id, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') - if isinstance(peer_target_database_id, six.string_types) and len(peer_target_database_id.strip()) == 0: + if isinstance(peer_target_database_id, str) and len(peer_target_database_id.strip()) == 0: raise click.UsageError('Parameter --peer-target-database-id cannot be whitespace or empty string') kwargs = {} @@ -8011,10 +8010,10 @@ def delete_peer_target_database(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_referential_relation(ctx, from_json, sensitive_data_model_id, referential_relation_key, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') - if isinstance(referential_relation_key, six.string_types) and len(referential_relation_key.strip()) == 0: + if isinstance(referential_relation_key, str) and len(referential_relation_key.strip()) == 0: raise click.UsageError('Parameter --referential-relation-key cannot be whitespace or empty string') kwargs = {} @@ -8044,7 +8043,7 @@ def delete_referential_relation(ctx, from_json, sensitive_data_model_id, referen @cli_util.wrap_exceptions def delete_report_definition(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, report_definition_id, if_match): - if isinstance(report_definition_id, six.string_types) and len(report_definition_id.strip()) == 0: + if isinstance(report_definition_id, str) and len(report_definition_id.strip()) == 0: raise click.UsageError('Parameter --report-definition-id cannot be whitespace or empty string') kwargs = {} @@ -8100,7 +8099,7 @@ def delete_report_definition(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_sdm_masking_policy_difference(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sdm_masking_policy_difference_id, if_match): - if isinstance(sdm_masking_policy_difference_id, six.string_types) and len(sdm_masking_policy_difference_id.strip()) == 0: + if isinstance(sdm_masking_policy_difference_id, str) and len(sdm_masking_policy_difference_id.strip()) == 0: raise click.UsageError('Parameter --sdm-masking-policy-difference-id cannot be whitespace or empty string') kwargs = {} @@ -8156,7 +8155,7 @@ def delete_sdm_masking_policy_difference(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def delete_security_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -8212,7 +8211,7 @@ def delete_security_assessment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_security_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_id, if_match): - if isinstance(security_policy_id, six.string_types) and len(security_policy_id.strip()) == 0: + if isinstance(security_policy_id, str) and len(security_policy_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-id cannot be whitespace or empty string') kwargs = {} @@ -8268,7 +8267,7 @@ def delete_security_policy(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_security_policy_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_config_id, if_match): - if isinstance(security_policy_config_id, six.string_types) and len(security_policy_config_id.strip()) == 0: + if isinstance(security_policy_config_id, str) and len(security_policy_config_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-config-id cannot be whitespace or empty string') kwargs = {} @@ -8324,7 +8323,7 @@ def delete_security_policy_config(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_security_policy_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_deployment_id, if_match): - if isinstance(security_policy_deployment_id, six.string_types) and len(security_policy_deployment_id.strip()) == 0: + if isinstance(security_policy_deployment_id, str) and len(security_policy_deployment_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -8378,10 +8377,10 @@ def delete_security_policy_deployment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def delete_sensitive_column(ctx, from_json, sensitive_data_model_id, sensitive_column_key, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') - if isinstance(sensitive_column_key, six.string_types) and len(sensitive_column_key.strip()) == 0: + if isinstance(sensitive_column_key, str) and len(sensitive_column_key.strip()) == 0: raise click.UsageError('Parameter --sensitive-column-key cannot be whitespace or empty string') kwargs = {} @@ -8411,7 +8410,7 @@ def delete_sensitive_column(ctx, from_json, sensitive_data_model_id, sensitive_c @cli_util.wrap_exceptions def delete_sensitive_data_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -8467,7 +8466,7 @@ def delete_sensitive_data_model(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_sensitive_type(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_type_id, if_match): - if isinstance(sensitive_type_id, six.string_types) and len(sensitive_type_id.strip()) == 0: + if isinstance(sensitive_type_id, str) and len(sensitive_type_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-id cannot be whitespace or empty string') kwargs = {} @@ -8531,7 +8530,7 @@ def delete_sensitive_type(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_sensitive_type_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_type_group_id, if_match): - if isinstance(sensitive_type_group_id, six.string_types) and len(sensitive_type_group_id.strip()) == 0: + if isinstance(sensitive_type_group_id, str) and len(sensitive_type_group_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-group-id cannot be whitespace or empty string') kwargs = {} @@ -8587,7 +8586,7 @@ def delete_sensitive_type_group(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_sensitive_types_export(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_types_export_id, if_match): - if isinstance(sensitive_types_export_id, six.string_types) and len(sensitive_types_export_id.strip()) == 0: + if isinstance(sensitive_types_export_id, str) and len(sensitive_types_export_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-types-export-id cannot be whitespace or empty string') kwargs = {} @@ -8651,7 +8650,7 @@ def delete_sensitive_types_export(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_sql_collection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_collection_id, if_match): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -8707,7 +8706,7 @@ def delete_sql_collection(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_sql_firewall_allowed_sql(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_firewall_allowed_sql_id, if_match): - if isinstance(sql_firewall_allowed_sql_id, six.string_types) and len(sql_firewall_allowed_sql_id.strip()) == 0: + if isinstance(sql_firewall_allowed_sql_id, str) and len(sql_firewall_allowed_sql_id.strip()) == 0: raise click.UsageError('Parameter --sql-firewall-allowed-sql-id cannot be whitespace or empty string') kwargs = {} @@ -8763,7 +8762,7 @@ def delete_sql_firewall_allowed_sql(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def delete_sql_firewall_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_firewall_policy_id, if_match): - if isinstance(sql_firewall_policy_id, six.string_types) and len(sql_firewall_policy_id.strip()) == 0: + if isinstance(sql_firewall_policy_id, str) and len(sql_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --sql-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -8819,7 +8818,7 @@ def delete_sql_firewall_policy(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_target_alert_policy_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_alert_policy_association_id, if_match): - if isinstance(target_alert_policy_association_id, six.string_types) and len(target_alert_policy_association_id.strip()) == 0: + if isinstance(target_alert_policy_association_id, str) and len(target_alert_policy_association_id.strip()) == 0: raise click.UsageError('Parameter --target-alert-policy-association-id cannot be whitespace or empty string') kwargs = {} @@ -8875,7 +8874,7 @@ def delete_target_alert_policy_association(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def delete_target_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -8931,7 +8930,7 @@ def delete_target_database(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_target_database_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_group_id, if_match): - if isinstance(target_database_group_id, six.string_types) and len(target_database_group_id.strip()) == 0: + if isinstance(target_database_group_id, str) and len(target_database_group_id.strip()) == 0: raise click.UsageError('Parameter --target-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -8987,7 +8986,7 @@ def delete_target_database_group(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_unified_audit_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_audit_policy_id, if_match): - if isinstance(unified_audit_policy_id, six.string_types) and len(unified_audit_policy_id.strip()) == 0: + if isinstance(unified_audit_policy_id, str) and len(unified_audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --unified-audit-policy-id cannot be whitespace or empty string') kwargs = {} @@ -9043,7 +9042,7 @@ def delete_unified_audit_policy(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_unified_audit_policy_definition(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_audit_policy_definition_id, if_match): - if isinstance(unified_audit_policy_definition_id, six.string_types) and len(unified_audit_policy_definition_id.strip()) == 0: + if isinstance(unified_audit_policy_definition_id, str) and len(unified_audit_policy_definition_id.strip()) == 0: raise click.UsageError('Parameter --unified-audit-policy-definition-id cannot be whitespace or empty string') kwargs = {} @@ -9099,7 +9098,7 @@ def delete_unified_audit_policy_definition(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def delete_user_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_assessment_id, if_match): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -9154,7 +9153,7 @@ def delete_user_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def deploy_security_policy_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_deployment_id, if_match): - if isinstance(security_policy_deployment_id, six.string_types) and len(security_policy_deployment_id.strip()) == 0: + if isinstance(security_policy_deployment_id, str) and len(security_policy_deployment_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -9209,7 +9208,7 @@ def deploy_security_policy_deployment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def discover_audit_trails(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_profile_id, if_match): - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -9263,7 +9262,7 @@ def discover_audit_trails(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def download_discovery_report(ctx, from_json, file, sensitive_data_model_id, discovery_job_id, report_format): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -9320,7 +9319,7 @@ def download_discovery_report(ctx, from_json, file, sensitive_data_model_id, dis @cli_util.wrap_exceptions def download_masking_log(ctx, from_json, file, masking_policy_id, target_id, masking_work_request_id): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -9376,7 +9375,7 @@ def download_masking_log(ctx, from_json, file, masking_policy_id, target_id, mas @cli_util.wrap_exceptions def download_masking_policy(ctx, from_json, file, masking_policy_id, policy_format): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -9430,7 +9429,7 @@ def download_masking_policy(ctx, from_json, file, masking_policy_id, policy_form @cli_util.wrap_exceptions def download_masking_report(ctx, from_json, file, masking_policy_id, report_id, report_format): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -9526,7 +9525,7 @@ def download_privilege_script(ctx, from_json, file, if_match): @cli_util.wrap_exceptions def download_security_assessment_report(ctx, from_json, file, security_assessment_id, format, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -9579,7 +9578,7 @@ def download_security_assessment_report(ctx, from_json, file, security_assessmen @cli_util.wrap_exceptions def download_sensitive_data_model(ctx, from_json, file, sensitive_data_model_id, data_model_format): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -9632,7 +9631,7 @@ def download_sensitive_data_model(ctx, from_json, file, sensitive_data_model_id, @cli_util.wrap_exceptions def download_sensitive_types_export(ctx, from_json, file, sensitive_types_export_id, data_model_format): - if isinstance(sensitive_types_export_id, six.string_types) and len(sensitive_types_export_id.strip()) == 0: + if isinstance(sensitive_types_export_id, str) and len(sensitive_types_export_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-types-export-id cannot be whitespace or empty string') kwargs = {} @@ -9686,7 +9685,7 @@ def download_sensitive_types_export(ctx, from_json, file, sensitive_types_export @cli_util.wrap_exceptions def download_user_assessment_report(ctx, from_json, file, user_assessment_id, format, if_match): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -9801,7 +9800,7 @@ def enable_data_safe_configuration(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def generate_discovery_report_for_download(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, report_format, discovery_job_id): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -9869,7 +9868,7 @@ def generate_discovery_report_for_download(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def generate_health_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, check_type, target_id, compartment_id, tablespace, freeform_tags, defined_tags): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -9944,7 +9943,7 @@ def generate_health_report(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def generate_masking_policy_for_download(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, policy_format): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -10005,7 +10004,7 @@ def generate_masking_policy_for_download(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def generate_masking_report_for_download(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, report_id, report_format): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -10063,7 +10062,7 @@ def generate_masking_report_for_download(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def generate_on_prem_connector_configuration(ctx, from_json, file, password, on_prem_connector_id, if_match): - if isinstance(on_prem_connector_id, six.string_types) and len(on_prem_connector_id.strip()) == 0: + if isinstance(on_prem_connector_id, str) and len(on_prem_connector_id.strip()) == 0: raise click.UsageError('Parameter --on-prem-connector-id cannot be whitespace or empty string') kwargs = {} @@ -10130,7 +10129,7 @@ def generate_on_prem_connector_configuration(ctx, from_json, file, password, on_ @cli_util.wrap_exceptions def generate_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, report_definition_id, display_name, compartment_id, mime_type, target_ids, target_group_ids, description, time_less_than, time_greater_than, row_limit, if_match, scim_query): - if isinstance(report_definition_id, six.string_types) and len(report_definition_id.strip()) == 0: + if isinstance(report_definition_id, str) and len(report_definition_id.strip()) == 0: raise click.UsageError('Parameter --report-definition-id cannot be whitespace or empty string') kwargs = {} @@ -10213,7 +10212,7 @@ def generate_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def generate_security_assessment_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, format, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -10273,7 +10272,7 @@ def generate_security_assessment_report(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def generate_sensitive_data_model_for_download(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, data_model_format): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -10333,7 +10332,7 @@ def generate_sensitive_data_model_for_download(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def generate_sql_firewall_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_collection_id, if_match): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -10389,7 +10388,7 @@ def generate_sql_firewall_policy(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def generate_user_assessment_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_assessment_id, format, if_match): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -10445,7 +10444,7 @@ def generate_user_assessment_report(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def get_alert(ctx, from_json, alert_id): - if isinstance(alert_id, six.string_types) and len(alert_id.strip()) == 0: + if isinstance(alert_id, str) and len(alert_id.strip()) == 0: raise click.UsageError('Parameter --alert-id cannot be whitespace or empty string') kwargs = {} @@ -10467,7 +10466,7 @@ def get_alert(ctx, from_json, alert_id): @cli_util.wrap_exceptions def get_alert_policy(ctx, from_json, alert_policy_id): - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') kwargs = {} @@ -10490,10 +10489,10 @@ def get_alert_policy(ctx, from_json, alert_policy_id): @cli_util.wrap_exceptions def get_alert_policy_rule(ctx, from_json, alert_policy_id, rule_key): - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') - if isinstance(rule_key, six.string_types) and len(rule_key.strip()) == 0: + if isinstance(rule_key, str) and len(rule_key.strip()) == 0: raise click.UsageError('Parameter --rule-key cannot be whitespace or empty string') kwargs = {} @@ -10517,7 +10516,7 @@ def get_alert_policy_rule(ctx, from_json, alert_policy_id, rule_key): @cli_util.wrap_exceptions def get_attribute_set(ctx, from_json, attribute_set_id, if_match): - if isinstance(attribute_set_id, six.string_types) and len(attribute_set_id.strip()) == 0: + if isinstance(attribute_set_id, str) and len(attribute_set_id.strip()) == 0: raise click.UsageError('Parameter --attribute-set-id cannot be whitespace or empty string') kwargs = {} @@ -10542,7 +10541,7 @@ def get_attribute_set(ctx, from_json, attribute_set_id, if_match): @cli_util.wrap_exceptions def get_audit_archive_retrieval(ctx, from_json, audit_archive_retrieval_id, if_match): - if isinstance(audit_archive_retrieval_id, six.string_types) and len(audit_archive_retrieval_id.strip()) == 0: + if isinstance(audit_archive_retrieval_id, str) and len(audit_archive_retrieval_id.strip()) == 0: raise click.UsageError('Parameter --audit-archive-retrieval-id cannot be whitespace or empty string') kwargs = {} @@ -10566,7 +10565,7 @@ def get_audit_archive_retrieval(ctx, from_json, audit_archive_retrieval_id, if_m @cli_util.wrap_exceptions def get_audit_policy(ctx, from_json, audit_policy_id): - if isinstance(audit_policy_id, six.string_types) and len(audit_policy_id.strip()) == 0: + if isinstance(audit_policy_id, str) and len(audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --audit-policy-id cannot be whitespace or empty string') kwargs = {} @@ -10588,7 +10587,7 @@ def get_audit_policy(ctx, from_json, audit_policy_id): @cli_util.wrap_exceptions def get_audit_profile(ctx, from_json, audit_profile_id): - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -10610,7 +10609,7 @@ def get_audit_profile(ctx, from_json, audit_profile_id): @cli_util.wrap_exceptions def get_audit_trail(ctx, from_json, audit_trail_id): - if isinstance(audit_trail_id, six.string_types) and len(audit_trail_id.strip()) == 0: + if isinstance(audit_trail_id, str) and len(audit_trail_id.strip()) == 0: raise click.UsageError('Parameter --audit-trail-id cannot be whitespace or empty string') kwargs = {} @@ -10706,7 +10705,7 @@ def get_data_safe_configuration(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_data_safe_private_endpoint(ctx, from_json, data_safe_private_endpoint_id): - if isinstance(data_safe_private_endpoint_id, six.string_types) and len(data_safe_private_endpoint_id.strip()) == 0: + if isinstance(data_safe_private_endpoint_id, str) and len(data_safe_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --data-safe-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -10728,7 +10727,7 @@ def get_data_safe_private_endpoint(ctx, from_json, data_safe_private_endpoint_id @cli_util.wrap_exceptions def get_database_security_config(ctx, from_json, database_security_config_id): - if isinstance(database_security_config_id, six.string_types) and len(database_security_config_id.strip()) == 0: + if isinstance(database_security_config_id, str) and len(database_security_config_id.strip()) == 0: raise click.UsageError('Parameter --database-security-config-id cannot be whitespace or empty string') kwargs = {} @@ -10751,10 +10750,10 @@ def get_database_security_config(ctx, from_json, database_security_config_id): @cli_util.wrap_exceptions def get_database_table_access_entry(ctx, from_json, security_policy_report_id, database_table_access_entry_key): - if isinstance(security_policy_report_id, six.string_types) and len(security_policy_report_id.strip()) == 0: + if isinstance(security_policy_report_id, str) and len(security_policy_report_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-report-id cannot be whitespace or empty string') - if isinstance(database_table_access_entry_key, six.string_types) and len(database_table_access_entry_key.strip()) == 0: + if isinstance(database_table_access_entry_key, str) and len(database_table_access_entry_key.strip()) == 0: raise click.UsageError('Parameter --database-table-access-entry-key cannot be whitespace or empty string') kwargs = {} @@ -10778,10 +10777,10 @@ def get_database_table_access_entry(ctx, from_json, security_policy_report_id, d @cli_util.wrap_exceptions def get_database_view_access_entry(ctx, from_json, security_policy_report_id, database_view_access_entry_key): - if isinstance(security_policy_report_id, six.string_types) and len(security_policy_report_id.strip()) == 0: + if isinstance(security_policy_report_id, str) and len(security_policy_report_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-report-id cannot be whitespace or empty string') - if isinstance(database_view_access_entry_key, six.string_types) and len(database_view_access_entry_key.strip()) == 0: + if isinstance(database_view_access_entry_key, str) and len(database_view_access_entry_key.strip()) == 0: raise click.UsageError('Parameter --database-view-access-entry-key cannot be whitespace or empty string') kwargs = {} @@ -10805,10 +10804,10 @@ def get_database_view_access_entry(ctx, from_json, security_policy_report_id, da @cli_util.wrap_exceptions def get_difference_column(ctx, from_json, sdm_masking_policy_difference_id, difference_column_key): - if isinstance(sdm_masking_policy_difference_id, six.string_types) and len(sdm_masking_policy_difference_id.strip()) == 0: + if isinstance(sdm_masking_policy_difference_id, str) and len(sdm_masking_policy_difference_id.strip()) == 0: raise click.UsageError('Parameter --sdm-masking-policy-difference-id cannot be whitespace or empty string') - if isinstance(difference_column_key, six.string_types) and len(difference_column_key.strip()) == 0: + if isinstance(difference_column_key, str) and len(difference_column_key.strip()) == 0: raise click.UsageError('Parameter --difference-column-key cannot be whitespace or empty string') kwargs = {} @@ -10831,7 +10830,7 @@ def get_difference_column(ctx, from_json, sdm_masking_policy_difference_id, diff @cli_util.wrap_exceptions def get_discovery_job(ctx, from_json, discovery_job_id): - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') kwargs = {} @@ -10854,10 +10853,10 @@ def get_discovery_job(ctx, from_json, discovery_job_id): @cli_util.wrap_exceptions def get_discovery_job_result(ctx, from_json, discovery_job_id, result_key): - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') - if isinstance(result_key, six.string_types) and len(result_key.strip()) == 0: + if isinstance(result_key, str) and len(result_key.strip()) == 0: raise click.UsageError('Parameter --result-key cannot be whitespace or empty string') kwargs = {} @@ -10883,7 +10882,7 @@ def get_discovery_job_result(ctx, from_json, discovery_job_id, result_key): @cli_util.wrap_exceptions def get_group_members(ctx, from_json, target_database_group_id, target_database_id, limit, page): - if isinstance(target_database_group_id, six.string_types) and len(target_database_group_id.strip()) == 0: + if isinstance(target_database_group_id, str) and len(target_database_group_id.strip()) == 0: raise click.UsageError('Parameter --target-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -10911,7 +10910,7 @@ def get_group_members(ctx, from_json, target_database_group_id, target_database_ @cli_util.wrap_exceptions def get_library_masking_format(ctx, from_json, library_masking_format_id): - if isinstance(library_masking_format_id, six.string_types) and len(library_masking_format_id.strip()) == 0: + if isinstance(library_masking_format_id, str) and len(library_masking_format_id.strip()) == 0: raise click.UsageError('Parameter --library-masking-format-id cannot be whitespace or empty string') kwargs = {} @@ -10934,10 +10933,10 @@ def get_library_masking_format(ctx, from_json, library_masking_format_id): @cli_util.wrap_exceptions def get_masking_column(ctx, from_json, masking_policy_id, masking_column_key): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') - if isinstance(masking_column_key, six.string_types) and len(masking_column_key.strip()) == 0: + if isinstance(masking_column_key, str) and len(masking_column_key.strip()) == 0: raise click.UsageError('Parameter --masking-column-key cannot be whitespace or empty string') kwargs = {} @@ -10960,7 +10959,7 @@ def get_masking_column(ctx, from_json, masking_policy_id, masking_column_key): @cli_util.wrap_exceptions def get_masking_policy(ctx, from_json, masking_policy_id): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -10982,7 +10981,7 @@ def get_masking_policy(ctx, from_json, masking_policy_id): @cli_util.wrap_exceptions def get_masking_policy_health_report(ctx, from_json, masking_policy_health_report_id): - if isinstance(masking_policy_health_report_id, six.string_types) and len(masking_policy_health_report_id.strip()) == 0: + if isinstance(masking_policy_health_report_id, str) and len(masking_policy_health_report_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-health-report-id cannot be whitespace or empty string') kwargs = {} @@ -11004,7 +11003,7 @@ def get_masking_policy_health_report(ctx, from_json, masking_policy_health_repor @cli_util.wrap_exceptions def get_masking_report(ctx, from_json, masking_report_id): - if isinstance(masking_report_id, six.string_types) and len(masking_report_id.strip()) == 0: + if isinstance(masking_report_id, str) and len(masking_report_id.strip()) == 0: raise click.UsageError('Parameter --masking-report-id cannot be whitespace or empty string') kwargs = {} @@ -11026,7 +11025,7 @@ def get_masking_report(ctx, from_json, masking_report_id): @cli_util.wrap_exceptions def get_on_prem_connector(ctx, from_json, on_prem_connector_id): - if isinstance(on_prem_connector_id, six.string_types) and len(on_prem_connector_id.strip()) == 0: + if isinstance(on_prem_connector_id, str) and len(on_prem_connector_id.strip()) == 0: raise click.UsageError('Parameter --on-prem-connector-id cannot be whitespace or empty string') kwargs = {} @@ -11049,10 +11048,10 @@ def get_on_prem_connector(ctx, from_json, on_prem_connector_id): @cli_util.wrap_exceptions def get_peer_target_database(ctx, from_json, target_database_id, peer_target_database_id): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') - if isinstance(peer_target_database_id, six.string_types) and len(peer_target_database_id.strip()) == 0: + if isinstance(peer_target_database_id, str) and len(peer_target_database_id.strip()) == 0: raise click.UsageError('Parameter --peer-target-database-id cannot be whitespace or empty string') kwargs = {} @@ -11078,10 +11077,10 @@ def get_peer_target_database(ctx, from_json, target_database_id, peer_target_dat @cli_util.wrap_exceptions def get_profile(ctx, from_json, user_assessment_id, profile_name): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') - if isinstance(profile_name, six.string_types) and len(profile_name.strip()) == 0: + if isinstance(profile_name, str) and len(profile_name.strip()) == 0: raise click.UsageError('Parameter --profile-name cannot be whitespace or empty string') kwargs = {} @@ -11105,10 +11104,10 @@ def get_profile(ctx, from_json, user_assessment_id, profile_name): @cli_util.wrap_exceptions def get_referential_relation(ctx, from_json, sensitive_data_model_id, referential_relation_key): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') - if isinstance(referential_relation_key, six.string_types) and len(referential_relation_key.strip()) == 0: + if isinstance(referential_relation_key, str) and len(referential_relation_key.strip()) == 0: raise click.UsageError('Parameter --referential-relation-key cannot be whitespace or empty string') kwargs = {} @@ -11131,7 +11130,7 @@ def get_referential_relation(ctx, from_json, sensitive_data_model_id, referentia @cli_util.wrap_exceptions def get_report(ctx, from_json, report_id): - if isinstance(report_id, six.string_types) and len(report_id.strip()) == 0: + if isinstance(report_id, str) and len(report_id.strip()) == 0: raise click.UsageError('Parameter --report-id cannot be whitespace or empty string') kwargs = {} @@ -11154,7 +11153,7 @@ def get_report(ctx, from_json, report_id): @cli_util.wrap_exceptions def get_report_content(ctx, from_json, file, report_id): - if isinstance(report_id, six.string_types) and len(report_id.strip()) == 0: + if isinstance(report_id, str) and len(report_id.strip()) == 0: raise click.UsageError('Parameter --report-id cannot be whitespace or empty string') kwargs = {} @@ -11198,7 +11197,7 @@ def get_report_content(ctx, from_json, file, report_id): @cli_util.wrap_exceptions def get_report_definition(ctx, from_json, report_definition_id): - if isinstance(report_definition_id, six.string_types) and len(report_definition_id.strip()) == 0: + if isinstance(report_definition_id, str) and len(report_definition_id.strip()) == 0: raise click.UsageError('Parameter --report-definition-id cannot be whitespace or empty string') kwargs = {} @@ -11220,7 +11219,7 @@ def get_report_definition(ctx, from_json, report_definition_id): @cli_util.wrap_exceptions def get_sdm_masking_policy_difference(ctx, from_json, sdm_masking_policy_difference_id): - if isinstance(sdm_masking_policy_difference_id, six.string_types) and len(sdm_masking_policy_difference_id.strip()) == 0: + if isinstance(sdm_masking_policy_difference_id, str) and len(sdm_masking_policy_difference_id.strip()) == 0: raise click.UsageError('Parameter --sdm-masking-policy-difference-id cannot be whitespace or empty string') kwargs = {} @@ -11242,7 +11241,7 @@ def get_sdm_masking_policy_difference(ctx, from_json, sdm_masking_policy_differe @cli_util.wrap_exceptions def get_security_assessment(ctx, from_json, security_assessment_id): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -11265,10 +11264,10 @@ def get_security_assessment(ctx, from_json, security_assessment_id): @cli_util.wrap_exceptions def get_security_assessment_comparison(ctx, from_json, security_assessment_id, comparison_security_assessment_id): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') - if isinstance(comparison_security_assessment_id, six.string_types) and len(comparison_security_assessment_id.strip()) == 0: + if isinstance(comparison_security_assessment_id, str) and len(comparison_security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --comparison-security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -11291,7 +11290,7 @@ def get_security_assessment_comparison(ctx, from_json, security_assessment_id, c @cli_util.wrap_exceptions def get_security_policy(ctx, from_json, security_policy_id): - if isinstance(security_policy_id, six.string_types) and len(security_policy_id.strip()) == 0: + if isinstance(security_policy_id, str) and len(security_policy_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-id cannot be whitespace or empty string') kwargs = {} @@ -11313,7 +11312,7 @@ def get_security_policy(ctx, from_json, security_policy_id): @cli_util.wrap_exceptions def get_security_policy_config(ctx, from_json, security_policy_config_id): - if isinstance(security_policy_config_id, six.string_types) and len(security_policy_config_id.strip()) == 0: + if isinstance(security_policy_config_id, str) and len(security_policy_config_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-config-id cannot be whitespace or empty string') kwargs = {} @@ -11335,7 +11334,7 @@ def get_security_policy_config(ctx, from_json, security_policy_config_id): @cli_util.wrap_exceptions def get_security_policy_deployment(ctx, from_json, security_policy_deployment_id): - if isinstance(security_policy_deployment_id, six.string_types) and len(security_policy_deployment_id.strip()) == 0: + if isinstance(security_policy_deployment_id, str) and len(security_policy_deployment_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -11358,10 +11357,10 @@ def get_security_policy_deployment(ctx, from_json, security_policy_deployment_id @cli_util.wrap_exceptions def get_security_policy_entry_state(ctx, from_json, security_policy_deployment_id, security_policy_entry_state_id): - if isinstance(security_policy_deployment_id, six.string_types) and len(security_policy_deployment_id.strip()) == 0: + if isinstance(security_policy_deployment_id, str) and len(security_policy_deployment_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-deployment-id cannot be whitespace or empty string') - if isinstance(security_policy_entry_state_id, six.string_types) and len(security_policy_entry_state_id.strip()) == 0: + if isinstance(security_policy_entry_state_id, str) and len(security_policy_entry_state_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-entry-state-id cannot be whitespace or empty string') kwargs = {} @@ -11384,7 +11383,7 @@ def get_security_policy_entry_state(ctx, from_json, security_policy_deployment_i @cli_util.wrap_exceptions def get_security_policy_report(ctx, from_json, security_policy_report_id): - if isinstance(security_policy_report_id, six.string_types) and len(security_policy_report_id.strip()) == 0: + if isinstance(security_policy_report_id, str) and len(security_policy_report_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-report-id cannot be whitespace or empty string') kwargs = {} @@ -11407,10 +11406,10 @@ def get_security_policy_report(ctx, from_json, security_policy_report_id): @cli_util.wrap_exceptions def get_sensitive_column(ctx, from_json, sensitive_data_model_id, sensitive_column_key): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') - if isinstance(sensitive_column_key, six.string_types) and len(sensitive_column_key.strip()) == 0: + if isinstance(sensitive_column_key, str) and len(sensitive_column_key.strip()) == 0: raise click.UsageError('Parameter --sensitive-column-key cannot be whitespace or empty string') kwargs = {} @@ -11433,7 +11432,7 @@ def get_sensitive_column(ctx, from_json, sensitive_data_model_id, sensitive_colu @cli_util.wrap_exceptions def get_sensitive_data_model(ctx, from_json, sensitive_data_model_id): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -11455,7 +11454,7 @@ def get_sensitive_data_model(ctx, from_json, sensitive_data_model_id): @cli_util.wrap_exceptions def get_sensitive_type(ctx, from_json, sensitive_type_id): - if isinstance(sensitive_type_id, six.string_types) and len(sensitive_type_id.strip()) == 0: + if isinstance(sensitive_type_id, str) and len(sensitive_type_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-id cannot be whitespace or empty string') kwargs = {} @@ -11477,7 +11476,7 @@ def get_sensitive_type(ctx, from_json, sensitive_type_id): @cli_util.wrap_exceptions def get_sensitive_type_group(ctx, from_json, sensitive_type_group_id): - if isinstance(sensitive_type_group_id, six.string_types) and len(sensitive_type_group_id.strip()) == 0: + if isinstance(sensitive_type_group_id, str) and len(sensitive_type_group_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-group-id cannot be whitespace or empty string') kwargs = {} @@ -11499,7 +11498,7 @@ def get_sensitive_type_group(ctx, from_json, sensitive_type_group_id): @cli_util.wrap_exceptions def get_sensitive_types_export(ctx, from_json, sensitive_types_export_id): - if isinstance(sensitive_types_export_id, six.string_types) and len(sensitive_types_export_id.strip()) == 0: + if isinstance(sensitive_types_export_id, str) and len(sensitive_types_export_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-types-export-id cannot be whitespace or empty string') kwargs = {} @@ -11521,7 +11520,7 @@ def get_sensitive_types_export(ctx, from_json, sensitive_types_export_id): @cli_util.wrap_exceptions def get_sql_collection(ctx, from_json, sql_collection_id): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -11543,7 +11542,7 @@ def get_sql_collection(ctx, from_json, sql_collection_id): @cli_util.wrap_exceptions def get_sql_firewall_allowed_sql(ctx, from_json, sql_firewall_allowed_sql_id): - if isinstance(sql_firewall_allowed_sql_id, six.string_types) and len(sql_firewall_allowed_sql_id.strip()) == 0: + if isinstance(sql_firewall_allowed_sql_id, str) and len(sql_firewall_allowed_sql_id.strip()) == 0: raise click.UsageError('Parameter --sql-firewall-allowed-sql-id cannot be whitespace or empty string') kwargs = {} @@ -11565,7 +11564,7 @@ def get_sql_firewall_allowed_sql(ctx, from_json, sql_firewall_allowed_sql_id): @cli_util.wrap_exceptions def get_sql_firewall_policy(ctx, from_json, sql_firewall_policy_id): - if isinstance(sql_firewall_policy_id, six.string_types) and len(sql_firewall_policy_id.strip()) == 0: + if isinstance(sql_firewall_policy_id, str) and len(sql_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --sql-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -11587,7 +11586,7 @@ def get_sql_firewall_policy(ctx, from_json, sql_firewall_policy_id): @cli_util.wrap_exceptions def get_target_alert_policy_association(ctx, from_json, target_alert_policy_association_id): - if isinstance(target_alert_policy_association_id, six.string_types) and len(target_alert_policy_association_id.strip()) == 0: + if isinstance(target_alert_policy_association_id, str) and len(target_alert_policy_association_id.strip()) == 0: raise click.UsageError('Parameter --target-alert-policy-association-id cannot be whitespace or empty string') kwargs = {} @@ -11609,7 +11608,7 @@ def get_target_alert_policy_association(ctx, from_json, target_alert_policy_asso @cli_util.wrap_exceptions def get_target_database(ctx, from_json, target_database_id): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -11631,7 +11630,7 @@ def get_target_database(ctx, from_json, target_database_id): @cli_util.wrap_exceptions def get_target_database_group(ctx, from_json, target_database_group_id): - if isinstance(target_database_group_id, six.string_types) and len(target_database_group_id.strip()) == 0: + if isinstance(target_database_group_id, str) and len(target_database_group_id.strip()) == 0: raise click.UsageError('Parameter --target-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -11657,10 +11656,10 @@ def get_target_database_group(ctx, from_json, target_database_group_id): @cli_util.wrap_exceptions def get_template_baseline_comparison(ctx, from_json, security_assessment_id, comparison_security_assessment_id, target_id, category, finding_key): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') - if isinstance(comparison_security_assessment_id, six.string_types) and len(comparison_security_assessment_id.strip()) == 0: + if isinstance(comparison_security_assessment_id, str) and len(comparison_security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --comparison-security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -11689,7 +11688,7 @@ def get_template_baseline_comparison(ctx, from_json, security_assessment_id, com @cli_util.wrap_exceptions def get_unified_audit_policy(ctx, from_json, unified_audit_policy_id): - if isinstance(unified_audit_policy_id, six.string_types) and len(unified_audit_policy_id.strip()) == 0: + if isinstance(unified_audit_policy_id, str) and len(unified_audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --unified-audit-policy-id cannot be whitespace or empty string') kwargs = {} @@ -11711,7 +11710,7 @@ def get_unified_audit_policy(ctx, from_json, unified_audit_policy_id): @cli_util.wrap_exceptions def get_unified_audit_policy_definition(ctx, from_json, unified_audit_policy_definition_id): - if isinstance(unified_audit_policy_definition_id, six.string_types) and len(unified_audit_policy_definition_id.strip()) == 0: + if isinstance(unified_audit_policy_definition_id, str) and len(unified_audit_policy_definition_id.strip()) == 0: raise click.UsageError('Parameter --unified-audit-policy-definition-id cannot be whitespace or empty string') kwargs = {} @@ -11733,7 +11732,7 @@ def get_unified_audit_policy_definition(ctx, from_json, unified_audit_policy_def @cli_util.wrap_exceptions def get_user_assessment(ctx, from_json, user_assessment_id): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -11756,10 +11755,10 @@ def get_user_assessment(ctx, from_json, user_assessment_id): @cli_util.wrap_exceptions def get_user_assessment_comparison(ctx, from_json, user_assessment_id, comparison_user_assessment_id): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') - if isinstance(comparison_user_assessment_id, six.string_types) and len(comparison_user_assessment_id.strip()) == 0: + if isinstance(comparison_user_assessment_id, str) and len(comparison_user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --comparison-user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -11782,7 +11781,7 @@ def get_user_assessment_comparison(ctx, from_json, user_assessment_id, compariso @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -11979,7 +11978,7 @@ def list_alert_policy_rules(ctx, from_json, all_pages, page_size, alert_policy_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') kwargs = {} @@ -12104,7 +12103,7 @@ def list_associated_resources(ctx, from_json, all_pages, page_size, attribute_se if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(attribute_set_id, six.string_types) and len(attribute_set_id.strip()) == 0: + if isinstance(attribute_set_id, str) and len(attribute_set_id.strip()) == 0: raise click.UsageError('Parameter --attribute-set-id cannot be whitespace or empty string') kwargs = {} @@ -12965,7 +12964,7 @@ def list_available_audit_volumes(ctx, from_json, all_pages, page_size, audit_pro if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -13037,7 +13036,7 @@ def list_checks(ctx, from_json, all_pages, page_size, security_assessment_id, li if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -13113,7 +13112,7 @@ def list_collected_audit_volumes(ctx, from_json, all_pages, page_size, audit_pro if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -13184,7 +13183,7 @@ def list_columns(ctx, from_json, all_pages, page_size, target_database_id, limit if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -13420,7 +13419,7 @@ def list_database_table_access_entries(ctx, from_json, all_pages, page_size, sec if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(security_policy_report_id, six.string_types) and len(security_policy_report_id.strip()) == 0: + if isinstance(security_policy_report_id, str) and len(security_policy_report_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-report-id cannot be whitespace or empty string') kwargs = {} @@ -13485,7 +13484,7 @@ def list_database_view_access_entries(ctx, from_json, all_pages, page_size, secu if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(security_policy_report_id, six.string_types) and len(security_policy_report_id.strip()) == 0: + if isinstance(security_policy_report_id, str) and len(security_policy_report_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-report-id cannot be whitespace or empty string') kwargs = {} @@ -13552,7 +13551,7 @@ def list_difference_columns(ctx, from_json, all_pages, page_size, sdm_masking_po if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sdm_masking_policy_difference_id, six.string_types) and len(sdm_masking_policy_difference_id.strip()) == 0: + if isinstance(sdm_masking_policy_difference_id, str) and len(sdm_masking_policy_difference_id.strip()) == 0: raise click.UsageError('Parameter --sdm-masking-policy-difference-id cannot be whitespace or empty string') kwargs = {} @@ -13705,7 +13704,7 @@ def list_discovery_job_results(ctx, from_json, all_pages, page_size, discovery_j if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') kwargs = {} @@ -13960,7 +13959,7 @@ def list_findings(ctx, from_json, all_pages, page_size, security_assessment_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -14058,7 +14057,7 @@ def list_findings_change_audit_logs(ctx, from_json, all_pages, page_size, securi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -14141,10 +14140,10 @@ def list_grants(ctx, from_json, all_pages, page_size, user_assessment_id, user_k if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') - if isinstance(user_key, six.string_types) and len(user_key.strip()) == 0: + if isinstance(user_key, str) and len(user_key.strip()) == 0: raise click.UsageError('Parameter --user-key cannot be whitespace or empty string') kwargs = {} @@ -14217,7 +14216,7 @@ def list_grouped_sensitive_types(ctx, from_json, all_pages, page_size, sensitive if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sensitive_type_group_id, six.string_types) and len(sensitive_type_group_id.strip()) == 0: + if isinstance(sensitive_type_group_id, str) and len(sensitive_type_group_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-group-id cannot be whitespace or empty string') kwargs = {} @@ -14360,7 +14359,7 @@ def list_masked_columns(ctx, from_json, all_pages, page_size, masking_report_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(masking_report_id, six.string_types) and len(masking_report_id.strip()) == 0: + if isinstance(masking_report_id, str) and len(masking_report_id.strip()) == 0: raise click.UsageError('Parameter --masking-report-id cannot be whitespace or empty string') kwargs = {} @@ -14519,7 +14518,7 @@ def list_masking_columns(ctx, from_json, all_pages, page_size, masking_policy_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -14605,7 +14604,7 @@ def list_masking_errors(ctx, from_json, all_pages, page_size, masking_report_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(masking_report_id, six.string_types) and len(masking_report_id.strip()) == 0: + if isinstance(masking_report_id, str) and len(masking_report_id.strip()) == 0: raise click.UsageError('Parameter --masking-report-id cannot be whitespace or empty string') kwargs = {} @@ -14667,7 +14666,7 @@ def list_masking_objects(ctx, from_json, all_pages, page_size, masking_policy_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -14816,7 +14815,7 @@ def list_masking_policy_health_report_logs(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(masking_policy_health_report_id, six.string_types) and len(masking_policy_health_report_id.strip()) == 0: + if isinstance(masking_policy_health_report_id, str) and len(masking_policy_health_report_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-health-report-id cannot be whitespace or empty string') kwargs = {} @@ -14954,7 +14953,7 @@ def list_masking_policy_referential_relations(ctx, from_json, all_pages, page_si if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -15086,7 +15085,7 @@ def list_masking_schemas(ctx, from_json, all_pages, page_size, masking_policy_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -15214,7 +15213,7 @@ def list_on_prem_connectors(ctx, from_json, all_pages, page_size, compartment_id @cli_util.wrap_exceptions def list_password_expiry_date_analytics(ctx, from_json, all_pages, user_assessment_id, compartment_id_in_subtree, access_level, user_category, time_password_expiry_less_than): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -15252,7 +15251,7 @@ def list_peer_target_databases(ctx, from_json, all_pages, page_size, target_data if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -15318,7 +15317,7 @@ def list_profile_analytics(ctx, from_json, all_pages, page_size, user_assessment if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -15409,7 +15408,7 @@ def list_profile_summaries(ctx, from_json, all_pages, page_size, user_assessment if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -15506,7 +15505,7 @@ def list_referential_relations(ctx, from_json, all_pages, page_size, sensitive_d if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -15738,7 +15737,7 @@ def list_role_grant_paths(ctx, from_json, all_pages, page_size, security_policy_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(security_policy_report_id, six.string_types) and len(security_policy_report_id.strip()) == 0: + if isinstance(security_policy_report_id, str) and len(security_policy_report_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-report-id cannot be whitespace or empty string') kwargs = {} @@ -15801,7 +15800,7 @@ def list_roles(ctx, from_json, all_pages, page_size, target_database_id, limit, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -15869,7 +15868,7 @@ def list_schemas(ctx, from_json, all_pages, page_size, target_database_id, limit if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -16494,7 +16493,7 @@ def list_security_policy_entry_states(ctx, from_json, all_pages, page_size, secu if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(security_policy_deployment_id, six.string_types) and len(security_policy_deployment_id.strip()) == 0: + if isinstance(security_policy_deployment_id, str) and len(security_policy_deployment_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -16738,7 +16737,7 @@ def list_sensitive_columns(ctx, from_json, all_pages, page_size, sensitive_data_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -16828,7 +16827,7 @@ def list_sensitive_data_model_sensitive_types(ctx, from_json, all_pages, page_si if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -16972,7 +16971,7 @@ def list_sensitive_objects(ctx, from_json, all_pages, page_size, sensitive_data_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -17036,7 +17035,7 @@ def list_sensitive_schemas(ctx, from_json, all_pages, page_size, sensitive_data_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -17426,7 +17425,7 @@ def list_sql_collection_log_insights(ctx, from_json, all_pages, page_size, time_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -18036,7 +18035,7 @@ def list_tables(ctx, from_json, all_pages, page_size, target_database_id, limit, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -18344,7 +18343,7 @@ def list_target_overrides(ctx, from_json, all_pages, page_size, audit_profile_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') kwargs = {} @@ -18730,7 +18729,7 @@ def list_user_access_analytics(ctx, from_json, all_pages, page_size, user_assess if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -18815,7 +18814,7 @@ def list_user_analytics(ctx, from_json, all_pages, page_size, user_assessment_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -19037,7 +19036,7 @@ def list_users(ctx, from_json, all_pages, page_size, user_assessment_id, limit, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -19134,7 +19133,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -19185,7 +19184,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -19315,7 +19314,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, ope @cli_util.wrap_exceptions def mask_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, target_id, is_decrypt, is_rerun, re_run_from_step, tablespace, is_ignore_errors_enabled, seed, is_move_interim_tables_enabled, is_execute_saved_script_enabled, is_drop_temp_tables_enabled, is_redo_logging_enabled, is_refresh_stats_enabled, parallel_degree, recompile): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -19417,7 +19416,7 @@ def mask_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_se @cli_util.wrap_exceptions def modify_global_settings(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, is_paid_usage, online_retention_period, offline_retention_period, if_match): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') kwargs = {} @@ -19552,7 +19551,7 @@ def patch_alerts(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def patch_checks(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, items, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -19617,7 +19616,7 @@ def patch_checks(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def patch_discovery_job_results(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, discovery_job_id, items, if_match): - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') kwargs = {} @@ -19682,7 +19681,7 @@ def patch_discovery_job_results(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def patch_findings(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, items, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -19747,7 +19746,7 @@ def patch_findings(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def patch_grouped_sensitive_types(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_type_group_id, items, if_match): - if isinstance(sensitive_type_group_id, six.string_types) and len(sensitive_type_group_id.strip()) == 0: + if isinstance(sensitive_type_group_id, str) and len(sensitive_type_group_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-group-id cannot be whitespace or empty string') kwargs = {} @@ -19812,7 +19811,7 @@ def patch_grouped_sensitive_types(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def patch_masking_columns(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, items, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -19877,7 +19876,7 @@ def patch_masking_columns(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def patch_sdm_masking_policy_difference_columns(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sdm_masking_policy_difference_id, items, if_match): - if isinstance(sdm_masking_policy_difference_id, six.string_types) and len(sdm_masking_policy_difference_id.strip()) == 0: + if isinstance(sdm_masking_policy_difference_id, str) and len(sdm_masking_policy_difference_id.strip()) == 0: raise click.UsageError('Parameter --sdm-masking-policy-difference-id cannot be whitespace or empty string') kwargs = {} @@ -19942,7 +19941,7 @@ def patch_sdm_masking_policy_difference_columns(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def patch_sensitive_columns(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, items, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} @@ -20122,7 +20121,7 @@ def patch_target_alert_policy_association(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def provision_audit_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, provision_audit_conditions, audit_policy_id, is_data_safe_service_account_excluded, if_match): - if isinstance(audit_policy_id, six.string_types) and len(audit_policy_id.strip()) == 0: + if isinstance(audit_policy_id, str) and len(audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --audit-policy-id cannot be whitespace or empty string') kwargs = {} @@ -20185,7 +20184,7 @@ def provision_audit_policy(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def purge_sql_collection_logs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_collection_id, if_match): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -20240,7 +20239,7 @@ def purge_sql_collection_logs(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def refresh_database_security_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_security_config_id, if_match): - if isinstance(database_security_config_id, six.string_types) and len(database_security_config_id.strip()) == 0: + if isinstance(database_security_config_id, str) and len(database_security_config_id.strip()) == 0: raise click.UsageError('Parameter --database-security-config-id cannot be whitespace or empty string') kwargs = {} @@ -20301,7 +20300,7 @@ def refresh_database_security_configuration(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def refresh_security_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, compartment_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -20372,7 +20371,7 @@ def refresh_security_assessment(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def refresh_security_policy_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_deployment_id, if_match): - if isinstance(security_policy_deployment_id, six.string_types) and len(security_policy_deployment_id.strip()) == 0: + if isinstance(security_policy_deployment_id, str) and len(security_policy_deployment_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -20427,7 +20426,7 @@ def refresh_security_policy_deployment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def refresh_sql_collection_log_insights(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_collection_id, if_match): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -20482,7 +20481,7 @@ def refresh_sql_collection_log_insights(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def refresh_target_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') kwargs = {} @@ -20544,7 +20543,7 @@ def refresh_target_database(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def refresh_user_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_assessment_id, compartment_id, description, display_name, freeform_tags, defined_tags, if_match): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -20618,7 +20617,7 @@ def refresh_user_assessment(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def remove_schedule_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, report_definition_id, if_match): - if isinstance(report_definition_id, six.string_types) and len(report_definition_id.strip()) == 0: + if isinstance(report_definition_id, str) and len(report_definition_id.strip()) == 0: raise click.UsageError('Parameter --report-definition-id cannot be whitespace or empty string') kwargs = {} @@ -20673,7 +20672,7 @@ def remove_schedule_report(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def remove_security_assessment_template(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -20728,7 +20727,7 @@ def remove_security_assessment_template(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def resume_audit_trail(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_trail_id, if_match): - if isinstance(audit_trail_id, six.string_types) and len(audit_trail_id.strip()) == 0: + if isinstance(audit_trail_id, str) and len(audit_trail_id.strip()) == 0: raise click.UsageError('Parameter --audit-trail-id cannot be whitespace or empty string') kwargs = {} @@ -20780,7 +20779,7 @@ def resume_audit_trail(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def resume_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -20808,7 +20807,7 @@ def resume_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def retrieve_audit_policies(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_policy_id, if_match): - if isinstance(audit_policy_id, six.string_types) and len(audit_policy_id.strip()) == 0: + if isinstance(audit_policy_id, str) and len(audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --audit-policy-id cannot be whitespace or empty string') kwargs = {} @@ -20870,7 +20869,7 @@ def retrieve_audit_policies(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def schedule_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, report_definition_id, schedule, mime_type, compartment_id, report_details, display_name, if_match): - if isinstance(report_definition_id, six.string_types) and len(report_definition_id.strip()) == 0: + if isinstance(report_definition_id, str) and len(report_definition_id.strip()) == 0: raise click.UsageError('Parameter --report-definition-id cannot be whitespace or empty string') kwargs = {} @@ -20944,7 +20943,7 @@ def schedule_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def schedule_report_schedule_audit_report_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, report_definition_id, schedule, mime_type, compartment_id, report_details_record_time_span, display_name, if_match, report_details_row_limit): - if isinstance(report_definition_id, six.string_types) and len(report_definition_id.strip()) == 0: + if isinstance(report_definition_id, str) and len(report_definition_id.strip()) == 0: raise click.UsageError('Parameter --report-definition-id cannot be whitespace or empty string') kwargs = {} @@ -21017,7 +21016,7 @@ def schedule_report_schedule_audit_report_details(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def set_security_assessment_baseline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, if_match, assessment_ids): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -21080,7 +21079,7 @@ def set_security_assessment_baseline(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def set_user_assessment_baseline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_assessment_id, if_match, assessment_ids): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -21145,7 +21144,7 @@ def set_user_assessment_baseline(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def start_audit_trail(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_collection_start_time, audit_trail_id, is_auto_purge_enabled, can_update_last_archive_time_on_target, if_match): - if isinstance(audit_trail_id, six.string_types) and len(audit_trail_id.strip()) == 0: + if isinstance(audit_trail_id, str) and len(audit_trail_id.strip()) == 0: raise click.UsageError('Parameter --audit-trail-id cannot be whitespace or empty string') kwargs = {} @@ -21211,7 +21210,7 @@ def start_audit_trail(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def start_sql_collection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_collection_id, if_match): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -21266,7 +21265,7 @@ def start_sql_collection(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def stop_audit_trail(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_trail_id, if_match): - if isinstance(audit_trail_id, six.string_types) and len(audit_trail_id.strip()) == 0: + if isinstance(audit_trail_id, str) and len(audit_trail_id.strip()) == 0: raise click.UsageError('Parameter --audit-trail-id cannot be whitespace or empty string') kwargs = {} @@ -21321,7 +21320,7 @@ def stop_audit_trail(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def stop_sql_collection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_collection_id, if_match): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') kwargs = {} @@ -21373,7 +21372,7 @@ def stop_sql_collection(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def suspend_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -21402,7 +21401,7 @@ def suspend_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def unset_security_assessment_baseline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, if_match, target_ids): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -21465,7 +21464,7 @@ def unset_security_assessment_baseline(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def unset_user_assessment_baseline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_assessment_id, if_match, target_ids): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') kwargs = {} @@ -21534,7 +21533,7 @@ def unset_user_assessment_baseline(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_alert(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, alert_id, comment, status, freeform_tags, defined_tags, if_match): - if isinstance(alert_id, six.string_types) and len(alert_id.strip()) == 0: + if isinstance(alert_id, str) and len(alert_id.strip()) == 0: raise click.UsageError('Parameter --alert-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -21613,7 +21612,7 @@ def update_alert(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_alert_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, alert_policy_id, display_name, description, severity, freeform_tags, defined_tags, if_match): - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -21695,10 +21694,10 @@ def update_alert_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_alert_policy_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, alert_policy_id, rule_key, description, expression, display_name, if_match): - if isinstance(alert_policy_id, six.string_types) and len(alert_policy_id.strip()) == 0: + if isinstance(alert_policy_id, str) and len(alert_policy_id.strip()) == 0: raise click.UsageError('Parameter --alert-policy-id cannot be whitespace or empty string') - if isinstance(rule_key, six.string_types) and len(rule_key.strip()) == 0: + if isinstance(rule_key, str) and len(rule_key.strip()) == 0: raise click.UsageError('Parameter --rule-key cannot be whitespace or empty string') kwargs = {} @@ -21775,7 +21774,7 @@ def update_alert_policy_rule(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_attribute_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, attribute_set_id, display_name, description, attribute_set_values, freeform_tags, defined_tags, if_match): - if isinstance(attribute_set_id, six.string_types) and len(attribute_set_id.strip()) == 0: + if isinstance(attribute_set_id, str) and len(attribute_set_id.strip()) == 0: raise click.UsageError('Parameter --attribute-set-id cannot be whitespace or empty string') if not force: if attribute_set_values or freeform_tags or defined_tags: @@ -21860,7 +21859,7 @@ def update_attribute_set(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_audit_archive_retrieval(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_archive_retrieval_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(audit_archive_retrieval_id, six.string_types) and len(audit_archive_retrieval_id.strip()) == 0: + if isinstance(audit_archive_retrieval_id, str) and len(audit_archive_retrieval_id.strip()) == 0: raise click.UsageError('Parameter --audit-archive-retrieval-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -21942,7 +21941,7 @@ def update_audit_archive_retrieval(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_audit_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_policy_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(audit_policy_id, six.string_types) and len(audit_policy_id.strip()) == 0: + if isinstance(audit_policy_id, str) and len(audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --audit-policy-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -22026,7 +22025,7 @@ def update_audit_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_audit_profile(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_profile_id, description, display_name, is_paid_usage_enabled, is_override_global_paid_usage, freeform_tags, defined_tags, if_match): - if isinstance(audit_profile_id, six.string_types) and len(audit_profile_id.strip()) == 0: + if isinstance(audit_profile_id, str) and len(audit_profile_id.strip()) == 0: raise click.UsageError('Parameter --audit-profile-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -22116,7 +22115,7 @@ def update_audit_profile(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_audit_trail(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, audit_trail_id, description, display_name, is_auto_purge_enabled, can_update_last_archive_time_on_target, freeform_tags, defined_tags, if_match): - if isinstance(audit_trail_id, six.string_types) and len(audit_trail_id.strip()) == 0: + if isinstance(audit_trail_id, str) and len(audit_trail_id.strip()) == 0: raise click.UsageError('Parameter --audit-trail-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -22205,7 +22204,7 @@ def update_audit_trail(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_data_safe_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_safe_private_endpoint_id, display_name, description, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(data_safe_private_endpoint_id, six.string_types) and len(data_safe_private_endpoint_id.strip()) == 0: + if isinstance(data_safe_private_endpoint_id, str) and len(data_safe_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --data-safe-private-endpoint-id cannot be whitespace or empty string') if not force: if nsg_ids or freeform_tags or defined_tags: @@ -22291,7 +22290,7 @@ def update_data_safe_private_endpoint(ctx, from_json, force, wait_for_state, max @cli_util.wrap_exceptions def update_database_security_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_security_config_id, display_name, description, sql_firewall_config, freeform_tags, defined_tags, if_match): - if isinstance(database_security_config_id, six.string_types) and len(database_security_config_id.strip()) == 0: + if isinstance(database_security_config_id, str) and len(database_security_config_id.strip()) == 0: raise click.UsageError('Parameter --database-security-config-id cannot be whitespace or empty string') if not force: if sql_firewall_config or freeform_tags or defined_tags: @@ -22373,10 +22372,10 @@ def update_database_security_config(ctx, from_json, force, wait_for_state, max_w @cli_util.wrap_exceptions def update_finding(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, finding_key, severity, justification, time_valid_until, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') - if isinstance(finding_key, six.string_types) and len(finding_key.strip()) == 0: + if isinstance(finding_key, str) and len(finding_key.strip()) == 0: raise click.UsageError('Parameter --finding-key cannot be whitespace or empty string') kwargs = {} @@ -22456,7 +22455,7 @@ def update_finding(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def update_library_masking_format(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, library_masking_format_id, display_name, description, sensitive_type_ids, format_entries, freeform_tags, defined_tags, if_match): - if isinstance(library_masking_format_id, six.string_types) and len(library_masking_format_id.strip()) == 0: + if isinstance(library_masking_format_id, str) and len(library_masking_format_id.strip()) == 0: raise click.UsageError('Parameter --library-masking-format-id cannot be whitespace or empty string') if not force: if sensitive_type_ids or format_entries or freeform_tags or defined_tags: @@ -22546,10 +22545,10 @@ def update_library_masking_format(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_masking_column(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_column_key, masking_policy_id, object_type, masking_column_group, sensitive_type_id, is_masking_enabled, masking_formats, if_match): - if isinstance(masking_column_key, six.string_types) and len(masking_column_key.strip()) == 0: + if isinstance(masking_column_key, str) and len(masking_column_key.strip()) == 0: raise click.UsageError('Parameter --masking-column-key cannot be whitespace or empty string') - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') if not force: if masking_formats: @@ -22643,7 +22642,7 @@ def update_masking_column(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_masking_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, display_name, description, is_drop_temp_tables_enabled, is_redo_logging_enabled, is_refresh_stats_enabled, parallel_degree, recompile, pre_masking_script, post_masking_script, column_source, freeform_tags, defined_tags, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') if not force: if column_source or freeform_tags or defined_tags: @@ -22757,7 +22756,7 @@ def update_masking_policy(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_masking_policy_update_column_source_sdm_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, column_source_sensitive_data_model_id, display_name, description, is_drop_temp_tables_enabled, is_redo_logging_enabled, is_refresh_stats_enabled, parallel_degree, recompile, pre_masking_script, post_masking_script, freeform_tags, defined_tags, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -22872,7 +22871,7 @@ def update_masking_policy_update_column_source_sdm_details(ctx, from_json, force @cli_util.wrap_exceptions def update_masking_policy_update_column_source_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, column_source_target_id, display_name, description, is_drop_temp_tables_enabled, is_redo_logging_enabled, is_refresh_stats_enabled, parallel_degree, recompile, pre_masking_script, post_masking_script, freeform_tags, defined_tags, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -22979,7 +22978,7 @@ def update_masking_policy_update_column_source_target_details(ctx, from_json, fo @cli_util.wrap_exceptions def update_on_prem_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, on_prem_connector_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(on_prem_connector_id, six.string_types) and len(on_prem_connector_id.strip()) == 0: + if isinstance(on_prem_connector_id, str) and len(on_prem_connector_id.strip()) == 0: raise click.UsageError('Parameter --on-prem-connector-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -23055,7 +23054,7 @@ def update_on_prem_connector(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_on_prem_connector_wallet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, on_prem_connector_id, is_update, if_match): - if isinstance(on_prem_connector_id, six.string_types) and len(on_prem_connector_id.strip()) == 0: + if isinstance(on_prem_connector_id, str) and len(on_prem_connector_id.strip()) == 0: raise click.UsageError('Parameter --on-prem-connector-id cannot be whitespace or empty string') kwargs = {} @@ -23123,10 +23122,10 @@ def update_on_prem_connector_wallet(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_peer_target_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, peer_target_database_id, display_name, description, database_details, tls_config, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') - if isinstance(peer_target_database_id, six.string_types) and len(peer_target_database_id.strip()) == 0: + if isinstance(peer_target_database_id, str) and len(peer_target_database_id.strip()) == 0: raise click.UsageError('Parameter --peer-target-database-id cannot be whitespace or empty string') if not force: if database_details or tls_config: @@ -23212,10 +23211,10 @@ def update_peer_target_database(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_peer_target_database_installed_database_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, peer_target_database_id, database_details_infrastructure_type, database_details_listener_port, database_details_service_name, display_name, description, tls_config, if_match, database_details_instance_id, database_details_ip_addresses): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') - if isinstance(peer_target_database_id, six.string_types) and len(peer_target_database_id.strip()) == 0: + if isinstance(peer_target_database_id, str) and len(peer_target_database_id.strip()) == 0: raise click.UsageError('Parameter --peer-target-database-id cannot be whitespace or empty string') if not force: if tls_config: @@ -23307,10 +23306,10 @@ def update_peer_target_database_installed_database_details(ctx, from_json, force @cli_util.wrap_exceptions def update_peer_target_database_autonomous_database_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, peer_target_database_id, database_details_infrastructure_type, database_details_autonomous_database_id, display_name, description, tls_config, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') - if isinstance(peer_target_database_id, six.string_types) and len(peer_target_database_id.strip()) == 0: + if isinstance(peer_target_database_id, str) and len(peer_target_database_id.strip()) == 0: raise click.UsageError('Parameter --peer-target-database-id cannot be whitespace or empty string') if not force: if tls_config: @@ -23399,10 +23398,10 @@ def update_peer_target_database_autonomous_database_details(ctx, from_json, forc @cli_util.wrap_exceptions def update_peer_target_database_database_cloud_service_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, peer_target_database_id, database_details_infrastructure_type, display_name, description, tls_config, if_match, database_details_vm_cluster_id, database_details_db_system_id, database_details_pluggable_database_id, database_details_listener_port, database_details_service_name): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') - if isinstance(peer_target_database_id, six.string_types) and len(peer_target_database_id.strip()) == 0: + if isinstance(peer_target_database_id, str) and len(peer_target_database_id.strip()) == 0: raise click.UsageError('Parameter --peer-target-database-id cannot be whitespace or empty string') if not force: if tls_config: @@ -23499,7 +23498,7 @@ def update_peer_target_database_database_cloud_service_details(ctx, from_json, f @cli_util.wrap_exceptions def update_report(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, report_id, freeform_tags, defined_tags, if_match): - if isinstance(report_id, six.string_types) and len(report_id.strip()) == 0: + if isinstance(report_id, str) and len(report_id.strip()) == 0: raise click.UsageError('Parameter --report-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -23579,7 +23578,7 @@ def update_report(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_report_definition(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, report_definition_id, display_name, column_info, column_filters, column_sortings, summary, description, freeform_tags, defined_tags, if_match): - if isinstance(report_definition_id, six.string_types) and len(report_definition_id.strip()) == 0: + if isinstance(report_definition_id, str) and len(report_definition_id.strip()) == 0: raise click.UsageError('Parameter --report-definition-id cannot be whitespace or empty string') if not force: if column_info or column_filters or column_sortings or summary or freeform_tags or defined_tags: @@ -23662,7 +23661,7 @@ def update_report_definition(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_sdm_masking_policy_difference(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sdm_masking_policy_difference_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(sdm_masking_policy_difference_id, six.string_types) and len(sdm_masking_policy_difference_id.strip()) == 0: + if isinstance(sdm_masking_policy_difference_id, str) and len(sdm_masking_policy_difference_id.strip()) == 0: raise click.UsageError('Parameter --sdm-masking-policy-difference-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -23745,7 +23744,7 @@ def update_sdm_masking_policy_difference(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_security_assessment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_assessment_id, display_name, description, is_assessment_scheduled, schedule, freeform_tags, defined_tags, if_match): - if isinstance(security_assessment_id, six.string_types) and len(security_assessment_id.strip()) == 0: + if isinstance(security_assessment_id, str) and len(security_assessment_id.strip()) == 0: raise click.UsageError('Parameter --security-assessment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -23833,7 +23832,7 @@ def update_security_assessment(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_security_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(security_policy_id, six.string_types) and len(security_policy_id.strip()) == 0: + if isinstance(security_policy_id, str) and len(security_policy_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -23917,7 +23916,7 @@ def update_security_policy(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_security_policy_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_config_id, display_name, description, firewall_config, unified_audit_policy_config, freeform_tags, defined_tags, if_match): - if isinstance(security_policy_config_id, six.string_types) and len(security_policy_config_id.strip()) == 0: + if isinstance(security_policy_config_id, str) and len(security_policy_config_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-config-id cannot be whitespace or empty string') if not force: if firewall_config or unified_audit_policy_config or freeform_tags or defined_tags: @@ -24005,7 +24004,7 @@ def update_security_policy_config(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_security_policy_deployment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_policy_deployment_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(security_policy_deployment_id, six.string_types) and len(security_policy_deployment_id.strip()) == 0: + if isinstance(security_policy_deployment_id, str) and len(security_policy_deployment_id.strip()) == 0: raise click.UsageError('Parameter --security-policy-deployment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -24089,10 +24088,10 @@ def update_security_policy_deployment(ctx, from_json, force, wait_for_state, max @cli_util.wrap_exceptions def update_sensitive_column(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, sensitive_column_key, data_type, status, sensitive_type_id, parent_column_keys, relation_type, app_defined_child_column_keys, db_defined_child_column_keys, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') - if isinstance(sensitive_column_key, six.string_types) and len(sensitive_column_key.strip()) == 0: + if isinstance(sensitive_column_key, str) and len(sensitive_column_key.strip()) == 0: raise click.UsageError('Parameter --sensitive-column-key cannot be whitespace or empty string') if not force: if parent_column_keys or app_defined_child_column_keys or db_defined_child_column_keys: @@ -24194,7 +24193,7 @@ def update_sensitive_column(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_sensitive_data_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, display_name, target_id, app_suite_name, description, schemas_for_discovery, tables_for_discovery, sensitive_type_ids_for_discovery, sensitive_type_group_ids_for_discovery, is_sample_data_collection_enabled, is_app_defined_relation_discovery_enabled, freeform_tags, defined_tags, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') if not force: if schemas_for_discovery or tables_for_discovery or sensitive_type_ids_for_discovery or sensitive_type_group_ids_for_discovery or freeform_tags or defined_tags: @@ -24303,7 +24302,7 @@ def update_sensitive_data_model(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_sensitive_type(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_type_id, entity_type, display_name, short_name, description, parent_category_id, freeform_tags, defined_tags, if_match): - if isinstance(sensitive_type_id, six.string_types) and len(sensitive_type_id.strip()) == 0: + if isinstance(sensitive_type_id, str) and len(sensitive_type_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -24394,7 +24393,7 @@ def update_sensitive_type(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_sensitive_type_update_sensitive_category_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_type_id, display_name, short_name, description, parent_category_id, freeform_tags, defined_tags, if_match): - if isinstance(sensitive_type_id, six.string_types) and len(sensitive_type_id.strip()) == 0: + if isinstance(sensitive_type_id, str) and len(sensitive_type_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -24491,7 +24490,7 @@ def update_sensitive_type_update_sensitive_category_details(ctx, from_json, forc @cli_util.wrap_exceptions def update_sensitive_type_update_sensitive_type_pattern_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_type_id, display_name, short_name, description, parent_category_id, freeform_tags, defined_tags, name_pattern, comment_pattern, data_pattern, search_type, default_masking_format_id, if_match): - if isinstance(sensitive_type_id, six.string_types) and len(sensitive_type_id.strip()) == 0: + if isinstance(sensitive_type_id, str) and len(sensitive_type_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -24596,7 +24595,7 @@ def update_sensitive_type_update_sensitive_type_pattern_details(ctx, from_json, @cli_util.wrap_exceptions def update_sensitive_type_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_type_group_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(sensitive_type_group_id, six.string_types) and len(sensitive_type_group_id.strip()) == 0: + if isinstance(sensitive_type_group_id, str) and len(sensitive_type_group_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-type-group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -24678,7 +24677,7 @@ def update_sensitive_type_group(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_sensitive_types_export(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_types_export_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(sensitive_types_export_id, six.string_types) and len(sensitive_types_export_id.strip()) == 0: + if isinstance(sensitive_types_export_id, str) and len(sensitive_types_export_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-types-export-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -24760,7 +24759,7 @@ def update_sensitive_types_export(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_sql_collection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_collection_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(sql_collection_id, six.string_types) and len(sql_collection_id.strip()) == 0: + if isinstance(sql_collection_id, str) and len(sql_collection_id.strip()) == 0: raise click.UsageError('Parameter --sql-collection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -24849,7 +24848,7 @@ def update_sql_collection(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_sql_firewall_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_firewall_policy_id, display_name, description, status, enforcement_scope, violation_action, violation_audit, allowed_client_ips, allowed_client_os_usernames, allowed_client_programs, freeform_tags, defined_tags, if_match): - if isinstance(sql_firewall_policy_id, six.string_types) and len(sql_firewall_policy_id.strip()) == 0: + if isinstance(sql_firewall_policy_id, str) and len(sql_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --sql-firewall-policy-id cannot be whitespace or empty string') if not force: if allowed_client_ips or allowed_client_os_usernames or allowed_client_programs or freeform_tags or defined_tags: @@ -24953,7 +24952,7 @@ def update_sql_firewall_policy(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_target_alert_policy_association(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_alert_policy_association_id, is_enabled, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(target_alert_policy_association_id, six.string_types) and len(target_alert_policy_association_id.strip()) == 0: + if isinstance(target_alert_policy_association_id, str) and len(target_alert_policy_association_id.strip()) == 0: raise click.UsageError('Parameter --target-alert-policy-association-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -25042,7 +25041,7 @@ def update_target_alert_policy_association(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def update_target_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, display_name, description, database_details, credentials, tls_config, connection_option, freeform_tags, defined_tags, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') if not force: if database_details or credentials or tls_config or connection_option or freeform_tags or defined_tags: @@ -25144,7 +25143,7 @@ def update_target_database(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_target_database_installed_database_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, database_details_infrastructure_type, database_details_listener_port, database_details_service_name, display_name, description, credentials, tls_config, connection_option, freeform_tags, defined_tags, if_match, database_details_instance_id, database_details_ip_addresses): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') if not force: if credentials or tls_config or connection_option or freeform_tags or defined_tags: @@ -25252,7 +25251,7 @@ def update_target_database_installed_database_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_target_database_autonomous_database_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, database_details_infrastructure_type, database_details_autonomous_database_id, display_name, description, credentials, tls_config, connection_option, freeform_tags, defined_tags, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') if not force: if credentials or tls_config or connection_option or freeform_tags or defined_tags: @@ -25357,7 +25356,7 @@ def update_target_database_autonomous_database_details(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_target_database_database_cloud_service_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, database_details_infrastructure_type, display_name, description, credentials, tls_config, connection_option, freeform_tags, defined_tags, if_match, database_details_vm_cluster_id, database_details_db_system_id, database_details_pluggable_database_id, database_details_listener_port, database_details_service_name): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') if not force: if credentials or tls_config or connection_option or freeform_tags or defined_tags: @@ -25471,7 +25470,7 @@ def update_target_database_database_cloud_service_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_target_database_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, connection_option_datasafe_private_endpoint_id, display_name, description, database_details, credentials, tls_config, freeform_tags, defined_tags, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') if not force: if database_details or credentials or tls_config or freeform_tags or defined_tags: @@ -25570,7 +25569,7 @@ def update_target_database_private_endpoint(ctx, from_json, force, wait_for_stat @cli_util.wrap_exceptions def update_target_database_on_premise_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_id, connection_option_on_prem_connector_id, display_name, description, database_details, credentials, tls_config, freeform_tags, defined_tags, if_match): - if isinstance(target_database_id, six.string_types) and len(target_database_id.strip()) == 0: + if isinstance(target_database_id, str) and len(target_database_id.strip()) == 0: raise click.UsageError('Parameter --target-database-id cannot be whitespace or empty string') if not force: if database_details or credentials or tls_config or freeform_tags or defined_tags: @@ -25666,7 +25665,7 @@ def update_target_database_on_premise_connector(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_target_database_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, target_database_group_id, display_name, description, matching_criteria, freeform_tags, defined_tags, if_match): - if isinstance(target_database_group_id, six.string_types) and len(target_database_group_id.strip()) == 0: + if isinstance(target_database_group_id, str) and len(target_database_group_id.strip()) == 0: raise click.UsageError('Parameter --target-database-group-id cannot be whitespace or empty string') if not force: if matching_criteria or freeform_tags or defined_tags: @@ -25755,7 +25754,7 @@ def update_target_database_group(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_unified_audit_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_audit_policy_id, display_name, description, status, conditions, freeform_tags, defined_tags, if_match): - if isinstance(unified_audit_policy_id, six.string_types) and len(unified_audit_policy_id.strip()) == 0: + if isinstance(unified_audit_policy_id, str) and len(unified_audit_policy_id.strip()) == 0: raise click.UsageError('Parameter --unified-audit-policy-id cannot be whitespace or empty string') if not force: if conditions or freeform_tags or defined_tags: @@ -25843,7 +25842,7 @@ def update_unified_audit_policy(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_unified_audit_policy_definition(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_audit_policy_definition_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(unified_audit_policy_definition_id, six.string_types) and len(unified_audit_policy_definition_id.strip()) == 0: + if isinstance(unified_audit_policy_definition_id, str) and len(unified_audit_policy_definition_id.strip()) == 0: raise click.UsageError('Parameter --unified-audit-policy-definition-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -25929,7 +25928,7 @@ def update_unified_audit_policy_definition(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def update_user_assessment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, user_assessment_id, description, display_name, is_assessment_scheduled, schedule, freeform_tags, defined_tags, if_match): - if isinstance(user_assessment_id, six.string_types) and len(user_assessment_id.strip()) == 0: + if isinstance(user_assessment_id, str) and len(user_assessment_id.strip()) == 0: raise click.UsageError('Parameter --user-assessment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -26011,7 +26010,7 @@ def update_user_assessment(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def upload_masking_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, upload_masking_policy_details, masking_policy_id, if_match): - if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0: + if isinstance(masking_policy_id, str) and len(masking_policy_id.strip()) == 0: raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string') kwargs = {} @@ -26072,7 +26071,7 @@ def upload_masking_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def upload_sensitive_data_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sensitive_data_model_id, upload_sensitive_data_model_details, if_match): - if isinstance(sensitive_data_model_id, six.string_types) and len(sensitive_data_model_id.strip()) == 0: + if isinstance(sensitive_data_model_id, str) and len(sensitive_data_model_id.strip()) == 0: raise click.UsageError('Parameter --sensitive-data-model-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/data_science/src/oci_cli_data_science/datascience_cli_extended.py b/services/data_science/src/oci_cli_data_science/datascience_cli_extended.py index 61ec7de7d..d34f71d10 100644 --- a/services/data_science/src/oci_cli_data_science/datascience_cli_extended.py +++ b/services/data_science/src/oci_cli_data_science/datascience_cli_extended.py @@ -7,7 +7,6 @@ from oci_cli import json_skeleton_utils from oci_cli import custom_types from services.data_science.src.oci_cli_data_science.generated import datascience_cli -import six @cli_util.copy_params_from_generated_command(datascience_cli.list_work_request_logs, params_to_exclude=[]) @@ -85,7 +84,7 @@ def create_notebook_session_extended(ctx, **kwargs): @cli_util.wrap_exceptions def head_model_artifact(ctx, from_json, model_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -110,7 +109,7 @@ def create_model_artifact_extended(ctx, model_id, from_json, **kwargs): model_artifact_file = kwargs['model_artifact_file'] del kwargs['model_artifact_file'] - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') with open(model_artifact_file, 'rb') as file: @@ -127,7 +126,7 @@ def create_model_artifact_extended(ctx, model_id, from_json, **kwargs): @cli_util.wrap_exceptions def head_job_artifact(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -153,7 +152,7 @@ def create_job_artifact_extended(ctx, job_id, from_json, **kwargs): job_artifact_file = kwargs['job_artifact_file'] del kwargs['job_artifact_file'] - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') with open(job_artifact_file, 'rb') as file: @@ -234,10 +233,10 @@ def update_job_extended(ctx, **kwargs): @cli_util.wrap_exceptions def head_step_artifact(ctx, from_json, pipeline_id, step_name): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') - if isinstance(step_name, six.string_types) and len(step_name.strip()) == 0: + if isinstance(step_name, str) and len(step_name.strip()) == 0: raise click.UsageError('Parameter --step-name cannot be whitespace or empty string') kwargs = {} @@ -264,10 +263,10 @@ def create_step_artifact_extended(ctx, pipeline_id, step_name, from_json, **kwar step_artifact = kwargs['step_artifact'] del kwargs['step_artifact'] - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') - if isinstance(step_name, six.string_types) and len(step_name.strip()) == 0: + if isinstance(step_name, str) and len(step_name.strip()) == 0: raise click.UsageError('Parameter --step-name cannot be whitespace or empty string') with open(step_artifact, 'rb') as file: @@ -716,7 +715,7 @@ def put_ml_application_package_extended(ctx, ml_app_implementation_id, from_json template_file = kwargs['ml_app_package_file'] del kwargs['ml_app_package_file'] - if isinstance(ml_app_implementation_id, six.string_types) and len( + if isinstance(ml_app_implementation_id, str) and len( ml_app_implementation_id.strip()) == 0: raise click.UsageError('Parameter --ml_app_implementation_id cannot be whitespace or empty string') @@ -737,7 +736,7 @@ def put_ml_application_package_extended(ctx, ml_app_implementation_id, from_json @click.pass_context def change_ml_application_compartment(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -755,7 +754,7 @@ def change_ml_application_compartment(ctx, **kwargs): @click.pass_context def change_ml_application_implementation_compartment(ctx, **kwargs): - if isinstance(kwargs['ml_app_implementation_id'], six.string_types) and len(kwargs['ml_app_implementation_id'].strip()) == 0: + if isinstance(kwargs['ml_app_implementation_id'], str) and len(kwargs['ml_app_implementation_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-implementation-id cannot be whitespace or empty string') if 'ml_app_implementation_id' in kwargs: @@ -773,7 +772,7 @@ def change_ml_application_implementation_compartment(ctx, **kwargs): @click.pass_context def change_ml_application_instance_compartment(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_id'], six.string_types) and len(kwargs['ml_app_instance_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_id'], str) and len(kwargs['ml_app_instance_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-id cannot be whitespace or empty string') if 'ml_app_instance_id' in kwargs: @@ -791,7 +790,7 @@ def change_ml_application_instance_compartment(ctx, **kwargs): @click.pass_context def change_ml_application_instance_view_compartment(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_view_id'], six.string_types) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_view_id'], str) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-view-id cannot be whitespace or empty string') if 'ml_app_instance_view_id' in kwargs: @@ -809,7 +808,7 @@ def change_ml_application_instance_view_compartment(ctx, **kwargs): @click.pass_context def create_ml_application_implementation(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -828,7 +827,7 @@ def create_ml_application_implementation(ctx, **kwargs): @click.pass_context def create_ml_application_instance(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -850,7 +849,7 @@ def create_ml_application_instance(ctx, **kwargs): @click.pass_context def create_ml_application_instance_create_idcs_auth_configuration_details(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -872,7 +871,7 @@ def create_ml_application_instance_create_idcs_auth_configuration_details(ctx, * @click.pass_context def create_ml_application_instance_create_idcs_custom_service_auth_configuration_details(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -894,7 +893,7 @@ def create_ml_application_instance_create_idcs_custom_service_auth_configuration @click.pass_context def create_ml_application_instance_create_iam_auth_configuration_create_details(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -915,7 +914,7 @@ def create_ml_application_instance_create_iam_auth_configuration_create_details( @click.pass_context def delete_ml_application(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -933,7 +932,7 @@ def delete_ml_application(ctx, **kwargs): @click.pass_context def delete_ml_application_implementation(ctx, **kwargs): - if isinstance(kwargs['ml_app_implementation_id'], six.string_types) and len(kwargs['ml_app_implementation_id'].strip()) == 0: + if isinstance(kwargs['ml_app_implementation_id'], str) and len(kwargs['ml_app_implementation_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-implementation-id cannot be whitespace or empty string') if 'ml_app_implementation_id' in kwargs: @@ -951,7 +950,7 @@ def delete_ml_application_implementation(ctx, **kwargs): @click.pass_context def delete_ml_application_instance(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_id'], six.string_types) and len(kwargs['ml_app_instance_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_id'], str) and len(kwargs['ml_app_instance_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-id cannot be whitespace or empty string') if 'ml_app_instance_id' in kwargs: @@ -969,7 +968,7 @@ def delete_ml_application_instance(ctx, **kwargs): @click.pass_context def disable_ml_application_instance_view_trigger(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_view_id'], six.string_types) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_view_id'], str) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-view-id cannot be whitespace or empty string') if 'ml_app_instance_view_id' in kwargs: @@ -987,7 +986,7 @@ def disable_ml_application_instance_view_trigger(ctx, **kwargs): @click.pass_context def enable_ml_application_instance_view_trigger(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_view_id'], six.string_types) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_view_id'], str) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-view-id cannot be whitespace or empty string') if 'ml_app_instance_view_id' in kwargs: @@ -1005,7 +1004,7 @@ def enable_ml_application_instance_view_trigger(ctx, **kwargs): @click.pass_context def get_ml_application(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -1023,7 +1022,7 @@ def get_ml_application(ctx, **kwargs): @click.pass_context def get_ml_application_historical_package_content(ctx, **kwargs): - if isinstance(kwargs['ml_app_implementation_version_id'], six.string_types) and len(kwargs['ml_app_implementation_version_id'].strip()) == 0: + if isinstance(kwargs['ml_app_implementation_version_id'], str) and len(kwargs['ml_app_implementation_version_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-implementation-version-id cannot be whitespace or empty string') if 'ml_app_implementation_version_id' in kwargs: @@ -1041,7 +1040,7 @@ def get_ml_application_historical_package_content(ctx, **kwargs): @click.pass_context def get_ml_application_implementation(ctx, **kwargs): - if isinstance(kwargs['ml_app_implementation_id'], six.string_types) and len(kwargs['ml_app_implementation_id'].strip()) == 0: + if isinstance(kwargs['ml_app_implementation_id'], str) and len(kwargs['ml_app_implementation_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-implementation-id cannot be whitespace or empty string') if 'ml_app_implementation_id' in kwargs: @@ -1059,7 +1058,7 @@ def get_ml_application_implementation(ctx, **kwargs): @click.pass_context def get_ml_application_implementation_version(ctx, **kwargs): - if isinstance(kwargs['ml_app_implementation_version_id'], six.string_types) and len(kwargs['ml_app_implementation_version_id'].strip()) == 0: + if isinstance(kwargs['ml_app_implementation_version_id'], str) and len(kwargs['ml_app_implementation_version_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-implementation-version-id cannot be whitespace or empty string') if 'ml_app_implementation_version_id' in kwargs: @@ -1077,7 +1076,7 @@ def get_ml_application_implementation_version(ctx, **kwargs): @click.pass_context def get_ml_application_instance(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_id'], six.string_types) and len(kwargs['ml_app_instance_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_id'], str) and len(kwargs['ml_app_instance_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-id cannot be whitespace or empty string') if 'ml_app_instance_id' in kwargs: @@ -1095,7 +1094,7 @@ def get_ml_application_instance(ctx, **kwargs): @click.pass_context def get_ml_application_instance_view(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_view_id'], six.string_types) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_view_id'], str) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-view-id cannot be whitespace or empty string') if 'ml_app_instance_view_id' in kwargs: @@ -1113,7 +1112,7 @@ def get_ml_application_instance_view(ctx, **kwargs): @click.pass_context def get_ml_application_package_content(ctx, **kwargs): - if isinstance(kwargs['ml_app_implementation_id'], six.string_types) and len(kwargs['ml_app_implementation_id'].strip()) == 0: + if isinstance(kwargs['ml_app_implementation_id'], str) and len(kwargs['ml_app_implementation_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-implementation-id cannot be whitespace or empty string') if 'ml_app_implementation_id' in kwargs: @@ -1214,7 +1213,7 @@ def list_ml_applications(ctx, **kwargs): @click.pass_context def recover_ml_application_instance_view(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_view_id'], six.string_types) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_view_id'], str) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-view-id cannot be whitespace or empty string') if 'ml_app_instance_view_id' in kwargs: @@ -1232,7 +1231,7 @@ def recover_ml_application_instance_view(ctx, **kwargs): @click.pass_context def trigger_ml_application_instance_flow(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_id'], six.string_types) and len(kwargs['ml_app_instance_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_id'], str) and len(kwargs['ml_app_instance_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-id cannot be whitespace or empty string') if 'ml_app_instance_id' in kwargs: @@ -1250,7 +1249,7 @@ def trigger_ml_application_instance_flow(ctx, **kwargs): @click.pass_context def trigger_ml_application_instance_view_flow(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_view_id'], six.string_types) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_view_id'], str) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-view-id cannot be whitespace or empty string') if 'ml_app_instance_view_id' in kwargs: @@ -1268,7 +1267,7 @@ def trigger_ml_application_instance_view_flow(ctx, **kwargs): @click.pass_context def update_ml_application(ctx, **kwargs): - if isinstance(kwargs['ml_app_id'], six.string_types) and len(kwargs['ml_app_id'].strip()) == 0: + if isinstance(kwargs['ml_app_id'], str) and len(kwargs['ml_app_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-id cannot be whitespace or empty string') if 'ml_app_id' in kwargs: @@ -1286,7 +1285,7 @@ def update_ml_application(ctx, **kwargs): @click.pass_context def update_ml_application_implementation(ctx, **kwargs): - if isinstance(kwargs['ml_app_implementation_id'], six.string_types) and len(kwargs['ml_app_implementation_id'].strip()) == 0: + if isinstance(kwargs['ml_app_implementation_id'], str) and len(kwargs['ml_app_implementation_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-implementation-id cannot be whitespace or empty string') if 'ml_app_implementation_id' in kwargs: @@ -1304,7 +1303,7 @@ def update_ml_application_implementation(ctx, **kwargs): @click.pass_context def update_ml_application_implementation_version(ctx, **kwargs): - if isinstance(kwargs['ml_app_implementation_version_id'], six.string_types) and len(kwargs['ml_app_implementation_version_id'].strip()) == 0: + if isinstance(kwargs['ml_app_implementation_version_id'], str) and len(kwargs['ml_app_implementation_version_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-implementation-version-id cannot be whitespace or empty string') if 'ml_app_implementation_version_id' in kwargs: @@ -1323,7 +1322,7 @@ def update_ml_application_implementation_version(ctx, **kwargs): @click.pass_context def update_ml_application_instance(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_id'], six.string_types) and len(kwargs['ml_app_instance_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_id'], str) and len(kwargs['ml_app_instance_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-id cannot be whitespace or empty string') if 'ml_app_instance_id' in kwargs: @@ -1344,7 +1343,7 @@ def update_ml_application_instance(ctx, **kwargs): @click.pass_context def update_ml_application_instance_view(ctx, **kwargs): - if isinstance(kwargs['ml_app_instance_view_id'], six.string_types) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: + if isinstance(kwargs['ml_app_instance_view_id'], str) and len(kwargs['ml_app_instance_view_id'].strip()) == 0: raise click.UsageError('Parameter --ml-app-instance-view-id cannot be whitespace or empty string') if 'ml_app_instance_view_id' in kwargs: diff --git a/services/data_science/src/oci_cli_data_science/generated/datascience_cli.py b/services/data_science/src/oci_cli_data_science/generated/datascience_cli.py index 20ce70510..7af222b4a 100644 --- a/services/data_science/src/oci_cli_data_science/generated/datascience_cli.py +++ b/services/data_science/src/oci_cli_data_science/generated/datascience_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -219,7 +218,7 @@ def data_science_private_endpoint_group(): @cli_util.wrap_exceptions def activate_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -270,7 +269,7 @@ def activate_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def activate_model_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_deployment_id, if_match): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -325,7 +324,7 @@ def activate_model_deployment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def activate_model_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_group_id, if_match): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -376,7 +375,7 @@ def activate_model_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def activate_notebook_session(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, notebook_session_id, if_match): - if isinstance(notebook_session_id, six.string_types) and len(notebook_session_id.strip()) == 0: + if isinstance(notebook_session_id, str) and len(notebook_session_id.strip()) == 0: raise click.UsageError('Parameter --notebook-session-id cannot be whitespace or empty string') kwargs = {} @@ -431,7 +430,7 @@ def activate_notebook_session(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def activate_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -483,7 +482,7 @@ def activate_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def cancel_job_run(ctx, from_json, job_run_id, if_match): - if isinstance(job_run_id, six.string_types) and len(job_run_id.strip()) == 0: + if isinstance(job_run_id, str) and len(job_run_id.strip()) == 0: raise click.UsageError('Parameter --job-run-id cannot be whitespace or empty string') kwargs = {} @@ -509,7 +508,7 @@ def cancel_job_run(ctx, from_json, job_run_id, if_match): @cli_util.wrap_exceptions def cancel_pipeline_run(ctx, from_json, pipeline_run_id, if_match, terminate_gracefully): - if isinstance(pipeline_run_id, six.string_types) and len(pipeline_run_id.strip()) == 0: + if isinstance(pipeline_run_id, str) and len(pipeline_run_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-run-id cannot be whitespace or empty string') kwargs = {} @@ -537,7 +536,7 @@ def cancel_pipeline_run(ctx, from_json, pipeline_run_id, if_match, terminate_gra @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -566,7 +565,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_data_science_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_science_private_endpoint_id, compartment_id, if_match): - if isinstance(data_science_private_endpoint_id, six.string_types) and len(data_science_private_endpoint_id.strip()) == 0: + if isinstance(data_science_private_endpoint_id, str) and len(data_science_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --data-science-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -624,7 +623,7 @@ def change_data_science_private_endpoint_compartment(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def change_job_compartment(ctx, from_json, job_id, compartment_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -655,7 +654,7 @@ def change_job_compartment(ctx, from_json, job_id, compartment_id, if_match): @cli_util.wrap_exceptions def change_job_run_compartment(ctx, from_json, job_run_id, compartment_id, if_match): - if isinstance(job_run_id, six.string_types) and len(job_run_id.strip()) == 0: + if isinstance(job_run_id, str) and len(job_run_id.strip()) == 0: raise click.UsageError('Parameter --job-run-id cannot be whitespace or empty string') kwargs = {} @@ -686,7 +685,7 @@ def change_job_run_compartment(ctx, from_json, job_run_id, compartment_id, if_ma @cli_util.wrap_exceptions def change_ml_application_compartment(ctx, from_json, ml_application_id, compartment_id, if_match): - if isinstance(ml_application_id, six.string_types) and len(ml_application_id.strip()) == 0: + if isinstance(ml_application_id, str) and len(ml_application_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-id cannot be whitespace or empty string') kwargs = {} @@ -720,7 +719,7 @@ def change_ml_application_compartment(ctx, from_json, ml_application_id, compart @cli_util.wrap_exceptions def change_ml_application_implementation_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_implementation_id, compartment_id, if_match): - if isinstance(ml_application_implementation_id, six.string_types) and len(ml_application_implementation_id.strip()) == 0: + if isinstance(ml_application_implementation_id, str) and len(ml_application_implementation_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-id cannot be whitespace or empty string') kwargs = {} @@ -781,7 +780,7 @@ def change_ml_application_implementation_compartment(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def change_ml_application_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_instance_id, compartment_id, if_match): - if isinstance(ml_application_instance_id, six.string_types) and len(ml_application_instance_id.strip()) == 0: + if isinstance(ml_application_instance_id, str) and len(ml_application_instance_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-id cannot be whitespace or empty string') kwargs = {} @@ -842,7 +841,7 @@ def change_ml_application_instance_compartment(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def change_ml_application_instance_view_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_instance_view_id, compartment_id, if_match): - if isinstance(ml_application_instance_view_id, six.string_types) and len(ml_application_instance_view_id.strip()) == 0: + if isinstance(ml_application_instance_view_id, str) and len(ml_application_instance_view_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-view-id cannot be whitespace or empty string') kwargs = {} @@ -900,7 +899,7 @@ def change_ml_application_instance_view_compartment(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -931,7 +930,7 @@ def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match) @cli_util.wrap_exceptions def change_model_deployment_compartment(ctx, from_json, model_deployment_id, compartment_id, if_match): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -962,7 +961,7 @@ def change_model_deployment_compartment(ctx, from_json, model_deployment_id, com @cli_util.wrap_exceptions def change_model_group_compartment(ctx, from_json, model_group_id, compartment_id, if_match): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -993,7 +992,7 @@ def change_model_group_compartment(ctx, from_json, model_group_id, compartment_i @cli_util.wrap_exceptions def change_model_group_version_history_compartment(ctx, from_json, model_group_version_history_id, compartment_id, if_match): - if isinstance(model_group_version_history_id, six.string_types) and len(model_group_version_history_id.strip()) == 0: + if isinstance(model_group_version_history_id, str) and len(model_group_version_history_id.strip()) == 0: raise click.UsageError('Parameter --model-group-version-history-id cannot be whitespace or empty string') kwargs = {} @@ -1027,7 +1026,7 @@ def change_model_group_version_history_compartment(ctx, from_json, model_group_v @cli_util.wrap_exceptions def change_model_version_set_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_version_set_id, compartment_id, if_match): - if isinstance(model_version_set_id, six.string_types) and len(model_version_set_id.strip()) == 0: + if isinstance(model_version_set_id, str) and len(model_version_set_id.strip()) == 0: raise click.UsageError('Parameter --model-version-set-id cannot be whitespace or empty string') kwargs = {} @@ -1085,7 +1084,7 @@ def change_model_version_set_compartment(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def change_notebook_session_compartment(ctx, from_json, notebook_session_id, compartment_id, if_match): - if isinstance(notebook_session_id, six.string_types) and len(notebook_session_id.strip()) == 0: + if isinstance(notebook_session_id, str) and len(notebook_session_id.strip()) == 0: raise click.UsageError('Parameter --notebook-session-id cannot be whitespace or empty string') kwargs = {} @@ -1116,7 +1115,7 @@ def change_notebook_session_compartment(ctx, from_json, notebook_session_id, com @cli_util.wrap_exceptions def change_pipeline_compartment(ctx, from_json, pipeline_id, compartment_id, if_match): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -1147,7 +1146,7 @@ def change_pipeline_compartment(ctx, from_json, pipeline_id, compartment_id, if_ @cli_util.wrap_exceptions def change_pipeline_run_compartment(ctx, from_json, pipeline_run_id, compartment_id, if_match): - if isinstance(pipeline_run_id, six.string_types) and len(pipeline_run_id.strip()) == 0: + if isinstance(pipeline_run_id, str) and len(pipeline_run_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-run-id cannot be whitespace or empty string') kwargs = {} @@ -1178,7 +1177,7 @@ def change_pipeline_run_compartment(ctx, from_json, pipeline_run_id, compartment @cli_util.wrap_exceptions def change_project_compartment(ctx, from_json, project_id, compartment_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -1212,7 +1211,7 @@ def change_project_compartment(ctx, from_json, project_id, compartment_id, if_ma @cli_util.wrap_exceptions def change_schedule_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, compartment_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -2259,7 +2258,7 @@ def create_job_multi_node_job_node_configuration_details(ctx, from_json, wait_fo @cli_util.wrap_exceptions def create_job_artifact(ctx, from_json, job_id, job_artifact, content_length, content_disposition): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -3734,7 +3733,7 @@ def create_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def create_model_artifact(ctx, from_json, model_id, model_artifact, content_length, content_disposition, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -3772,10 +3771,10 @@ def create_model_artifact(ctx, from_json, model_id, model_artifact, content_leng @cli_util.wrap_exceptions def create_model_custom_metadatum_artifact(ctx, from_json, model_id, metadatum_key_name, model_custom_metadatum_artifact, content_length, content_disposition, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -3814,10 +3813,10 @@ def create_model_custom_metadatum_artifact(ctx, from_json, model_id, metadatum_k @cli_util.wrap_exceptions def create_model_defined_metadatum_artifact(ctx, from_json, model_id, metadatum_key_name, model_defined_metadatum_artifact, content_length, content_disposition, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -4312,7 +4311,7 @@ def create_model_group_create_model_group_details(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def create_model_group_artifact(ctx, from_json, model_group_id, model_group_artifact, content_length, content_disposition, if_match): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -4422,7 +4421,7 @@ def create_model_group_version_history(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def create_model_provenance(ctx, from_json, model_id, repository_url, git_branch, git_commit, script_dir, training_script, training_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -5492,10 +5491,10 @@ def create_schedule_schedule_http_action(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def create_step_artifact(ctx, from_json, pipeline_id, step_name, step_artifact, content_length, content_disposition): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') - if isinstance(step_name, six.string_types) and len(step_name.strip()) == 0: + if isinstance(step_name, str) and len(step_name.strip()) == 0: raise click.UsageError('Parameter --step-name cannot be whitespace or empty string') kwargs = {} @@ -5531,7 +5530,7 @@ def create_step_artifact(ctx, from_json, pipeline_id, step_name, step_artifact, @cli_util.wrap_exceptions def deactivate_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -5582,7 +5581,7 @@ def deactivate_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def deactivate_model_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_deployment_id, if_match): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -5637,7 +5636,7 @@ def deactivate_model_deployment(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def deactivate_model_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_group_id, if_match): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -5688,7 +5687,7 @@ def deactivate_model_group(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def deactivate_notebook_session(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, notebook_session_id, if_match): - if isinstance(notebook_session_id, six.string_types) and len(notebook_session_id.strip()) == 0: + if isinstance(notebook_session_id, str) and len(notebook_session_id.strip()) == 0: raise click.UsageError('Parameter --notebook-session-id cannot be whitespace or empty string') kwargs = {} @@ -5743,7 +5742,7 @@ def deactivate_notebook_session(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def deactivate_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -5799,7 +5798,7 @@ def deactivate_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_data_science_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_science_private_endpoint_id, if_match): - if isinstance(data_science_private_endpoint_id, six.string_types) and len(data_science_private_endpoint_id.strip()) == 0: + if isinstance(data_science_private_endpoint_id, str) and len(data_science_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --data-science-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -5856,7 +5855,7 @@ def delete_data_science_private_endpoint(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def delete_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, if_match, delete_related_job_runs): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -5914,7 +5913,7 @@ def delete_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_job_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_run_id, if_match): - if isinstance(job_run_id, six.string_types) and len(job_run_id.strip()) == 0: + if isinstance(job_run_id, str) and len(job_run_id.strip()) == 0: raise click.UsageError('Parameter --job-run-id cannot be whitespace or empty string') kwargs = {} @@ -5978,7 +5977,7 @@ def delete_job_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_ml_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_id, if_match): - if isinstance(ml_application_id, six.string_types) and len(ml_application_id.strip()) == 0: + if isinstance(ml_application_id, str) and len(ml_application_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-id cannot be whitespace or empty string') kwargs = {} @@ -6042,7 +6041,7 @@ def delete_ml_application(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_ml_application_implementation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_implementation_id, if_match): - if isinstance(ml_application_implementation_id, six.string_types) and len(ml_application_implementation_id.strip()) == 0: + if isinstance(ml_application_implementation_id, str) and len(ml_application_implementation_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-id cannot be whitespace or empty string') kwargs = {} @@ -6098,7 +6097,7 @@ def delete_ml_application_implementation(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def delete_ml_application_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_instance_id, if_match): - if isinstance(ml_application_instance_id, six.string_types) and len(ml_application_instance_id.strip()) == 0: + if isinstance(ml_application_instance_id, str) and len(ml_application_instance_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-id cannot be whitespace or empty string') kwargs = {} @@ -6154,7 +6153,7 @@ def delete_ml_application_instance(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -6216,10 +6215,10 @@ def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_model_custom_metadatum_artifact(ctx, from_json, model_id, metadatum_key_name, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -6247,10 +6246,10 @@ def delete_model_custom_metadatum_artifact(ctx, from_json, model_id, metadatum_k @cli_util.wrap_exceptions def delete_model_defined_metadatum_artifact(ctx, from_json, model_id, metadatum_key_name, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -6280,7 +6279,7 @@ def delete_model_defined_metadatum_artifact(ctx, from_json, model_id, metadatum_ @cli_util.wrap_exceptions def delete_model_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_deployment_id, if_match): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6336,7 +6335,7 @@ def delete_model_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_model_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_group_id, if_match): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -6392,7 +6391,7 @@ def delete_model_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_model_group_version_history(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_group_version_history_id, if_match): - if isinstance(model_group_version_history_id, six.string_types) and len(model_group_version_history_id.strip()) == 0: + if isinstance(model_group_version_history_id, str) and len(model_group_version_history_id.strip()) == 0: raise click.UsageError('Parameter --model-group-version-history-id cannot be whitespace or empty string') kwargs = {} @@ -6449,7 +6448,7 @@ def delete_model_group_version_history(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_model_version_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_version_set_id, is_delete_related_models, if_match): - if isinstance(model_version_set_id, six.string_types) and len(model_version_set_id.strip()) == 0: + if isinstance(model_version_set_id, str) and len(model_version_set_id.strip()) == 0: raise click.UsageError('Parameter --model-version-set-id cannot be whitespace or empty string') kwargs = {} @@ -6507,7 +6506,7 @@ def delete_model_version_set(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_notebook_session(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, notebook_session_id, if_match): - if isinstance(notebook_session_id, six.string_types) and len(notebook_session_id.strip()) == 0: + if isinstance(notebook_session_id, str) and len(notebook_session_id.strip()) == 0: raise click.UsageError('Parameter --notebook-session-id cannot be whitespace or empty string') kwargs = {} @@ -6565,7 +6564,7 @@ def delete_notebook_session(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, delete_related_pipeline_runs, delete_related_job_runs, if_match): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -6626,7 +6625,7 @@ def delete_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_pipeline_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_run_id, delete_related_job_runs, if_match): - if isinstance(pipeline_run_id, six.string_types) and len(pipeline_run_id.strip()) == 0: + if isinstance(pipeline_run_id, str) and len(pipeline_run_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-run-id cannot be whitespace or empty string') kwargs = {} @@ -6692,7 +6691,7 @@ def delete_pipeline_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -6748,7 +6747,7 @@ def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -6804,7 +6803,7 @@ def delete_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def disable_ml_application_instance_view_trigger(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_name, ml_application_instance_view_id, if_match): - if isinstance(ml_application_instance_view_id, six.string_types) and len(ml_application_instance_view_id.strip()) == 0: + if isinstance(ml_application_instance_view_id, str) and len(ml_application_instance_view_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-view-id cannot be whitespace or empty string') kwargs = {} @@ -6861,7 +6860,7 @@ def disable_ml_application_instance_view_trigger(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def enable_ml_application_instance_view_trigger(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_name, ml_application_instance_view_id, if_match): - if isinstance(ml_application_instance_view_id, six.string_types) and len(ml_application_instance_view_id.strip()) == 0: + if isinstance(ml_application_instance_view_id, str) and len(ml_application_instance_view_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-view-id cannot be whitespace or empty string') kwargs = {} @@ -6918,7 +6917,7 @@ def enable_ml_application_instance_view_trigger(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def export_model_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, artifact_export_details, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -6982,7 +6981,7 @@ def export_model_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def export_model_artifact_artifact_export_details_object_storage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match, artifact_export_details_namespace, artifact_export_details_source_bucket, artifact_export_details_source_object_name, artifact_export_details_source_region): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -7052,7 +7051,7 @@ def export_model_artifact_artifact_export_details_object_storage(ctx, from_json, @cli_util.wrap_exceptions def get_data_science_private_endpoint(ctx, from_json, data_science_private_endpoint_id): - if isinstance(data_science_private_endpoint_id, six.string_types) and len(data_science_private_endpoint_id.strip()) == 0: + if isinstance(data_science_private_endpoint_id, str) and len(data_science_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --data-science-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -7074,7 +7073,7 @@ def get_data_science_private_endpoint(ctx, from_json, data_science_private_endpo @cli_util.wrap_exceptions def get_job(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -7098,7 +7097,7 @@ def get_job(ctx, from_json, job_id): @cli_util.wrap_exceptions def get_job_artifact_content(ctx, from_json, file, job_id, range): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -7144,7 +7143,7 @@ def get_job_artifact_content(ctx, from_json, file, job_id, range): @cli_util.wrap_exceptions def get_job_run(ctx, from_json, job_run_id): - if isinstance(job_run_id, six.string_types) and len(job_run_id.strip()) == 0: + if isinstance(job_run_id, str) and len(job_run_id.strip()) == 0: raise click.UsageError('Parameter --job-run-id cannot be whitespace or empty string') kwargs = {} @@ -7166,7 +7165,7 @@ def get_job_run(ctx, from_json, job_run_id): @cli_util.wrap_exceptions def get_ml_application(ctx, from_json, ml_application_id): - if isinstance(ml_application_id, six.string_types) and len(ml_application_id.strip()) == 0: + if isinstance(ml_application_id, str) and len(ml_application_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-id cannot be whitespace or empty string') kwargs = {} @@ -7189,7 +7188,7 @@ def get_ml_application(ctx, from_json, ml_application_id): @cli_util.wrap_exceptions def get_ml_application_historical_package_content(ctx, from_json, file, ml_application_implementation_version_id): - if isinstance(ml_application_implementation_version_id, six.string_types) and len(ml_application_implementation_version_id.strip()) == 0: + if isinstance(ml_application_implementation_version_id, str) and len(ml_application_implementation_version_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-version-id cannot be whitespace or empty string') kwargs = {} @@ -7233,7 +7232,7 @@ def get_ml_application_historical_package_content(ctx, from_json, file, ml_appli @cli_util.wrap_exceptions def get_ml_application_implementation(ctx, from_json, ml_application_implementation_id): - if isinstance(ml_application_implementation_id, six.string_types) and len(ml_application_implementation_id.strip()) == 0: + if isinstance(ml_application_implementation_id, str) and len(ml_application_implementation_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-id cannot be whitespace or empty string') kwargs = {} @@ -7255,7 +7254,7 @@ def get_ml_application_implementation(ctx, from_json, ml_application_implementat @cli_util.wrap_exceptions def get_ml_application_implementation_version(ctx, from_json, ml_application_implementation_version_id): - if isinstance(ml_application_implementation_version_id, six.string_types) and len(ml_application_implementation_version_id.strip()) == 0: + if isinstance(ml_application_implementation_version_id, str) and len(ml_application_implementation_version_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-version-id cannot be whitespace or empty string') kwargs = {} @@ -7277,7 +7276,7 @@ def get_ml_application_implementation_version(ctx, from_json, ml_application_imp @cli_util.wrap_exceptions def get_ml_application_instance(ctx, from_json, ml_application_instance_id): - if isinstance(ml_application_instance_id, six.string_types) and len(ml_application_instance_id.strip()) == 0: + if isinstance(ml_application_instance_id, str) and len(ml_application_instance_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-id cannot be whitespace or empty string') kwargs = {} @@ -7299,7 +7298,7 @@ def get_ml_application_instance(ctx, from_json, ml_application_instance_id): @cli_util.wrap_exceptions def get_ml_application_instance_view(ctx, from_json, ml_application_instance_view_id): - if isinstance(ml_application_instance_view_id, six.string_types) and len(ml_application_instance_view_id.strip()) == 0: + if isinstance(ml_application_instance_view_id, str) and len(ml_application_instance_view_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-view-id cannot be whitespace or empty string') kwargs = {} @@ -7322,7 +7321,7 @@ def get_ml_application_instance_view(ctx, from_json, ml_application_instance_vie @cli_util.wrap_exceptions def get_ml_application_package_content(ctx, from_json, file, ml_application_implementation_id): - if isinstance(ml_application_implementation_id, six.string_types) and len(ml_application_implementation_id.strip()) == 0: + if isinstance(ml_application_implementation_id, str) and len(ml_application_implementation_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-id cannot be whitespace or empty string') kwargs = {} @@ -7366,7 +7365,7 @@ def get_ml_application_package_content(ctx, from_json, file, ml_application_impl @cli_util.wrap_exceptions def get_model(ctx, from_json, model_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -7390,7 +7389,7 @@ def get_model(ctx, from_json, model_id): @cli_util.wrap_exceptions def get_model_artifact_content(ctx, from_json, file, model_id, range): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -7439,10 +7438,10 @@ def get_model_artifact_content(ctx, from_json, file, model_id, range): @cli_util.wrap_exceptions def get_model_custom_metadatum_artifact_content(ctx, from_json, file, model_id, metadatum_key_name, range): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -7492,10 +7491,10 @@ def get_model_custom_metadatum_artifact_content(ctx, from_json, file, model_id, @cli_util.wrap_exceptions def get_model_defined_metadatum_artifact_content(ctx, from_json, file, model_id, metadatum_key_name, range): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -7542,7 +7541,7 @@ def get_model_defined_metadatum_artifact_content(ctx, from_json, file, model_id, @cli_util.wrap_exceptions def get_model_deployment(ctx, from_json, model_deployment_id): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -7564,7 +7563,7 @@ def get_model_deployment(ctx, from_json, model_deployment_id): @cli_util.wrap_exceptions def get_model_group(ctx, from_json, model_group_id): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -7588,7 +7587,7 @@ def get_model_group(ctx, from_json, model_group_id): @cli_util.wrap_exceptions def get_model_group_artifact_content(ctx, from_json, file, model_group_id, range): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -7634,7 +7633,7 @@ def get_model_group_artifact_content(ctx, from_json, file, model_group_id, range @cli_util.wrap_exceptions def get_model_group_version_history(ctx, from_json, model_group_version_history_id): - if isinstance(model_group_version_history_id, six.string_types) and len(model_group_version_history_id.strip()) == 0: + if isinstance(model_group_version_history_id, str) and len(model_group_version_history_id.strip()) == 0: raise click.UsageError('Parameter --model-group-version-history-id cannot be whitespace or empty string') kwargs = {} @@ -7656,7 +7655,7 @@ def get_model_group_version_history(ctx, from_json, model_group_version_history_ @cli_util.wrap_exceptions def get_model_provenance(ctx, from_json, model_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -7678,7 +7677,7 @@ def get_model_provenance(ctx, from_json, model_id): @cli_util.wrap_exceptions def get_model_version_set(ctx, from_json, model_version_set_id): - if isinstance(model_version_set_id, six.string_types) and len(model_version_set_id.strip()) == 0: + if isinstance(model_version_set_id, str) and len(model_version_set_id.strip()) == 0: raise click.UsageError('Parameter --model-version-set-id cannot be whitespace or empty string') kwargs = {} @@ -7700,7 +7699,7 @@ def get_model_version_set(ctx, from_json, model_version_set_id): @cli_util.wrap_exceptions def get_notebook_session(ctx, from_json, notebook_session_id): - if isinstance(notebook_session_id, six.string_types) and len(notebook_session_id.strip()) == 0: + if isinstance(notebook_session_id, str) and len(notebook_session_id.strip()) == 0: raise click.UsageError('Parameter --notebook-session-id cannot be whitespace or empty string') kwargs = {} @@ -7722,7 +7721,7 @@ def get_notebook_session(ctx, from_json, notebook_session_id): @cli_util.wrap_exceptions def get_pipeline(ctx, from_json, pipeline_id): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -7744,7 +7743,7 @@ def get_pipeline(ctx, from_json, pipeline_id): @cli_util.wrap_exceptions def get_pipeline_run(ctx, from_json, pipeline_run_id): - if isinstance(pipeline_run_id, six.string_types) and len(pipeline_run_id.strip()) == 0: + if isinstance(pipeline_run_id, str) and len(pipeline_run_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-run-id cannot be whitespace or empty string') kwargs = {} @@ -7766,7 +7765,7 @@ def get_pipeline_run(ctx, from_json, pipeline_run_id): @cli_util.wrap_exceptions def get_project(ctx, from_json, project_id): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -7788,7 +7787,7 @@ def get_project(ctx, from_json, project_id): @cli_util.wrap_exceptions def get_schedule(ctx, from_json, schedule_id): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -7813,10 +7812,10 @@ def get_schedule(ctx, from_json, schedule_id): @cli_util.wrap_exceptions def get_step_artifact_content(ctx, from_json, file, pipeline_id, step_name, range): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') - if isinstance(step_name, six.string_types) and len(step_name.strip()) == 0: + if isinstance(step_name, str) and len(step_name.strip()) == 0: raise click.UsageError('Parameter --step-name cannot be whitespace or empty string') kwargs = {} @@ -7863,7 +7862,7 @@ def get_step_artifact_content(ctx, from_json, file, pipeline_id, step_name, rang @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -7885,7 +7884,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def head_job_artifact(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -7907,7 +7906,7 @@ def head_job_artifact(ctx, from_json, job_id): @cli_util.wrap_exceptions def head_model_artifact(ctx, from_json, model_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -7930,10 +7929,10 @@ def head_model_artifact(ctx, from_json, model_id): @cli_util.wrap_exceptions def head_model_custom_metadatum_artifact(ctx, from_json, model_id, metadatum_key_name): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -7957,10 +7956,10 @@ def head_model_custom_metadatum_artifact(ctx, from_json, model_id, metadatum_key @cli_util.wrap_exceptions def head_model_defined_metadatum_artifact(ctx, from_json, model_id, metadatum_key_name): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -7983,7 +7982,7 @@ def head_model_defined_metadatum_artifact(ctx, from_json, model_id, metadatum_ke @cli_util.wrap_exceptions def head_model_group_artifact(ctx, from_json, model_group_id): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -8006,10 +8005,10 @@ def head_model_group_artifact(ctx, from_json, model_group_id): @cli_util.wrap_exceptions def head_step_artifact(ctx, from_json, pipeline_id, step_name): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') - if isinstance(step_name, six.string_types) and len(step_name.strip()) == 0: + if isinstance(step_name, str) and len(step_name.strip()) == 0: raise click.UsageError('Parameter --step-name cannot be whitespace or empty string') kwargs = {} @@ -8037,7 +8036,7 @@ def head_step_artifact(ctx, from_json, pipeline_id, step_name): @cli_util.wrap_exceptions def import_model_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, artifact_import_details, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -8101,7 +8100,7 @@ def import_model_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def import_model_artifact_artifact_import_details_object_storage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match, artifact_import_details_namespace, artifact_import_details_destination_bucket, artifact_import_details_destination_object_name, artifact_import_details_destination_region): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -8919,7 +8918,7 @@ def list_model_deployment_model_states(ctx, from_json, all_pages, page_size, mod if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -9121,7 +9120,7 @@ def list_model_group_models(ctx, from_json, all_pages, page_size, model_group_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') kwargs = {} @@ -9909,7 +9908,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -9964,7 +9963,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -10082,7 +10081,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, id, @cli_util.wrap_exceptions def put_ml_application_package(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_implementation_id, put_ml_application_package, content_length, content_disposition, opc_ml_app_package_args): - if isinstance(ml_application_implementation_id, six.string_types) and len(ml_application_implementation_id.strip()) == 0: + if isinstance(ml_application_implementation_id, str) and len(ml_application_implementation_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-id cannot be whitespace or empty string') kwargs = {} @@ -10146,7 +10145,7 @@ def put_ml_application_package(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def recover_ml_application_instance_view(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_instance_view_id, if_match): - if isinstance(ml_application_instance_view_id, six.string_types) and len(ml_application_instance_view_id.strip()) == 0: + if isinstance(ml_application_instance_view_id, str) and len(ml_application_instance_view_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-view-id cannot be whitespace or empty string') kwargs = {} @@ -10202,7 +10201,7 @@ def recover_ml_application_instance_view(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def register_model_artifact_reference(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_artifact_references, model_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -10263,7 +10262,7 @@ def register_model_artifact_reference(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def restore_archived_model_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, restore_model_for_hours_specified, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -10320,7 +10319,7 @@ def restore_archived_model_artifact(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def trigger_ml_application_instance_flow(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_name, ml_application_instance_id): - if isinstance(ml_application_instance_id, six.string_types) and len(ml_application_instance_id.strip()) == 0: + if isinstance(ml_application_instance_id, str) and len(ml_application_instance_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-id cannot be whitespace or empty string') kwargs = {} @@ -10381,7 +10380,7 @@ def trigger_ml_application_instance_flow(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def trigger_ml_application_instance_view_flow(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_name, ml_application_instance_view_id, parameters): - if isinstance(ml_application_instance_view_id, six.string_types) and len(ml_application_instance_view_id.strip()) == 0: + if isinstance(ml_application_instance_view_id, str) and len(ml_application_instance_view_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-view-id cannot be whitespace or empty string') kwargs = {} @@ -10448,7 +10447,7 @@ def trigger_ml_application_instance_view_flow(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def update_data_science_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_science_private_endpoint_id, freeform_tags, defined_tags, description, display_name, nsg_ids, if_match): - if isinstance(data_science_private_endpoint_id, six.string_types) and len(data_science_private_endpoint_id.strip()) == 0: + if isinstance(data_science_private_endpoint_id, str) and len(data_science_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --data-science-private-endpoint-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -10535,7 +10534,7 @@ def update_data_science_private_endpoint(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, display_name, description, job_infrastructure_configuration_details, job_storage_mount_configuration_details_list, freeform_tags, defined_tags, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if job_infrastructure_configuration_details or job_storage_mount_configuration_details_list or freeform_tags or defined_tags: @@ -10623,7 +10622,7 @@ def update_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_job_multi_node_job_infrastructure_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, job_infrastructure_configuration_details_shape_name, job_infrastructure_configuration_details_block_storage_size_in_gbs, display_name, description, job_storage_mount_configuration_details_list, freeform_tags, defined_tags, if_match, job_infrastructure_configuration_details_job_shape_config_details): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if job_storage_mount_configuration_details_list or freeform_tags or defined_tags: @@ -10713,7 +10712,7 @@ def update_job_multi_node_job_infrastructure_configuration_details(ctx, from_jso @cli_util.wrap_exceptions def update_job_empty_job_infrastructure_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, display_name, description, job_storage_mount_configuration_details_list, freeform_tags, defined_tags, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if job_storage_mount_configuration_details_list or freeform_tags or defined_tags: @@ -10801,7 +10800,7 @@ def update_job_empty_job_infrastructure_configuration_details(ctx, from_json, fo @cli_util.wrap_exceptions def update_job_managed_egress_standalone_job_infrastructure_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, job_infrastructure_configuration_details_shape_name, job_infrastructure_configuration_details_block_storage_size_in_gbs, display_name, description, job_storage_mount_configuration_details_list, freeform_tags, defined_tags, if_match, job_infrastructure_configuration_details_job_shape_config_details): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if job_storage_mount_configuration_details_list or freeform_tags or defined_tags: @@ -10895,7 +10894,7 @@ def update_job_managed_egress_standalone_job_infrastructure_configuration_detail @cli_util.wrap_exceptions def update_job_standalone_job_infrastructure_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, job_infrastructure_configuration_details_shape_name, job_infrastructure_configuration_details_subnet_id, job_infrastructure_configuration_details_block_storage_size_in_gbs, display_name, description, job_storage_mount_configuration_details_list, freeform_tags, defined_tags, if_match, job_infrastructure_configuration_details_job_shape_config_details): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if job_storage_mount_configuration_details_list or freeform_tags or defined_tags: @@ -10982,7 +10981,7 @@ def update_job_standalone_job_infrastructure_configuration_details(ctx, from_jso @cli_util.wrap_exceptions def update_job_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_run_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(job_run_id, six.string_types) and len(job_run_id.strip()) == 0: + if isinstance(job_run_id, str) and len(job_run_id.strip()) == 0: raise click.UsageError('Parameter --job-run-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11054,7 +11053,7 @@ def update_job_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_ml_application(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_id, description, freeform_tags, defined_tags, if_match): - if isinstance(ml_application_id, six.string_types) and len(ml_application_id.strip()) == 0: + if isinstance(ml_application_id, str) and len(ml_application_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11127,7 +11126,7 @@ def update_ml_application(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_ml_application_implementation(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_implementation_id, allowed_migration_destinations, logging, freeform_tags, defined_tags, if_match): - if isinstance(ml_application_implementation_id, six.string_types) and len(ml_application_implementation_id.strip()) == 0: + if isinstance(ml_application_implementation_id, str) and len(ml_application_implementation_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-id cannot be whitespace or empty string') if not force: if allowed_migration_destinations or logging or freeform_tags or defined_tags: @@ -11205,7 +11204,7 @@ def update_ml_application_implementation(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_ml_application_implementation_version(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_implementation_version_id, freeform_tags, defined_tags, if_match): - if isinstance(ml_application_implementation_version_id, six.string_types) and len(ml_application_implementation_version_id.strip()) == 0: + if isinstance(ml_application_implementation_version_id, str) and len(ml_application_implementation_version_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-implementation-version-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11278,7 +11277,7 @@ def update_ml_application_implementation_version(ctx, from_json, force, wait_for @cli_util.wrap_exceptions def update_ml_application_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_instance_id, configuration, ml_application_implementation_id, is_enabled, freeform_tags, defined_tags, if_match): - if isinstance(ml_application_instance_id, six.string_types) and len(ml_application_instance_id.strip()) == 0: + if isinstance(ml_application_instance_id, str) and len(ml_application_instance_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-id cannot be whitespace or empty string') if not force: if configuration or freeform_tags or defined_tags: @@ -11359,7 +11358,7 @@ def update_ml_application_instance(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_ml_application_instance_view(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ml_application_instance_view_id, freeform_tags, defined_tags, if_match): - if isinstance(ml_application_instance_view_id, six.string_types) and len(ml_application_instance_view_id.strip()) == 0: + if isinstance(ml_application_instance_view_id, str) and len(ml_application_instance_view_id.strip()) == 0: raise click.UsageError('Parameter --ml-application-instance-view-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11439,7 +11438,7 @@ def update_ml_application_instance_view(ctx, from_json, force, wait_for_state, m @cli_util.wrap_exceptions def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, display_name, description, freeform_tags, defined_tags, custom_metadata_list, defined_metadata_list, model_version_set_id, version_label, retention_setting, backup_setting, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or custom_metadata_list or defined_metadata_list or retention_setting or backup_setting: @@ -11529,10 +11528,10 @@ def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_model_custom_metadatum_artifact(ctx, from_json, model_id, metadatum_key_name, model_custom_metadatum_artifact, content_length, content_disposition, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -11571,10 +11570,10 @@ def update_model_custom_metadatum_artifact(ctx, from_json, model_id, metadatum_k @cli_util.wrap_exceptions def update_model_defined_metadatum_artifact(ctx, from_json, model_id, metadatum_key_name, model_defined_metadatum_artifact, content_length, content_disposition, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') - if isinstance(metadatum_key_name, six.string_types) and len(metadatum_key_name.strip()) == 0: + if isinstance(metadatum_key_name, str) and len(metadatum_key_name.strip()) == 0: raise click.UsageError('Parameter --metadatum-key-name cannot be whitespace or empty string') kwargs = {} @@ -11619,7 +11618,7 @@ def update_model_defined_metadatum_artifact(ctx, from_json, model_id, metadatum_ @cli_util.wrap_exceptions def update_model_deployment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_deployment_id, display_name, description, model_deployment_configuration_details, category_log_details, freeform_tags, defined_tags, if_match): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') if not force: if model_deployment_configuration_details or category_log_details or freeform_tags or defined_tags: @@ -11710,7 +11709,7 @@ def update_model_deployment(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_model_deployment_update_model_group_deployment_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_deployment_id, display_name, description, category_log_details, freeform_tags, defined_tags, if_match, model_deployment_configuration_details_update_type, model_deployment_configuration_details_model_group_configuration_details, model_deployment_configuration_details_infrastructure_configuration_details, model_deployment_configuration_details_environment_configuration_details): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') if not force: if category_log_details or freeform_tags or defined_tags: @@ -11811,7 +11810,7 @@ def update_model_deployment_update_model_group_deployment_configuration_details( @cli_util.wrap_exceptions def update_model_deployment_update_single_model_deployment_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_deployment_id, display_name, description, category_log_details, freeform_tags, defined_tags, if_match, model_deployment_configuration_details_model_configuration_details, model_deployment_configuration_details_environment_configuration_details): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') if not force: if category_log_details or freeform_tags or defined_tags: @@ -11905,7 +11904,7 @@ def update_model_deployment_update_single_model_deployment_configuration_details @cli_util.wrap_exceptions def update_model_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_group_id, display_name, description, version_label, model_group_version_history_id, freeform_tags, defined_tags, if_match): - if isinstance(model_group_id, six.string_types) and len(model_group_id.strip()) == 0: + if isinstance(model_group_id, str) and len(model_group_id.strip()) == 0: raise click.UsageError('Parameter --model-group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11988,7 +11987,7 @@ def update_model_group(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_model_group_version_history(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_group_version_history_id, display_name, description, latest_model_group_id, freeform_tags, defined_tags, if_match): - if isinstance(model_group_version_history_id, six.string_types) and len(model_group_version_history_id.strip()) == 0: + if isinstance(model_group_version_history_id, str) and len(model_group_version_history_id.strip()) == 0: raise click.UsageError('Parameter --model-group-version-history-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12065,7 +12064,7 @@ def update_model_group_version_history(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_model_provenance(ctx, from_json, model_id, repository_url, git_branch, git_commit, script_dir, training_script, training_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -12119,7 +12118,7 @@ def update_model_provenance(ctx, from_json, model_id, repository_url, git_branch @cli_util.wrap_exceptions def update_model_version_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_version_set_id, description, freeform_tags, defined_tags, if_match): - if isinstance(model_version_set_id, six.string_types) and len(model_version_set_id.strip()) == 0: + if isinstance(model_version_set_id, str) and len(model_version_set_id.strip()) == 0: raise click.UsageError('Parameter --model-version-set-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12196,7 +12195,7 @@ def update_model_version_set(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_notebook_session(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, notebook_session_id, display_name, notebook_session_configuration_details, freeform_tags, defined_tags, notebook_session_runtime_config_details, notebook_session_storage_mount_configuration_details_list, if_match): - if isinstance(notebook_session_id, six.string_types) and len(notebook_session_id.strip()) == 0: + if isinstance(notebook_session_id, str) and len(notebook_session_id.strip()) == 0: raise click.UsageError('Parameter --notebook-session-id cannot be whitespace or empty string') if not force: if notebook_session_configuration_details or freeform_tags or defined_tags or notebook_session_runtime_config_details or notebook_session_storage_mount_configuration_details_list: @@ -12287,7 +12286,7 @@ def update_notebook_session(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_pipeline(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, display_name, description, configuration_details, infrastructure_configuration_details, log_configuration_details, storage_mount_configuration_details_list, step_details, freeform_tags, defined_tags, if_match): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') if not force: if configuration_details or infrastructure_configuration_details or log_configuration_details or storage_mount_configuration_details_list or step_details or freeform_tags or defined_tags: @@ -12389,7 +12388,7 @@ def update_pipeline(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_pipeline_pipeline_default_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, display_name, description, infrastructure_configuration_details, log_configuration_details, storage_mount_configuration_details_list, step_details, freeform_tags, defined_tags, if_match, configuration_details_maximum_runtime_in_minutes, configuration_details_environment_variables, configuration_details_command_line_arguments): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') if not force: if infrastructure_configuration_details or log_configuration_details or storage_mount_configuration_details_list or step_details or freeform_tags or defined_tags: @@ -12488,7 +12487,7 @@ def update_pipeline_pipeline_default_configuration_details(ctx, from_json, force @cli_util.wrap_exceptions def update_pipeline_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_run_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(pipeline_run_id, six.string_types) and len(pipeline_run_id.strip()) == 0: + if isinstance(pipeline_run_id, str) and len(pipeline_run_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-run-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12561,7 +12560,7 @@ def update_pipeline_run(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12640,7 +12639,7 @@ def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, display_name, description, trigger, action, log_details, freeform_tags, defined_tags, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') if not force: if trigger or action or log_details or freeform_tags or defined_tags: @@ -12734,7 +12733,7 @@ def update_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_schedule_schedule_i_cal_trigger(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, trigger_recurrence, display_name, description, action, log_details, freeform_tags, defined_tags, if_match, trigger_time_start, trigger_time_end): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') if not force: if action or log_details or freeform_tags or defined_tags: @@ -12837,7 +12836,7 @@ def update_schedule_schedule_i_cal_trigger(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def update_schedule_schedule_interval_trigger(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, trigger_frequency, trigger_interval, display_name, description, action, log_details, freeform_tags, defined_tags, if_match, trigger_time_start, trigger_time_end, trigger_is_random_start_time): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') if not force: if action or log_details or freeform_tags or defined_tags: @@ -12942,7 +12941,7 @@ def update_schedule_schedule_interval_trigger(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_schedule_schedule_cron_trigger(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, trigger_cron_expression, display_name, description, action, log_details, freeform_tags, defined_tags, if_match, trigger_time_start, trigger_time_end): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') if not force: if action or log_details or freeform_tags or defined_tags: @@ -13041,7 +13040,7 @@ def update_schedule_schedule_cron_trigger(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_schedule_schedule_http_action(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, action_action_details, display_name, description, trigger, log_details, freeform_tags, defined_tags, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') if not force: if trigger or log_details or freeform_tags or defined_tags: diff --git a/services/database/src/oci_cli_database/database_cli_extended.py b/services/database/src/oci_cli_database/database_cli_extended.py index 12e57ecb4..2a0c29959 100644 --- a/services/database/src/oci_cli_database/database_cli_extended.py +++ b/services/database/src/oci_cli_database/database_cli_extended.py @@ -6,7 +6,6 @@ import click import json import oci -import six # noqa: F401 from oci_cli import cli_util from oci_cli import json_skeleton_utils @@ -3324,10 +3323,10 @@ def modify_pluggable_database_management_extended(ctx, **kwargs): @cli_util.wrap_exceptions def failover_data_guard_association_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -3377,10 +3376,10 @@ def failover_data_guard_association_extended(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def reinstate_data_guard_association_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -3430,10 +3429,10 @@ def reinstate_data_guard_association_extended(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def switchover_data_guard_association_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -3483,10 +3482,10 @@ def switchover_data_guard_association_extended(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def update_data_guard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, database_admin_password, protection_mode, transport_type, is_active_data_guard_enabled, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -3547,7 +3546,7 @@ def update_data_guard_association(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_autonomous_database_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/database/src/oci_cli_database/generated/database_cli.py b/services/database/src/oci_cli_database/generated/database_cli.py index fabb9fe5c..5631efbc1 100644 --- a/services/database/src/oci_cli_database/generated/database_cli.py +++ b/services/database/src/oci_cli_database/generated/database_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -621,7 +620,7 @@ def system_version_minor_version_collection_group(): @cli_util.wrap_exceptions def activate_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, activation_file): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -685,7 +684,7 @@ def activate_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def add_standby_autonomous_container_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, fast_start_fail_over_lag_limit_in_seconds, is_automatic_failover_enabled, peer_autonomous_container_database_backup_config, peer_autonomous_container_database_compartment_id, peer_autonomous_container_database_display_name, peer_cloud_autonomous_vm_cluster_id, peer_autonomous_vm_cluster_id, peer_db_unique_name, protection_mode, standby_maintenance_buffer_in_days, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -770,7 +769,7 @@ def add_standby_autonomous_container_database(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def add_storage_capacity_cloud_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_exadata_infrastructure_id, if_match): - if isinstance(cloud_exadata_infrastructure_id, six.string_types) and len(cloud_exadata_infrastructure_id.strip()) == 0: + if isinstance(cloud_exadata_infrastructure_id, str) and len(cloud_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --cloud-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -821,7 +820,7 @@ def add_storage_capacity_cloud_exadata_infrastructure(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def add_storage_capacity_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, if_match): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -873,7 +872,7 @@ def add_storage_capacity_exadata_infrastructure(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def add_virtual_machine_to_cloud_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_servers, cloud_vm_cluster_id, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -930,7 +929,7 @@ def add_virtual_machine_to_cloud_vm_cluster(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def add_virtual_machine_to_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_servers, vm_cluster_id, if_match): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -988,7 +987,7 @@ def add_virtual_machine_to_vm_cluster(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def autonomous_database_manual_refresh(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, time_refresh_cutoff, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -1048,7 +1047,7 @@ def autonomous_database_manual_refresh(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def cancel_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -1114,7 +1113,7 @@ def cancel_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def cancel_execution_window(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, execution_window_id, time_scheduled_of_new_window, window_duration_in_mins_of_new_window, is_enforced_duration_of_new_window, if_match): - if isinstance(execution_window_id, six.string_types) and len(execution_window_id.strip()) == 0: + if isinstance(execution_window_id, str) and len(execution_window_id.strip()) == 0: raise click.UsageError('Parameter --execution-window-id cannot be whitespace or empty string') kwargs = {} @@ -1174,7 +1173,7 @@ def cancel_execution_window(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def cascading_delete_scheduling_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduling_plan_id, if_match): - if isinstance(scheduling_plan_id, six.string_types) and len(scheduling_plan_id.strip()) == 0: + if isinstance(scheduling_plan_id, str) and len(scheduling_plan_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-plan-id cannot be whitespace or empty string') kwargs = {} @@ -1238,7 +1237,7 @@ def cascading_delete_scheduling_plan(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def change_autonomous_container_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, autonomous_container_database_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -1308,7 +1307,7 @@ def change_autonomous_container_database_compartment(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def change_autonomous_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, autonomous_database_id, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -1379,7 +1378,7 @@ def change_autonomous_database_compartment(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def change_autonomous_database_software_image_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, autonomous_database_software_image_id, if_match): - if isinstance(autonomous_database_software_image_id, six.string_types) and len(autonomous_database_software_image_id.strip()) == 0: + if isinstance(autonomous_database_software_image_id, str) and len(autonomous_database_software_image_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-software-image-id cannot be whitespace or empty string') kwargs = {} @@ -1450,7 +1449,7 @@ def change_autonomous_database_software_image_compartment(ctx, from_json, wait_f @cli_util.wrap_exceptions def change_autonomous_database_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, subscription_id, is_default, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -1526,7 +1525,7 @@ def change_autonomous_database_subscription(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def change_autonomous_exadata_infrastructure_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, autonomous_exadata_infrastructure_id, if_match): - if isinstance(autonomous_exadata_infrastructure_id, six.string_types) and len(autonomous_exadata_infrastructure_id.strip()) == 0: + if isinstance(autonomous_exadata_infrastructure_id, str) and len(autonomous_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -1595,7 +1594,7 @@ def change_autonomous_exadata_infrastructure_compartment(ctx, from_json, wait_fo @cli_util.wrap_exceptions def change_autonomous_vm_cluster_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, autonomous_vm_cluster_id, if_match): - if isinstance(autonomous_vm_cluster_id, six.string_types) and len(autonomous_vm_cluster_id.strip()) == 0: + if isinstance(autonomous_vm_cluster_id, str) and len(autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1664,7 +1663,7 @@ def change_autonomous_vm_cluster_compartment(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def change_backup_destination_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, backup_destination_id, if_match): - if isinstance(backup_destination_id, six.string_types) and len(backup_destination_id.strip()) == 0: + if isinstance(backup_destination_id, str) and len(backup_destination_id.strip()) == 0: raise click.UsageError('Parameter --backup-destination-id cannot be whitespace or empty string') kwargs = {} @@ -1733,7 +1732,7 @@ def change_backup_destination_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_cloud_autonomous_vm_cluster_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, cloud_autonomous_vm_cluster_id, if_match): - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1803,7 +1802,7 @@ def change_cloud_autonomous_vm_cluster_compartment(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def change_cloud_autonomous_vm_cluster_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_autonomous_vm_cluster_id, subscription_id, is_default, if_match): - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1877,7 +1876,7 @@ def change_cloud_autonomous_vm_cluster_subscription(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def change_cloud_exadata_infrastructure_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, cloud_exadata_infrastructure_id, if_match): - if isinstance(cloud_exadata_infrastructure_id, six.string_types) and len(cloud_exadata_infrastructure_id.strip()) == 0: + if isinstance(cloud_exadata_infrastructure_id, str) and len(cloud_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --cloud-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -1947,7 +1946,7 @@ def change_cloud_exadata_infrastructure_compartment(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def change_cloud_exadata_infrastructure_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_exadata_infrastructure_id, subscription_id, is_default, if_match): - if isinstance(cloud_exadata_infrastructure_id, six.string_types) and len(cloud_exadata_infrastructure_id.strip()) == 0: + if isinstance(cloud_exadata_infrastructure_id, str) and len(cloud_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --cloud-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -2021,7 +2020,7 @@ def change_cloud_exadata_infrastructure_subscription(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def change_cloud_vm_cluster_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, cloud_vm_cluster_id, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -2091,7 +2090,7 @@ def change_cloud_vm_cluster_compartment(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def change_cloud_vm_cluster_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_vm_cluster_id, subscription_id, is_default, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -2165,7 +2164,7 @@ def change_cloud_vm_cluster_subscription(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def change_database_software_image_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, database_software_image_id, if_match): - if isinstance(database_software_image_id, six.string_types) and len(database_software_image_id.strip()) == 0: + if isinstance(database_software_image_id, str) and len(database_software_image_id.strip()) == 0: raise click.UsageError('Parameter --database-software-image-id cannot be whitespace or empty string') kwargs = {} @@ -2236,7 +2235,7 @@ def change_database_software_image_compartment(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def change_dataguard_role(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, role, autonomous_container_database_dataguard_association_id, autonomous_container_database_id, connection_strings_type, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -2297,7 +2296,7 @@ def change_dataguard_role(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def change_db_system_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -2370,7 +2369,7 @@ def change_db_system_compartment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def change_disaster_recovery_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, disaster_recovery_type, time_snapshot_standby_enabled_till, is_snapshot_standby, is_replicate_automatic_backups, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -2440,7 +2439,7 @@ def change_disaster_recovery_configuration(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def change_encryption_key_location(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, provider_type, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -2509,7 +2508,7 @@ def change_encryption_key_location(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def change_encryption_key_location_external_hsm_encryption_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, hsm_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -2580,7 +2579,7 @@ def change_encryption_key_location_external_hsm_encryption_details(ctx, from_jso @cli_util.wrap_exceptions def change_encryption_key_location_google_cloud_provider_encryption_key_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, google_cloud_provider_encryption_key_id, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -2651,7 +2650,7 @@ def change_encryption_key_location_google_cloud_provider_encryption_key_details( @cli_util.wrap_exceptions def change_encryption_key_location_azure_encryption_key_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, azure_encryption_key_id, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -2722,7 +2721,7 @@ def change_encryption_key_location_azure_encryption_key_details(ctx, from_json, @cli_util.wrap_exceptions def change_exadata_infrastructure_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, exadata_infrastructure_id, if_match): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -2791,7 +2790,7 @@ def change_exadata_infrastructure_compartment(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def change_exadb_vm_cluster_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, exadb_vm_cluster_id, if_match): - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -2861,7 +2860,7 @@ def change_exadb_vm_cluster_compartment(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def change_exadb_vm_cluster_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadb_vm_cluster_id, subscription_id, is_default, if_match): - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -2935,7 +2934,7 @@ def change_exadb_vm_cluster_subscription(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def change_exascale_db_storage_vault_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, exascale_db_storage_vault_id, if_match): - if isinstance(exascale_db_storage_vault_id, six.string_types) and len(exascale_db_storage_vault_id.strip()) == 0: + if isinstance(exascale_db_storage_vault_id, str) and len(exascale_db_storage_vault_id.strip()) == 0: raise click.UsageError('Parameter --exascale-db-storage-vault-id cannot be whitespace or empty string') kwargs = {} @@ -3005,7 +3004,7 @@ def change_exascale_db_storage_vault_compartment(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_exascale_db_storage_vault_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exascale_db_storage_vault_id, subscription_id, is_default, if_match): - if isinstance(exascale_db_storage_vault_id, six.string_types) and len(exascale_db_storage_vault_id.strip()) == 0: + if isinstance(exascale_db_storage_vault_id, str) and len(exascale_db_storage_vault_id.strip()) == 0: raise click.UsageError('Parameter --exascale-db-storage-vault-id cannot be whitespace or empty string') kwargs = {} @@ -3079,7 +3078,7 @@ def change_exascale_db_storage_vault_subscription(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def change_external_container_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, external_container_database_id, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -3148,7 +3147,7 @@ def change_external_container_database_compartment(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def change_external_non_container_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, external_non_container_database_id, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -3217,7 +3216,7 @@ def change_external_non_container_database_compartment(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def change_external_pluggable_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, external_pluggable_database_id, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -3286,7 +3285,7 @@ def change_external_pluggable_database_compartment(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def change_key_store_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, key_store_id, if_match): - if isinstance(key_store_id, six.string_types) and len(key_store_id.strip()) == 0: + if isinstance(key_store_id, str) and len(key_store_id.strip()) == 0: raise click.UsageError('Parameter --key-store-id cannot be whitespace or empty string') kwargs = {} @@ -3355,7 +3354,7 @@ def change_key_store_compartment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def change_key_store_type(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, key_store_id, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -3424,7 +3423,7 @@ def change_key_store_type(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def change_oneoff_patch_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, oneoff_patch_id, if_match): - if isinstance(oneoff_patch_id, six.string_types) and len(oneoff_patch_id.strip()) == 0: + if isinstance(oneoff_patch_id, str) and len(oneoff_patch_id.strip()) == 0: raise click.UsageError('Parameter --oneoff-patch-id cannot be whitespace or empty string') kwargs = {} @@ -3493,7 +3492,7 @@ def change_oneoff_patch_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_scheduling_plan_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, scheduling_plan_id, if_match): - if isinstance(scheduling_plan_id, six.string_types) and len(scheduling_plan_id.strip()) == 0: + if isinstance(scheduling_plan_id, str) and len(scheduling_plan_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-plan-id cannot be whitespace or empty string') kwargs = {} @@ -3562,7 +3561,7 @@ def change_scheduling_plan_compartment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def change_scheduling_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, scheduling_policy_id, if_match): - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3631,7 +3630,7 @@ def change_scheduling_policy_compartment(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def change_vm_cluster_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, vm_cluster_id, if_match): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -3699,7 +3698,7 @@ def change_vm_cluster_compartment(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def check_external_database_connector_connection_status(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_database_connector_id, if_match): - if isinstance(external_database_connector_id, six.string_types) and len(external_database_connector_id.strip()) == 0: + if isinstance(external_database_connector_id, str) and len(external_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-database-connector-id cannot be whitespace or empty string') kwargs = {} @@ -3767,7 +3766,7 @@ def check_external_database_connector_connection_status(ctx, from_json, wait_for @cli_util.wrap_exceptions def complete_external_backup_job(ctx, from_json, backup_id, tde_wallet_path, cf_backup_handle, spf_backup_handle, sql_patches, data_size, redo_size, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -3820,7 +3819,7 @@ def complete_external_backup_job(ctx, from_json, backup_id, tde_wallet_path, cf_ @cli_util.wrap_exceptions def configure_autonomous_database_vault_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, kms_key_id, vault_id, is_using_oracle_managed_keys, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -3899,7 +3898,7 @@ def configure_autonomous_database_vault_key(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def configure_exascale_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, total_storage_in_gbs, if_match): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -3963,7 +3962,7 @@ def configure_exascale_exadata_infrastructure(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def configure_saas_admin_user(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, password, secret_id, secret_version_number, duration, is_enabled, access_type, time_saas_admin_user_enabled, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -4041,7 +4040,7 @@ def configure_saas_admin_user(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def confirm_key_store_details_are_correct(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_store_id, if_match): - if isinstance(key_store_id, six.string_types) and len(key_store_id.strip()) == 0: + if isinstance(key_store_id, str) and len(key_store_id.strip()) == 0: raise click.UsageError('Parameter --key-store-id cannot be whitespace or empty string') kwargs = {} @@ -4106,7 +4105,7 @@ def confirm_key_store_details_are_correct(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def convert_standby_autonomous_container_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, role, autonomous_container_database_id, connection_strings_type, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -4167,7 +4166,7 @@ def convert_standby_autonomous_container_database(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def convert_to_pdb(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, action, convert_to_pdb_target_details, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -4233,7 +4232,7 @@ def convert_to_pdb(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def convert_to_pdb_pdb_conversion_to_new_database_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, action, convert_to_pdb_target_details_cdb_name, convert_to_pdb_target_details_cdb_admin_password, convert_to_pdb_target_details_non_cdb_tde_wallet_password, if_match, convert_to_pdb_target_details_pdb_admin_password, convert_to_pdb_target_details_cdb_tde_wallet_password, convert_to_pdb_target_details_additional_cdb_params): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -4307,7 +4306,7 @@ def convert_to_pdb_pdb_conversion_to_new_database_details(ctx, from_json, wait_f @cli_util.wrap_exceptions def convert_to_regular_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, should_create_pdb_backup, container_database_admin_password, tde_wallet_password, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -4378,7 +4377,7 @@ def convert_to_regular_pluggable_database(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def convert_to_standalone(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -5112,7 +5111,7 @@ def create_autonomous_container_database_create_autonomous_container_database_fr @cli_util.wrap_exceptions def create_autonomous_container_database_dataguard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, peer_autonomous_container_database_display_name, protection_mode, peer_autonomous_container_database_compartment_id, peer_cloud_autonomous_vm_cluster_id, peer_autonomous_vm_cluster_id, peer_db_unique_name, peer_autonomous_container_database_backup_config, is_automatic_failover_enabled, fast_start_fail_over_lag_limit_in_seconds, standby_maintenance_buffer_in_days): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -11104,7 +11103,7 @@ def create_cloud_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def create_console_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, public_key, db_node_id, freeform_tags, defined_tags): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') kwargs = {} @@ -11167,7 +11166,7 @@ def create_console_connection(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def create_console_history(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, display_name, db_node_id, freeform_tags, defined_tags): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') kwargs = {} @@ -11257,7 +11256,7 @@ def create_console_history(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def create_data_guard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, protection_mode, transport_type, creation_type, database_software_image_id, source_encryption_key_location_details, is_active_data_guard_enabled, peer_db_unique_name, peer_sid_prefix): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -11397,7 +11396,7 @@ def create_data_guard_association(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def create_data_guard_association_create_data_guard_association_with_new_db_system_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, protection_mode, transport_type, database_software_image_id, source_encryption_key_location_details, is_active_data_guard_enabled, peer_db_unique_name, peer_sid_prefix, display_name, availability_domain, shape, cpu_core_count, storage_volume_performance_mode, compute_model, compute_count, node_count, subnet_id, nsg_ids, backup_network_nsg_ids, hostname, domain, time_zone, fault_domains, private_ip, private_ip_v6, license_model, db_system_freeform_tags, db_system_defined_tags, db_system_security_attributes, database_freeform_tags, database_defined_tags, data_collection_options): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -11572,7 +11571,7 @@ def create_data_guard_association_create_data_guard_association_with_new_db_syst @cli_util.wrap_exceptions def create_data_guard_association_create_data_guard_association_to_existing_vm_cluster_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, protection_mode, transport_type, database_software_image_id, source_encryption_key_location_details, is_active_data_guard_enabled, peer_db_unique_name, peer_sid_prefix, peer_vm_cluster_id, peer_db_home_id): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -11681,7 +11680,7 @@ def create_data_guard_association_create_data_guard_association_to_existing_vm_c @cli_util.wrap_exceptions def create_data_guard_association_create_data_guard_association_to_existing_db_system_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, protection_mode, transport_type, database_software_image_id, source_encryption_key_location_details, is_active_data_guard_enabled, peer_db_unique_name, peer_sid_prefix, peer_db_system_id, peer_db_home_id): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -11788,7 +11787,7 @@ def create_data_guard_association_create_data_guard_association_to_existing_db_s @cli_util.wrap_exceptions def create_data_guard_association_external_hsm_encryption_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, protection_mode, transport_type, source_encryption_key_location_details_hsm_password, database_software_image_id, is_active_data_guard_enabled, peer_db_unique_name, peer_sid_prefix): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -11888,7 +11887,7 @@ def create_data_guard_association_external_hsm_encryption_details(ctx, from_json @cli_util.wrap_exceptions def create_data_guard_association_google_cloud_provider_encryption_key_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, protection_mode, transport_type, source_encryption_key_location_details_google_cloud_provider_encryption_key_id, database_software_image_id, is_active_data_guard_enabled, peer_db_unique_name, peer_sid_prefix): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -11988,7 +11987,7 @@ def create_data_guard_association_google_cloud_provider_encryption_key_details(c @cli_util.wrap_exceptions def create_data_guard_association_azure_encryption_key_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, protection_mode, transport_type, source_encryption_key_location_details_azure_encryption_key_id, database_software_image_id, is_active_data_guard_enabled, peer_db_unique_name, peer_sid_prefix): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -14780,7 +14779,7 @@ def create_scheduling_policy(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_scheduling_window(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduling_policy_id, window_preference, compartment_id, freeform_tags, defined_tags): - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') kwargs = {} @@ -14992,7 +14991,7 @@ def create_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def create_vm_cluster_network(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, compartment_id, display_name, scans, vm_networks, dns, ntp, dr_scans, freeform_tags, defined_tags): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -15067,7 +15066,7 @@ def create_vm_cluster_network(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def db_node_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_node_id, action, if_match): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') kwargs = {} @@ -15119,7 +15118,7 @@ def db_node_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_application_vip(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, application_vip_id, if_match): - if isinstance(application_vip_id, six.string_types) and len(application_vip_id.strip()) == 0: + if isinstance(application_vip_id, str) and len(application_vip_id.strip()) == 0: raise click.UsageError('Parameter --application-vip-id cannot be whitespace or empty string') kwargs = {} @@ -15178,7 +15177,7 @@ def delete_application_vip(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, must_delete_associated_long_term_backups, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -15240,7 +15239,7 @@ def delete_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_autonomous_database_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_backup_id, if_match, opc_dry_run): - if isinstance(autonomous_database_backup_id, six.string_types) and len(autonomous_database_backup_id.strip()) == 0: + if isinstance(autonomous_database_backup_id, str) and len(autonomous_database_backup_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-backup-id cannot be whitespace or empty string') kwargs = {} @@ -15299,7 +15298,7 @@ def delete_autonomous_database_backup(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def delete_autonomous_database_software_image(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_software_image_id, if_match): - if isinstance(autonomous_database_software_image_id, six.string_types) and len(autonomous_database_software_image_id.strip()) == 0: + if isinstance(autonomous_database_software_image_id, str) and len(autonomous_database_software_image_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-software-image-id cannot be whitespace or empty string') kwargs = {} @@ -15356,7 +15355,7 @@ def delete_autonomous_database_software_image(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def delete_autonomous_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_vm_cluster_id, if_match): - if isinstance(autonomous_vm_cluster_id, six.string_types) and len(autonomous_vm_cluster_id.strip()) == 0: + if isinstance(autonomous_vm_cluster_id, str) and len(autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -15413,7 +15412,7 @@ def delete_autonomous_vm_cluster(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -15469,7 +15468,7 @@ def delete_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_backup_destination(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_destination_id, if_match): - if isinstance(backup_destination_id, six.string_types) and len(backup_destination_id.strip()) == 0: + if isinstance(backup_destination_id, str) and len(backup_destination_id.strip()) == 0: raise click.UsageError('Parameter --backup-destination-id cannot be whitespace or empty string') kwargs = {} @@ -15533,7 +15532,7 @@ def delete_backup_destination(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_cloud_autonomous_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_autonomous_vm_cluster_id, if_match): - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -15591,7 +15590,7 @@ def delete_cloud_autonomous_vm_cluster(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_cloud_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_exadata_infrastructure_id, if_match, is_delete_vm_clusters): - if isinstance(cloud_exadata_infrastructure_id, six.string_types) and len(cloud_exadata_infrastructure_id.strip()) == 0: + if isinstance(cloud_exadata_infrastructure_id, str) and len(cloud_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --cloud-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -15650,7 +15649,7 @@ def delete_cloud_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def delete_cloud_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_vm_cluster_id, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -15708,10 +15707,10 @@ def delete_cloud_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_console_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_node_id, console_connection_id, if_match): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') - if isinstance(console_connection_id, six.string_types) and len(console_connection_id.strip()) == 0: + if isinstance(console_connection_id, str) and len(console_connection_id.strip()) == 0: raise click.UsageError('Parameter --console-connection-id cannot be whitespace or empty string') kwargs = {} @@ -15769,10 +15768,10 @@ def delete_console_connection(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_console_history(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_node_id, console_history_id, if_match): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') - if isinstance(console_history_id, six.string_types) and len(console_history_id.strip()) == 0: + if isinstance(console_history_id, str) and len(console_history_id.strip()) == 0: raise click.UsageError('Parameter --console-history-id cannot be whitespace or empty string') kwargs = {} @@ -15837,7 +15836,7 @@ def delete_console_history(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, if_match, perform_final_backup): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -15896,7 +15895,7 @@ def delete_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_database_software_image(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_software_image_id, if_match): - if isinstance(database_software_image_id, six.string_types) and len(database_software_image_id.strip()) == 0: + if isinstance(database_software_image_id, str) and len(database_software_image_id.strip()) == 0: raise click.UsageError('Parameter --database-software-image-id cannot be whitespace or empty string') kwargs = {} @@ -15959,7 +15958,7 @@ def delete_database_software_image(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_db_home(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_home_id, if_match, perform_final_backup): - if isinstance(db_home_id, six.string_types) and len(db_home_id.strip()) == 0: + if isinstance(db_home_id, str) and len(db_home_id.strip()) == 0: raise click.UsageError('Parameter --db-home-id cannot be whitespace or empty string') kwargs = {} @@ -16017,7 +16016,7 @@ def delete_db_home(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, if_match): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -16074,7 +16073,7 @@ def delete_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_exadb_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadb_vm_cluster_id, if_match): - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -16131,7 +16130,7 @@ def delete_exadb_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_exascale_db_storage_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exascale_db_storage_vault_id, if_match): - if isinstance(exascale_db_storage_vault_id, six.string_types) and len(exascale_db_storage_vault_id.strip()) == 0: + if isinstance(exascale_db_storage_vault_id, str) and len(exascale_db_storage_vault_id.strip()) == 0: raise click.UsageError('Parameter --exascale-db-storage-vault-id cannot be whitespace or empty string') kwargs = {} @@ -16188,7 +16187,7 @@ def delete_exascale_db_storage_vault(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_execution_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, execution_action_id, if_match): - if isinstance(execution_action_id, six.string_types) and len(execution_action_id.strip()) == 0: + if isinstance(execution_action_id, str) and len(execution_action_id.strip()) == 0: raise click.UsageError('Parameter --execution-action-id cannot be whitespace or empty string') kwargs = {} @@ -16245,7 +16244,7 @@ def delete_execution_action(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_execution_window(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, execution_window_id, if_match): - if isinstance(execution_window_id, six.string_types) and len(execution_window_id.strip()) == 0: + if isinstance(execution_window_id, str) and len(execution_window_id.strip()) == 0: raise click.UsageError('Parameter --execution-window-id cannot be whitespace or empty string') kwargs = {} @@ -16309,7 +16308,7 @@ def delete_execution_window(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_external_container_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -16366,7 +16365,7 @@ def delete_external_container_database(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_external_database_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_database_connector_id, if_match): - if isinstance(external_database_connector_id, six.string_types) and len(external_database_connector_id.strip()) == 0: + if isinstance(external_database_connector_id, str) and len(external_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-database-connector-id cannot be whitespace or empty string') kwargs = {} @@ -16423,7 +16422,7 @@ def delete_external_database_connector(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_external_non_container_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -16480,7 +16479,7 @@ def delete_external_non_container_database(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def delete_external_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -16537,7 +16536,7 @@ def delete_external_pluggable_database(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_key_store(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_store_id, if_match): - if isinstance(key_store_id, six.string_types) and len(key_store_id.strip()) == 0: + if isinstance(key_store_id, str) and len(key_store_id.strip()) == 0: raise click.UsageError('Parameter --key-store-id cannot be whitespace or empty string') kwargs = {} @@ -16601,7 +16600,7 @@ def delete_key_store(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_oneoff_patch(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oneoff_patch_id, if_match): - if isinstance(oneoff_patch_id, six.string_types) and len(oneoff_patch_id.strip()) == 0: + if isinstance(oneoff_patch_id, str) and len(oneoff_patch_id.strip()) == 0: raise click.UsageError('Parameter --oneoff-patch-id cannot be whitespace or empty string') kwargs = {} @@ -16658,7 +16657,7 @@ def delete_oneoff_patch(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -16715,7 +16714,7 @@ def delete_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_pluggable_database_snapshot(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_snapshot_id, if_match): - if isinstance(pluggable_database_snapshot_id, six.string_types) and len(pluggable_database_snapshot_id.strip()) == 0: + if isinstance(pluggable_database_snapshot_id, str) and len(pluggable_database_snapshot_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-snapshot-id cannot be whitespace or empty string') kwargs = {} @@ -16772,7 +16771,7 @@ def delete_pluggable_database_snapshot(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_scheduled_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduled_action_id, if_match): - if isinstance(scheduled_action_id, six.string_types) and len(scheduled_action_id.strip()) == 0: + if isinstance(scheduled_action_id, str) and len(scheduled_action_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-action-id cannot be whitespace or empty string') kwargs = {} @@ -16829,7 +16828,7 @@ def delete_scheduled_action(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_scheduling_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduling_plan_id, if_match): - if isinstance(scheduling_plan_id, six.string_types) and len(scheduling_plan_id.strip()) == 0: + if isinstance(scheduling_plan_id, str) and len(scheduling_plan_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-plan-id cannot be whitespace or empty string') kwargs = {} @@ -16886,7 +16885,7 @@ def delete_scheduling_plan(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_scheduling_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduling_policy_id, if_match): - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') kwargs = {} @@ -16948,10 +16947,10 @@ def delete_scheduling_policy(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_scheduling_window(ctx, from_json, scheduling_policy_id, scheduling_window_id, if_match): - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') - if isinstance(scheduling_window_id, six.string_types) and len(scheduling_window_id.strip()) == 0: + if isinstance(scheduling_window_id, str) and len(scheduling_window_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-window-id cannot be whitespace or empty string') kwargs = {} @@ -16981,7 +16980,7 @@ def delete_scheduling_window(ctx, from_json, scheduling_policy_id, scheduling_wi @cli_util.wrap_exceptions def delete_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vm_cluster_id, if_match): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -17039,10 +17038,10 @@ def delete_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_vm_cluster_network(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, vm_cluster_network_id, if_match): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') - if isinstance(vm_cluster_network_id, six.string_types) and len(vm_cluster_network_id.strip()) == 0: + if isinstance(vm_cluster_network_id, str) and len(vm_cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -17100,7 +17099,7 @@ def delete_vm_cluster_network(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def deregister_autonomous_database_data_safe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, pdb_admin_password, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -17168,7 +17167,7 @@ def deregister_autonomous_database_data_safe(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def disable_autonomous_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -17231,7 +17230,7 @@ def disable_autonomous_database_management(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def disable_autonomous_database_operations_insights(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -17294,7 +17293,7 @@ def disable_autonomous_database_operations_insights(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def disable_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -17345,7 +17344,7 @@ def disable_database_management(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def disable_external_container_database_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17408,7 +17407,7 @@ def disable_external_container_database_database_management(ctx, from_json, wait @cli_util.wrap_exceptions def disable_external_container_database_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17471,7 +17470,7 @@ def disable_external_container_database_stack_monitoring(ctx, from_json, wait_fo @cli_util.wrap_exceptions def disable_external_non_container_database_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17534,7 +17533,7 @@ def disable_external_non_container_database_database_management(ctx, from_json, @cli_util.wrap_exceptions def disable_external_non_container_database_operations_insights(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17597,7 +17596,7 @@ def disable_external_non_container_database_operations_insights(ctx, from_json, @cli_util.wrap_exceptions def disable_external_non_container_database_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17660,7 +17659,7 @@ def disable_external_non_container_database_stack_monitoring(ctx, from_json, wai @cli_util.wrap_exceptions def disable_external_pluggable_database_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -17723,7 +17722,7 @@ def disable_external_pluggable_database_database_management(ctx, from_json, wait @cli_util.wrap_exceptions def disable_external_pluggable_database_operations_insights(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -17786,7 +17785,7 @@ def disable_external_pluggable_database_operations_insights(ctx, from_json, wait @cli_util.wrap_exceptions def disable_external_pluggable_database_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -17849,7 +17848,7 @@ def disable_external_pluggable_database_stack_monitoring(ctx, from_json, wait_fo @cli_util.wrap_exceptions def disable_pluggable_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -17897,7 +17896,7 @@ def disable_pluggable_database_management(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def download_exadata_infrastructure_config_file(ctx, from_json, file, exadata_infrastructure_id): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -17942,7 +17941,7 @@ def download_exadata_infrastructure_config_file(ctx, from_json, file, exadata_in @cli_util.wrap_exceptions def download_oneoff_patch(ctx, from_json, oneoff_patch_id, if_match): - if isinstance(oneoff_patch_id, six.string_types) and len(oneoff_patch_id.strip()) == 0: + if isinstance(oneoff_patch_id, str) and len(oneoff_patch_id.strip()) == 0: raise click.UsageError('Parameter --oneoff-patch-id cannot be whitespace or empty string') kwargs = {} @@ -17968,10 +17967,10 @@ def download_oneoff_patch(ctx, from_json, oneoff_patch_id, if_match): @cli_util.wrap_exceptions def download_validation_report(ctx, from_json, file, exadata_infrastructure_id, vm_cluster_network_id): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') - if isinstance(vm_cluster_network_id, six.string_types) and len(vm_cluster_network_id.strip()) == 0: + if isinstance(vm_cluster_network_id, str) and len(vm_cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -18018,10 +18017,10 @@ def download_validation_report(ctx, from_json, file, exadata_infrastructure_id, @cli_util.wrap_exceptions def download_vm_cluster_network_config_file(ctx, from_json, file, exadata_infrastructure_id, vm_cluster_network_id): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') - if isinstance(vm_cluster_network_id, six.string_types) and len(vm_cluster_network_id.strip()) == 0: + if isinstance(vm_cluster_network_id, str) and len(vm_cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -18073,7 +18072,7 @@ def download_vm_cluster_network_config_file(ctx, from_json, file, exadata_infras @cli_util.wrap_exceptions def edit_autonomous_container_database_dataguard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, is_automatic_failover_enabled, protection_mode, fast_start_fail_over_lag_limit_in_seconds, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -18137,7 +18136,7 @@ def edit_autonomous_container_database_dataguard(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def enable_autonomous_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -18200,7 +18199,7 @@ def enable_autonomous_database_management(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def enable_autonomous_database_operations_insights(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -18271,7 +18270,7 @@ def enable_autonomous_database_operations_insights(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def enable_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, credential_details, private_end_point_id, service_name, management_type, protocol, port, ssl_secret_id, role, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -18346,7 +18345,7 @@ def enable_database_management(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def enable_external_container_database_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, license_model, external_database_connector_id, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -18416,7 +18415,7 @@ def enable_external_container_database_database_management(ctx, from_json, wait_ @cli_util.wrap_exceptions def enable_external_container_database_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, external_database_connector_id, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -18486,7 +18485,7 @@ def enable_external_container_database_stack_monitoring(ctx, from_json, wait_for @cli_util.wrap_exceptions def enable_external_non_container_database_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, license_model, external_database_connector_id, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -18556,7 +18555,7 @@ def enable_external_non_container_database_database_management(ctx, from_json, w @cli_util.wrap_exceptions def enable_external_non_container_database_operations_insights(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, external_database_connector_id, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -18625,7 +18624,7 @@ def enable_external_non_container_database_operations_insights(ctx, from_json, w @cli_util.wrap_exceptions def enable_external_non_container_database_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, external_database_connector_id, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -18694,7 +18693,7 @@ def enable_external_non_container_database_stack_monitoring(ctx, from_json, wait @cli_util.wrap_exceptions def enable_external_pluggable_database_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, external_database_connector_id, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -18763,7 +18762,7 @@ def enable_external_pluggable_database_database_management(ctx, from_json, wait_ @cli_util.wrap_exceptions def enable_external_pluggable_database_operations_insights(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, external_database_connector_id, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -18832,7 +18831,7 @@ def enable_external_pluggable_database_operations_insights(ctx, from_json, wait_ @cli_util.wrap_exceptions def enable_external_pluggable_database_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, external_database_connector_id, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -18907,7 +18906,7 @@ def enable_external_pluggable_database_stack_monitoring(ctx, from_json, wait_for @cli_util.wrap_exceptions def enable_pluggable_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, credential_details, private_end_point_id, service_name, protocol, port, ssl_secret_id, role, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -18979,7 +18978,7 @@ def enable_pluggable_database_management(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def fail_over_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, peer_db_id, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -19034,7 +19033,7 @@ def fail_over_autonomous_database(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def failover_autonomous_container_database_dataguard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -19088,10 +19087,10 @@ def failover_autonomous_container_database_dataguard(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def failover_autonomous_container_database_dataguard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, autonomous_container_database_dataguard_association_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') - if isinstance(autonomous_container_database_dataguard_association_id, six.string_types) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: + if isinstance(autonomous_container_database_dataguard_association_id, str) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-dataguard-association-id cannot be whitespace or empty string') kwargs = {} @@ -19149,7 +19148,7 @@ def failover_autonomous_container_database_dataguard_association(ctx, from_json, @cli_util.wrap_exceptions def failover_data_guard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -19209,10 +19208,10 @@ def failover_data_guard(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def failover_data_guard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -19273,7 +19272,7 @@ def failover_data_guard_association(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def generate_autonomous_database_wallet(ctx, from_json, file, autonomous_database_id, password, generate_type, is_regional, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -19343,7 +19342,7 @@ def generate_autonomous_database_wallet(ctx, from_json, file, autonomous_databas @cli_util.wrap_exceptions def generate_recommended_vm_cluster_network(ctx, from_json, exadata_infrastructure_id, compartment_id, display_name, networks, db_servers, scan_listener_port_tcp, scan_listener_port_tcp_ssl, dr_scan_listener_port_tcp, dns, ntp, freeform_tags, defined_tags): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -19396,7 +19395,7 @@ def generate_recommended_vm_cluster_network(ctx, from_json, exadata_infrastructu @cli_util.wrap_exceptions def get_application_vip(ctx, from_json, application_vip_id): - if isinstance(application_vip_id, six.string_types) and len(application_vip_id.strip()) == 0: + if isinstance(application_vip_id, str) and len(application_vip_id.strip()) == 0: raise click.UsageError('Parameter --application-vip-id cannot be whitespace or empty string') kwargs = {} @@ -19418,7 +19417,7 @@ def get_application_vip(ctx, from_json, application_vip_id): @cli_util.wrap_exceptions def get_autonomous_container_database(ctx, from_json, autonomous_container_database_id): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -19440,10 +19439,10 @@ def get_autonomous_container_database(ctx, from_json, autonomous_container_datab @cli_util.wrap_exceptions def get_autonomous_container_database_dataguard_association(ctx, from_json, autonomous_container_database_id, autonomous_container_database_dataguard_association_id): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') - if isinstance(autonomous_container_database_dataguard_association_id, six.string_types) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: + if isinstance(autonomous_container_database_dataguard_association_id, str) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-dataguard-association-id cannot be whitespace or empty string') kwargs = {} @@ -19465,7 +19464,7 @@ def get_autonomous_container_database_dataguard_association(ctx, from_json, auto @cli_util.wrap_exceptions def get_autonomous_container_database_resource_usage(ctx, from_json, autonomous_container_database_id): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -19487,7 +19486,7 @@ def get_autonomous_container_database_resource_usage(ctx, from_json, autonomous_ @cli_util.wrap_exceptions def get_autonomous_database(ctx, from_json, autonomous_database_id): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -19509,7 +19508,7 @@ def get_autonomous_database(ctx, from_json, autonomous_database_id): @cli_util.wrap_exceptions def get_autonomous_database_backup(ctx, from_json, autonomous_database_backup_id): - if isinstance(autonomous_database_backup_id, six.string_types) and len(autonomous_database_backup_id.strip()) == 0: + if isinstance(autonomous_database_backup_id, str) and len(autonomous_database_backup_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-backup-id cannot be whitespace or empty string') kwargs = {} @@ -19532,10 +19531,10 @@ def get_autonomous_database_backup(ctx, from_json, autonomous_database_backup_id @cli_util.wrap_exceptions def get_autonomous_database_dataguard_association(ctx, from_json, autonomous_database_id, autonomous_database_dataguard_association_id): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') - if isinstance(autonomous_database_dataguard_association_id, six.string_types) and len(autonomous_database_dataguard_association_id.strip()) == 0: + if isinstance(autonomous_database_dataguard_association_id, str) and len(autonomous_database_dataguard_association_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-dataguard-association-id cannot be whitespace or empty string') kwargs = {} @@ -19575,7 +19574,7 @@ def get_autonomous_database_regional_wallet(ctx, from_json, ): @cli_util.wrap_exceptions def get_autonomous_database_software_image(ctx, from_json, autonomous_database_software_image_id): - if isinstance(autonomous_database_software_image_id, six.string_types) and len(autonomous_database_software_image_id.strip()) == 0: + if isinstance(autonomous_database_software_image_id, str) and len(autonomous_database_software_image_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-software-image-id cannot be whitespace or empty string') kwargs = {} @@ -19597,7 +19596,7 @@ def get_autonomous_database_software_image(ctx, from_json, autonomous_database_s @cli_util.wrap_exceptions def get_autonomous_database_wallet(ctx, from_json, autonomous_database_id): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -19619,7 +19618,7 @@ def get_autonomous_database_wallet(ctx, from_json, autonomous_database_id): @cli_util.wrap_exceptions def get_autonomous_exadata_infrastructure(ctx, from_json, autonomous_exadata_infrastructure_id): - if isinstance(autonomous_exadata_infrastructure_id, six.string_types) and len(autonomous_exadata_infrastructure_id.strip()) == 0: + if isinstance(autonomous_exadata_infrastructure_id, str) and len(autonomous_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -19640,7 +19639,7 @@ def get_autonomous_exadata_infrastructure(ctx, from_json, autonomous_exadata_inf @cli_util.wrap_exceptions def get_autonomous_patch(ctx, from_json, autonomous_patch_id): - if isinstance(autonomous_patch_id, six.string_types) and len(autonomous_patch_id.strip()) == 0: + if isinstance(autonomous_patch_id, str) and len(autonomous_patch_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-patch-id cannot be whitespace or empty string') kwargs = {} @@ -19661,7 +19660,7 @@ def get_autonomous_patch(ctx, from_json, autonomous_patch_id): @cli_util.wrap_exceptions def get_autonomous_virtual_machine(ctx, from_json, autonomous_virtual_machine_id): - if isinstance(autonomous_virtual_machine_id, six.string_types) and len(autonomous_virtual_machine_id.strip()) == 0: + if isinstance(autonomous_virtual_machine_id, str) and len(autonomous_virtual_machine_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-virtual-machine-id cannot be whitespace or empty string') kwargs = {} @@ -19683,7 +19682,7 @@ def get_autonomous_virtual_machine(ctx, from_json, autonomous_virtual_machine_id @cli_util.wrap_exceptions def get_autonomous_vm_cluster(ctx, from_json, autonomous_vm_cluster_id): - if isinstance(autonomous_vm_cluster_id, six.string_types) and len(autonomous_vm_cluster_id.strip()) == 0: + if isinstance(autonomous_vm_cluster_id, str) and len(autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -19705,7 +19704,7 @@ def get_autonomous_vm_cluster(ctx, from_json, autonomous_vm_cluster_id): @cli_util.wrap_exceptions def get_autonomous_vm_cluster_resource_usage(ctx, from_json, autonomous_vm_cluster_id): - if isinstance(autonomous_vm_cluster_id, six.string_types) and len(autonomous_vm_cluster_id.strip()) == 0: + if isinstance(autonomous_vm_cluster_id, str) and len(autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -19727,7 +19726,7 @@ def get_autonomous_vm_cluster_resource_usage(ctx, from_json, autonomous_vm_clust @cli_util.wrap_exceptions def get_backup(ctx, from_json, backup_id): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -19748,7 +19747,7 @@ def get_backup(ctx, from_json, backup_id): @cli_util.wrap_exceptions def get_backup_destination(ctx, from_json, backup_destination_id): - if isinstance(backup_destination_id, six.string_types) and len(backup_destination_id.strip()) == 0: + if isinstance(backup_destination_id, str) and len(backup_destination_id.strip()) == 0: raise click.UsageError('Parameter --backup-destination-id cannot be whitespace or empty string') kwargs = {} @@ -19770,7 +19769,7 @@ def get_backup_destination(ctx, from_json, backup_destination_id): @cli_util.wrap_exceptions def get_cloud_autonomous_vm_cluster(ctx, from_json, cloud_autonomous_vm_cluster_id): - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -19792,7 +19791,7 @@ def get_cloud_autonomous_vm_cluster(ctx, from_json, cloud_autonomous_vm_cluster_ @cli_util.wrap_exceptions def get_cloud_autonomous_vm_cluster_resource_usage(ctx, from_json, cloud_autonomous_vm_cluster_id): - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -19814,7 +19813,7 @@ def get_cloud_autonomous_vm_cluster_resource_usage(ctx, from_json, cloud_autonom @cli_util.wrap_exceptions def get_cloud_exadata_infrastructure(ctx, from_json, cloud_exadata_infrastructure_id): - if isinstance(cloud_exadata_infrastructure_id, six.string_types) and len(cloud_exadata_infrastructure_id.strip()) == 0: + if isinstance(cloud_exadata_infrastructure_id, str) and len(cloud_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --cloud-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -19837,7 +19836,7 @@ def get_cloud_exadata_infrastructure(ctx, from_json, cloud_exadata_infrastructur @cli_util.wrap_exceptions def get_cloud_exadata_infrastructure_unallocated_resources(ctx, from_json, cloud_exadata_infrastructure_id, db_servers): - if isinstance(cloud_exadata_infrastructure_id, six.string_types) and len(cloud_exadata_infrastructure_id.strip()) == 0: + if isinstance(cloud_exadata_infrastructure_id, str) and len(cloud_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --cloud-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -19861,7 +19860,7 @@ def get_cloud_exadata_infrastructure_unallocated_resources(ctx, from_json, cloud @cli_util.wrap_exceptions def get_cloud_vm_cluster(ctx, from_json, cloud_vm_cluster_id): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -19883,7 +19882,7 @@ def get_cloud_vm_cluster(ctx, from_json, cloud_vm_cluster_id): @cli_util.wrap_exceptions def get_cloud_vm_cluster_iorm_config(ctx, from_json, cloud_vm_cluster_id): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -19906,10 +19905,10 @@ def get_cloud_vm_cluster_iorm_config(ctx, from_json, cloud_vm_cluster_id): @cli_util.wrap_exceptions def get_cloud_vm_cluster_update(ctx, from_json, cloud_vm_cluster_id, update_id): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') - if isinstance(update_id, six.string_types) and len(update_id.strip()) == 0: + if isinstance(update_id, str) and len(update_id.strip()) == 0: raise click.UsageError('Parameter --update-id cannot be whitespace or empty string') kwargs = {} @@ -19933,10 +19932,10 @@ def get_cloud_vm_cluster_update(ctx, from_json, cloud_vm_cluster_id, update_id): @cli_util.wrap_exceptions def get_cloud_vm_cluster_update_history_entry(ctx, from_json, cloud_vm_cluster_id, update_history_entry_id): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') - if isinstance(update_history_entry_id, six.string_types) and len(update_history_entry_id.strip()) == 0: + if isinstance(update_history_entry_id, str) and len(update_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --update-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -19960,10 +19959,10 @@ def get_cloud_vm_cluster_update_history_entry(ctx, from_json, cloud_vm_cluster_i @cli_util.wrap_exceptions def get_console_connection(ctx, from_json, db_node_id, console_connection_id): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') - if isinstance(console_connection_id, six.string_types) and len(console_connection_id.strip()) == 0: + if isinstance(console_connection_id, str) and len(console_connection_id.strip()) == 0: raise click.UsageError('Parameter --console-connection-id cannot be whitespace or empty string') kwargs = {} @@ -19986,10 +19985,10 @@ def get_console_connection(ctx, from_json, db_node_id, console_connection_id): @cli_util.wrap_exceptions def get_console_history(ctx, from_json, db_node_id, console_history_id): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') - if isinstance(console_history_id, six.string_types) and len(console_history_id.strip()) == 0: + if isinstance(console_history_id, str) and len(console_history_id.strip()) == 0: raise click.UsageError('Parameter --console-history-id cannot be whitespace or empty string') kwargs = {} @@ -20014,10 +20013,10 @@ def get_console_history(ctx, from_json, db_node_id, console_history_id): @cli_util.wrap_exceptions def get_console_history_content(ctx, from_json, file, db_node_id, console_history_id): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') - if isinstance(console_history_id, six.string_types) and len(console_history_id.strip()) == 0: + if isinstance(console_history_id, str) and len(console_history_id.strip()) == 0: raise click.UsageError('Parameter --console-history-id cannot be whitespace or empty string') kwargs = {} @@ -20063,10 +20062,10 @@ def get_console_history_content(ctx, from_json, file, db_node_id, console_histor @cli_util.wrap_exceptions def get_data_guard_association(ctx, from_json, database_id, data_guard_association_id): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -20088,7 +20087,7 @@ def get_data_guard_association(ctx, from_json, database_id, data_guard_associati @cli_util.wrap_exceptions def get_database(ctx, from_json, database_id): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -20109,7 +20108,7 @@ def get_database(ctx, from_json, database_id): @cli_util.wrap_exceptions def get_database_software_image(ctx, from_json, database_software_image_id): - if isinstance(database_software_image_id, six.string_types) and len(database_software_image_id.strip()) == 0: + if isinstance(database_software_image_id, str) and len(database_software_image_id.strip()) == 0: raise click.UsageError('Parameter --database-software-image-id cannot be whitespace or empty string') kwargs = {} @@ -20131,10 +20130,10 @@ def get_database_software_image(ctx, from_json, database_software_image_id): @cli_util.wrap_exceptions def get_database_upgrade_history_entry(ctx, from_json, database_id, upgrade_history_entry_id): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(upgrade_history_entry_id, six.string_types) and len(upgrade_history_entry_id.strip()) == 0: + if isinstance(upgrade_history_entry_id, str) and len(upgrade_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --upgrade-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -20157,7 +20156,7 @@ def get_database_upgrade_history_entry(ctx, from_json, database_id, upgrade_hist @cli_util.wrap_exceptions def get_db_home(ctx, from_json, db_home_id): - if isinstance(db_home_id, six.string_types) and len(db_home_id.strip()) == 0: + if isinstance(db_home_id, str) and len(db_home_id.strip()) == 0: raise click.UsageError('Parameter --db-home-id cannot be whitespace or empty string') kwargs = {} @@ -20179,10 +20178,10 @@ def get_db_home(ctx, from_json, db_home_id): @cli_util.wrap_exceptions def get_db_home_patch(ctx, from_json, db_home_id, patch_id): - if isinstance(db_home_id, six.string_types) and len(db_home_id.strip()) == 0: + if isinstance(db_home_id, str) and len(db_home_id.strip()) == 0: raise click.UsageError('Parameter --db-home-id cannot be whitespace or empty string') - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') kwargs = {} @@ -20205,10 +20204,10 @@ def get_db_home_patch(ctx, from_json, db_home_id, patch_id): @cli_util.wrap_exceptions def get_db_home_patch_history_entry(ctx, from_json, db_home_id, patch_history_entry_id): - if isinstance(db_home_id, six.string_types) and len(db_home_id.strip()) == 0: + if isinstance(db_home_id, str) and len(db_home_id.strip()) == 0: raise click.UsageError('Parameter --db-home-id cannot be whitespace or empty string') - if isinstance(patch_history_entry_id, six.string_types) and len(patch_history_entry_id.strip()) == 0: + if isinstance(patch_history_entry_id, str) and len(patch_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --patch-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -20230,7 +20229,7 @@ def get_db_home_patch_history_entry(ctx, from_json, db_home_id, patch_history_en @cli_util.wrap_exceptions def get_db_node(ctx, from_json, db_node_id): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') kwargs = {} @@ -20252,7 +20251,7 @@ def get_db_node(ctx, from_json, db_node_id): @cli_util.wrap_exceptions def get_db_server(ctx, from_json, exadata_infrastructure_id, db_server_id): - if isinstance(db_server_id, six.string_types) and len(db_server_id.strip()) == 0: + if isinstance(db_server_id, str) and len(db_server_id.strip()) == 0: raise click.UsageError('Parameter --db-server-id cannot be whitespace or empty string') kwargs = {} @@ -20279,7 +20278,7 @@ def get_db_server(ctx, from_json, exadata_infrastructure_id, db_server_id): @cli_util.wrap_exceptions def get_db_system(ctx, from_json, db_system_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -20301,10 +20300,10 @@ def get_db_system(ctx, from_json, db_system_id): @cli_util.wrap_exceptions def get_db_system_patch(ctx, from_json, db_system_id, patch_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') kwargs = {} @@ -20327,10 +20326,10 @@ def get_db_system_patch(ctx, from_json, db_system_id, patch_id): @cli_util.wrap_exceptions def get_db_system_patch_history_entry(ctx, from_json, db_system_id, patch_history_entry_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') - if isinstance(patch_history_entry_id, six.string_types) and len(patch_history_entry_id.strip()) == 0: + if isinstance(patch_history_entry_id, str) and len(patch_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --patch-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -20353,10 +20352,10 @@ def get_db_system_patch_history_entry(ctx, from_json, db_system_id, patch_histor @cli_util.wrap_exceptions def get_db_system_upgrade_history_entry(ctx, from_json, db_system_id, upgrade_history_entry_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') - if isinstance(upgrade_history_entry_id, six.string_types) and len(upgrade_history_entry_id.strip()) == 0: + if isinstance(upgrade_history_entry_id, str) and len(upgrade_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --upgrade-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -20380,7 +20379,7 @@ def get_db_system_upgrade_history_entry(ctx, from_json, db_system_id, upgrade_hi @cli_util.wrap_exceptions def get_exadata_infrastructure(ctx, from_json, exadata_infrastructure_id, excluded_fields): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -20404,7 +20403,7 @@ def get_exadata_infrastructure(ctx, from_json, exadata_infrastructure_id, exclud @cli_util.wrap_exceptions def get_exadata_infrastructure_ocpus(ctx, from_json, autonomous_exadata_infrastructure_id): - if isinstance(autonomous_exadata_infrastructure_id, six.string_types) and len(autonomous_exadata_infrastructure_id.strip()) == 0: + if isinstance(autonomous_exadata_infrastructure_id, str) and len(autonomous_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -20427,7 +20426,7 @@ def get_exadata_infrastructure_ocpus(ctx, from_json, autonomous_exadata_infrastr @cli_util.wrap_exceptions def get_exadata_infrastructure_un_allocated_resources(ctx, from_json, exadata_infrastructure_id, db_servers): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -20457,7 +20456,7 @@ def get_exadata_infrastructure_un_allocated_resources(ctx, from_json, exadata_in @cli_util.wrap_exceptions def get_exadata_iorm_config(ctx, from_json, db_system_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -20479,7 +20478,7 @@ def get_exadata_iorm_config(ctx, from_json, db_system_id): @cli_util.wrap_exceptions def get_exadb_vm_cluster(ctx, from_json, exadb_vm_cluster_id): - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -20502,10 +20501,10 @@ def get_exadb_vm_cluster(ctx, from_json, exadb_vm_cluster_id): @cli_util.wrap_exceptions def get_exadb_vm_cluster_update(ctx, from_json, exadb_vm_cluster_id, update_id): - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') - if isinstance(update_id, six.string_types) and len(update_id.strip()) == 0: + if isinstance(update_id, str) and len(update_id.strip()) == 0: raise click.UsageError('Parameter --update-id cannot be whitespace or empty string') kwargs = {} @@ -20529,10 +20528,10 @@ def get_exadb_vm_cluster_update(ctx, from_json, exadb_vm_cluster_id, update_id): @cli_util.wrap_exceptions def get_exadb_vm_cluster_update_history_entry(ctx, from_json, exadb_vm_cluster_id, update_history_entry_id): - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') - if isinstance(update_history_entry_id, six.string_types) and len(update_history_entry_id.strip()) == 0: + if isinstance(update_history_entry_id, str) and len(update_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --update-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -20555,7 +20554,7 @@ def get_exadb_vm_cluster_update_history_entry(ctx, from_json, exadb_vm_cluster_i @cli_util.wrap_exceptions def get_exascale_db_storage_vault(ctx, from_json, exascale_db_storage_vault_id): - if isinstance(exascale_db_storage_vault_id, six.string_types) and len(exascale_db_storage_vault_id.strip()) == 0: + if isinstance(exascale_db_storage_vault_id, str) and len(exascale_db_storage_vault_id.strip()) == 0: raise click.UsageError('Parameter --exascale-db-storage-vault-id cannot be whitespace or empty string') kwargs = {} @@ -20577,7 +20576,7 @@ def get_exascale_db_storage_vault(ctx, from_json, exascale_db_storage_vault_id): @cli_util.wrap_exceptions def get_execution_action(ctx, from_json, execution_action_id): - if isinstance(execution_action_id, six.string_types) and len(execution_action_id.strip()) == 0: + if isinstance(execution_action_id, str) and len(execution_action_id.strip()) == 0: raise click.UsageError('Parameter --execution-action-id cannot be whitespace or empty string') kwargs = {} @@ -20599,7 +20598,7 @@ def get_execution_action(ctx, from_json, execution_action_id): @cli_util.wrap_exceptions def get_execution_window(ctx, from_json, execution_window_id): - if isinstance(execution_window_id, six.string_types) and len(execution_window_id.strip()) == 0: + if isinstance(execution_window_id, str) and len(execution_window_id.strip()) == 0: raise click.UsageError('Parameter --execution-window-id cannot be whitespace or empty string') kwargs = {} @@ -20623,7 +20622,7 @@ def get_execution_window(ctx, from_json, execution_window_id): @cli_util.wrap_exceptions def get_external_backup_job(ctx, from_json, backup_id): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -20644,7 +20643,7 @@ def get_external_backup_job(ctx, from_json, backup_id): @cli_util.wrap_exceptions def get_external_container_database(ctx, from_json, external_container_database_id): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -20666,7 +20665,7 @@ def get_external_container_database(ctx, from_json, external_container_database_ @cli_util.wrap_exceptions def get_external_database_connector(ctx, from_json, external_database_connector_id): - if isinstance(external_database_connector_id, six.string_types) and len(external_database_connector_id.strip()) == 0: + if isinstance(external_database_connector_id, str) and len(external_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-database-connector-id cannot be whitespace or empty string') kwargs = {} @@ -20688,7 +20687,7 @@ def get_external_database_connector(ctx, from_json, external_database_connector_ @cli_util.wrap_exceptions def get_external_non_container_database(ctx, from_json, external_non_container_database_id): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -20710,7 +20709,7 @@ def get_external_non_container_database(ctx, from_json, external_non_container_d @cli_util.wrap_exceptions def get_external_pluggable_database(ctx, from_json, external_pluggable_database_id): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -20757,7 +20756,7 @@ def get_infrastructure_target_versions(ctx, from_json, compartment_id, target_re @cli_util.wrap_exceptions def get_key_store(ctx, from_json, key_store_id): - if isinstance(key_store_id, six.string_types) and len(key_store_id.strip()) == 0: + if isinstance(key_store_id, str) and len(key_store_id.strip()) == 0: raise click.UsageError('Parameter --key-store-id cannot be whitespace or empty string') kwargs = {} @@ -20779,7 +20778,7 @@ def get_key_store(ctx, from_json, key_store_id): @cli_util.wrap_exceptions def get_maintenance_run(ctx, from_json, maintenance_run_id): - if isinstance(maintenance_run_id, six.string_types) and len(maintenance_run_id.strip()) == 0: + if isinstance(maintenance_run_id, str) and len(maintenance_run_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-run-id cannot be whitespace or empty string') kwargs = {} @@ -20800,7 +20799,7 @@ def get_maintenance_run(ctx, from_json, maintenance_run_id): @cli_util.wrap_exceptions def get_maintenance_run_history(ctx, from_json, maintenance_run_history_id): - if isinstance(maintenance_run_history_id, six.string_types) and len(maintenance_run_history_id.strip()) == 0: + if isinstance(maintenance_run_history_id, str) and len(maintenance_run_history_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-run-history-id cannot be whitespace or empty string') kwargs = {} @@ -20821,7 +20820,7 @@ def get_maintenance_run_history(ctx, from_json, maintenance_run_history_id): @cli_util.wrap_exceptions def get_oneoff_patch(ctx, from_json, oneoff_patch_id): - if isinstance(oneoff_patch_id, six.string_types) and len(oneoff_patch_id.strip()) == 0: + if isinstance(oneoff_patch_id, str) and len(oneoff_patch_id.strip()) == 0: raise click.UsageError('Parameter --oneoff-patch-id cannot be whitespace or empty string') kwargs = {} @@ -20844,10 +20843,10 @@ def get_oneoff_patch(ctx, from_json, oneoff_patch_id): @cli_util.wrap_exceptions def get_pdb_conversion_history_entry(ctx, from_json, database_id, pdb_conversion_history_entry_id): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(pdb_conversion_history_entry_id, six.string_types) and len(pdb_conversion_history_entry_id.strip()) == 0: + if isinstance(pdb_conversion_history_entry_id, str) and len(pdb_conversion_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --pdb-conversion-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -20870,7 +20869,7 @@ def get_pdb_conversion_history_entry(ctx, from_json, database_id, pdb_conversion @cli_util.wrap_exceptions def get_pluggable_database(ctx, from_json, pluggable_database_id): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -20891,7 +20890,7 @@ def get_pluggable_database(ctx, from_json, pluggable_database_id): @cli_util.wrap_exceptions def get_pluggable_database_snapshot(ctx, from_json, pluggable_database_snapshot_id): - if isinstance(pluggable_database_snapshot_id, six.string_types) and len(pluggable_database_snapshot_id.strip()) == 0: + if isinstance(pluggable_database_snapshot_id, str) and len(pluggable_database_snapshot_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-snapshot-id cannot be whitespace or empty string') kwargs = {} @@ -20913,7 +20912,7 @@ def get_pluggable_database_snapshot(ctx, from_json, pluggable_database_snapshot_ @cli_util.wrap_exceptions def get_scheduled_action(ctx, from_json, scheduled_action_id): - if isinstance(scheduled_action_id, six.string_types) and len(scheduled_action_id.strip()) == 0: + if isinstance(scheduled_action_id, str) and len(scheduled_action_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-action-id cannot be whitespace or empty string') kwargs = {} @@ -20935,7 +20934,7 @@ def get_scheduled_action(ctx, from_json, scheduled_action_id): @cli_util.wrap_exceptions def get_scheduling_plan(ctx, from_json, scheduling_plan_id): - if isinstance(scheduling_plan_id, six.string_types) and len(scheduling_plan_id.strip()) == 0: + if isinstance(scheduling_plan_id, str) and len(scheduling_plan_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-plan-id cannot be whitespace or empty string') kwargs = {} @@ -20957,7 +20956,7 @@ def get_scheduling_plan(ctx, from_json, scheduling_plan_id): @cli_util.wrap_exceptions def get_scheduling_policy(ctx, from_json, scheduling_policy_id): - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') kwargs = {} @@ -20980,10 +20979,10 @@ def get_scheduling_policy(ctx, from_json, scheduling_policy_id): @cli_util.wrap_exceptions def get_scheduling_window(ctx, from_json, scheduling_policy_id, scheduling_window_id): - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') - if isinstance(scheduling_window_id, six.string_types) and len(scheduling_window_id.strip()) == 0: + if isinstance(scheduling_window_id, str) and len(scheduling_window_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-window-id cannot be whitespace or empty string') kwargs = {} @@ -21006,7 +21005,7 @@ def get_scheduling_window(ctx, from_json, scheduling_policy_id, scheduling_windo @cli_util.wrap_exceptions def get_vm_cluster(ctx, from_json, vm_cluster_id): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -21029,10 +21028,10 @@ def get_vm_cluster(ctx, from_json, vm_cluster_id): @cli_util.wrap_exceptions def get_vm_cluster_network(ctx, from_json, exadata_infrastructure_id, vm_cluster_network_id): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') - if isinstance(vm_cluster_network_id, six.string_types) and len(vm_cluster_network_id.strip()) == 0: + if isinstance(vm_cluster_network_id, str) and len(vm_cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -21056,10 +21055,10 @@ def get_vm_cluster_network(ctx, from_json, exadata_infrastructure_id, vm_cluster @cli_util.wrap_exceptions def get_vm_cluster_patch(ctx, from_json, vm_cluster_id, patch_id): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') kwargs = {} @@ -21082,10 +21081,10 @@ def get_vm_cluster_patch(ctx, from_json, vm_cluster_id, patch_id): @cli_util.wrap_exceptions def get_vm_cluster_patch_history_entry(ctx, from_json, vm_cluster_id, patch_history_entry_id): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') - if isinstance(patch_history_entry_id, six.string_types) and len(patch_history_entry_id.strip()) == 0: + if isinstance(patch_history_entry_id, str) and len(patch_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --patch-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -21108,10 +21107,10 @@ def get_vm_cluster_patch_history_entry(ctx, from_json, vm_cluster_id, patch_hist @cli_util.wrap_exceptions def get_vm_cluster_update(ctx, from_json, vm_cluster_id, update_id): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') - if isinstance(update_id, six.string_types) and len(update_id.strip()) == 0: + if isinstance(update_id, str) and len(update_id.strip()) == 0: raise click.UsageError('Parameter --update-id cannot be whitespace or empty string') kwargs = {} @@ -21135,10 +21134,10 @@ def get_vm_cluster_update(ctx, from_json, vm_cluster_id, update_id): @cli_util.wrap_exceptions def get_vm_cluster_update_history_entry(ctx, from_json, vm_cluster_id, update_history_entry_id): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') - if isinstance(update_history_entry_id, six.string_types) and len(update_history_entry_id.strip()) == 0: + if isinstance(update_history_entry_id, str) and len(update_history_entry_id.strip()) == 0: raise click.UsageError('Parameter --update-history-entry-id cannot be whitespace or empty string') kwargs = {} @@ -22407,7 +22406,7 @@ def list_autonomous_container_database_dataguard_associations(ctx, from_json, al if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -22704,7 +22703,7 @@ def list_autonomous_database_clones(ctx, from_json, all_pages, page_size, compar if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -22768,7 +22767,7 @@ def list_autonomous_database_dataguard_associations(ctx, from_json, all_pages, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -22818,7 +22817,7 @@ def list_autonomous_database_peers(ctx, from_json, all_pages, page_size, autonom if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -22869,7 +22868,7 @@ def list_autonomous_database_refreshable_clones(ctx, from_json, all_pages, page_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -23360,7 +23359,7 @@ def list_autonomous_vm_cluster_acd_resource_usage(ctx, from_json, all_pages, pag if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(autonomous_vm_cluster_id, six.string_types) and len(autonomous_vm_cluster_id.strip()) == 0: + if isinstance(autonomous_vm_cluster_id, str) and len(autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -23598,7 +23597,7 @@ def list_cloud_autonomous_vm_cluster_acd_resource_usage(ctx, from_json, all_page if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -23783,7 +23782,7 @@ def list_cloud_vm_cluster_update_history_entries(ctx, from_json, all_pages, page if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -23837,7 +23836,7 @@ def list_cloud_vm_cluster_updates(ctx, from_json, all_pages, page_size, cloud_vm if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -23950,7 +23949,7 @@ def list_cloud_vm_clusters(ctx, from_json, all_pages, page_size, compartment_id, @cli_util.wrap_exceptions def list_console_connections(ctx, from_json, all_pages, db_node_id): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') kwargs = {} @@ -23982,7 +23981,7 @@ def list_console_histories(ctx, from_json, all_pages, page_size, db_node_id, lim if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') kwargs = {} @@ -24043,7 +24042,7 @@ def list_container_database_patches(ctx, from_json, all_pages, page_size, autono if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -24098,7 +24097,7 @@ def list_data_guard_associations(ctx, from_json, all_pages, page_size, database_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -24226,7 +24225,7 @@ def list_database_upgrade_history_entries(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -24350,7 +24349,7 @@ def list_db_home_patch_history_entries(ctx, from_json, all_pages, page_size, db_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(db_home_id, six.string_types) and len(db_home_id.strip()) == 0: + if isinstance(db_home_id, str) and len(db_home_id.strip()) == 0: raise click.UsageError('Parameter --db-home-id cannot be whitespace or empty string') kwargs = {} @@ -24400,7 +24399,7 @@ def list_db_home_patches(ctx, from_json, all_pages, page_size, db_home_id, limit if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(db_home_id, six.string_types) and len(db_home_id.strip()) == 0: + if isinstance(db_home_id, str) and len(db_home_id.strip()) == 0: raise click.UsageError('Parameter --db-home-id cannot be whitespace or empty string') kwargs = {} @@ -24671,7 +24670,7 @@ def list_db_system_patch_history_entries(ctx, from_json, all_pages, page_size, d if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -24721,7 +24720,7 @@ def list_db_system_patches(ctx, from_json, all_pages, page_size, db_system_id, l if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -24857,7 +24856,7 @@ def list_db_system_upgrade_history_entries(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -24916,7 +24915,7 @@ def list_db_system_upgrades(ctx, from_json, all_pages, page_size, db_system_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -25168,7 +25167,7 @@ def list_exadb_vm_cluster_update_history_entries(ctx, from_json, all_pages, page if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -25223,7 +25222,7 @@ def list_exadb_vm_cluster_updates(ctx, from_json, all_pages, page_size, exadb_vm if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -25863,7 +25862,7 @@ def list_gi_version_minor_versions(ctx, from_json, all_pages, page_size, version if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(version_parameterconflict, six.string_types) and len(version_parameterconflict.strip()) == 0: + if isinstance(version_parameterconflict, str) and len(version_parameterconflict.strip()) == 0: raise click.UsageError('Parameter --version-parameterconflict cannot be whitespace or empty string') kwargs = {} @@ -26303,7 +26302,7 @@ def list_pdb_conversion_history_entries(ctx, from_json, all_pages, page_size, da if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -26490,7 +26489,7 @@ def list_recommended_scheduled_actions(ctx, from_json, all_pages, page_size, sch if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') kwargs = {} @@ -26547,7 +26546,7 @@ def list_resource_pool_members(ctx, from_json, all_pages, page_size, autonomous_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -26801,7 +26800,7 @@ def list_scheduling_windows(ctx, from_json, all_pages, page_size, scheduling_pol if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') kwargs = {} @@ -26868,7 +26867,7 @@ def list_system_version_minor_versions(ctx, from_json, all_pages, page_size, maj if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(major_version, six.string_types) and len(major_version.strip()) == 0: + if isinstance(major_version, str) and len(major_version.strip()) == 0: raise click.UsageError('Parameter --major-version cannot be whitespace or empty string') kwargs = {} @@ -27002,7 +27001,7 @@ def list_vm_cluster_networks(ctx, from_json, all_pages, page_size, exadata_infra if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -27064,7 +27063,7 @@ def list_vm_cluster_patch_history_entries(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -27114,7 +27113,7 @@ def list_vm_cluster_patches(ctx, from_json, all_pages, page_size, vm_cluster_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -27166,7 +27165,7 @@ def list_vm_cluster_update_history_entries(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -27223,7 +27222,7 @@ def list_vm_cluster_updates(ctx, from_json, all_pages, page_size, vm_cluster_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -27345,7 +27344,7 @@ def list_vm_clusters(ctx, from_json, all_pages, page_size, compartment_id, exada @cli_util.wrap_exceptions def local_clone_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloned_pdb_name, pluggable_database_id, pdb_admin_password, target_tde_wallet_password, should_pdb_admin_account_be_locked, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -27411,10 +27410,10 @@ def local_clone_pluggable_database(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def migrate_autonomous_container_database_dataguard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, autonomous_container_database_dataguard_association_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') - if isinstance(autonomous_container_database_dataguard_association_id, six.string_types) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: + if isinstance(autonomous_container_database_dataguard_association_id, str) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-dataguard-association-id cannot be whitespace or empty string') kwargs = {} @@ -27469,10 +27468,10 @@ def migrate_autonomous_container_database_dataguard_association(ctx, from_json, @cli_util.wrap_exceptions def migrate_data_guard_association_to_multi_data_guards(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -27521,7 +27520,7 @@ def migrate_data_guard_association_to_multi_data_guards(ctx, from_json, wait_for @cli_util.wrap_exceptions def migrate_exadata_db_system_resource_model(ctx, from_json, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -27554,7 +27553,7 @@ def migrate_exadata_db_system_resource_model(ctx, from_json, db_system_id, if_ma @cli_util.wrap_exceptions def migrate_vault_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, kms_key_id, kms_key_version_id, vault_id, tde_wallet_password, admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -27630,7 +27629,7 @@ def migrate_vault_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def modify_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, credential_details, private_end_point_id, management_type, service_name, protocol, port, ssl_secret_id, role, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -27716,7 +27715,7 @@ def modify_database_management(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def modify_pluggable_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, credential_details, private_end_point_id, service_name, protocol, port, ssl_secret_id, role, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -27799,7 +27798,7 @@ def modify_pluggable_database_management(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def move_execution_action_member(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, execution_action_id, source_execution_action_id, execution_action_member_id, execution_action_member_count, freeform_tags, defined_tags, if_match): - if isinstance(execution_action_id, six.string_types) and len(execution_action_id.strip()) == 0: + if isinstance(execution_action_id, str) and len(execution_action_id.strip()) == 0: raise click.UsageError('Parameter --execution-action-id cannot be whitespace or empty string') kwargs = {} @@ -27869,7 +27868,7 @@ def move_execution_action_member(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def refresh_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -27921,7 +27920,7 @@ def refresh_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def register_autonomous_database_data_safe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, pdb_admin_password, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -27990,7 +27989,7 @@ def register_autonomous_database_data_safe(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def register_cloud_vm_cluster_pkcs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_vm_cluster_id, tde_key_store_type, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -28058,7 +28057,7 @@ def register_cloud_vm_cluster_pkcs(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def reinstate_autonomous_container_database_dataguard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -28110,10 +28109,10 @@ def reinstate_autonomous_container_database_dataguard(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def reinstate_autonomous_container_database_dataguard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, autonomous_container_database_dataguard_association_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') - if isinstance(autonomous_container_database_dataguard_association_id, six.string_types) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: + if isinstance(autonomous_container_database_dataguard_association_id, str) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-dataguard-association-id cannot be whitespace or empty string') kwargs = {} @@ -28170,7 +28169,7 @@ def reinstate_autonomous_container_database_dataguard_association(ctx, from_json @cli_util.wrap_exceptions def reinstate_data_guard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, source_database_id, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -28229,10 +28228,10 @@ def reinstate_data_guard(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def reinstate_data_guard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -28294,7 +28293,7 @@ def reinstate_data_guard_association(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def remote_clone_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, target_container_database_id, source_container_db_admin_password, cloned_pdb_name, pluggable_database_id, pdb_admin_password, target_tde_wallet_password, should_pdb_admin_account_be_locked, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -28362,7 +28361,7 @@ def remote_clone_pluggable_database(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def remove_virtual_machine_from_cloud_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_servers, cloud_vm_cluster_id, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -28419,7 +28418,7 @@ def remove_virtual_machine_from_cloud_vm_cluster(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def remove_virtual_machine_from_exadb_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_nodes, exadb_vm_cluster_id, if_match): - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -28476,7 +28475,7 @@ def remove_virtual_machine_from_exadb_vm_cluster(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def remove_virtual_machine_from_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_servers, vm_cluster_id, if_match): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -28539,7 +28538,7 @@ def remove_virtual_machine_from_vm_cluster(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def reorder_execution_actions(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, execution_window_id, execution_action_order_list, freeform_tags, defined_tags, if_match): - if isinstance(execution_window_id, six.string_types) and len(execution_window_id.strip()) == 0: + if isinstance(execution_window_id, str) and len(execution_window_id.strip()) == 0: raise click.UsageError('Parameter --execution-window-id cannot be whitespace or empty string') kwargs = {} @@ -28605,7 +28604,7 @@ def reorder_execution_actions(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def reorder_scheduled_actions(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduling_window_id, scheduled_action_id_orders, scheduling_plan_id, if_match): - if isinstance(scheduling_plan_id, six.string_types) and len(scheduling_plan_id.strip()) == 0: + if isinstance(scheduling_plan_id, str) and len(scheduling_plan_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-plan-id cannot be whitespace or empty string') kwargs = {} @@ -28665,10 +28664,10 @@ def reorder_scheduled_actions(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def resize_vm_cluster_network(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, vm_cluster_network_id, action, vm_networks, if_match): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') - if isinstance(vm_cluster_network_id, six.string_types) and len(vm_cluster_network_id.strip()) == 0: + if isinstance(vm_cluster_network_id, str) and len(vm_cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-network-id cannot be whitespace or empty string') kwargs = {} @@ -28752,7 +28751,7 @@ def resource_pool_shapes(ctx, from_json, if_match, limit, page): @cli_util.wrap_exceptions def restart_autonomous_container_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -28804,7 +28803,7 @@ def restart_autonomous_container_database(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def restart_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -28860,7 +28859,7 @@ def restart_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def restore_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, timestamp, database_scn, latest, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -28929,7 +28928,7 @@ def restore_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def restore_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_scn, timestamp, latest, pluggable_database_name, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -28996,7 +28995,7 @@ def restore_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def rotate_autonomous_container_database_encryption_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, if_match, key_version_id): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -29055,7 +29054,7 @@ def rotate_autonomous_container_database_encryption_key(ctx, from_json, wait_for @cli_util.wrap_exceptions def rotate_autonomous_database_encryption_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, key_version_id): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -29117,7 +29116,7 @@ def rotate_autonomous_database_encryption_key(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def rotate_autonomous_vm_cluster_ords_certs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_generation_type, autonomous_vm_cluster_id, certificate_id, certificate_authority_id, ca_bundle_id, if_match): - if isinstance(autonomous_vm_cluster_id, six.string_types) and len(autonomous_vm_cluster_id.strip()) == 0: + if isinstance(autonomous_vm_cluster_id, str) and len(autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -29198,7 +29197,7 @@ def rotate_autonomous_vm_cluster_ords_certs(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def rotate_autonomous_vm_cluster_ssl_certs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_generation_type, autonomous_vm_cluster_id, certificate_id, certificate_authority_id, ca_bundle_id, if_match): - if isinstance(autonomous_vm_cluster_id, six.string_types) and len(autonomous_vm_cluster_id.strip()) == 0: + if isinstance(autonomous_vm_cluster_id, str) and len(autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -29279,7 +29278,7 @@ def rotate_autonomous_vm_cluster_ssl_certs(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def rotate_cloud_autonomous_vm_cluster_ords_certs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_autonomous_vm_cluster_id, certificate_generation_type, certificate_id, certificate_authority_id, ca_bundle_id, if_match): - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -29360,7 +29359,7 @@ def rotate_cloud_autonomous_vm_cluster_ords_certs(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def rotate_cloud_autonomous_vm_cluster_ssl_certs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_autonomous_vm_cluster_id, certificate_generation_type, certificate_id, certificate_authority_id, ca_bundle_id, if_match): - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -29437,7 +29436,7 @@ def rotate_cloud_autonomous_vm_cluster_ssl_certs(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def rotate_ords_certs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_exadata_infrastructure_id, if_match): - if isinstance(autonomous_exadata_infrastructure_id, six.string_types) and len(autonomous_exadata_infrastructure_id.strip()) == 0: + if isinstance(autonomous_exadata_infrastructure_id, str) and len(autonomous_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -29500,7 +29499,7 @@ def rotate_ords_certs(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def rotate_pluggable_database_encryption_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -29563,7 +29562,7 @@ def rotate_pluggable_database_encryption_key(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def rotate_ssl_certs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_exadata_infrastructure_id, if_match): - if isinstance(autonomous_exadata_infrastructure_id, six.string_types) and len(autonomous_exadata_infrastructure_id.strip()) == 0: + if isinstance(autonomous_exadata_infrastructure_id, str) and len(autonomous_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -29626,7 +29625,7 @@ def rotate_ssl_certs(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def rotate_vault_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -29673,7 +29672,7 @@ def rotate_vault_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def saas_admin_user_status(ctx, from_json, autonomous_database_id): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -29699,7 +29698,7 @@ def saas_admin_user_status(ctx, from_json, autonomous_database_id): @cli_util.wrap_exceptions def scan_external_container_database_pluggable_databases(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, external_database_connector_id): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -29762,7 +29761,7 @@ def scan_external_container_database_pluggable_databases(ctx, from_json, wait_fo @cli_util.wrap_exceptions def set_db_key_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, provider, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -29819,7 +29818,7 @@ def set_db_key_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def set_db_key_version_oci_provider_set_key_version_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, kms_key_version_id, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -29878,7 +29877,7 @@ def set_db_key_version_oci_provider_set_key_version_details(ctx, from_json, wait @cli_util.wrap_exceptions def set_pdb_key_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, provider, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -29935,7 +29934,7 @@ def set_pdb_key_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def set_pdb_key_version_oci_provider_set_key_version_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, kms_key_version_id, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -29994,7 +29993,7 @@ def set_pdb_key_version_oci_provider_set_key_version_details(ctx, from_json, wai @cli_util.wrap_exceptions def shrink_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -30047,7 +30046,7 @@ def shrink_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def start_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -30099,7 +30098,7 @@ def start_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def start_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -30151,7 +30150,7 @@ def start_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def stop_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -30204,7 +30203,7 @@ def stop_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def stop_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -30262,7 +30261,7 @@ def stop_pluggable_database(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def switch_over_data_guard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -30318,7 +30317,7 @@ def switch_over_data_guard(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def switchover_autonomous_container_database_dataguard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -30372,10 +30371,10 @@ def switchover_autonomous_container_database_dataguard(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def switchover_autonomous_container_database_dataguard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, autonomous_container_database_dataguard_association_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') - if isinstance(autonomous_container_database_dataguard_association_id, six.string_types) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: + if isinstance(autonomous_container_database_dataguard_association_id, str) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-dataguard-association-id cannot be whitespace or empty string') kwargs = {} @@ -30428,7 +30427,7 @@ def switchover_autonomous_container_database_dataguard_association(ctx, from_jso @cli_util.wrap_exceptions def switchover_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, if_match, peer_db_id, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -30487,10 +30486,10 @@ def switchover_autonomous_database(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def switchover_data_guard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, database_admin_password, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -30547,7 +30546,7 @@ def switchover_data_guard_association(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def terminate_autonomous_container_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -30603,7 +30602,7 @@ def terminate_autonomous_container_database(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def terminate_autonomous_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_exadata_infrastructure_id, if_match): - if isinstance(autonomous_exadata_infrastructure_id, six.string_types) and len(autonomous_exadata_infrastructure_id.strip()) == 0: + if isinstance(autonomous_exadata_infrastructure_id, str) and len(autonomous_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -30663,7 +30662,7 @@ def terminate_autonomous_exadata_infrastructure(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def terminate_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -30719,7 +30718,7 @@ def terminate_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def unregister_cloud_vm_cluster_pkcs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_vm_cluster_id, tde_key_store_type, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -30803,7 +30802,7 @@ def unregister_cloud_vm_cluster_pkcs(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_autonomous_container_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, display_name, customer_contacts, okv_end_point_group_name, patch_model, maintenance_window_details, standby_maintenance_buffer_in_days, version_preference, is_dst_file_update_enabled, freeform_tags, defined_tags, backup_config, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') if not force: if customer_contacts or maintenance_window_details or freeform_tags or defined_tags or backup_config: @@ -30898,10 +30897,10 @@ def update_autonomous_container_database(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_autonomous_container_database_dataguard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_container_database_id, autonomous_container_database_dataguard_association_id, is_automatic_failover_enabled, protection_mode, fast_start_fail_over_lag_limit_in_seconds, if_match): - if isinstance(autonomous_container_database_id, six.string_types) and len(autonomous_container_database_id.strip()) == 0: + if isinstance(autonomous_container_database_id, str) and len(autonomous_container_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-id cannot be whitespace or empty string') - if isinstance(autonomous_container_database_dataguard_association_id, six.string_types) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: + if isinstance(autonomous_container_database_dataguard_association_id, str) and len(autonomous_container_database_dataguard_association_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-container-database-dataguard-association-id cannot be whitespace or empty string') kwargs = {} @@ -31122,7 +31121,7 @@ def update_autonomous_container_database_dataguard_association(ctx, from_json, w @cli_util.wrap_exceptions def update_autonomous_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, backup_retention_period_in_days, compute_model, in_memory_percentage, local_adg_auto_failover_max_data_loss_limit, cpu_core_count, long_term_backup_schedule, is_dev_tier, compute_count, ocpu_count, data_storage_size_in_tbs, data_storage_size_in_gbs, display_name, is_free_tier, admin_password, db_name, freeform_tags, defined_tags, security_attributes, db_workload, license_model, byol_compute_count_limit, is_access_control_enabled, whitelisted_ips, are_primary_whitelisted_ips_used, standby_whitelisted_ips, is_auto_scaling_enabled, is_refreshable_clone, refreshable_mode, is_local_data_guard_enabled, is_data_guard_enabled, peer_db_id, db_version, open_mode, permission_level, subnet_id, private_endpoint_label, private_endpoint_ip, nsg_ids, auto_refresh_frequency_in_seconds, auto_refresh_point_lag_in_seconds, time_of_auto_refresh_start, customer_contacts, is_mtls_connection_required, resource_pool_leader_id, resource_pool_summary, autonomous_maintenance_schedule_type, is_backup_retention_locked, time_scheduled_db_version_upgrade, is_disable_db_version_upgrade_schedule, is_schedule_db_version_upgrade_to_earliest, scheduled_operations, is_auto_scaling_for_storage_enabled, database_edition, db_tools_details, secret_id, secret_version_number, encryption_key, is_disconnect_peer, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') if not force: if long_term_backup_schedule or freeform_tags or defined_tags or security_attributes or whitelisted_ips or standby_whitelisted_ips or nsg_ids or customer_contacts or resource_pool_summary or scheduled_operations or db_tools_details or encryption_key: @@ -31517,7 +31516,7 @@ def update_autonomous_database(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_autonomous_database_okv_key_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, encryption_key_okv_uri, encryption_key_okv_kms_key, encryption_key_directory_name, encryption_key_certificate_directory_name, backup_retention_period_in_days, compute_model, in_memory_percentage, local_adg_auto_failover_max_data_loss_limit, cpu_core_count, long_term_backup_schedule, is_dev_tier, compute_count, ocpu_count, data_storage_size_in_tbs, data_storage_size_in_gbs, display_name, is_free_tier, admin_password, db_name, freeform_tags, defined_tags, security_attributes, db_workload, license_model, byol_compute_count_limit, is_access_control_enabled, whitelisted_ips, are_primary_whitelisted_ips_used, standby_whitelisted_ips, is_auto_scaling_enabled, is_refreshable_clone, refreshable_mode, is_local_data_guard_enabled, is_data_guard_enabled, peer_db_id, db_version, open_mode, permission_level, subnet_id, private_endpoint_label, private_endpoint_ip, nsg_ids, auto_refresh_frequency_in_seconds, auto_refresh_point_lag_in_seconds, time_of_auto_refresh_start, customer_contacts, is_mtls_connection_required, resource_pool_leader_id, resource_pool_summary, autonomous_maintenance_schedule_type, is_backup_retention_locked, time_scheduled_db_version_upgrade, is_disable_db_version_upgrade_schedule, is_schedule_db_version_upgrade_to_earliest, scheduled_operations, is_auto_scaling_for_storage_enabled, database_edition, db_tools_details, secret_id, secret_version_number, is_disconnect_peer, if_match, opc_dry_run, encryption_key_certificate_id): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') if not force: if long_term_backup_schedule or freeform_tags or defined_tags or security_attributes or whitelisted_ips or standby_whitelisted_ips or nsg_ids or customer_contacts or resource_pool_summary or scheduled_operations or db_tools_details: @@ -31916,7 +31915,7 @@ def update_autonomous_database_okv_key_details(ctx, from_json, force, wait_for_s @cli_util.wrap_exceptions def update_autonomous_database_azure_key_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, encryption_key_vault_uri, encryption_key_key_name, backup_retention_period_in_days, compute_model, in_memory_percentage, local_adg_auto_failover_max_data_loss_limit, cpu_core_count, long_term_backup_schedule, is_dev_tier, compute_count, ocpu_count, data_storage_size_in_tbs, data_storage_size_in_gbs, display_name, is_free_tier, admin_password, db_name, freeform_tags, defined_tags, security_attributes, db_workload, license_model, byol_compute_count_limit, is_access_control_enabled, whitelisted_ips, are_primary_whitelisted_ips_used, standby_whitelisted_ips, is_auto_scaling_enabled, is_refreshable_clone, refreshable_mode, is_local_data_guard_enabled, is_data_guard_enabled, peer_db_id, db_version, open_mode, permission_level, subnet_id, private_endpoint_label, private_endpoint_ip, nsg_ids, auto_refresh_frequency_in_seconds, auto_refresh_point_lag_in_seconds, time_of_auto_refresh_start, customer_contacts, is_mtls_connection_required, resource_pool_leader_id, resource_pool_summary, autonomous_maintenance_schedule_type, is_backup_retention_locked, time_scheduled_db_version_upgrade, is_disable_db_version_upgrade_schedule, is_schedule_db_version_upgrade_to_earliest, scheduled_operations, is_auto_scaling_for_storage_enabled, database_edition, db_tools_details, secret_id, secret_version_number, is_disconnect_peer, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') if not force: if long_term_backup_schedule or freeform_tags or defined_tags or security_attributes or whitelisted_ips or standby_whitelisted_ips or nsg_ids or customer_contacts or resource_pool_summary or scheduled_operations or db_tools_details: @@ -32312,7 +32311,7 @@ def update_autonomous_database_azure_key_details(ctx, from_json, force, wait_for @cli_util.wrap_exceptions def update_autonomous_database_aws_key_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, encryption_key_service_endpoint_uri, encryption_key_key_arn, backup_retention_period_in_days, compute_model, in_memory_percentage, local_adg_auto_failover_max_data_loss_limit, cpu_core_count, long_term_backup_schedule, is_dev_tier, compute_count, ocpu_count, data_storage_size_in_tbs, data_storage_size_in_gbs, display_name, is_free_tier, admin_password, db_name, freeform_tags, defined_tags, security_attributes, db_workload, license_model, byol_compute_count_limit, is_access_control_enabled, whitelisted_ips, are_primary_whitelisted_ips_used, standby_whitelisted_ips, is_auto_scaling_enabled, is_refreshable_clone, refreshable_mode, is_local_data_guard_enabled, is_data_guard_enabled, peer_db_id, db_version, open_mode, permission_level, subnet_id, private_endpoint_label, private_endpoint_ip, nsg_ids, auto_refresh_frequency_in_seconds, auto_refresh_point_lag_in_seconds, time_of_auto_refresh_start, customer_contacts, is_mtls_connection_required, resource_pool_leader_id, resource_pool_summary, autonomous_maintenance_schedule_type, is_backup_retention_locked, time_scheduled_db_version_upgrade, is_disable_db_version_upgrade_schedule, is_schedule_db_version_upgrade_to_earliest, scheduled_operations, is_auto_scaling_for_storage_enabled, database_edition, db_tools_details, secret_id, secret_version_number, is_disconnect_peer, if_match, opc_dry_run, encryption_key_arn_role, encryption_key_external_id): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') if not force: if long_term_backup_schedule or freeform_tags or defined_tags or security_attributes or whitelisted_ips or standby_whitelisted_ips or nsg_ids or customer_contacts or resource_pool_summary or scheduled_operations or db_tools_details: @@ -32712,7 +32711,7 @@ def update_autonomous_database_aws_key_details(ctx, from_json, force, wait_for_s @cli_util.wrap_exceptions def update_autonomous_database_oci_key_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, encryption_key_kms_key_id, encryption_key_vault_id, backup_retention_period_in_days, compute_model, in_memory_percentage, local_adg_auto_failover_max_data_loss_limit, cpu_core_count, long_term_backup_schedule, is_dev_tier, compute_count, ocpu_count, data_storage_size_in_tbs, data_storage_size_in_gbs, display_name, is_free_tier, admin_password, db_name, freeform_tags, defined_tags, security_attributes, db_workload, license_model, byol_compute_count_limit, is_access_control_enabled, whitelisted_ips, are_primary_whitelisted_ips_used, standby_whitelisted_ips, is_auto_scaling_enabled, is_refreshable_clone, refreshable_mode, is_local_data_guard_enabled, is_data_guard_enabled, peer_db_id, db_version, open_mode, permission_level, subnet_id, private_endpoint_label, private_endpoint_ip, nsg_ids, auto_refresh_frequency_in_seconds, auto_refresh_point_lag_in_seconds, time_of_auto_refresh_start, customer_contacts, is_mtls_connection_required, resource_pool_leader_id, resource_pool_summary, autonomous_maintenance_schedule_type, is_backup_retention_locked, time_scheduled_db_version_upgrade, is_disable_db_version_upgrade_schedule, is_schedule_db_version_upgrade_to_earliest, scheduled_operations, is_auto_scaling_for_storage_enabled, database_edition, db_tools_details, secret_id, secret_version_number, is_disconnect_peer, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') if not force: if long_term_backup_schedule or freeform_tags or defined_tags or security_attributes or whitelisted_ips or standby_whitelisted_ips or nsg_ids or customer_contacts or resource_pool_summary or scheduled_operations or db_tools_details: @@ -33104,7 +33103,7 @@ def update_autonomous_database_oci_key_details(ctx, from_json, force, wait_for_s @cli_util.wrap_exceptions def update_autonomous_database_oracle_managed_key_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, backup_retention_period_in_days, compute_model, in_memory_percentage, local_adg_auto_failover_max_data_loss_limit, cpu_core_count, long_term_backup_schedule, is_dev_tier, compute_count, ocpu_count, data_storage_size_in_tbs, data_storage_size_in_gbs, display_name, is_free_tier, admin_password, db_name, freeform_tags, defined_tags, security_attributes, db_workload, license_model, byol_compute_count_limit, is_access_control_enabled, whitelisted_ips, are_primary_whitelisted_ips_used, standby_whitelisted_ips, is_auto_scaling_enabled, is_refreshable_clone, refreshable_mode, is_local_data_guard_enabled, is_data_guard_enabled, peer_db_id, db_version, open_mode, permission_level, subnet_id, private_endpoint_label, private_endpoint_ip, nsg_ids, auto_refresh_frequency_in_seconds, auto_refresh_point_lag_in_seconds, time_of_auto_refresh_start, customer_contacts, is_mtls_connection_required, resource_pool_leader_id, resource_pool_summary, autonomous_maintenance_schedule_type, is_backup_retention_locked, time_scheduled_db_version_upgrade, is_disable_db_version_upgrade_schedule, is_schedule_db_version_upgrade_to_earliest, scheduled_operations, is_auto_scaling_for_storage_enabled, database_edition, db_tools_details, secret_id, secret_version_number, is_disconnect_peer, if_match, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') if not force: if long_term_backup_schedule or freeform_tags or defined_tags or security_attributes or whitelisted_ips or standby_whitelisted_ips or nsg_ids or customer_contacts or resource_pool_summary or scheduled_operations or db_tools_details: @@ -33341,7 +33340,7 @@ def update_autonomous_database_oracle_managed_key_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_autonomous_database_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_backup_id, retention_period_in_days, if_match, opc_dry_run): - if isinstance(autonomous_database_backup_id, six.string_types) and len(autonomous_database_backup_id.strip()) == 0: + if isinstance(autonomous_database_backup_id, str) and len(autonomous_database_backup_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-backup-id cannot be whitespace or empty string') kwargs = {} @@ -33476,7 +33475,7 @@ def update_autonomous_database_regional_wallet(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def update_autonomous_database_software_image(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_software_image_id, freeform_tags, defined_tags, if_match): - if isinstance(autonomous_database_software_image_id, six.string_types) and len(autonomous_database_software_image_id.strip()) == 0: + if isinstance(autonomous_database_software_image_id, str) and len(autonomous_database_software_image_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-software-image-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -33543,7 +33542,7 @@ def update_autonomous_database_software_image(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_autonomous_database_wallet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, should_rotate, grace_period, opc_dry_run): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -33624,7 +33623,7 @@ def update_autonomous_database_wallet(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_autonomous_exadata_infrastructure(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_exadata_infrastructure_id, display_name, maintenance_window_details, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(autonomous_exadata_infrastructure_id, six.string_types) and len(autonomous_exadata_infrastructure_id.strip()) == 0: + if isinstance(autonomous_exadata_infrastructure_id, str) and len(autonomous_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-exadata-infrastructure-id cannot be whitespace or empty string') if not force: if maintenance_window_details or nsg_ids or freeform_tags or defined_tags: @@ -33707,7 +33706,7 @@ def update_autonomous_exadata_infrastructure(ctx, from_json, force, wait_for_sta @cli_util.wrap_exceptions def update_autonomous_vm_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_vm_cluster_id, maintenance_window_details, license_model, freeform_tags, defined_tags, autonomous_data_storage_size_in_tbs, cpu_core_count_per_node, total_container_databases, if_match): - if isinstance(autonomous_vm_cluster_id, six.string_types) and len(autonomous_vm_cluster_id.strip()) == 0: + if isinstance(autonomous_vm_cluster_id, str) and len(autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-vm-cluster-id cannot be whitespace or empty string') if not force: if maintenance_window_details or freeform_tags or defined_tags: @@ -33789,7 +33788,7 @@ def update_autonomous_vm_cluster(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, retention_period_in_days, retention_period_in_years, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -33861,7 +33860,7 @@ def update_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def update_backup_destination(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_destination_id, vpc_users, connection_string, local_mount_point_path, nfs_mount_type, nfs_server, nfs_server_export, freeform_tags, defined_tags, if_match): - if isinstance(backup_destination_id, six.string_types) and len(backup_destination_id.strip()) == 0: + if isinstance(backup_destination_id, str) and len(backup_destination_id.strip()) == 0: raise click.UsageError('Parameter --backup-destination-id cannot be whitespace or empty string') if not force: if vpc_users or nfs_server or freeform_tags or defined_tags: @@ -33961,7 +33960,7 @@ def update_backup_destination(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_cloud_autonomous_vm_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_autonomous_vm_cluster_id, description, display_name, maintenance_window_details, autonomous_data_storage_size_in_tbs, cpu_core_count_per_node, total_container_databases, license_model, nsg_ids, freeform_tags, defined_tags, security_attributes, if_match, opc_dry_run): - if isinstance(cloud_autonomous_vm_cluster_id, six.string_types) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: + if isinstance(cloud_autonomous_vm_cluster_id, str) and len(cloud_autonomous_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-autonomous-vm-cluster-id cannot be whitespace or empty string') if not force: if maintenance_window_details or nsg_ids or freeform_tags or defined_tags or security_attributes: @@ -34067,7 +34066,7 @@ def update_cloud_autonomous_vm_cluster(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_cloud_exadata_infrastructure(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_exadata_infrastructure_id, display_name, maintenance_window, compute_count, storage_count, freeform_tags, defined_tags, customer_contacts, if_match): - if isinstance(cloud_exadata_infrastructure_id, six.string_types) and len(cloud_exadata_infrastructure_id.strip()) == 0: + if isinstance(cloud_exadata_infrastructure_id, str) and len(cloud_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --cloud-exadata-infrastructure-id cannot be whitespace or empty string') if not force: if maintenance_window or freeform_tags or defined_tags or customer_contacts: @@ -34171,7 +34170,7 @@ def update_cloud_exadata_infrastructure(ctx, from_json, force, wait_for_state, m @cli_util.wrap_exceptions def update_cloud_vm_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_vm_cluster_id, display_name, cpu_core_count, ocpu_count, memory_size_in_gbs, db_node_storage_size_in_gbs, data_storage_size_in_tbs, license_model, ssh_public_keys, update_details, nsg_ids, backup_network_nsg_ids, compute_nodes, storage_size_in_gbs, freeform_tags, defined_tags, security_attributes, data_collection_options, file_system_configuration_details, cloud_automation_update_details, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') if not force: if ssh_public_keys or update_details or nsg_ids or backup_network_nsg_ids or compute_nodes or freeform_tags or defined_tags or security_attributes or data_collection_options or file_system_configuration_details or cloud_automation_update_details: @@ -34289,7 +34288,7 @@ def update_cloud_vm_cluster(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_cloud_vm_cluster_iorm_config(ctx, from_json, force, cloud_vm_cluster_id, objective, db_plans, if_match): - if isinstance(cloud_vm_cluster_id, six.string_types) and len(cloud_vm_cluster_id.strip()) == 0: + if isinstance(cloud_vm_cluster_id, str) and len(cloud_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-vm-cluster-id cannot be whitespace or empty string') if not force: if db_plans: @@ -34337,10 +34336,10 @@ def update_cloud_vm_cluster_iorm_config(ctx, from_json, force, cloud_vm_cluster_ @cli_util.wrap_exceptions def update_console_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_node_id, console_connection_id, freeform_tags, defined_tags, if_match): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') - if isinstance(console_connection_id, six.string_types) and len(console_connection_id.strip()) == 0: + if isinstance(console_connection_id, str) and len(console_connection_id.strip()) == 0: raise click.UsageError('Parameter --console-connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -34413,10 +34412,10 @@ def update_console_connection(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_console_history(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_node_id, console_history_id, freeform_tags, defined_tags, display_name, if_match): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') - if isinstance(console_history_id, six.string_types) and len(console_history_id.strip()) == 0: + if isinstance(console_history_id, str) and len(console_history_id.strip()) == 0: raise click.UsageError('Parameter --console-history-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -34497,7 +34496,7 @@ def update_console_history(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_data_guard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, database_admin_password, protection_mode, transport_type, is_active_data_guard_enabled, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -34583,10 +34582,10 @@ def update_data_guard(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_data_guard_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, data_guard_association_id, database_admin_password, protection_mode, transport_type, is_active_data_guard_enabled, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') - if isinstance(data_guard_association_id, six.string_types) and len(data_guard_association_id.strip()) == 0: + if isinstance(data_guard_association_id, str) and len(data_guard_association_id.strip()) == 0: raise click.UsageError('Parameter --data-guard-association-id cannot be whitespace or empty string') kwargs = {} @@ -34665,7 +34664,7 @@ def update_data_guard_association(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, db_backup_config, db_home_id, new_admin_password, old_tde_wallet_password, new_tde_wallet_password, storage_size_details, freeform_tags, defined_tags, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') if not force: if db_backup_config or storage_size_details or freeform_tags or defined_tags: @@ -34753,7 +34752,7 @@ def update_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_database_software_image(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_software_image_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(database_software_image_id, six.string_types) and len(database_software_image_id.strip()) == 0: + if isinstance(database_software_image_id, str) and len(database_software_image_id.strip()) == 0: raise click.UsageError('Parameter --database-software-image-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -34827,7 +34826,7 @@ def update_database_software_image(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_db_home(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_home_id, db_version, one_off_patches, freeform_tags, defined_tags, if_match): - if isinstance(db_home_id, six.string_types) and len(db_home_id.strip()) == 0: + if isinstance(db_home_id, str) and len(db_home_id.strip()) == 0: raise click.UsageError('Parameter --db-home-id cannot be whitespace or empty string') if not force: if db_version or one_off_patches or freeform_tags or defined_tags: @@ -34902,7 +34901,7 @@ def update_db_home(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_db_node(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_node_id, freeform_tags, defined_tags, if_match): - if isinstance(db_node_id, six.string_types) and len(db_node_id.strip()) == 0: + if isinstance(db_node_id, str) and len(db_node_id.strip()) == 0: raise click.UsageError('Parameter --db-node-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -34992,7 +34991,7 @@ def update_db_node(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_db_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, cpu_core_count, version_parameterconflict, ssh_public_keys, data_storage_size_in_gbs, reco_storage_size_in_gbs, freeform_tags, defined_tags, security_attributes, shape, nsg_ids, backup_network_nsg_ids, license_model, maintenance_window_details, data_collection_options, compute_model, compute_count, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') if not force: if version_parameterconflict or ssh_public_keys or freeform_tags or defined_tags or security_attributes or nsg_ids or backup_network_nsg_ids or maintenance_window_details or data_collection_options: @@ -35124,7 +35123,7 @@ def update_db_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_exadata_infrastructure(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, cloud_control_plane_server1, cloud_control_plane_server2, netmask, gateway, admin_network_cidr, infini_band_network_cidr, corporate_proxy, contacts, maintenance_window, additional_storage_count, is_multi_rack_deployment, multi_rack_configuration_file, additional_compute_count, additional_compute_system_model, dns_server, ntp_server, time_zone, is_cps_offline_report_enabled, network_bonding_mode_details, freeform_tags, defined_tags, if_match): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') if not force: if contacts or maintenance_window or dns_server or ntp_server or network_bonding_mode_details or freeform_tags or defined_tags: @@ -35257,7 +35256,7 @@ def update_exadata_infrastructure(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_exadata_iorm_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, objective, db_plans, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') if not force: if db_plans: @@ -35343,7 +35342,7 @@ def update_exadata_iorm_config(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_exadb_vm_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, exadb_vm_cluster_id, display_name, total_e_cpu_count, enabled_e_cpu_count, vm_file_system_storage, node_count, license_model, ssh_public_keys, nsg_ids, backup_network_nsg_ids, freeform_tags, defined_tags, security_attributes, data_collection_options, system_version, grid_image_id, update_action, if_match): - if isinstance(exadb_vm_cluster_id, six.string_types) and len(exadb_vm_cluster_id.strip()) == 0: + if isinstance(exadb_vm_cluster_id, str) and len(exadb_vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --exadb-vm-cluster-id cannot be whitespace or empty string') if not force: if vm_file_system_storage or ssh_public_keys or nsg_ids or backup_network_nsg_ids or freeform_tags or defined_tags or security_attributes or data_collection_options: @@ -35461,7 +35460,7 @@ def update_exadb_vm_cluster(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_exascale_db_storage_vault(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, exascale_db_storage_vault_id, display_name, description, high_capacity_database_storage, additional_flash_cache_in_percent, freeform_tags, defined_tags, is_autoscale_enabled, autoscale_limit_in_gbs, if_match): - if isinstance(exascale_db_storage_vault_id, six.string_types) and len(exascale_db_storage_vault_id.strip()) == 0: + if isinstance(exascale_db_storage_vault_id, str) and len(exascale_db_storage_vault_id.strip()) == 0: raise click.UsageError('Parameter --exascale-db-storage-vault-id cannot be whitespace or empty string') if not force: if high_capacity_database_storage or freeform_tags or defined_tags: @@ -35554,7 +35553,7 @@ def update_exascale_db_storage_vault(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_execution_action(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, execution_action_id, execution_window_id, action_params, action_members, freeform_tags, defined_tags, if_match): - if isinstance(execution_action_id, six.string_types) and len(execution_action_id.strip()) == 0: + if isinstance(execution_action_id, str) and len(execution_action_id.strip()) == 0: raise click.UsageError('Parameter --execution-action-id cannot be whitespace or empty string') if not force: if action_params or action_members or freeform_tags or defined_tags: @@ -35636,7 +35635,7 @@ def update_execution_action(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_execution_window(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, execution_window_id, time_scheduled, window_duration_in_mins, is_enforced_duration, freeform_tags, defined_tags, if_match): - if isinstance(execution_window_id, six.string_types) and len(execution_window_id.strip()) == 0: + if isinstance(execution_window_id, str) and len(execution_window_id.strip()) == 0: raise click.UsageError('Parameter --execution-window-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -35716,7 +35715,7 @@ def update_execution_window(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_external_container_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -35789,7 +35788,7 @@ def update_external_container_database(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_external_database_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_database_connector_id, freeform_tags, defined_tags, display_name, connector_type, if_match): - if isinstance(external_database_connector_id, six.string_types) and len(external_database_connector_id.strip()) == 0: + if isinstance(external_database_connector_id, str) and len(external_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-database-connector-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -35868,7 +35867,7 @@ def update_external_database_connector(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_external_database_connector_update_external_macs_connector_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_database_connector_id, freeform_tags, defined_tags, display_name, connection_string, connection_credentials, if_match): - if isinstance(external_database_connector_id, six.string_types) and len(external_database_connector_id.strip()) == 0: + if isinstance(external_database_connector_id, str) and len(external_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-database-connector-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or connection_string or connection_credentials: @@ -35950,7 +35949,7 @@ def update_external_database_connector_update_external_macs_connector_details(ct @cli_util.wrap_exceptions def update_external_non_container_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -36022,7 +36021,7 @@ def update_external_non_container_database(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def update_external_pluggable_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -36094,7 +36093,7 @@ def update_external_pluggable_database(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_key_store(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, key_store_id, type_details, freeform_tags, defined_tags, if_match): - if isinstance(key_store_id, six.string_types) and len(key_store_id.strip()) == 0: + if isinstance(key_store_id, str) and len(key_store_id.strip()) == 0: raise click.UsageError('Parameter --key-store-id cannot be whitespace or empty string') if not force: if type_details or freeform_tags or defined_tags: @@ -36171,7 +36170,7 @@ def update_key_store(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_key_store_key_store_type_from_oracle_key_vault_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, key_store_id, type_details_connection_ips, type_details_admin_username, type_details_vault_id, type_details_secret_id, freeform_tags, defined_tags, if_match): - if isinstance(key_store_id, six.string_types) and len(key_store_id.strip()) == 0: + if isinstance(key_store_id, str) and len(key_store_id.strip()) == 0: raise click.UsageError('Parameter --key-store-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -36256,7 +36255,7 @@ def update_key_store_key_store_type_from_oracle_key_vault_details(ctx, from_json @cli_util.wrap_exceptions def update_maintenance_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_run_id, is_enabled, time_scheduled, is_patch_now_enabled, patch_id, patching_mode, is_custom_action_timeout_enabled, custom_action_timeout_in_mins, current_custom_action_timeout_in_mins, is_resume_patching, target_db_server_version, target_storage_server_version, if_match): - if isinstance(maintenance_run_id, six.string_types) and len(maintenance_run_id.strip()) == 0: + if isinstance(maintenance_run_id, str) and len(maintenance_run_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-run-id cannot be whitespace or empty string') kwargs = {} @@ -36348,7 +36347,7 @@ def update_maintenance_run(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_oneoff_patch(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oneoff_patch_id, freeform_tags, defined_tags, if_match): - if isinstance(oneoff_patch_id, six.string_types) and len(oneoff_patch_id.strip()) == 0: + if isinstance(oneoff_patch_id, str) and len(oneoff_patch_id.strip()) == 0: raise click.UsageError('Parameter --oneoff-patch-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -36418,7 +36417,7 @@ def update_oneoff_patch(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_pluggable_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, freeform_tags, defined_tags, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -36488,7 +36487,7 @@ def update_pluggable_database(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_scheduled_action(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduled_action_id, action_params, action_members, scheduling_window_id, if_match): - if isinstance(scheduled_action_id, six.string_types) and len(scheduled_action_id.strip()) == 0: + if isinstance(scheduled_action_id, str) and len(scheduled_action_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-action-id cannot be whitespace or empty string') if not force: if action_params or action_members: @@ -36564,7 +36563,7 @@ def update_scheduled_action(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_scheduling_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduling_policy_id, display_name, cadence, cadence_start_month, freeform_tags, defined_tags, if_match): - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') if not force: if cadence_start_month or freeform_tags or defined_tags: @@ -36645,10 +36644,10 @@ def update_scheduling_policy(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_scheduling_window(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduling_policy_id, scheduling_window_id, window_preference, freeform_tags, defined_tags, if_match): - if isinstance(scheduling_policy_id, six.string_types) and len(scheduling_policy_id.strip()) == 0: + if isinstance(scheduling_policy_id, str) and len(scheduling_policy_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-policy-id cannot be whitespace or empty string') - if isinstance(scheduling_window_id, six.string_types) and len(scheduling_window_id.strip()) == 0: + if isinstance(scheduling_window_id, str) and len(scheduling_window_id.strip()) == 0: raise click.UsageError('Parameter --scheduling-window-id cannot be whitespace or empty string') if not force: if window_preference or freeform_tags or defined_tags: @@ -36737,7 +36736,7 @@ def update_scheduling_window(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_vm_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vm_cluster_id, cpu_core_count, ocpu_count, memory_size_in_gbs, db_node_storage_size_in_gbs, data_storage_size_in_tbs, data_storage_size_in_gbs, license_model, ssh_public_keys, version_parameterconflict, update_details, freeform_tags, defined_tags, data_collection_options, file_system_configuration_details, cloud_automation_update_details, if_match): - if isinstance(vm_cluster_id, six.string_types) and len(vm_cluster_id.strip()) == 0: + if isinstance(vm_cluster_id, str) and len(vm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-id cannot be whitespace or empty string') if not force: if ssh_public_keys or version_parameterconflict or update_details or freeform_tags or defined_tags or data_collection_options or file_system_configuration_details or cloud_automation_update_details: @@ -36858,10 +36857,10 @@ def update_vm_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_vm_cluster_network(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, vm_cluster_network_id, scans, dns, ntp, vm_networks, dr_scans, freeform_tags, defined_tags, if_match): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') - if isinstance(vm_cluster_network_id, six.string_types) and len(vm_cluster_network_id.strip()) == 0: + if isinstance(vm_cluster_network_id, str) and len(vm_cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-network-id cannot be whitespace or empty string') if not force: if scans or dns or ntp or vm_networks or dr_scans or freeform_tags or defined_tags: @@ -36944,7 +36943,7 @@ def update_vm_cluster_network(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def upgrade_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, action, database_upgrade_source_details, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -37006,7 +37005,7 @@ def upgrade_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def upgrade_database_database_upgrade_with_db_home_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, action, database_upgrade_source_details_db_home_id, if_match, database_upgrade_source_details_options): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -37072,7 +37071,7 @@ def upgrade_database_database_upgrade_with_db_home_details(ctx, from_json, wait_ @cli_util.wrap_exceptions def upgrade_database_database_upgrade_with_database_software_image_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, action, database_upgrade_source_details_database_software_image_id, if_match, database_upgrade_source_details_options): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -37140,7 +37139,7 @@ def upgrade_database_database_upgrade_with_database_software_image_details(ctx, @cli_util.wrap_exceptions def upgrade_database_database_upgrade_with_db_version_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, action, database_upgrade_source_details_db_version, if_match, database_upgrade_source_details_options): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -37208,7 +37207,7 @@ def upgrade_database_database_upgrade_with_db_version_details(ctx, from_json, wa @cli_util.wrap_exceptions def upgrade_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, action, snapshot_retention_period_in_days, new_gi_version, new_os_version, is_snapshot_retention_days_force_updated, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -37276,10 +37275,10 @@ def upgrade_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def validate_vm_cluster_network(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_infrastructure_id, vm_cluster_network_id): - if isinstance(exadata_infrastructure_id, six.string_types) and len(exadata_infrastructure_id.strip()) == 0: + if isinstance(exadata_infrastructure_id, str) and len(exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --exadata-infrastructure-id cannot be whitespace or empty string') - if isinstance(vm_cluster_network_id, six.string_types) and len(vm_cluster_network_id.strip()) == 0: + if isinstance(vm_cluster_network_id, str) and len(vm_cluster_network_id.strip()) == 0: raise click.UsageError('Parameter --vm-cluster-network-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/database_management/src/oci_cli_db_management/dbmanagement_cli_extended.py b/services/database_management/src/oci_cli_db_management/dbmanagement_cli_extended.py index 008bd191d..c93c4a66c 100644 --- a/services/database_management/src/oci_cli_db_management/dbmanagement_cli_extended.py +++ b/services/database_management/src/oci_cli_db_management/dbmanagement_cli_extended.py @@ -4,7 +4,6 @@ import click # noqa: F401 import json # noqa: F401 -import six from services.database_management.src.oci_cli_db_management.generated import dbmanagement_cli from services.database_management.src.oci_cli_database_management.generated import database_management_service_cli from oci_cli import cli_util # noqa: F401 @@ -54,10 +53,10 @@ @cli_util.wrap_exceptions def get_awr_db_report(ctx, from_json, managed_database_id, awr_db_id, inst_nums, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, report_type, container_id, report_format): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/database_management/src/oci_cli_db_management/generated/dbmanagement_cli.py b/services/database_management/src/oci_cli_db_management/generated/dbmanagement_cli.py index 017622662..e055786b5 100644 --- a/services/database_management/src/oci_cli_db_management/generated/dbmanagement_cli.py +++ b/services/database_management/src/oci_cli_db_management/generated/dbmanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -447,10 +446,10 @@ def preferred_credential_group(): @cli_util.wrap_exceptions def add_data_files(ctx, from_json, managed_database_id, tablespace_name, file_type, credential_details, database_credential, data_files, file_count, file_size, is_reusable, is_auto_extensible, auto_extend_next_size, auto_extend_max_size, is_max_size_unlimited): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -509,7 +508,7 @@ def add_data_files(ctx, from_json, managed_database_id, tablespace_name, file_ty @cli_util.wrap_exceptions def add_managed_database_to_managed_database_group(ctx, from_json, managed_database_group_id, managed_database_id): - if isinstance(managed_database_group_id, six.string_types) and len(managed_database_group_id.strip()) == 0: + if isinstance(managed_database_group_id, str) and len(managed_database_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -543,7 +542,7 @@ def add_managed_database_to_managed_database_group(ctx, from_json, managed_datab @cli_util.wrap_exceptions def addm_tasks(ctx, from_json, managed_database_id, time_start, time_end, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -587,7 +586,7 @@ def addm_tasks(ctx, from_json, managed_database_id, time_start, time_end, page, @cli_util.wrap_exceptions def change_database_parameters(ctx, from_json, managed_database_id, scope, parameters, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -633,7 +632,7 @@ def change_database_parameters(ctx, from_json, managed_database_id, scope, param @cli_util.wrap_exceptions def change_database_parameters_database_secret_credential_details(ctx, from_json, managed_database_id, scope, parameters, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -684,7 +683,7 @@ def change_database_parameters_database_secret_credential_details(ctx, from_json @cli_util.wrap_exceptions def change_database_parameters_database_named_credential_details(ctx, from_json, managed_database_id, scope, parameters, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -731,7 +730,7 @@ def change_database_parameters_database_named_credential_details(ctx, from_json, @cli_util.wrap_exceptions def change_database_parameters_database_password_credential_details(ctx, from_json, managed_database_id, scope, parameters, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -774,7 +773,7 @@ def change_database_parameters_database_password_credential_details(ctx, from_js @cli_util.wrap_exceptions def change_db_management_private_endpoint_compartment(ctx, from_json, db_management_private_endpoint_id, compartment_id, if_match): - if isinstance(db_management_private_endpoint_id, six.string_types) and len(db_management_private_endpoint_id.strip()) == 0: + if isinstance(db_management_private_endpoint_id, str) and len(db_management_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --db-management-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -810,7 +809,7 @@ def change_db_management_private_endpoint_compartment(ctx, from_json, db_managem @cli_util.wrap_exceptions def change_external_db_system_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_id, compartment_id, if_match): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -871,7 +870,7 @@ def change_external_db_system_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_external_exadata_infrastructure_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_infrastructure_id, compartment_id, if_match): - if isinstance(external_exadata_infrastructure_id, six.string_types) and len(external_exadata_infrastructure_id.strip()) == 0: + if isinstance(external_exadata_infrastructure_id, str) and len(external_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -929,7 +928,7 @@ def change_external_exadata_infrastructure_compartment(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def change_job_compartment(ctx, from_json, job_id, compartment_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -960,7 +959,7 @@ def change_job_compartment(ctx, from_json, job_id, compartment_id, if_match): @cli_util.wrap_exceptions def change_managed_database_group_compartment(ctx, from_json, managed_database_group_id, compartment_id, if_match): - if isinstance(managed_database_group_id, six.string_types) and len(managed_database_group_id.strip()) == 0: + if isinstance(managed_database_group_id, str) and len(managed_database_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -991,7 +990,7 @@ def change_managed_database_group_compartment(ctx, from_json, managed_database_g @cli_util.wrap_exceptions def change_named_credential_compartment(ctx, from_json, named_credential_id, compartment_id, if_match): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') kwargs = {} @@ -1025,7 +1024,7 @@ def change_named_credential_compartment(ctx, from_json, named_credential_id, com @cli_util.wrap_exceptions def change_plan_retention(ctx, from_json, managed_database_id, retention_weeks, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1065,7 +1064,7 @@ def change_plan_retention(ctx, from_json, managed_database_id, retention_weeks, @cli_util.wrap_exceptions def change_plan_retention_managed_database_password_credential(ctx, from_json, managed_database_id, retention_weeks, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1108,7 +1107,7 @@ def change_plan_retention_managed_database_password_credential(ctx, from_json, m @cli_util.wrap_exceptions def change_plan_retention_managed_database_secret_credential(ctx, from_json, managed_database_id, retention_weeks, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1151,7 +1150,7 @@ def change_plan_retention_managed_database_secret_credential(ctx, from_json, man @cli_util.wrap_exceptions def change_plan_retention_database_secret_credential_details(ctx, from_json, managed_database_id, retention_weeks, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1196,7 +1195,7 @@ def change_plan_retention_database_secret_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def change_plan_retention_database_named_credential_details(ctx, from_json, managed_database_id, retention_weeks, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1237,7 +1236,7 @@ def change_plan_retention_database_named_credential_details(ctx, from_json, mana @cli_util.wrap_exceptions def change_plan_retention_database_password_credential_details(ctx, from_json, managed_database_id, retention_weeks, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1280,7 +1279,7 @@ def change_plan_retention_database_password_credential_details(ctx, from_json, m @cli_util.wrap_exceptions def change_space_budget(ctx, from_json, managed_database_id, space_budget_percent, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1318,7 +1317,7 @@ def change_space_budget(ctx, from_json, managed_database_id, space_budget_percen @cli_util.wrap_exceptions def change_space_budget_managed_database_password_credential(ctx, from_json, managed_database_id, space_budget_percent, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1359,7 +1358,7 @@ def change_space_budget_managed_database_password_credential(ctx, from_json, man @cli_util.wrap_exceptions def change_space_budget_managed_database_secret_credential(ctx, from_json, managed_database_id, space_budget_percent, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1400,7 +1399,7 @@ def change_space_budget_managed_database_secret_credential(ctx, from_json, manag @cli_util.wrap_exceptions def change_space_budget_database_secret_credential_details(ctx, from_json, managed_database_id, space_budget_percent, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1443,7 +1442,7 @@ def change_space_budget_database_secret_credential_details(ctx, from_json, manag @cli_util.wrap_exceptions def change_space_budget_database_named_credential_details(ctx, from_json, managed_database_id, space_budget_percent, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1482,7 +1481,7 @@ def change_space_budget_database_named_credential_details(ctx, from_json, manage @cli_util.wrap_exceptions def change_space_budget_database_password_credential_details(ctx, from_json, managed_database_id, space_budget_percent, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1529,7 +1528,7 @@ def change_space_budget_database_password_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def change_sql_plan_baselines_attributes(ctx, from_json, managed_database_id, sql_handle, plan_name, is_enabled, is_fixed, is_auto_purged, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1585,7 +1584,7 @@ def change_sql_plan_baselines_attributes(ctx, from_json, managed_database_id, sq @cli_util.wrap_exceptions def change_sql_plan_baselines_attributes_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, sql_handle, plan_name, is_enabled, is_fixed, is_auto_purged, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1644,7 +1643,7 @@ def change_sql_plan_baselines_attributes_managed_database_password_credential(ct @cli_util.wrap_exceptions def change_sql_plan_baselines_attributes_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, sql_handle, plan_name, is_enabled, is_fixed, is_auto_purged, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1703,7 +1702,7 @@ def change_sql_plan_baselines_attributes_managed_database_secret_credential(ctx, @cli_util.wrap_exceptions def change_sql_plan_baselines_attributes_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, sql_handle, plan_name, is_enabled, is_fixed, is_auto_purged, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1764,7 +1763,7 @@ def change_sql_plan_baselines_attributes_database_secret_credential_details(ctx, @cli_util.wrap_exceptions def change_sql_plan_baselines_attributes_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, sql_handle, plan_name, is_enabled, is_fixed, is_auto_purged, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1821,7 +1820,7 @@ def change_sql_plan_baselines_attributes_database_named_credential_details(ctx, @cli_util.wrap_exceptions def change_sql_plan_baselines_attributes_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, sql_handle, plan_name, is_enabled, is_fixed, is_auto_purged, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1879,7 +1878,7 @@ def change_sql_plan_baselines_attributes_database_password_credential_details(ct @cli_util.wrap_exceptions def check_cloud_db_system_connector_connection_status(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_connector_id, if_match): - if isinstance(cloud_db_system_connector_id, six.string_types) and len(cloud_db_system_connector_id.strip()) == 0: + if isinstance(cloud_db_system_connector_id, str) and len(cloud_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-connector-id cannot be whitespace or empty string') kwargs = {} @@ -1930,7 +1929,7 @@ def check_cloud_db_system_connector_connection_status(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def check_external_db_system_connector_connection_status(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_connector_id, if_match): - if isinstance(external_db_system_connector_id, six.string_types) and len(external_db_system_connector_id.strip()) == 0: + if isinstance(external_db_system_connector_id, str) and len(external_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-connector-id cannot be whitespace or empty string') kwargs = {} @@ -1978,7 +1977,7 @@ def check_external_db_system_connector_connection_status(ctx, from_json, wait_fo @cli_util.wrap_exceptions def check_external_exadata_storage_connector(ctx, from_json, external_exadata_storage_connector_id, if_match): - if isinstance(external_exadata_storage_connector_id, six.string_types) and len(external_exadata_storage_connector_id.strip()) == 0: + if isinstance(external_exadata_storage_connector_id, str) and len(external_exadata_storage_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-connector-id cannot be whitespace or empty string') kwargs = {} @@ -2006,7 +2005,7 @@ def check_external_exadata_storage_connector(ctx, from_json, external_exadata_st @cli_util.wrap_exceptions def check_external_my_sql_database_connector_connection_status(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_my_sql_database_connector_id, if_match): - if isinstance(external_my_sql_database_connector_id, six.string_types) and len(external_my_sql_database_connector_id.strip()) == 0: + if isinstance(external_my_sql_database_connector_id, str) and len(external_my_sql_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-connector-id cannot be whitespace or empty string') kwargs = {} @@ -2060,7 +2059,7 @@ def check_external_my_sql_database_connector_connection_status(ctx, from_json, w @cli_util.wrap_exceptions def configure_automatic_capture_filters(ctx, from_json, managed_database_id, auto_capture_filters, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2098,7 +2097,7 @@ def configure_automatic_capture_filters(ctx, from_json, managed_database_id, aut @cli_util.wrap_exceptions def configure_automatic_capture_filters_managed_database_password_credential(ctx, from_json, managed_database_id, auto_capture_filters, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2139,7 +2138,7 @@ def configure_automatic_capture_filters_managed_database_password_credential(ctx @cli_util.wrap_exceptions def configure_automatic_capture_filters_managed_database_secret_credential(ctx, from_json, managed_database_id, auto_capture_filters, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2180,7 +2179,7 @@ def configure_automatic_capture_filters_managed_database_secret_credential(ctx, @cli_util.wrap_exceptions def configure_automatic_capture_filters_database_secret_credential_details(ctx, from_json, managed_database_id, auto_capture_filters, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2223,7 +2222,7 @@ def configure_automatic_capture_filters_database_secret_credential_details(ctx, @cli_util.wrap_exceptions def configure_automatic_capture_filters_database_named_credential_details(ctx, from_json, managed_database_id, auto_capture_filters, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2262,7 +2261,7 @@ def configure_automatic_capture_filters_database_named_credential_details(ctx, f @cli_util.wrap_exceptions def configure_automatic_capture_filters_database_password_credential_details(ctx, from_json, managed_database_id, auto_capture_filters, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2305,7 +2304,7 @@ def configure_automatic_capture_filters_database_password_credential_details(ctx @cli_util.wrap_exceptions def configure_automatic_spm_evolve_advisor_task(ctx, from_json, managed_database_id, task_parameters, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2343,7 +2342,7 @@ def configure_automatic_spm_evolve_advisor_task(ctx, from_json, managed_database @cli_util.wrap_exceptions def configure_automatic_spm_evolve_advisor_task_managed_database_password_credential(ctx, from_json, managed_database_id, task_parameters, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2384,7 +2383,7 @@ def configure_automatic_spm_evolve_advisor_task_managed_database_password_creden @cli_util.wrap_exceptions def configure_automatic_spm_evolve_advisor_task_managed_database_secret_credential(ctx, from_json, managed_database_id, task_parameters, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2425,7 +2424,7 @@ def configure_automatic_spm_evolve_advisor_task_managed_database_secret_credenti @cli_util.wrap_exceptions def configure_automatic_spm_evolve_advisor_task_database_secret_credential_details(ctx, from_json, managed_database_id, task_parameters, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2468,7 +2467,7 @@ def configure_automatic_spm_evolve_advisor_task_database_secret_credential_detai @cli_util.wrap_exceptions def configure_automatic_spm_evolve_advisor_task_database_named_credential_details(ctx, from_json, managed_database_id, task_parameters, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2507,7 +2506,7 @@ def configure_automatic_spm_evolve_advisor_task_database_named_credential_detail @cli_util.wrap_exceptions def configure_automatic_spm_evolve_advisor_task_database_password_credential_details(ctx, from_json, managed_database_id, task_parameters, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -3920,7 +3919,7 @@ def create_named_credential_basic_named_credential_content(ctx, from_json, wait_ @cli_util.wrap_exceptions def create_tablespace(ctx, from_json, managed_database_id, name, credential_details, database_credential, type, is_bigfile, data_files, file_count, file_size, is_reusable, is_auto_extensible, auto_extend_next_size, auto_extend_max_size, is_max_size_unlimited, block_size_in_kilobytes, is_encrypted, encryption_algorithm, default_compress, status, extent_management, extent_uniform_size, segment_management, is_default): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4015,7 +4014,7 @@ def create_tablespace(ctx, from_json, managed_database_id, name, credential_deta @cli_util.wrap_exceptions def delete_cloud_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_id, if_match): - if isinstance(cloud_db_system_id, six.string_types) and len(cloud_db_system_id.strip()) == 0: + if isinstance(cloud_db_system_id, str) and len(cloud_db_system_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -4071,7 +4070,7 @@ def delete_cloud_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_cloud_db_system_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_connector_id, if_match): - if isinstance(cloud_db_system_connector_id, six.string_types) and len(cloud_db_system_connector_id.strip()) == 0: + if isinstance(cloud_db_system_connector_id, str) and len(cloud_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-connector-id cannot be whitespace or empty string') kwargs = {} @@ -4135,7 +4134,7 @@ def delete_cloud_db_system_connector(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_cloud_db_system_discovery(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_discovery_id, if_match): - if isinstance(cloud_db_system_discovery_id, six.string_types) and len(cloud_db_system_discovery_id.strip()) == 0: + if isinstance(cloud_db_system_discovery_id, str) and len(cloud_db_system_discovery_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -4199,7 +4198,7 @@ def delete_cloud_db_system_discovery(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_db_management_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_management_private_endpoint_id, if_match): - if isinstance(db_management_private_endpoint_id, six.string_types) and len(db_management_private_endpoint_id.strip()) == 0: + if isinstance(db_management_private_endpoint_id, str) and len(db_management_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --db-management-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -4255,7 +4254,7 @@ def delete_db_management_private_endpoint(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def delete_external_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_id, if_match): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -4311,7 +4310,7 @@ def delete_external_db_system(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_external_db_system_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_connector_id, if_match): - if isinstance(external_db_system_connector_id, six.string_types) and len(external_db_system_connector_id.strip()) == 0: + if isinstance(external_db_system_connector_id, str) and len(external_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-connector-id cannot be whitespace or empty string') kwargs = {} @@ -4375,7 +4374,7 @@ def delete_external_db_system_connector(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def delete_external_db_system_discovery(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_discovery_id, if_match): - if isinstance(external_db_system_discovery_id, six.string_types) and len(external_db_system_discovery_id.strip()) == 0: + if isinstance(external_db_system_discovery_id, str) and len(external_db_system_discovery_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -4439,7 +4438,7 @@ def delete_external_db_system_discovery(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def delete_external_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_infrastructure_id, if_match): - if isinstance(external_exadata_infrastructure_id, six.string_types) and len(external_exadata_infrastructure_id.strip()) == 0: + if isinstance(external_exadata_infrastructure_id, str) and len(external_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -4495,7 +4494,7 @@ def delete_external_exadata_infrastructure(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def delete_external_exadata_storage_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_storage_connector_id, if_match): - if isinstance(external_exadata_storage_connector_id, six.string_types) and len(external_exadata_storage_connector_id.strip()) == 0: + if isinstance(external_exadata_storage_connector_id, str) and len(external_exadata_storage_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-connector-id cannot be whitespace or empty string') kwargs = {} @@ -4559,7 +4558,7 @@ def delete_external_exadata_storage_connector(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def delete_external_my_sql_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_my_sql_database_id, if_match): - if isinstance(external_my_sql_database_id, six.string_types) and len(external_my_sql_database_id.strip()) == 0: + if isinstance(external_my_sql_database_id, str) and len(external_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -4615,7 +4614,7 @@ def delete_external_my_sql_database(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def delete_external_my_sql_database_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_my_sql_database_connector_id, if_match): - if isinstance(external_my_sql_database_connector_id, six.string_types) and len(external_my_sql_database_connector_id.strip()) == 0: + if isinstance(external_my_sql_database_connector_id, str) and len(external_my_sql_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-connector-id cannot be whitespace or empty string') kwargs = {} @@ -4671,7 +4670,7 @@ def delete_external_my_sql_database_connector(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def delete_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -4735,7 +4734,7 @@ def delete_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_managed_database_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_database_group_id, if_match): - if isinstance(managed_database_group_id, six.string_types) and len(managed_database_group_id.strip()) == 0: + if isinstance(managed_database_group_id, str) and len(managed_database_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -4799,7 +4798,7 @@ def delete_managed_database_group(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_named_credential(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, named_credential_id, if_match): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') kwargs = {} @@ -4860,10 +4859,10 @@ def delete_named_credential(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_preferred_credential(ctx, from_json, managed_database_id, credential_name): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(credential_name, six.string_types) and len(credential_name.strip()) == 0: + if isinstance(credential_name, str) and len(credential_name.strip()) == 0: raise click.UsageError('Parameter --credential-name cannot be whitespace or empty string') kwargs = {} @@ -4888,7 +4887,7 @@ def delete_preferred_credential(ctx, from_json, managed_database_id, credential_ @cli_util.wrap_exceptions def disable_automatic_initial_plan_capture(ctx, from_json, managed_database_id, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4924,7 +4923,7 @@ def disable_automatic_initial_plan_capture(ctx, from_json, managed_database_id, @cli_util.wrap_exceptions def disable_automatic_initial_plan_capture_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4963,7 +4962,7 @@ def disable_automatic_initial_plan_capture_managed_database_password_credential( @cli_util.wrap_exceptions def disable_automatic_initial_plan_capture_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5002,7 +5001,7 @@ def disable_automatic_initial_plan_capture_managed_database_secret_credential(ct @cli_util.wrap_exceptions def disable_automatic_initial_plan_capture_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5043,7 +5042,7 @@ def disable_automatic_initial_plan_capture_database_secret_credential_details(ct @cli_util.wrap_exceptions def disable_automatic_initial_plan_capture_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5080,7 +5079,7 @@ def disable_automatic_initial_plan_capture_database_named_credential_details(ctx @cli_util.wrap_exceptions def disable_automatic_initial_plan_capture_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5123,7 +5122,7 @@ def disable_automatic_initial_plan_capture_database_password_credential_details( @cli_util.wrap_exceptions def disable_automatic_spm_evolve_advisor_task(ctx, from_json, managed_database_id, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5161,7 +5160,7 @@ def disable_automatic_spm_evolve_advisor_task(ctx, from_json, managed_database_i @cli_util.wrap_exceptions def disable_automatic_spm_evolve_advisor_task_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5202,7 +5201,7 @@ def disable_automatic_spm_evolve_advisor_task_managed_database_password_credenti @cli_util.wrap_exceptions def disable_automatic_spm_evolve_advisor_task_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5243,7 +5242,7 @@ def disable_automatic_spm_evolve_advisor_task_managed_database_secret_credential @cli_util.wrap_exceptions def disable_automatic_spm_evolve_advisor_task_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5286,7 +5285,7 @@ def disable_automatic_spm_evolve_advisor_task_database_secret_credential_details @cli_util.wrap_exceptions def disable_automatic_spm_evolve_advisor_task_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5325,7 +5324,7 @@ def disable_automatic_spm_evolve_advisor_task_database_named_credential_details( @cli_util.wrap_exceptions def disable_automatic_spm_evolve_advisor_task_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -5369,7 +5368,7 @@ def disable_automatic_spm_evolve_advisor_task_database_password_credential_detai @cli_util.wrap_exceptions def disable_autonomous_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, feature, if_match): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -5429,7 +5428,7 @@ def disable_autonomous_database_management_feature(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def disable_cloud_db_system_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_id, if_match): - if isinstance(cloud_db_system_id, six.string_types) and len(cloud_db_system_id.strip()) == 0: + if isinstance(cloud_db_system_id, str) and len(cloud_db_system_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -5484,7 +5483,7 @@ def disable_cloud_db_system_database_management(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def disable_cloud_db_system_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_id, if_match): - if isinstance(cloud_db_system_id, six.string_types) and len(cloud_db_system_id.strip()) == 0: + if isinstance(cloud_db_system_id, str) and len(cloud_db_system_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -5541,7 +5540,7 @@ def disable_cloud_db_system_stack_monitoring(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def disable_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature, can_disable_all_pdbs, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -5606,7 +5605,7 @@ def disable_database_management_feature(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def disable_external_container_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature, can_disable_all_pdbs, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -5669,7 +5668,7 @@ def disable_external_container_database_management_feature(ctx, from_json, wait_ @cli_util.wrap_exceptions def disable_external_db_system_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_id, if_match): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -5724,7 +5723,7 @@ def disable_external_db_system_database_management(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def disable_external_db_system_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_id, if_match): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -5783,7 +5782,7 @@ def disable_external_db_system_stack_monitoring(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def disable_external_exadata_infrastructure_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_infrastructure_id, if_match): - if isinstance(external_exadata_infrastructure_id, six.string_types) and len(external_exadata_infrastructure_id.strip()) == 0: + if isinstance(external_exadata_infrastructure_id, str) and len(external_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -5838,7 +5837,7 @@ def disable_external_exadata_infrastructure_management(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def disable_external_my_sql_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_my_sql_database_id, if_match): - if isinstance(external_my_sql_database_id, six.string_types) and len(external_my_sql_database_id.strip()) == 0: + if isinstance(external_my_sql_database_id, str) and len(external_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -5894,7 +5893,7 @@ def disable_external_my_sql_database_management(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def disable_external_non_container_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, feature, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -5955,7 +5954,7 @@ def disable_external_non_container_database_management_feature(ctx, from_json, w @cli_util.wrap_exceptions def disable_external_pluggable_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, feature, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -6015,7 +6014,7 @@ def disable_external_pluggable_database_management_feature(ctx, from_json, wait_ @cli_util.wrap_exceptions def disable_high_frequency_automatic_spm_evolve_advisor_task(ctx, from_json, managed_database_id, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6053,7 +6052,7 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task(ctx, from_json, man @cli_util.wrap_exceptions def disable_high_frequency_automatic_spm_evolve_advisor_task_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6094,7 +6093,7 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task_managed_database_pa @cli_util.wrap_exceptions def disable_high_frequency_automatic_spm_evolve_advisor_task_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6135,7 +6134,7 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task_managed_database_se @cli_util.wrap_exceptions def disable_high_frequency_automatic_spm_evolve_advisor_task_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6178,7 +6177,7 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task_database_secret_cre @cli_util.wrap_exceptions def disable_high_frequency_automatic_spm_evolve_advisor_task_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6217,7 +6216,7 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task_database_named_cred @cli_util.wrap_exceptions def disable_high_frequency_automatic_spm_evolve_advisor_task_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6261,7 +6260,7 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task_database_password_c @cli_util.wrap_exceptions def disable_pluggable_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -6321,7 +6320,7 @@ def disable_pluggable_database_management_feature(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def disable_sql_plan_baselines_usage(ctx, from_json, managed_database_id, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6359,7 +6358,7 @@ def disable_sql_plan_baselines_usage(ctx, from_json, managed_database_id, creden @cli_util.wrap_exceptions def disable_sql_plan_baselines_usage_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6400,7 +6399,7 @@ def disable_sql_plan_baselines_usage_managed_database_password_credential(ctx, f @cli_util.wrap_exceptions def disable_sql_plan_baselines_usage_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6441,7 +6440,7 @@ def disable_sql_plan_baselines_usage_managed_database_secret_credential(ctx, fro @cli_util.wrap_exceptions def disable_sql_plan_baselines_usage_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6484,7 +6483,7 @@ def disable_sql_plan_baselines_usage_database_secret_credential_details(ctx, fro @cli_util.wrap_exceptions def disable_sql_plan_baselines_usage_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6523,7 +6522,7 @@ def disable_sql_plan_baselines_usage_database_named_credential_details(ctx, from @cli_util.wrap_exceptions def disable_sql_plan_baselines_usage_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6608,7 +6607,7 @@ def discover_external_exadata_infrastructure(ctx, from_json, compartment_id, dis @cli_util.wrap_exceptions def drop_sql_plan_baselines(ctx, from_json, managed_database_id, sql_handle, plan_name, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6652,7 +6651,7 @@ def drop_sql_plan_baselines(ctx, from_json, managed_database_id, sql_handle, pla @cli_util.wrap_exceptions def drop_sql_plan_baselines_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, sql_handle, plan_name, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6699,7 +6698,7 @@ def drop_sql_plan_baselines_managed_database_password_credential(ctx, from_json, @cli_util.wrap_exceptions def drop_sql_plan_baselines_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, sql_handle, plan_name, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6746,7 +6745,7 @@ def drop_sql_plan_baselines_managed_database_secret_credential(ctx, from_json, m @cli_util.wrap_exceptions def drop_sql_plan_baselines_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, sql_handle, plan_name, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6795,7 +6794,7 @@ def drop_sql_plan_baselines_database_secret_credential_details(ctx, from_json, m @cli_util.wrap_exceptions def drop_sql_plan_baselines_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, sql_handle, plan_name, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6840,7 +6839,7 @@ def drop_sql_plan_baselines_database_named_credential_details(ctx, from_json, ma @cli_util.wrap_exceptions def drop_sql_plan_baselines_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, sql_handle, plan_name, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -6891,10 +6890,10 @@ def drop_sql_plan_baselines_database_password_credential_details(ctx, from_json, @cli_util.wrap_exceptions def drop_tablespace(ctx, from_json, managed_database_id, tablespace_name, credential_details, database_credential, is_including_contents, is_dropping_data_files, is_cascade_constraints): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -6944,10 +6943,10 @@ def drop_tablespace(ctx, from_json, managed_database_id, tablespace_name, creden @cli_util.wrap_exceptions def drop_tablespace_tablespace_admin_password_credential_details(ctx, from_json, managed_database_id, tablespace_name, credential_details_username, credential_details_role, credential_details_password, database_credential, is_including_contents, is_dropping_data_files, is_cascade_constraints): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -7000,10 +6999,10 @@ def drop_tablespace_tablespace_admin_password_credential_details(ctx, from_json, @cli_util.wrap_exceptions def drop_tablespace_tablespace_admin_secret_credential_details(ctx, from_json, managed_database_id, tablespace_name, credential_details_username, credential_details_role, credential_details_password_secret_id, database_credential, is_including_contents, is_dropping_data_files, is_cascade_constraints): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -7056,10 +7055,10 @@ def drop_tablespace_tablespace_admin_secret_credential_details(ctx, from_json, m @cli_util.wrap_exceptions def drop_tablespace_database_secret_credential_details(ctx, from_json, managed_database_id, tablespace_name, database_credential_password_secret_id, credential_details, is_including_contents, is_dropping_data_files, is_cascade_constraints, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -7114,10 +7113,10 @@ def drop_tablespace_database_secret_credential_details(ctx, from_json, managed_d @cli_util.wrap_exceptions def drop_tablespace_database_named_credential_details(ctx, from_json, managed_database_id, tablespace_name, database_credential_named_credential_id, credential_details, is_including_contents, is_dropping_data_files, is_cascade_constraints): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -7168,10 +7167,10 @@ def drop_tablespace_database_named_credential_details(ctx, from_json, managed_da @cli_util.wrap_exceptions def drop_tablespace_database_password_credential_details(ctx, from_json, managed_database_id, tablespace_name, database_credential_password, credential_details, is_including_contents, is_dropping_data_files, is_cascade_constraints, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -7224,7 +7223,7 @@ def drop_tablespace_database_password_credential_details(ctx, from_json, managed @cli_util.wrap_exceptions def enable_automatic_initial_plan_capture(ctx, from_json, managed_database_id, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7262,7 +7261,7 @@ def enable_automatic_initial_plan_capture(ctx, from_json, managed_database_id, c @cli_util.wrap_exceptions def enable_automatic_initial_plan_capture_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7303,7 +7302,7 @@ def enable_automatic_initial_plan_capture_managed_database_password_credential(c @cli_util.wrap_exceptions def enable_automatic_initial_plan_capture_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7344,7 +7343,7 @@ def enable_automatic_initial_plan_capture_managed_database_secret_credential(ctx @cli_util.wrap_exceptions def enable_automatic_initial_plan_capture_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7387,7 +7386,7 @@ def enable_automatic_initial_plan_capture_database_secret_credential_details(ctx @cli_util.wrap_exceptions def enable_automatic_initial_plan_capture_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7426,7 +7425,7 @@ def enable_automatic_initial_plan_capture_database_named_credential_details(ctx, @cli_util.wrap_exceptions def enable_automatic_initial_plan_capture_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7473,7 +7472,7 @@ def enable_automatic_initial_plan_capture_database_password_credential_details(c @cli_util.wrap_exceptions def enable_automatic_spm_evolve_advisor_task(ctx, from_json, managed_database_id, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7515,7 +7514,7 @@ def enable_automatic_spm_evolve_advisor_task(ctx, from_json, managed_database_id @cli_util.wrap_exceptions def enable_automatic_spm_evolve_advisor_task_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7560,7 +7559,7 @@ def enable_automatic_spm_evolve_advisor_task_managed_database_password_credentia @cli_util.wrap_exceptions def enable_automatic_spm_evolve_advisor_task_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7605,7 +7604,7 @@ def enable_automatic_spm_evolve_advisor_task_managed_database_secret_credential( @cli_util.wrap_exceptions def enable_automatic_spm_evolve_advisor_task_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7652,7 +7651,7 @@ def enable_automatic_spm_evolve_advisor_task_database_secret_credential_details( @cli_util.wrap_exceptions def enable_automatic_spm_evolve_advisor_task_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7695,7 +7694,7 @@ def enable_automatic_spm_evolve_advisor_task_database_named_credential_details(c @cli_util.wrap_exceptions def enable_automatic_spm_evolve_advisor_task_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -7739,7 +7738,7 @@ def enable_automatic_spm_evolve_advisor_task_database_password_credential_detail @cli_util.wrap_exceptions def enable_autonomous_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, feature_details, if_match): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -7801,7 +7800,7 @@ def enable_autonomous_database_management_feature(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def enable_autonomous_database_management_feature_autonomous_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, feature_details_database_connection_details, if_match, feature_details_connector_details): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -7869,7 +7868,7 @@ def enable_autonomous_database_management_feature_autonomous_database_sql_watch_ @cli_util.wrap_exceptions def enable_autonomous_database_management_feature_autonomous_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, feature_details_database_connection_details, if_match, feature_details_connector_details): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -7937,7 +7936,7 @@ def enable_autonomous_database_management_feature_autonomous_database_diagnostic @cli_util.wrap_exceptions def enable_cloud_db_system_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_id, is_enabled, metadata, if_match): - if isinstance(cloud_db_system_id, six.string_types) and len(cloud_db_system_id.strip()) == 0: + if isinstance(cloud_db_system_id, str) and len(cloud_db_system_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -8002,7 +8001,7 @@ def enable_cloud_db_system_database_management(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def enable_cloud_db_system_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_id, is_enabled, metadata, if_match): - if isinstance(cloud_db_system_id, six.string_types) and len(cloud_db_system_id.strip()) == 0: + if isinstance(cloud_db_system_id, str) and len(cloud_db_system_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -8066,7 +8065,7 @@ def enable_cloud_db_system_stack_monitoring(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def enable_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature_details, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -8131,7 +8130,7 @@ def enable_database_management_feature(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def enable_database_management_feature_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature_details_database_connection_details, feature_details_connector_details, feature_details_management_type, if_match, feature_details_is_auto_enable_pluggable_database, feature_details_can_enable_all_current_pdbs): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -8204,7 +8203,7 @@ def enable_database_management_feature_database_diagnostics_and_management_featu @cli_util.wrap_exceptions def enable_database_management_feature_database_lifecycle_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature_details_database_connection_details, feature_details_connector_details, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -8272,7 +8271,7 @@ def enable_database_management_feature_database_lifecycle_management_feature_det @cli_util.wrap_exceptions def enable_database_management_feature_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature_details_database_connection_details, feature_details_connector_details, if_match, feature_details_can_enable_all_current_pdbs, feature_details_is_auto_enable_pluggable_database): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -8343,7 +8342,7 @@ def enable_database_management_feature_database_sql_watch_feature_details(ctx, f @cli_util.wrap_exceptions def enable_external_container_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature_details, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -8405,7 +8404,7 @@ def enable_external_container_database_management_feature(ctx, from_json, wait_f @cli_util.wrap_exceptions def enable_external_container_database_management_feature_external_database_lifecycle_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature_details_connector_details, feature_details_license_model, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -8470,7 +8469,7 @@ def enable_external_container_database_management_feature_external_database_life @cli_util.wrap_exceptions def enable_external_container_database_management_feature_external_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature_details_connector_details, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -8537,7 +8536,7 @@ def enable_external_container_database_management_feature_external_database_sql_ @cli_util.wrap_exceptions def enable_external_container_database_management_feature_external_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature_details_connector_details, feature_details_license_model, if_match, feature_details_can_enable_all_current_pdbs, feature_details_is_auto_enable_pluggable_database): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -8608,7 +8607,7 @@ def enable_external_container_database_management_feature_external_database_diag @cli_util.wrap_exceptions def enable_external_db_system_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_id, license_model, if_match): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -8670,7 +8669,7 @@ def enable_external_db_system_database_management(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def enable_external_db_system_stack_monitoring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_id, is_enabled, metadata, if_match): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -8736,7 +8735,7 @@ def enable_external_db_system_stack_monitoring(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def enable_external_exadata_infrastructure_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_infrastructure_id, license_model, if_match): - if isinstance(external_exadata_infrastructure_id, six.string_types) and len(external_exadata_infrastructure_id.strip()) == 0: + if isinstance(external_exadata_infrastructure_id, str) and len(external_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -8797,7 +8796,7 @@ def enable_external_exadata_infrastructure_management(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def enable_external_my_sql_database_management(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_my_sql_database_id, connector_id, if_match): - if isinstance(external_my_sql_database_id, six.string_types) and len(external_my_sql_database_id.strip()) == 0: + if isinstance(external_my_sql_database_id, str) and len(external_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -8858,7 +8857,7 @@ def enable_external_my_sql_database_management(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def enable_external_non_container_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, feature_details, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -8920,7 +8919,7 @@ def enable_external_non_container_database_management_feature(ctx, from_json, wa @cli_util.wrap_exceptions def enable_external_non_container_database_management_feature_external_database_lifecycle_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, feature_details_connector_details, feature_details_license_model, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -8985,7 +8984,7 @@ def enable_external_non_container_database_management_feature_external_database_ @cli_util.wrap_exceptions def enable_external_non_container_database_management_feature_external_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, feature_details_connector_details, if_match): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -9052,7 +9051,7 @@ def enable_external_non_container_database_management_feature_external_database_ @cli_util.wrap_exceptions def enable_external_non_container_database_management_feature_external_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_non_container_database_id, feature_details_connector_details, feature_details_license_model, if_match, feature_details_can_enable_all_current_pdbs, feature_details_is_auto_enable_pluggable_database): - if isinstance(external_non_container_database_id, six.string_types) and len(external_non_container_database_id.strip()) == 0: + if isinstance(external_non_container_database_id, str) and len(external_non_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-non-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -9123,7 +9122,7 @@ def enable_external_non_container_database_management_feature_external_database_ @cli_util.wrap_exceptions def enable_external_pluggable_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, feature_details, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -9184,7 +9183,7 @@ def enable_external_pluggable_database_management_feature(ctx, from_json, wait_f @cli_util.wrap_exceptions def enable_external_pluggable_database_management_feature_external_pluggable_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, feature_details_connector_details, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -9248,7 +9247,7 @@ def enable_external_pluggable_database_management_feature_external_pluggable_dat @cli_util.wrap_exceptions def enable_external_pluggable_database_management_feature_external_pluggable_database_lifecycle_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, feature_details_connector_details, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -9312,7 +9311,7 @@ def enable_external_pluggable_database_management_feature_external_pluggable_dat @cli_util.wrap_exceptions def enable_external_pluggable_database_management_feature_external_pluggable_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_pluggable_database_id, feature_details_connector_details, if_match): - if isinstance(external_pluggable_database_id, six.string_types) and len(external_pluggable_database_id.strip()) == 0: + if isinstance(external_pluggable_database_id, str) and len(external_pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --external-pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -9377,7 +9376,7 @@ def enable_external_pluggable_database_management_feature_external_pluggable_dat @cli_util.wrap_exceptions def enable_high_frequency_automatic_spm_evolve_advisor_task(ctx, from_json, managed_database_id, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -9417,7 +9416,7 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task(ctx, from_json, mana @cli_util.wrap_exceptions def enable_high_frequency_automatic_spm_evolve_advisor_task_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -9460,7 +9459,7 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task_managed_database_pas @cli_util.wrap_exceptions def enable_high_frequency_automatic_spm_evolve_advisor_task_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -9503,7 +9502,7 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task_managed_database_sec @cli_util.wrap_exceptions def enable_high_frequency_automatic_spm_evolve_advisor_task_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -9548,7 +9547,7 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task_database_secret_cred @cli_util.wrap_exceptions def enable_high_frequency_automatic_spm_evolve_advisor_task_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -9589,7 +9588,7 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task_database_named_crede @cli_util.wrap_exceptions def enable_high_frequency_automatic_spm_evolve_advisor_task_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -9633,7 +9632,7 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task_database_password_cr @cli_util.wrap_exceptions def enable_pluggable_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature_details, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -9698,7 +9697,7 @@ def enable_pluggable_database_management_feature(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def enable_pluggable_database_management_feature_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature_details_database_connection_details, feature_details_connector_details, feature_details_management_type, if_match, feature_details_is_auto_enable_pluggable_database, feature_details_can_enable_all_current_pdbs): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -9771,7 +9770,7 @@ def enable_pluggable_database_management_feature_database_diagnostics_and_manage @cli_util.wrap_exceptions def enable_pluggable_database_management_feature_database_lifecycle_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature_details_database_connection_details, feature_details_connector_details, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -9839,7 +9838,7 @@ def enable_pluggable_database_management_feature_database_lifecycle_management_f @cli_util.wrap_exceptions def enable_pluggable_database_management_feature_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature_details_database_connection_details, feature_details_connector_details, if_match, feature_details_can_enable_all_current_pdbs, feature_details_is_auto_enable_pluggable_database): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -9909,7 +9908,7 @@ def enable_pluggable_database_management_feature_database_sql_watch_feature_deta @cli_util.wrap_exceptions def enable_sql_plan_baselines_usage(ctx, from_json, managed_database_id, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -9947,7 +9946,7 @@ def enable_sql_plan_baselines_usage(ctx, from_json, managed_database_id, credent @cli_util.wrap_exceptions def enable_sql_plan_baselines_usage_managed_database_password_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -9988,7 +9987,7 @@ def enable_sql_plan_baselines_usage_managed_database_password_credential(ctx, fr @cli_util.wrap_exceptions def enable_sql_plan_baselines_usage_managed_database_secret_credential(ctx, from_json, managed_database_id, credentials_username, credentials_role, credentials_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -10029,7 +10028,7 @@ def enable_sql_plan_baselines_usage_managed_database_secret_credential(ctx, from @cli_util.wrap_exceptions def enable_sql_plan_baselines_usage_database_secret_credential_details(ctx, from_json, managed_database_id, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -10072,7 +10071,7 @@ def enable_sql_plan_baselines_usage_database_secret_credential_details(ctx, from @cli_util.wrap_exceptions def enable_sql_plan_baselines_usage_database_named_credential_details(ctx, from_json, managed_database_id, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -10111,7 +10110,7 @@ def enable_sql_plan_baselines_usage_database_named_credential_details(ctx, from_ @cli_util.wrap_exceptions def enable_sql_plan_baselines_usage_database_password_credential_details(ctx, from_json, managed_database_id, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -10151,7 +10150,7 @@ def enable_sql_plan_baselines_usage_database_password_credential_details(ctx, fr @cli_util.wrap_exceptions def generate_awr_snapshot(ctx, from_json, managed_database_id, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -10185,10 +10184,10 @@ def generate_awr_snapshot(ctx, from_json, managed_database_id, opc_named_credent @cli_util.wrap_exceptions def get_awr_db_report(ctx, from_json, managed_database_id, awr_db_id, inst_nums, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, report_type, container_id, report_format, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -10239,10 +10238,10 @@ def get_awr_db_report(ctx, from_json, managed_database_id, awr_db_id, inst_nums, @cli_util.wrap_exceptions def get_awr_db_sql_report(ctx, from_json, managed_database_id, awr_db_id, sql_id, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, report_format, container_id, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -10282,7 +10281,7 @@ def get_awr_db_sql_report(ctx, from_json, managed_database_id, awr_db_id, sql_id @cli_util.wrap_exceptions def get_cloud_asm(ctx, from_json, cloud_asm_id): - if isinstance(cloud_asm_id, six.string_types) and len(cloud_asm_id.strip()) == 0: + if isinstance(cloud_asm_id, str) and len(cloud_asm_id.strip()) == 0: raise click.UsageError('Parameter --cloud-asm-id cannot be whitespace or empty string') kwargs = {} @@ -10305,7 +10304,7 @@ def get_cloud_asm(ctx, from_json, cloud_asm_id): @cli_util.wrap_exceptions def get_cloud_asm_configuration(ctx, from_json, cloud_asm_id, opc_named_credential_id): - if isinstance(cloud_asm_id, six.string_types) and len(cloud_asm_id.strip()) == 0: + if isinstance(cloud_asm_id, str) and len(cloud_asm_id.strip()) == 0: raise click.UsageError('Parameter --cloud-asm-id cannot be whitespace or empty string') kwargs = {} @@ -10329,7 +10328,7 @@ def get_cloud_asm_configuration(ctx, from_json, cloud_asm_id, opc_named_credenti @cli_util.wrap_exceptions def get_cloud_asm_instance(ctx, from_json, cloud_asm_instance_id): - if isinstance(cloud_asm_instance_id, six.string_types) and len(cloud_asm_instance_id.strip()) == 0: + if isinstance(cloud_asm_instance_id, str) and len(cloud_asm_instance_id.strip()) == 0: raise click.UsageError('Parameter --cloud-asm-instance-id cannot be whitespace or empty string') kwargs = {} @@ -10351,7 +10350,7 @@ def get_cloud_asm_instance(ctx, from_json, cloud_asm_instance_id): @cli_util.wrap_exceptions def get_cloud_cluster(ctx, from_json, cloud_cluster_id): - if isinstance(cloud_cluster_id, six.string_types) and len(cloud_cluster_id.strip()) == 0: + if isinstance(cloud_cluster_id, str) and len(cloud_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -10373,7 +10372,7 @@ def get_cloud_cluster(ctx, from_json, cloud_cluster_id): @cli_util.wrap_exceptions def get_cloud_cluster_instance(ctx, from_json, cloud_cluster_instance_id): - if isinstance(cloud_cluster_instance_id, six.string_types) and len(cloud_cluster_instance_id.strip()) == 0: + if isinstance(cloud_cluster_instance_id, str) and len(cloud_cluster_instance_id.strip()) == 0: raise click.UsageError('Parameter --cloud-cluster-instance-id cannot be whitespace or empty string') kwargs = {} @@ -10395,7 +10394,7 @@ def get_cloud_cluster_instance(ctx, from_json, cloud_cluster_instance_id): @cli_util.wrap_exceptions def get_cloud_db_home(ctx, from_json, cloud_db_home_id): - if isinstance(cloud_db_home_id, six.string_types) and len(cloud_db_home_id.strip()) == 0: + if isinstance(cloud_db_home_id, str) and len(cloud_db_home_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-home-id cannot be whitespace or empty string') kwargs = {} @@ -10417,7 +10416,7 @@ def get_cloud_db_home(ctx, from_json, cloud_db_home_id): @cli_util.wrap_exceptions def get_cloud_db_node(ctx, from_json, cloud_db_node_id): - if isinstance(cloud_db_node_id, six.string_types) and len(cloud_db_node_id.strip()) == 0: + if isinstance(cloud_db_node_id, str) and len(cloud_db_node_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-node-id cannot be whitespace or empty string') kwargs = {} @@ -10439,7 +10438,7 @@ def get_cloud_db_node(ctx, from_json, cloud_db_node_id): @cli_util.wrap_exceptions def get_cloud_db_system(ctx, from_json, cloud_db_system_id): - if isinstance(cloud_db_system_id, six.string_types) and len(cloud_db_system_id.strip()) == 0: + if isinstance(cloud_db_system_id, str) and len(cloud_db_system_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -10461,7 +10460,7 @@ def get_cloud_db_system(ctx, from_json, cloud_db_system_id): @cli_util.wrap_exceptions def get_cloud_db_system_connector(ctx, from_json, cloud_db_system_connector_id): - if isinstance(cloud_db_system_connector_id, six.string_types) and len(cloud_db_system_connector_id.strip()) == 0: + if isinstance(cloud_db_system_connector_id, str) and len(cloud_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-connector-id cannot be whitespace or empty string') kwargs = {} @@ -10483,7 +10482,7 @@ def get_cloud_db_system_connector(ctx, from_json, cloud_db_system_connector_id): @cli_util.wrap_exceptions def get_cloud_db_system_discovery(ctx, from_json, cloud_db_system_discovery_id): - if isinstance(cloud_db_system_discovery_id, six.string_types) and len(cloud_db_system_discovery_id.strip()) == 0: + if isinstance(cloud_db_system_discovery_id, str) and len(cloud_db_system_discovery_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -10505,7 +10504,7 @@ def get_cloud_db_system_discovery(ctx, from_json, cloud_db_system_discovery_id): @cli_util.wrap_exceptions def get_cloud_listener(ctx, from_json, cloud_listener_id): - if isinstance(cloud_listener_id, six.string_types) and len(cloud_listener_id.strip()) == 0: + if isinstance(cloud_listener_id, str) and len(cloud_listener_id.strip()) == 0: raise click.UsageError('Parameter --cloud-listener-id cannot be whitespace or empty string') kwargs = {} @@ -10529,7 +10528,7 @@ def get_cloud_listener(ctx, from_json, cloud_listener_id): @cli_util.wrap_exceptions def get_cluster_cache_metric(ctx, from_json, managed_database_id, start_time, end_time): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -10779,7 +10778,7 @@ def get_database_fleet_health_metrics(ctx, from_json, compare_baseline_time, com @cli_util.wrap_exceptions def get_database_ha_backup_details(ctx, from_json, managed_database_id, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -10830,7 +10829,7 @@ def get_database_home_metrics(ctx, from_json, managed_database_id, start_time, e @cli_util.wrap_exceptions def get_dataguard_performance_metrics(ctx, from_json, managed_database_id, start_time, end_time, peer_database_compartment_id, filter_by_metric_names): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -10858,7 +10857,7 @@ def get_dataguard_performance_metrics(ctx, from_json, managed_database_id, start @cli_util.wrap_exceptions def get_db_management_private_endpoint(ctx, from_json, db_management_private_endpoint_id): - if isinstance(db_management_private_endpoint_id, six.string_types) and len(db_management_private_endpoint_id.strip()) == 0: + if isinstance(db_management_private_endpoint_id, str) and len(db_management_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --db-management-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -10880,7 +10879,7 @@ def get_db_management_private_endpoint(ctx, from_json, db_management_private_end @cli_util.wrap_exceptions def get_external_asm(ctx, from_json, external_asm_id): - if isinstance(external_asm_id, six.string_types) and len(external_asm_id.strip()) == 0: + if isinstance(external_asm_id, str) and len(external_asm_id.strip()) == 0: raise click.UsageError('Parameter --external-asm-id cannot be whitespace or empty string') kwargs = {} @@ -10903,7 +10902,7 @@ def get_external_asm(ctx, from_json, external_asm_id): @cli_util.wrap_exceptions def get_external_asm_configuration(ctx, from_json, external_asm_id, opc_named_credential_id): - if isinstance(external_asm_id, six.string_types) and len(external_asm_id.strip()) == 0: + if isinstance(external_asm_id, str) and len(external_asm_id.strip()) == 0: raise click.UsageError('Parameter --external-asm-id cannot be whitespace or empty string') kwargs = {} @@ -10927,7 +10926,7 @@ def get_external_asm_configuration(ctx, from_json, external_asm_id, opc_named_cr @cli_util.wrap_exceptions def get_external_asm_instance(ctx, from_json, external_asm_instance_id): - if isinstance(external_asm_instance_id, six.string_types) and len(external_asm_instance_id.strip()) == 0: + if isinstance(external_asm_instance_id, str) and len(external_asm_instance_id.strip()) == 0: raise click.UsageError('Parameter --external-asm-instance-id cannot be whitespace or empty string') kwargs = {} @@ -10949,7 +10948,7 @@ def get_external_asm_instance(ctx, from_json, external_asm_instance_id): @cli_util.wrap_exceptions def get_external_cluster(ctx, from_json, external_cluster_id): - if isinstance(external_cluster_id, six.string_types) and len(external_cluster_id.strip()) == 0: + if isinstance(external_cluster_id, str) and len(external_cluster_id.strip()) == 0: raise click.UsageError('Parameter --external-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -10971,7 +10970,7 @@ def get_external_cluster(ctx, from_json, external_cluster_id): @cli_util.wrap_exceptions def get_external_cluster_instance(ctx, from_json, external_cluster_instance_id): - if isinstance(external_cluster_instance_id, six.string_types) and len(external_cluster_instance_id.strip()) == 0: + if isinstance(external_cluster_instance_id, str) and len(external_cluster_instance_id.strip()) == 0: raise click.UsageError('Parameter --external-cluster-instance-id cannot be whitespace or empty string') kwargs = {} @@ -10993,7 +10992,7 @@ def get_external_cluster_instance(ctx, from_json, external_cluster_instance_id): @cli_util.wrap_exceptions def get_external_db_home(ctx, from_json, external_db_home_id): - if isinstance(external_db_home_id, six.string_types) and len(external_db_home_id.strip()) == 0: + if isinstance(external_db_home_id, str) and len(external_db_home_id.strip()) == 0: raise click.UsageError('Parameter --external-db-home-id cannot be whitespace or empty string') kwargs = {} @@ -11015,7 +11014,7 @@ def get_external_db_home(ctx, from_json, external_db_home_id): @cli_util.wrap_exceptions def get_external_db_node(ctx, from_json, external_db_node_id): - if isinstance(external_db_node_id, six.string_types) and len(external_db_node_id.strip()) == 0: + if isinstance(external_db_node_id, str) and len(external_db_node_id.strip()) == 0: raise click.UsageError('Parameter --external-db-node-id cannot be whitespace or empty string') kwargs = {} @@ -11037,7 +11036,7 @@ def get_external_db_node(ctx, from_json, external_db_node_id): @cli_util.wrap_exceptions def get_external_db_system(ctx, from_json, external_db_system_id): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -11059,7 +11058,7 @@ def get_external_db_system(ctx, from_json, external_db_system_id): @cli_util.wrap_exceptions def get_external_db_system_connector(ctx, from_json, external_db_system_connector_id): - if isinstance(external_db_system_connector_id, six.string_types) and len(external_db_system_connector_id.strip()) == 0: + if isinstance(external_db_system_connector_id, str) and len(external_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-connector-id cannot be whitespace or empty string') kwargs = {} @@ -11081,7 +11080,7 @@ def get_external_db_system_connector(ctx, from_json, external_db_system_connecto @cli_util.wrap_exceptions def get_external_db_system_discovery(ctx, from_json, external_db_system_discovery_id): - if isinstance(external_db_system_discovery_id, six.string_types) and len(external_db_system_discovery_id.strip()) == 0: + if isinstance(external_db_system_discovery_id, str) and len(external_db_system_discovery_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -11103,7 +11102,7 @@ def get_external_db_system_discovery(ctx, from_json, external_db_system_discover @cli_util.wrap_exceptions def get_external_exadata_infrastructure(ctx, from_json, external_exadata_infrastructure_id): - if isinstance(external_exadata_infrastructure_id, six.string_types) and len(external_exadata_infrastructure_id.strip()) == 0: + if isinstance(external_exadata_infrastructure_id, str) and len(external_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-infrastructure-id cannot be whitespace or empty string') kwargs = {} @@ -11125,7 +11124,7 @@ def get_external_exadata_infrastructure(ctx, from_json, external_exadata_infrast @cli_util.wrap_exceptions def get_external_exadata_storage_connector(ctx, from_json, external_exadata_storage_connector_id): - if isinstance(external_exadata_storage_connector_id, six.string_types) and len(external_exadata_storage_connector_id.strip()) == 0: + if isinstance(external_exadata_storage_connector_id, str) and len(external_exadata_storage_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-connector-id cannot be whitespace or empty string') kwargs = {} @@ -11147,7 +11146,7 @@ def get_external_exadata_storage_connector(ctx, from_json, external_exadata_stor @cli_util.wrap_exceptions def get_external_exadata_storage_grid(ctx, from_json, external_exadata_storage_grid_id): - if isinstance(external_exadata_storage_grid_id, six.string_types) and len(external_exadata_storage_grid_id.strip()) == 0: + if isinstance(external_exadata_storage_grid_id, str) and len(external_exadata_storage_grid_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-grid-id cannot be whitespace or empty string') kwargs = {} @@ -11169,7 +11168,7 @@ def get_external_exadata_storage_grid(ctx, from_json, external_exadata_storage_g @cli_util.wrap_exceptions def get_external_exadata_storage_server(ctx, from_json, external_exadata_storage_server_id): - if isinstance(external_exadata_storage_server_id, six.string_types) and len(external_exadata_storage_server_id.strip()) == 0: + if isinstance(external_exadata_storage_server_id, str) and len(external_exadata_storage_server_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-server-id cannot be whitespace or empty string') kwargs = {} @@ -11191,7 +11190,7 @@ def get_external_exadata_storage_server(ctx, from_json, external_exadata_storage @cli_util.wrap_exceptions def get_external_listener(ctx, from_json, external_listener_id): - if isinstance(external_listener_id, six.string_types) and len(external_listener_id.strip()) == 0: + if isinstance(external_listener_id, str) and len(external_listener_id.strip()) == 0: raise click.UsageError('Parameter --external-listener-id cannot be whitespace or empty string') kwargs = {} @@ -11213,7 +11212,7 @@ def get_external_listener(ctx, from_json, external_listener_id): @cli_util.wrap_exceptions def get_external_my_sql_database(ctx, from_json, external_my_sql_database_id): - if isinstance(external_my_sql_database_id, six.string_types) and len(external_my_sql_database_id.strip()) == 0: + if isinstance(external_my_sql_database_id, str) and len(external_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -11235,7 +11234,7 @@ def get_external_my_sql_database(ctx, from_json, external_my_sql_database_id): @cli_util.wrap_exceptions def get_external_my_sql_database_connector(ctx, from_json, external_my_sql_database_connector_id): - if isinstance(external_my_sql_database_connector_id, six.string_types) and len(external_my_sql_database_connector_id.strip()) == 0: + if isinstance(external_my_sql_database_connector_id, str) and len(external_my_sql_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-connector-id cannot be whitespace or empty string') kwargs = {} @@ -11257,7 +11256,7 @@ def get_external_my_sql_database_connector(ctx, from_json, external_my_sql_datab @cli_util.wrap_exceptions def get_iorm_plan(ctx, from_json, external_exadata_storage_server_id): - if isinstance(external_exadata_storage_server_id, six.string_types) and len(external_exadata_storage_server_id.strip()) == 0: + if isinstance(external_exadata_storage_server_id, str) and len(external_exadata_storage_server_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-server-id cannot be whitespace or empty string') kwargs = {} @@ -11279,7 +11278,7 @@ def get_iorm_plan(ctx, from_json, external_exadata_storage_server_id): @cli_util.wrap_exceptions def get_job(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -11301,7 +11300,7 @@ def get_job(ctx, from_json, job_id): @cli_util.wrap_exceptions def get_job_execution(ctx, from_json, job_execution_id): - if isinstance(job_execution_id, six.string_types) and len(job_execution_id.strip()) == 0: + if isinstance(job_execution_id, str) and len(job_execution_id.strip()) == 0: raise click.UsageError('Parameter --job-execution-id cannot be whitespace or empty string') kwargs = {} @@ -11323,7 +11322,7 @@ def get_job_execution(ctx, from_json, job_execution_id): @cli_util.wrap_exceptions def get_job_run(ctx, from_json, job_run_id): - if isinstance(job_run_id, six.string_types) and len(job_run_id.strip()) == 0: + if isinstance(job_run_id, str) and len(job_run_id.strip()) == 0: raise click.UsageError('Parameter --job-run-id cannot be whitespace or empty string') kwargs = {} @@ -11345,7 +11344,7 @@ def get_job_run(ctx, from_json, job_run_id): @cli_util.wrap_exceptions def get_managed_database(ctx, from_json, managed_database_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -11367,7 +11366,7 @@ def get_managed_database(ctx, from_json, managed_database_id): @cli_util.wrap_exceptions def get_managed_database_group(ctx, from_json, managed_database_group_id): - if isinstance(managed_database_group_id, six.string_types) and len(managed_database_group_id.strip()) == 0: + if isinstance(managed_database_group_id, str) and len(managed_database_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -11389,7 +11388,7 @@ def get_managed_database_group(ctx, from_json, managed_database_group_id): @cli_util.wrap_exceptions def get_named_credential(ctx, from_json, named_credential_id): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') kwargs = {} @@ -11411,7 +11410,7 @@ def get_named_credential(ctx, from_json, named_credential_id): @cli_util.wrap_exceptions def get_open_alert_history(ctx, from_json, external_exadata_storage_server_id): - if isinstance(external_exadata_storage_server_id, six.string_types) and len(external_exadata_storage_server_id.strip()) == 0: + if isinstance(external_exadata_storage_server_id, str) and len(external_exadata_storage_server_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-server-id cannot be whitespace or empty string') kwargs = {} @@ -11436,10 +11435,10 @@ def get_open_alert_history(ctx, from_json, external_exadata_storage_server_id): @cli_util.wrap_exceptions def get_optimizer_statistics_advisor_execution(ctx, from_json, managed_database_id, execution_name, task_name, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(execution_name, six.string_types) and len(execution_name.strip()) == 0: + if isinstance(execution_name, str) and len(execution_name.strip()) == 0: raise click.UsageError('Parameter --execution-name cannot be whitespace or empty string') kwargs = {} @@ -11468,10 +11467,10 @@ def get_optimizer_statistics_advisor_execution(ctx, from_json, managed_database_ @cli_util.wrap_exceptions def get_optimizer_statistics_advisor_execution_script(ctx, from_json, managed_database_id, execution_name, task_name, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(execution_name, six.string_types) and len(execution_name.strip()) == 0: + if isinstance(execution_name, str) and len(execution_name.strip()) == 0: raise click.UsageError('Parameter --execution-name cannot be whitespace or empty string') kwargs = {} @@ -11499,10 +11498,10 @@ def get_optimizer_statistics_advisor_execution_script(ctx, from_json, managed_da @cli_util.wrap_exceptions def get_optimizer_statistics_collection_operation(ctx, from_json, managed_database_id, optimizer_statistics_collection_operation_id, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(optimizer_statistics_collection_operation_id, six.string_types) and len(optimizer_statistics_collection_operation_id.strip()) == 0: + if isinstance(optimizer_statistics_collection_operation_id, str) and len(optimizer_statistics_collection_operation_id.strip()) == 0: raise click.UsageError('Parameter --optimizer-statistics-collection-operation-id cannot be whitespace or empty string') kwargs = {} @@ -11532,7 +11531,7 @@ def get_optimizer_statistics_collection_operation(ctx, from_json, managed_databa @cli_util.wrap_exceptions def get_pdb_metrics(ctx, from_json, managed_database_id, start_time, end_time, compartment_id, compare_type, filter_by_metric_names): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -11567,7 +11566,7 @@ def get_pdb_metrics(ctx, from_json, managed_database_id, start_time, end_time, c @cli_util.wrap_exceptions def get_peer_database_metrics(ctx, from_json, managed_database_id, start_time, end_time, peer_database_compartment_id, compare_type, filter_by_metric_names): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -11598,10 +11597,10 @@ def get_peer_database_metrics(ctx, from_json, managed_database_id, start_time, e @cli_util.wrap_exceptions def get_preferred_credential(ctx, from_json, managed_database_id, credential_name): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(credential_name, six.string_types) and len(credential_name.strip()) == 0: + if isinstance(credential_name, str) and len(credential_name.strip()) == 0: raise click.UsageError('Parameter --credential-name cannot be whitespace or empty string') kwargs = {} @@ -11626,10 +11625,10 @@ def get_preferred_credential(ctx, from_json, managed_database_id, credential_nam @cli_util.wrap_exceptions def get_sql_plan_baseline(ctx, from_json, managed_database_id, plan_name, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(plan_name, six.string_types) and len(plan_name.strip()) == 0: + if isinstance(plan_name, str) and len(plan_name.strip()) == 0: raise click.UsageError('Parameter --plan-name cannot be whitespace or empty string') kwargs = {} @@ -11655,7 +11654,7 @@ def get_sql_plan_baseline(ctx, from_json, managed_database_id, plan_name, opc_na @cli_util.wrap_exceptions def get_sql_plan_baseline_configuration(ctx, from_json, managed_database_id, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -11681,10 +11680,10 @@ def get_sql_plan_baseline_configuration(ctx, from_json, managed_database_id, opc @cli_util.wrap_exceptions def get_tablespace(ctx, from_json, managed_database_id, tablespace_name, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -11709,7 +11708,7 @@ def get_tablespace(ctx, from_json, managed_database_id, tablespace_name, opc_nam @cli_util.wrap_exceptions def get_top_sql_cpu_activity(ctx, from_json, external_exadata_storage_server_id): - if isinstance(external_exadata_storage_server_id, six.string_types) and len(external_exadata_storage_server_id.strip()) == 0: + if isinstance(external_exadata_storage_server_id, str) and len(external_exadata_storage_server_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-server-id cannot be whitespace or empty string') kwargs = {} @@ -11733,10 +11732,10 @@ def get_top_sql_cpu_activity(ctx, from_json, external_exadata_storage_server_id) @cli_util.wrap_exceptions def get_user(ctx, from_json, managed_database_id, user_name, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(user_name, six.string_types) and len(user_name.strip()) == 0: + if isinstance(user_name, str) and len(user_name.strip()) == 0: raise click.UsageError('Parameter --user-name cannot be whitespace or empty string') kwargs = {} @@ -11761,7 +11760,7 @@ def get_user(ctx, from_json, managed_database_id, user_name, opc_named_credentia @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -11786,10 +11785,10 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def implement_optimizer_statistics_advisor_recommendations(ctx, from_json, managed_database_id, execution_name, task_name, job_details): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(execution_name, six.string_types) and len(execution_name.strip()) == 0: + if isinstance(execution_name, str) and len(execution_name.strip()) == 0: raise click.UsageError('Parameter --execution-name cannot be whitespace or empty string') kwargs = {} @@ -11828,7 +11827,7 @@ def list_asm_properties(ctx, from_json, all_pages, page_size, managed_database_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -11888,7 +11887,7 @@ def list_associated_databases(ctx, from_json, all_pages, page_size, db_managemen if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(db_management_private_endpoint_id, six.string_types) and len(db_management_private_endpoint_id.strip()) == 0: + if isinstance(db_management_private_endpoint_id, str) and len(db_management_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --db-management-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -11956,10 +11955,10 @@ def list_awr_db_snapshots(ctx, from_json, all_pages, page_size, managed_database if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -12037,7 +12036,7 @@ def list_awr_dbs(ctx, from_json, all_pages, page_size, managed_database_id, name if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -12103,7 +12102,7 @@ def list_cloud_asm_disk_groups(ctx, from_json, all_pages, page_size, cloud_asm_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cloud_asm_id, six.string_types) and len(cloud_asm_id.strip()) == 0: + if isinstance(cloud_asm_id, str) and len(cloud_asm_id.strip()) == 0: raise click.UsageError('Parameter --cloud-asm-id cannot be whitespace or empty string') kwargs = {} @@ -12222,7 +12221,7 @@ def list_cloud_asm_users(ctx, from_json, all_pages, page_size, cloud_asm_id, pag if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cloud_asm_id, six.string_types) and len(cloud_asm_id.strip()) == 0: + if isinstance(cloud_asm_id, str) and len(cloud_asm_id.strip()) == 0: raise click.UsageError('Parameter --cloud-asm-id cannot be whitespace or empty string') kwargs = {} @@ -12820,7 +12819,7 @@ def list_cloud_listener_services(ctx, from_json, all_pages, page_size, cloud_lis if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(cloud_listener_id, six.string_types) and len(cloud_listener_id.strip()) == 0: + if isinstance(cloud_listener_id, str) and len(cloud_listener_id.strip()) == 0: raise click.UsageError('Parameter --cloud-listener-id cannot be whitespace or empty string') kwargs = {} @@ -12944,10 +12943,10 @@ def list_consumer_group_privileges(ctx, from_json, all_pages, page_size, managed if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(user_name, six.string_types) and len(user_name.strip()) == 0: + if isinstance(user_name, str) and len(user_name.strip()) == 0: raise click.UsageError('Parameter --user-name cannot be whitespace or empty string') kwargs = {} @@ -13013,7 +13012,7 @@ def list_cursor_cache_statements(ctx, from_json, all_pages, page_size, managed_d if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -13077,10 +13076,10 @@ def list_data_access_containers(ctx, from_json, all_pages, page_size, managed_da if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(user_name, six.string_types) and len(user_name.strip()) == 0: + if isinstance(user_name, str) and len(user_name.strip()) == 0: raise click.UsageError('Parameter --user-name cannot be whitespace or empty string') kwargs = {} @@ -13142,7 +13141,7 @@ def list_data_access_containers(ctx, from_json, all_pages, page_size, managed_da @cli_util.wrap_exceptions def list_database_parameters(ctx, from_json, all_pages, managed_database_id, source, name, is_allowed_values_included, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -13255,7 +13254,7 @@ def list_external_asm_disk_groups(ctx, from_json, all_pages, page_size, external if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(external_asm_id, six.string_types) and len(external_asm_id.strip()) == 0: + if isinstance(external_asm_id, str) and len(external_asm_id.strip()) == 0: raise click.UsageError('Parameter --external-asm-id cannot be whitespace or empty string') kwargs = {} @@ -13374,7 +13373,7 @@ def list_external_asm_users(ctx, from_json, all_pages, page_size, external_asm_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(external_asm_id, six.string_types) and len(external_asm_id.strip()) == 0: + if isinstance(external_asm_id, str) and len(external_asm_id.strip()) == 0: raise click.UsageError('Parameter --external-asm-id cannot be whitespace or empty string') kwargs = {} @@ -14144,7 +14143,7 @@ def list_external_listener_services(ctx, from_json, all_pages, page_size, extern if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(external_listener_id, six.string_types) and len(external_listener_id.strip()) == 0: + if isinstance(external_listener_id, str) and len(external_listener_id.strip()) == 0: raise click.UsageError('Parameter --external-listener-id cannot be whitespace or empty string') kwargs = {} @@ -14799,10 +14798,10 @@ def list_object_privileges(ctx, from_json, all_pages, page_size, managed_databas if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(user_name, six.string_types) and len(user_name.strip()) == 0: + if isinstance(user_name, str) and len(user_name.strip()) == 0: raise click.UsageError('Parameter --user-name cannot be whitespace or empty string') kwargs = {} @@ -14861,7 +14860,7 @@ def list_object_privileges(ctx, from_json, all_pages, page_size, managed_databas @cli_util.wrap_exceptions def list_optimizer_statistics_advisor_executions(ctx, from_json, all_pages, managed_database_id, start_time_greater_than_or_equal_to, end_time_less_than_or_equal_to, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -14901,7 +14900,7 @@ def list_optimizer_statistics_collection_aggregations(ctx, from_json, all_pages, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -14970,7 +14969,7 @@ def list_optimizer_statistics_collection_operations(ctx, from_json, all_pages, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15029,7 +15028,7 @@ def list_optimizer_statistics_collection_operations(ctx, from_json, all_pages, p @cli_util.wrap_exceptions def list_preferred_credentials(ctx, from_json, all_pages, managed_database_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15063,10 +15062,10 @@ def list_proxied_for_users(ctx, from_json, all_pages, page_size, managed_databas if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(user_name, six.string_types) and len(user_name.strip()) == 0: + if isinstance(user_name, str) and len(user_name.strip()) == 0: raise click.UsageError('Parameter --user-name cannot be whitespace or empty string') kwargs = {} @@ -15133,10 +15132,10 @@ def list_proxy_users(ctx, from_json, all_pages, page_size, managed_database_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(user_name, six.string_types) and len(user_name.strip()) == 0: + if isinstance(user_name, str) and len(user_name.strip()) == 0: raise click.UsageError('Parameter --user-name cannot be whitespace or empty string') kwargs = {} @@ -15203,10 +15202,10 @@ def list_roles(ctx, from_json, all_pages, page_size, managed_database_id, user_n if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(user_name, six.string_types) and len(user_name.strip()) == 0: + if isinstance(user_name, str) and len(user_name.strip()) == 0: raise click.UsageError('Parameter --user-name cannot be whitespace or empty string') kwargs = {} @@ -15272,7 +15271,7 @@ def list_sql_plan_baseline_jobs(ctx, from_json, all_pages, page_size, managed_da if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15347,7 +15346,7 @@ def list_sql_plan_baselines(ctx, from_json, all_pages, page_size, managed_databa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15435,10 +15434,10 @@ def list_system_privileges(ctx, from_json, all_pages, page_size, managed_databas if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(user_name, six.string_types) and len(user_name.strip()) == 0: + if isinstance(user_name, str) and len(user_name.strip()) == 0: raise click.UsageError('Parameter --user-name cannot be whitespace or empty string') kwargs = {} @@ -15495,7 +15494,7 @@ def list_system_privileges(ctx, from_json, all_pages, page_size, managed_databas @cli_util.wrap_exceptions def list_table_statistics(ctx, from_json, all_pages, managed_database_id, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15530,7 +15529,7 @@ def list_tablespaces(ctx, from_json, all_pages, page_size, managed_database_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15593,7 +15592,7 @@ def list_users(ctx, from_json, all_pages, page_size, managed_database_id, name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15654,7 +15653,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -15711,7 +15710,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -15831,7 +15830,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, res @cli_util.wrap_exceptions def load_sql_plan_baselines_from_awr(ctx, from_json, managed_database_id, job_name, begin_snapshot, end_snapshot, job_description, sql_text_filter, is_fixed, is_enabled, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15889,7 +15888,7 @@ def load_sql_plan_baselines_from_awr(ctx, from_json, managed_database_id, job_na @cli_util.wrap_exceptions def load_sql_plan_baselines_from_awr_managed_database_password_credential(ctx, from_json, managed_database_id, job_name, begin_snapshot, end_snapshot, credentials_username, credentials_role, credentials_password, job_description, sql_text_filter, is_fixed, is_enabled, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -15950,7 +15949,7 @@ def load_sql_plan_baselines_from_awr_managed_database_password_credential(ctx, f @cli_util.wrap_exceptions def load_sql_plan_baselines_from_awr_managed_database_secret_credential(ctx, from_json, managed_database_id, job_name, begin_snapshot, end_snapshot, credentials_username, credentials_role, credentials_password_secret_id, job_description, sql_text_filter, is_fixed, is_enabled, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16011,7 +16010,7 @@ def load_sql_plan_baselines_from_awr_managed_database_secret_credential(ctx, fro @cli_util.wrap_exceptions def load_sql_plan_baselines_from_awr_database_secret_credential_details(ctx, from_json, managed_database_id, job_name, begin_snapshot, end_snapshot, database_credential_password_secret_id, job_description, sql_text_filter, is_fixed, is_enabled, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16074,7 +16073,7 @@ def load_sql_plan_baselines_from_awr_database_secret_credential_details(ctx, fro @cli_util.wrap_exceptions def load_sql_plan_baselines_from_awr_database_named_credential_details(ctx, from_json, managed_database_id, job_name, begin_snapshot, end_snapshot, database_credential_named_credential_id, job_description, sql_text_filter, is_fixed, is_enabled, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16133,7 +16132,7 @@ def load_sql_plan_baselines_from_awr_database_named_credential_details(ctx, from @cli_util.wrap_exceptions def load_sql_plan_baselines_from_awr_database_password_credential_details(ctx, from_json, managed_database_id, job_name, begin_snapshot, end_snapshot, database_credential_password, job_description, sql_text_filter, is_fixed, is_enabled, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16201,7 +16200,7 @@ def load_sql_plan_baselines_from_awr_database_password_credential_details(ctx, f @cli_util.wrap_exceptions def load_sql_plan_baselines_from_cursor_cache(ctx, from_json, managed_database_id, job_name, job_description, sql_id, plan_hash, sql_text, sql_handle, filter_name, filter_value, is_fixed, is_enabled, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16277,7 +16276,7 @@ def load_sql_plan_baselines_from_cursor_cache(ctx, from_json, managed_database_i @cli_util.wrap_exceptions def load_sql_plan_baselines_from_cursor_cache_managed_database_password_credential(ctx, from_json, managed_database_id, job_name, credentials_username, credentials_role, credentials_password, job_description, sql_id, plan_hash, sql_text, sql_handle, filter_name, filter_value, is_fixed, is_enabled, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16356,7 +16355,7 @@ def load_sql_plan_baselines_from_cursor_cache_managed_database_password_credenti @cli_util.wrap_exceptions def load_sql_plan_baselines_from_cursor_cache_managed_database_secret_credential(ctx, from_json, managed_database_id, job_name, credentials_username, credentials_role, credentials_password_secret_id, job_description, sql_id, plan_hash, sql_text, sql_handle, filter_name, filter_value, is_fixed, is_enabled, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16435,7 +16434,7 @@ def load_sql_plan_baselines_from_cursor_cache_managed_database_secret_credential @cli_util.wrap_exceptions def load_sql_plan_baselines_from_cursor_cache_database_secret_credential_details(ctx, from_json, managed_database_id, job_name, database_credential_password_secret_id, job_description, sql_id, plan_hash, sql_text, sql_handle, filter_name, filter_value, is_fixed, is_enabled, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16516,7 +16515,7 @@ def load_sql_plan_baselines_from_cursor_cache_database_secret_credential_details @cli_util.wrap_exceptions def load_sql_plan_baselines_from_cursor_cache_database_named_credential_details(ctx, from_json, managed_database_id, job_name, database_credential_named_credential_id, job_description, sql_id, plan_hash, sql_text, sql_handle, filter_name, filter_value, is_fixed, is_enabled, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16593,7 +16592,7 @@ def load_sql_plan_baselines_from_cursor_cache_database_named_credential_details( @cli_util.wrap_exceptions def load_sql_plan_baselines_from_cursor_cache_database_password_credential_details(ctx, from_json, managed_database_id, job_name, database_credential_password, job_description, sql_id, plan_hash, sql_text, sql_handle, filter_name, filter_value, is_fixed, is_enabled, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -16665,7 +16664,7 @@ def load_sql_plan_baselines_from_cursor_cache_database_password_credential_detai @cli_util.wrap_exceptions def modify_autonomous_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, feature_details, if_match): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -16727,7 +16726,7 @@ def modify_autonomous_database_management_feature(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def modify_autonomous_database_management_feature_autonomous_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, feature_details_database_connection_details, if_match, feature_details_connector_details): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -16795,7 +16794,7 @@ def modify_autonomous_database_management_feature_autonomous_database_sql_watch_ @cli_util.wrap_exceptions def modify_autonomous_database_management_feature_autonomous_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, autonomous_database_id, feature_details_database_connection_details, if_match, feature_details_connector_details): - if isinstance(autonomous_database_id, six.string_types) and len(autonomous_database_id.strip()) == 0: + if isinstance(autonomous_database_id, str) and len(autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -16862,7 +16861,7 @@ def modify_autonomous_database_management_feature_autonomous_database_diagnostic @cli_util.wrap_exceptions def modify_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature_details, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -16927,7 +16926,7 @@ def modify_database_management_feature(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def modify_database_management_feature_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature_details_database_connection_details, feature_details_connector_details, feature_details_management_type, if_match, feature_details_is_auto_enable_pluggable_database, feature_details_can_enable_all_current_pdbs): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -17000,7 +16999,7 @@ def modify_database_management_feature_database_diagnostics_and_management_featu @cli_util.wrap_exceptions def modify_database_management_feature_database_lifecycle_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature_details_database_connection_details, feature_details_connector_details, if_match): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -17068,7 +17067,7 @@ def modify_database_management_feature_database_lifecycle_management_feature_det @cli_util.wrap_exceptions def modify_database_management_feature_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_id, feature_details_database_connection_details, feature_details_connector_details, if_match, feature_details_can_enable_all_current_pdbs, feature_details_is_auto_enable_pluggable_database): - if isinstance(database_id, six.string_types) and len(database_id.strip()) == 0: + if isinstance(database_id, str) and len(database_id.strip()) == 0: raise click.UsageError('Parameter --database-id cannot be whitespace or empty string') kwargs = {} @@ -17139,7 +17138,7 @@ def modify_database_management_feature_database_sql_watch_feature_details(ctx, f @cli_util.wrap_exceptions def modify_external_container_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature_details, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17201,7 +17200,7 @@ def modify_external_container_database_management_feature(ctx, from_json, wait_f @cli_util.wrap_exceptions def modify_external_container_database_management_feature_external_database_lifecycle_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature_details_connector_details, feature_details_license_model, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17266,7 +17265,7 @@ def modify_external_container_database_management_feature_external_database_life @cli_util.wrap_exceptions def modify_external_container_database_management_feature_external_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature_details_connector_details, if_match): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17333,7 +17332,7 @@ def modify_external_container_database_management_feature_external_database_sql_ @cli_util.wrap_exceptions def modify_external_container_database_management_feature_external_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_container_database_id, feature_details_connector_details, feature_details_license_model, if_match, feature_details_can_enable_all_current_pdbs, feature_details_is_auto_enable_pluggable_database): - if isinstance(external_container_database_id, six.string_types) and len(external_container_database_id.strip()) == 0: + if isinstance(external_container_database_id, str) and len(external_container_database_id.strip()) == 0: raise click.UsageError('Parameter --external-container-database-id cannot be whitespace or empty string') kwargs = {} @@ -17404,7 +17403,7 @@ def modify_external_container_database_management_feature_external_database_diag @cli_util.wrap_exceptions def modify_pluggable_database_management_feature(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature_details, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -17469,7 +17468,7 @@ def modify_pluggable_database_management_feature(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def modify_pluggable_database_management_feature_database_diagnostics_and_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature_details_database_connection_details, feature_details_connector_details, feature_details_management_type, if_match, feature_details_is_auto_enable_pluggable_database, feature_details_can_enable_all_current_pdbs): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -17542,7 +17541,7 @@ def modify_pluggable_database_management_feature_database_diagnostics_and_manage @cli_util.wrap_exceptions def modify_pluggable_database_management_feature_database_lifecycle_management_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature_details_database_connection_details, feature_details_connector_details, if_match): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -17610,7 +17609,7 @@ def modify_pluggable_database_management_feature_database_lifecycle_management_f @cli_util.wrap_exceptions def modify_pluggable_database_management_feature_database_sql_watch_feature_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pluggable_database_id, feature_details_database_connection_details, feature_details_connector_details, if_match, feature_details_can_enable_all_current_pdbs, feature_details_is_auto_enable_pluggable_database): - if isinstance(pluggable_database_id, six.string_types) and len(pluggable_database_id.strip()) == 0: + if isinstance(pluggable_database_id, str) and len(pluggable_database_id.strip()) == 0: raise click.UsageError('Parameter --pluggable-database-id cannot be whitespace or empty string') kwargs = {} @@ -17680,7 +17679,7 @@ def modify_pluggable_database_management_feature_database_sql_watch_feature_deta @cli_util.wrap_exceptions def patch_cloud_db_system_discovery(ctx, from_json, cloud_db_system_discovery_id, items, if_match): - if isinstance(cloud_db_system_discovery_id, six.string_types) and len(cloud_db_system_discovery_id.strip()) == 0: + if isinstance(cloud_db_system_discovery_id, str) and len(cloud_db_system_discovery_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -17715,7 +17714,7 @@ def patch_cloud_db_system_discovery(ctx, from_json, cloud_db_system_discovery_id @cli_util.wrap_exceptions def patch_external_db_system_discovery(ctx, from_json, external_db_system_discovery_id, items, if_match): - if isinstance(external_db_system_discovery_id, six.string_types) and len(external_db_system_discovery_id.strip()) == 0: + if isinstance(external_db_system_discovery_id, str) and len(external_db_system_discovery_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -17751,10 +17750,10 @@ def patch_external_db_system_discovery(ctx, from_json, external_db_system_discov @cli_util.wrap_exceptions def remove_data_file(ctx, from_json, managed_database_id, tablespace_name, file_type, data_file, credential_details, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -17796,10 +17795,10 @@ def remove_data_file(ctx, from_json, managed_database_id, tablespace_name, file_ @cli_util.wrap_exceptions def remove_data_file_tablespace_admin_password_credential_details(ctx, from_json, managed_database_id, tablespace_name, file_type, data_file, credential_details_username, credential_details_role, credential_details_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -17844,10 +17843,10 @@ def remove_data_file_tablespace_admin_password_credential_details(ctx, from_json @cli_util.wrap_exceptions def remove_data_file_tablespace_admin_secret_credential_details(ctx, from_json, managed_database_id, tablespace_name, file_type, data_file, credential_details_username, credential_details_role, credential_details_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -17892,10 +17891,10 @@ def remove_data_file_tablespace_admin_secret_credential_details(ctx, from_json, @cli_util.wrap_exceptions def remove_data_file_database_secret_credential_details(ctx, from_json, managed_database_id, tablespace_name, file_type, data_file, database_credential_password_secret_id, credential_details, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -17942,10 +17941,10 @@ def remove_data_file_database_secret_credential_details(ctx, from_json, managed_ @cli_util.wrap_exceptions def remove_data_file_database_named_credential_details(ctx, from_json, managed_database_id, tablespace_name, file_type, data_file, database_credential_named_credential_id, credential_details): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -17988,10 +17987,10 @@ def remove_data_file_database_named_credential_details(ctx, from_json, managed_d @cli_util.wrap_exceptions def remove_data_file_database_password_credential_details(ctx, from_json, managed_database_id, tablespace_name, file_type, data_file, database_credential_password, credential_details, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -18034,7 +18033,7 @@ def remove_data_file_database_password_credential_details(ctx, from_json, manage @cli_util.wrap_exceptions def remove_managed_database_from_managed_database_group(ctx, from_json, managed_database_group_id, managed_database_id): - if isinstance(managed_database_group_id, six.string_types) and len(managed_database_group_id.strip()) == 0: + if isinstance(managed_database_group_id, str) and len(managed_database_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-group-id cannot be whitespace or empty string') kwargs = {} @@ -18067,7 +18066,7 @@ def remove_managed_database_from_managed_database_group(ctx, from_json, managed_ @cli_util.wrap_exceptions def reset_database_parameters(ctx, from_json, managed_database_id, scope, parameters, credentials, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -18109,7 +18108,7 @@ def reset_database_parameters(ctx, from_json, managed_database_id, scope, parame @cli_util.wrap_exceptions def reset_database_parameters_database_secret_credential_details(ctx, from_json, managed_database_id, scope, parameters, database_credential_password_secret_id, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -18156,7 +18155,7 @@ def reset_database_parameters_database_secret_credential_details(ctx, from_json, @cli_util.wrap_exceptions def reset_database_parameters_database_named_credential_details(ctx, from_json, managed_database_id, scope, parameters, database_credential_named_credential_id, credentials): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -18199,7 +18198,7 @@ def reset_database_parameters_database_named_credential_details(ctx, from_json, @cli_util.wrap_exceptions def reset_database_parameters_database_password_credential_details(ctx, from_json, managed_database_id, scope, parameters, database_credential_password, credentials, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -18250,10 +18249,10 @@ def reset_database_parameters_database_password_credential_details(ctx, from_jso @cli_util.wrap_exceptions def resize_data_file(ctx, from_json, managed_database_id, tablespace_name, file_type, data_file, credential_details, database_credential, file_size, is_auto_extensible, auto_extend_next_size, auto_extend_max_size, is_max_size_unlimited): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') kwargs = {} @@ -18306,7 +18305,7 @@ def resize_data_file(ctx, from_json, managed_database_id, tablespace_name, file_ @cli_util.wrap_exceptions def run_historic_addm(ctx, from_json, managed_database_id, start_snapshot_id, end_snapshot_id, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -18349,10 +18348,10 @@ def run_historic_addm(ctx, from_json, managed_database_id, start_snapshot_id, en @cli_util.wrap_exceptions def summarize_awr_db_cpu_usages(ctx, from_json, managed_database_id, awr_db_id, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, session_type, container_id, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -18412,10 +18411,10 @@ def summarize_awr_db_cpu_usages(ctx, from_json, managed_database_id, awr_db_id, @cli_util.wrap_exceptions def summarize_awr_db_metrics(ctx, from_json, managed_database_id, awr_db_id, name, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, container_id, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -18474,10 +18473,10 @@ def summarize_awr_db_metrics(ctx, from_json, managed_database_id, awr_db_id, nam @cli_util.wrap_exceptions def summarize_awr_db_parameter_changes(ctx, from_json, managed_database_id, awr_db_id, name, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, container_id, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -18544,10 +18543,10 @@ def summarize_awr_db_parameter_changes(ctx, from_json, managed_database_id, awr_ @cli_util.wrap_exceptions def summarize_awr_db_parameters(ctx, from_json, managed_database_id, awr_db_id, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, container_id, name, name_contains, value_changed, value_default, value_modified, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -18610,7 +18609,7 @@ def summarize_awr_db_parameters(ctx, from_json, managed_database_id, awr_db_id, @cli_util.wrap_exceptions def summarize_awr_db_snapshot_ranges(ctx, from_json, managed_database_id, name, time_greater_than_or_equal_to, time_less_than_or_equal_to, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -18661,10 +18660,10 @@ def summarize_awr_db_snapshot_ranges(ctx, from_json, managed_database_id, name, @cli_util.wrap_exceptions def summarize_awr_db_sysstats(ctx, from_json, managed_database_id, awr_db_id, name, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, container_id, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -18722,10 +18721,10 @@ def summarize_awr_db_sysstats(ctx, from_json, managed_database_id, awr_db_id, na @cli_util.wrap_exceptions def summarize_awr_db_top_wait_events(ctx, from_json, managed_database_id, awr_db_id, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, session_type, container_id, top_n, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -18786,10 +18785,10 @@ def summarize_awr_db_top_wait_events(ctx, from_json, managed_database_id, awr_db @cli_util.wrap_exceptions def summarize_awr_db_wait_event_buckets(ctx, from_json, managed_database_id, awr_db_id, name, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, num_bucket, min_value, max_value, container_id, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -18855,10 +18854,10 @@ def summarize_awr_db_wait_event_buckets(ctx, from_json, managed_database_id, awr @cli_util.wrap_exceptions def summarize_awr_db_wait_events(ctx, from_json, managed_database_id, awr_db_id, inst_num, begin_sn_id_greater_than_or_equal_to, end_sn_id_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, name, session_type, container_id, page, limit, sort_by, sort_order, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(awr_db_id, six.string_types) and len(awr_db_id.strip()) == 0: + if isinstance(awr_db_id, str) and len(awr_db_id.strip()) == 0: raise click.UsageError('Parameter --awr-db-id cannot be whitespace or empty string') kwargs = {} @@ -18912,7 +18911,7 @@ def summarize_awr_db_wait_events(ctx, from_json, managed_database_id, awr_db_id, @cli_util.wrap_exceptions def summarize_cloud_asm_metrics(ctx, from_json, cloud_asm_id, start_time, end_time, page, limit, filter_by_metric_names): - if isinstance(cloud_asm_id, six.string_types) and len(cloud_asm_id.strip()) == 0: + if isinstance(cloud_asm_id, str) and len(cloud_asm_id.strip()) == 0: raise click.UsageError('Parameter --cloud-asm-id cannot be whitespace or empty string') kwargs = {} @@ -18947,7 +18946,7 @@ def summarize_cloud_asm_metrics(ctx, from_json, cloud_asm_id, start_time, end_ti @cli_util.wrap_exceptions def summarize_cloud_cluster_metrics(ctx, from_json, cloud_cluster_id, start_time, end_time, page, limit, filter_by_metric_names): - if isinstance(cloud_cluster_id, six.string_types) and len(cloud_cluster_id.strip()) == 0: + if isinstance(cloud_cluster_id, str) and len(cloud_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -18982,7 +18981,7 @@ def summarize_cloud_cluster_metrics(ctx, from_json, cloud_cluster_id, start_time @cli_util.wrap_exceptions def summarize_cloud_db_node_metrics(ctx, from_json, cloud_db_node_id, start_time, end_time, page, limit, filter_by_metric_names): - if isinstance(cloud_db_node_id, six.string_types) and len(cloud_db_node_id.strip()) == 0: + if isinstance(cloud_db_node_id, str) and len(cloud_db_node_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-node-id cannot be whitespace or empty string') kwargs = {} @@ -19017,7 +19016,7 @@ def summarize_cloud_db_node_metrics(ctx, from_json, cloud_db_node_id, start_time @cli_util.wrap_exceptions def summarize_cloud_db_system_availability_metrics(ctx, from_json, cloud_db_system_id, start_time, end_time, page, limit, filter_by_component_types): - if isinstance(cloud_db_system_id, six.string_types) and len(cloud_db_system_id.strip()) == 0: + if isinstance(cloud_db_system_id, str) and len(cloud_db_system_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -19052,7 +19051,7 @@ def summarize_cloud_db_system_availability_metrics(ctx, from_json, cloud_db_syst @cli_util.wrap_exceptions def summarize_cloud_listener_metrics(ctx, from_json, cloud_listener_id, start_time, end_time, page, limit, filter_by_metric_names): - if isinstance(cloud_listener_id, six.string_types) and len(cloud_listener_id.strip()) == 0: + if isinstance(cloud_listener_id, str) and len(cloud_listener_id.strip()) == 0: raise click.UsageError('Parameter --cloud-listener-id cannot be whitespace or empty string') kwargs = {} @@ -19087,7 +19086,7 @@ def summarize_cloud_listener_metrics(ctx, from_json, cloud_listener_id, start_ti @cli_util.wrap_exceptions def summarize_external_asm_metrics(ctx, from_json, external_asm_id, start_time, end_time, page, limit, filter_by_metric_names): - if isinstance(external_asm_id, six.string_types) and len(external_asm_id.strip()) == 0: + if isinstance(external_asm_id, str) and len(external_asm_id.strip()) == 0: raise click.UsageError('Parameter --external-asm-id cannot be whitespace or empty string') kwargs = {} @@ -19122,7 +19121,7 @@ def summarize_external_asm_metrics(ctx, from_json, external_asm_id, start_time, @cli_util.wrap_exceptions def summarize_external_cluster_metrics(ctx, from_json, external_cluster_id, start_time, end_time, page, limit, filter_by_metric_names): - if isinstance(external_cluster_id, six.string_types) and len(external_cluster_id.strip()) == 0: + if isinstance(external_cluster_id, str) and len(external_cluster_id.strip()) == 0: raise click.UsageError('Parameter --external-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -19157,7 +19156,7 @@ def summarize_external_cluster_metrics(ctx, from_json, external_cluster_id, star @cli_util.wrap_exceptions def summarize_external_db_node_metrics(ctx, from_json, external_db_node_id, start_time, end_time, page, limit, filter_by_metric_names): - if isinstance(external_db_node_id, six.string_types) and len(external_db_node_id.strip()) == 0: + if isinstance(external_db_node_id, str) and len(external_db_node_id.strip()) == 0: raise click.UsageError('Parameter --external-db-node-id cannot be whitespace or empty string') kwargs = {} @@ -19192,7 +19191,7 @@ def summarize_external_db_node_metrics(ctx, from_json, external_db_node_id, star @cli_util.wrap_exceptions def summarize_external_db_system_availability_metrics(ctx, from_json, external_db_system_id, start_time, end_time, page, limit, filter_by_component_types): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') kwargs = {} @@ -19227,7 +19226,7 @@ def summarize_external_db_system_availability_metrics(ctx, from_json, external_d @cli_util.wrap_exceptions def summarize_external_listener_metrics(ctx, from_json, external_listener_id, start_time, end_time, page, limit, filter_by_metric_names): - if isinstance(external_listener_id, six.string_types) and len(external_listener_id.strip()) == 0: + if isinstance(external_listener_id, str) and len(external_listener_id.strip()) == 0: raise click.UsageError('Parameter --external-listener-id cannot be whitespace or empty string') kwargs = {} @@ -19302,7 +19301,7 @@ def summarize_job_executions_statuses(ctx, from_json, compartment_id, start_time @cli_util.wrap_exceptions def summarize_managed_database_availability_metrics(ctx, from_json, managed_database_id, start_time, end_time, page, limit): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -19332,7 +19331,7 @@ def summarize_managed_database_availability_metrics(ctx, from_json, managed_data @cli_util.wrap_exceptions def summarize_sql_plan_baselines(ctx, from_json, managed_database_id, page, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -19360,7 +19359,7 @@ def summarize_sql_plan_baselines(ctx, from_json, managed_database_id, page, opc_ @cli_util.wrap_exceptions def summarize_sql_plan_baselines_by_last_execution(ctx, from_json, managed_database_id, page, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -19387,7 +19386,7 @@ def summarize_sql_plan_baselines_by_last_execution(ctx, from_json, managed_datab @cli_util.wrap_exceptions def test_named_credential(ctx, from_json, named_credential_id, managed_database_id): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') kwargs = {} @@ -19418,10 +19417,10 @@ def test_named_credential(ctx, from_json, named_credential_id, managed_database_ @cli_util.wrap_exceptions def test_preferred_credential(ctx, from_json, managed_database_id, credential_name, type): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(credential_name, six.string_types) and len(credential_name.strip()) == 0: + if isinstance(credential_name, str) and len(credential_name.strip()) == 0: raise click.UsageError('Parameter --credential-name cannot be whitespace or empty string') kwargs = {} @@ -19451,10 +19450,10 @@ def test_preferred_credential(ctx, from_json, managed_database_id, credential_na @cli_util.wrap_exceptions def test_preferred_credential_test_named_preferred_credential_details(ctx, from_json, managed_database_id, credential_name, named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(credential_name, six.string_types) and len(credential_name.strip()) == 0: + if isinstance(credential_name, str) and len(credential_name.strip()) == 0: raise click.UsageError('Parameter --credential-name cannot be whitespace or empty string') kwargs = {} @@ -19490,10 +19489,10 @@ def test_preferred_credential_test_named_preferred_credential_details(ctx, from_ @cli_util.wrap_exceptions def test_preferred_credential_test_basic_preferred_credential_details(ctx, from_json, managed_database_id, credential_name, user_name, role, password_secret_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(credential_name, six.string_types) and len(credential_name.strip()) == 0: + if isinstance(credential_name, str) and len(credential_name.strip()) == 0: raise click.UsageError('Parameter --credential-name cannot be whitespace or empty string') kwargs = {} @@ -19539,7 +19538,7 @@ def test_preferred_credential_test_basic_preferred_credential_details(ctx, from_ @cli_util.wrap_exceptions def update_cloud_asm(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_asm_id, cloud_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(cloud_asm_id, six.string_types) and len(cloud_asm_id.strip()) == 0: + if isinstance(cloud_asm_id, str) and len(cloud_asm_id.strip()) == 0: raise click.UsageError('Parameter --cloud-asm-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -19614,7 +19613,7 @@ def update_cloud_asm(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_cloud_asm_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_asm_instance_id, freeform_tags, defined_tags, if_match): - if isinstance(cloud_asm_instance_id, six.string_types) and len(cloud_asm_instance_id.strip()) == 0: + if isinstance(cloud_asm_instance_id, str) and len(cloud_asm_instance_id.strip()) == 0: raise click.UsageError('Parameter --cloud-asm-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -19683,7 +19682,7 @@ def update_cloud_asm_instance(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_cloud_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_cluster_id, cloud_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(cloud_cluster_id, six.string_types) and len(cloud_cluster_id.strip()) == 0: + if isinstance(cloud_cluster_id, str) and len(cloud_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cloud-cluster-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -19759,7 +19758,7 @@ def update_cloud_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_cloud_cluster_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_cluster_instance_id, cloud_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(cloud_cluster_instance_id, six.string_types) and len(cloud_cluster_instance_id.strip()) == 0: + if isinstance(cloud_cluster_instance_id, str) and len(cloud_cluster_instance_id.strip()) == 0: raise click.UsageError('Parameter --cloud-cluster-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -19834,7 +19833,7 @@ def update_cloud_cluster_instance(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_cloud_db_home(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_home_id, freeform_tags, defined_tags, if_match): - if isinstance(cloud_db_home_id, six.string_types) and len(cloud_db_home_id.strip()) == 0: + if isinstance(cloud_db_home_id, str) and len(cloud_db_home_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-home-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -19903,7 +19902,7 @@ def update_cloud_db_home(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_cloud_db_node(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_node_id, cloud_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(cloud_db_node_id, six.string_types) and len(cloud_db_node_id.strip()) == 0: + if isinstance(cloud_db_node_id, str) and len(cloud_db_node_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-node-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -19979,7 +19978,7 @@ def update_cloud_db_node(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_cloud_db_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(cloud_db_system_id, six.string_types) and len(cloud_db_system_id.strip()) == 0: + if isinstance(cloud_db_system_id, str) and len(cloud_db_system_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20048,7 +20047,7 @@ def update_cloud_db_system(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_cloud_db_system_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_connector_id, connector_type, if_match): - if isinstance(cloud_db_system_connector_id, six.string_types) and len(cloud_db_system_connector_id.strip()) == 0: + if isinstance(cloud_db_system_connector_id, str) and len(cloud_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-connector-id cannot be whitespace or empty string') kwargs = {} @@ -20112,7 +20111,7 @@ def update_cloud_db_system_connector(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_cloud_db_system_connector_update_cloud_db_system_macs_connector_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_connector_id, connection_info, freeform_tags, defined_tags, if_match): - if isinstance(cloud_db_system_connector_id, six.string_types) and len(cloud_db_system_connector_id.strip()) == 0: + if isinstance(cloud_db_system_connector_id, str) and len(cloud_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-connector-id cannot be whitespace or empty string') if not force: if connection_info or freeform_tags or defined_tags: @@ -20190,7 +20189,7 @@ def update_cloud_db_system_connector_update_cloud_db_system_macs_connector_detai @cli_util.wrap_exceptions def update_cloud_db_system_discovery(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_db_system_discovery_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(cloud_db_system_discovery_id, six.string_types) and len(cloud_db_system_discovery_id.strip()) == 0: + if isinstance(cloud_db_system_discovery_id, str) and len(cloud_db_system_discovery_id.strip()) == 0: raise click.UsageError('Parameter --cloud-db-system-discovery-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20262,7 +20261,7 @@ def update_cloud_db_system_discovery(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_cloud_listener(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_listener_id, cloud_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(cloud_listener_id, six.string_types) and len(cloud_listener_id.strip()) == 0: + if isinstance(cloud_listener_id, str) and len(cloud_listener_id.strip()) == 0: raise click.UsageError('Parameter --cloud-listener-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20340,7 +20339,7 @@ def update_cloud_listener(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_db_management_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_management_private_endpoint_id, name, description, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(db_management_private_endpoint_id, six.string_types) and len(db_management_private_endpoint_id.strip()) == 0: + if isinstance(db_management_private_endpoint_id, str) and len(db_management_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --db-management-private-endpoint-id cannot be whitespace or empty string') if not force: if nsg_ids or freeform_tags or defined_tags: @@ -20418,7 +20417,7 @@ def update_db_management_private_endpoint(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_external_asm(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_asm_id, external_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(external_asm_id, six.string_types) and len(external_asm_id.strip()) == 0: + if isinstance(external_asm_id, str) and len(external_asm_id.strip()) == 0: raise click.UsageError('Parameter --external-asm-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20493,7 +20492,7 @@ def update_external_asm(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_external_asm_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_asm_instance_id, freeform_tags, defined_tags, if_match): - if isinstance(external_asm_instance_id, six.string_types) and len(external_asm_instance_id.strip()) == 0: + if isinstance(external_asm_instance_id, str) and len(external_asm_instance_id.strip()) == 0: raise click.UsageError('Parameter --external-asm-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20562,7 +20561,7 @@ def update_external_asm_instance(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_external_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_cluster_id, external_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(external_cluster_id, six.string_types) and len(external_cluster_id.strip()) == 0: + if isinstance(external_cluster_id, str) and len(external_cluster_id.strip()) == 0: raise click.UsageError('Parameter --external-cluster-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20638,7 +20637,7 @@ def update_external_cluster(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_external_cluster_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_cluster_instance_id, external_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(external_cluster_instance_id, six.string_types) and len(external_cluster_instance_id.strip()) == 0: + if isinstance(external_cluster_instance_id, str) and len(external_cluster_instance_id.strip()) == 0: raise click.UsageError('Parameter --external-cluster-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20713,7 +20712,7 @@ def update_external_cluster_instance(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_external_db_home(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_home_id, freeform_tags, defined_tags, if_match): - if isinstance(external_db_home_id, six.string_types) and len(external_db_home_id.strip()) == 0: + if isinstance(external_db_home_id, str) and len(external_db_home_id.strip()) == 0: raise click.UsageError('Parameter --external-db-home-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20782,7 +20781,7 @@ def update_external_db_home(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_external_db_node(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_node_id, external_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(external_db_node_id, six.string_types) and len(external_db_node_id.strip()) == 0: + if isinstance(external_db_node_id, str) and len(external_db_node_id.strip()) == 0: raise click.UsageError('Parameter --external-db-node-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20858,7 +20857,7 @@ def update_external_db_node(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_external_db_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(external_db_system_id, six.string_types) and len(external_db_system_id.strip()) == 0: + if isinstance(external_db_system_id, str) and len(external_db_system_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -20927,7 +20926,7 @@ def update_external_db_system(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_external_db_system_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_connector_id, connector_type, if_match): - if isinstance(external_db_system_connector_id, six.string_types) and len(external_db_system_connector_id.strip()) == 0: + if isinstance(external_db_system_connector_id, str) and len(external_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-connector-id cannot be whitespace or empty string') kwargs = {} @@ -20991,7 +20990,7 @@ def update_external_db_system_connector(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def update_external_db_system_connector_update_external_db_system_macs_connector_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_connector_id, connection_info, freeform_tags, defined_tags, if_match): - if isinstance(external_db_system_connector_id, six.string_types) and len(external_db_system_connector_id.strip()) == 0: + if isinstance(external_db_system_connector_id, str) and len(external_db_system_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-connector-id cannot be whitespace or empty string') if not force: if connection_info or freeform_tags or defined_tags: @@ -21069,7 +21068,7 @@ def update_external_db_system_connector_update_external_db_system_macs_connector @cli_util.wrap_exceptions def update_external_db_system_discovery(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_db_system_discovery_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(external_db_system_discovery_id, six.string_types) and len(external_db_system_discovery_id.strip()) == 0: + if isinstance(external_db_system_discovery_id, str) and len(external_db_system_discovery_id.strip()) == 0: raise click.UsageError('Parameter --external-db-system-discovery-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -21146,7 +21145,7 @@ def update_external_db_system_discovery(ctx, from_json, force, wait_for_state, m @cli_util.wrap_exceptions def update_external_exadata_infrastructure(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_infrastructure_id, compartment_id, discovery_key, license_model, display_name, db_system_ids, storage_server_names, freeform_tags, defined_tags, if_match): - if isinstance(external_exadata_infrastructure_id, six.string_types) and len(external_exadata_infrastructure_id.strip()) == 0: + if isinstance(external_exadata_infrastructure_id, str) and len(external_exadata_infrastructure_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-infrastructure-id cannot be whitespace or empty string') if not force: if db_system_ids or storage_server_names or freeform_tags or defined_tags: @@ -21233,7 +21232,7 @@ def update_external_exadata_infrastructure(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def update_external_exadata_storage_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_storage_connector_id, connector_name, connection_uri, credential_info, freeform_tags, defined_tags, if_match): - if isinstance(external_exadata_storage_connector_id, six.string_types) and len(external_exadata_storage_connector_id.strip()) == 0: + if isinstance(external_exadata_storage_connector_id, str) and len(external_exadata_storage_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-connector-id cannot be whitespace or empty string') if not force: if credential_info or freeform_tags or defined_tags: @@ -21310,7 +21309,7 @@ def update_external_exadata_storage_connector(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_external_exadata_storage_grid(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_storage_grid_id, freeform_tags, defined_tags, if_match): - if isinstance(external_exadata_storage_grid_id, six.string_types) and len(external_exadata_storage_grid_id.strip()) == 0: + if isinstance(external_exadata_storage_grid_id, str) and len(external_exadata_storage_grid_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-grid-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -21378,7 +21377,7 @@ def update_external_exadata_storage_grid(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_external_exadata_storage_server(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_exadata_storage_server_id, freeform_tags, defined_tags, if_match): - if isinstance(external_exadata_storage_server_id, six.string_types) and len(external_exadata_storage_server_id.strip()) == 0: + if isinstance(external_exadata_storage_server_id, str) and len(external_exadata_storage_server_id.strip()) == 0: raise click.UsageError('Parameter --external-exadata-storage-server-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -21447,7 +21446,7 @@ def update_external_exadata_storage_server(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def update_external_listener(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_listener_id, external_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(external_listener_id, six.string_types) and len(external_listener_id.strip()) == 0: + if isinstance(external_listener_id, str) and len(external_listener_id.strip()) == 0: raise click.UsageError('Parameter --external-listener-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -21517,7 +21516,7 @@ def update_external_listener(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_external_mysql_database(ctx, from_json, external_my_sql_database_id, db_name, if_match): - if isinstance(external_my_sql_database_id, six.string_types) and len(external_my_sql_database_id.strip()) == 0: + if isinstance(external_my_sql_database_id, str) and len(external_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -21553,7 +21552,7 @@ def update_external_mysql_database(ctx, from_json, external_my_sql_database_id, @cli_util.wrap_exceptions def update_external_mysql_database_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, external_my_sql_database_connector_id, connector_details, compartment_id, if_match): - if isinstance(external_my_sql_database_connector_id, six.string_types) and len(external_my_sql_database_connector_id.strip()) == 0: + if isinstance(external_my_sql_database_connector_id, str) and len(external_my_sql_database_connector_id.strip()) == 0: raise click.UsageError('Parameter --external-my-sql-database-connector-id cannot be whitespace or empty string') if not force: if connector_details: @@ -21626,7 +21625,7 @@ def update_external_mysql_database_connector(ctx, from_json, force, wait_for_sta @cli_util.wrap_exceptions def update_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, description, job_type, timeout, result_location, schedule_details, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if result_location or schedule_details: @@ -21716,7 +21715,7 @@ def update_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_job_update_sql_job_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, description, timeout, result_location, schedule_details, sql_text, in_binds, out_binds, sql_type, user_name, password, secret_id, named_credential_id, role, freeform_tags, defined_tags, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if result_location or schedule_details or in_binds or out_binds or freeform_tags or defined_tags: @@ -21828,7 +21827,7 @@ def update_job_update_sql_job_details(ctx, from_json, force, wait_for_state, max @cli_util.wrap_exceptions def update_job_object_storage_job_execution_result_location(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, description, timeout, schedule_details, if_match, result_location_namespace_name, result_location_bucket_name): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if schedule_details: @@ -21905,7 +21904,7 @@ def update_job_object_storage_job_execution_result_location(ctx, from_json, forc @cli_util.wrap_exceptions def update_managed_database(ctx, from_json, force, managed_database_id, freeform_tags, defined_tags, if_match): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -21951,7 +21950,7 @@ def update_managed_database(ctx, from_json, force, managed_database_id, freeform @cli_util.wrap_exceptions def update_managed_database_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_database_group_id, description, freeform_tags, defined_tags, if_match): - if isinstance(managed_database_group_id, six.string_types) and len(managed_database_group_id.strip()) == 0: + if isinstance(managed_database_group_id, str) and len(managed_database_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -22026,7 +22025,7 @@ def update_managed_database_group(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_named_credential(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, named_credential_id, description, scope, content, associated_resource, freeform_tags, defined_tags, if_match): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') if not force: if content or freeform_tags or defined_tags: @@ -22113,7 +22112,7 @@ def update_named_credential(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_named_credential_basic_named_credential_content(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, named_credential_id, content_user_name, content_role, content_password_secret_id, content_password_secret_access_mode, description, scope, associated_resource, freeform_tags, defined_tags, if_match): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -22193,10 +22192,10 @@ def update_named_credential_basic_named_credential_content(ctx, from_json, force @cli_util.wrap_exceptions def update_preferred_credential(ctx, from_json, managed_database_id, credential_name, type, if_match): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(credential_name, six.string_types) and len(credential_name.strip()) == 0: + if isinstance(credential_name, str) and len(credential_name.strip()) == 0: raise click.UsageError('Parameter --credential-name cannot be whitespace or empty string') kwargs = {} @@ -22229,10 +22228,10 @@ def update_preferred_credential(ctx, from_json, managed_database_id, credential_ @cli_util.wrap_exceptions def update_preferred_credential_update_named_preferred_credential_details(ctx, from_json, managed_database_id, credential_name, named_credential_id, if_match): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(credential_name, six.string_types) and len(credential_name.strip()) == 0: + if isinstance(credential_name, str) and len(credential_name.strip()) == 0: raise click.UsageError('Parameter --credential-name cannot be whitespace or empty string') kwargs = {} @@ -22271,10 +22270,10 @@ def update_preferred_credential_update_named_preferred_credential_details(ctx, f @cli_util.wrap_exceptions def update_preferred_credential_update_basic_preferred_credential_details(ctx, from_json, managed_database_id, credential_name, user_name, role, password_secret_id, if_match): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(credential_name, six.string_types) and len(credential_name.strip()) == 0: + if isinstance(credential_name, str) and len(credential_name.strip()) == 0: raise click.UsageError('Parameter --credential-name cannot be whitespace or empty string') kwargs = {} @@ -22327,10 +22326,10 @@ def update_preferred_credential_update_basic_preferred_credential_details(ctx, f @cli_util.wrap_exceptions def update_tablespace(ctx, from_json, force, managed_database_id, tablespace_name, credential_details, database_credential, name, type, file_size, status, is_auto_extensible, auto_extend_next_size, auto_extend_max_size, is_max_size_unlimited, is_default): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(tablespace_name, six.string_types) and len(tablespace_name.strip()) == 0: + if isinstance(tablespace_name, str) and len(tablespace_name.strip()) == 0: raise click.UsageError('Parameter --tablespace-name cannot be whitespace or empty string') if not force: if credential_details or database_credential or file_size or auto_extend_next_size or auto_extend_max_size: diff --git a/services/database_management/src/oci_cli_diagnosability/generated/diagnosability_cli.py b/services/database_management/src/oci_cli_diagnosability/generated/diagnosability_cli.py index f8b1f7ce5..21fcfde7b 100644 --- a/services/database_management/src/oci_cli_diagnosability/generated/diagnosability_cli.py +++ b/services/database_management/src/oci_cli_diagnosability/generated/diagnosability_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -59,7 +58,7 @@ def list_alert_logs(ctx, from_json, all_pages, page_size, managed_database_id, t if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -137,7 +136,7 @@ def list_attention_logs(ctx, from_json, all_pages, page_size, managed_database_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -209,7 +208,7 @@ def list_attention_logs(ctx, from_json, all_pages, page_size, managed_database_i @cli_util.wrap_exceptions def summarize_alert_log_counts(ctx, from_json, managed_database_id, time_greater_than_or_equal_to, time_less_than_or_equal_to, level_filter, group_by, type_filter, log_search_text, is_regular_expression, page, limit, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -261,7 +260,7 @@ def summarize_alert_log_counts(ctx, from_json, managed_database_id, time_greater @cli_util.wrap_exceptions def summarize_attention_log_counts(ctx, from_json, managed_database_id, time_greater_than_or_equal_to, time_less_than_or_equal_to, urgency_filter, group_by, type_filter, log_search_text, is_regular_expression, page, limit, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/database_management/src/oci_cli_managed_my_sql_databases/generated/managedmysqldatabases_cli.py b/services/database_management/src/oci_cli_managed_my_sql_databases/generated/managedmysqldatabases_cli.py index 47dafdd55..a847b1389 100644 --- a/services/database_management/src/oci_cli_managed_my_sql_databases/generated/managedmysqldatabases_cli.py +++ b/services/database_management/src/oci_cli_managed_my_sql_databases/generated/managedmysqldatabases_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -70,7 +69,7 @@ def managed_my_sql_database_collection_group(): @cli_util.wrap_exceptions def change_mysql_database_management_type(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_my_sql_database_id, management_type, operation, if_match): - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -129,7 +128,7 @@ def change_mysql_database_management_type(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def get_binary_log_information(ctx, from_json, managed_my_sql_database_id): - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -151,7 +150,7 @@ def get_binary_log_information(ctx, from_json, managed_my_sql_database_id): @cli_util.wrap_exceptions def get_general_replication_information(ctx, from_json, managed_my_sql_database_id): - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -208,7 +207,7 @@ def get_heat_wave_fleet_metric(ctx, from_json, compartment_id, start_time, end_t @cli_util.wrap_exceptions def get_managed_my_sql_database(ctx, from_json, managed_my_sql_database_id): - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -275,7 +274,7 @@ def get_my_sql_fleet_metric(ctx, from_json, compartment_id, start_time, end_time @cli_util.wrap_exceptions def get_my_sql_query_details(ctx, from_json, managed_my_sql_database_id, digest): - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -307,7 +306,7 @@ def list_high_availability_members(ctx, from_json, all_pages, page_size, managed if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -364,7 +363,7 @@ def list_inbound_replications(ctx, from_json, all_pages, page_size, managed_my_s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -421,7 +420,7 @@ def list_managed_my_sql_database_configuration_data(ctx, from_json, all_pages, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -481,7 +480,7 @@ def list_managed_my_sql_database_sql_data(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -604,7 +603,7 @@ def list_my_sql_digest_errors(ctx, from_json, all_pages, page_size, managed_my_s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -664,7 +663,7 @@ def list_outbound_replications(ctx, from_json, all_pages, page_size, managed_my_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} @@ -716,7 +715,7 @@ def list_outbound_replications(ctx, from_json, all_pages, page_size, managed_my_ @cli_util.wrap_exceptions def summarize_managed_my_sql_database_availability_metrics(ctx, from_json, managed_my_sql_database_id, start_time, end_time, page, limit): - if isinstance(managed_my_sql_database_id, six.string_types) and len(managed_my_sql_database_id.strip()) == 0: + if isinstance(managed_my_sql_database_id, str) and len(managed_my_sql_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-my-sql-database-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/database_management/src/oci_cli_perfhub/generated/perfhub_cli.py b/services/database_management/src/oci_cli_perfhub/generated/perfhub_cli.py index 0ad5eb5dc..baf651dbd 100644 --- a/services/database_management/src/oci_cli_perfhub/generated/perfhub_cli.py +++ b/services/database_management/src/oci_cli_perfhub/generated/perfhub_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -46,7 +45,7 @@ def managed_database_group(): @cli_util.wrap_exceptions def modify_snapshot_settings(ctx, from_json, managed_database_id, retention, interval, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/database_management/src/oci_cli_sql_tuning/generated/sqltuning_cli.py b/services/database_management/src/oci_cli_sql_tuning/generated/sqltuning_cli.py index 737133a78..da45a4f93 100644 --- a/services/database_management/src/oci_cli_sql_tuning/generated/sqltuning_cli.py +++ b/services/database_management/src/oci_cli_sql_tuning/generated/sqltuning_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -55,7 +54,7 @@ def sql_tuning_set_group(): @cli_util.wrap_exceptions def clone_sql_tuning_task(ctx, from_json, managed_database_id, task_name, original_task_id, task_description, credential_details, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -99,7 +98,7 @@ def clone_sql_tuning_task(ctx, from_json, managed_database_id, task_name, origin @cli_util.wrap_exceptions def clone_sql_tuning_task_sql_tuning_task_secret_credential_details(ctx, from_json, managed_database_id, task_name, original_task_id, credential_details_username, credential_details_role, credential_details_password_secret_id, task_description, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -146,7 +145,7 @@ def clone_sql_tuning_task_sql_tuning_task_secret_credential_details(ctx, from_js @cli_util.wrap_exceptions def clone_sql_tuning_task_sql_tuning_task_password_credential_details(ctx, from_json, managed_database_id, task_name, original_task_id, credential_details_username, credential_details_role, credential_details_password, task_description, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -193,7 +192,7 @@ def clone_sql_tuning_task_sql_tuning_task_password_credential_details(ctx, from_ @cli_util.wrap_exceptions def clone_sql_tuning_task_database_secret_credential_details(ctx, from_json, managed_database_id, task_name, original_task_id, database_credential_password_secret_id, task_description, credential_details, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -242,7 +241,7 @@ def clone_sql_tuning_task_database_secret_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def clone_sql_tuning_task_database_named_credential_details(ctx, from_json, managed_database_id, task_name, original_task_id, database_credential_named_credential_id, task_description, credential_details): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -287,7 +286,7 @@ def clone_sql_tuning_task_database_named_credential_details(ctx, from_json, mana @cli_util.wrap_exceptions def clone_sql_tuning_task_database_password_credential_details(ctx, from_json, managed_database_id, task_name, original_task_id, database_credential_password, task_description, credential_details, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -337,7 +336,7 @@ def clone_sql_tuning_task_database_password_credential_details(ctx, from_json, m @cli_util.wrap_exceptions def create_sql_tuning_set(ctx, from_json, managed_database_id, name, credential_details, database_credential, owner, description, show_sql_only): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -387,7 +386,7 @@ def create_sql_tuning_set(ctx, from_json, managed_database_id, name, credential_ @cli_util.wrap_exceptions def create_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, from_json, managed_database_id, name, credential_details_username, credential_details_role, credential_details_password, database_credential, owner, description, show_sql_only): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -440,7 +439,7 @@ def create_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, @cli_util.wrap_exceptions def create_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, from_json, managed_database_id, name, credential_details_username, credential_details_role, credential_details_secret_id, database_credential, owner, description, show_sql_only): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -493,7 +492,7 @@ def create_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, fr @cli_util.wrap_exceptions def create_sql_tuning_set_database_secret_credential_details(ctx, from_json, managed_database_id, name, database_credential_password_secret_id, credential_details, owner, description, show_sql_only, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -548,7 +547,7 @@ def create_sql_tuning_set_database_secret_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def create_sql_tuning_set_database_named_credential_details(ctx, from_json, managed_database_id, name, database_credential_named_credential_id, credential_details, owner, description, show_sql_only): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -599,7 +598,7 @@ def create_sql_tuning_set_database_named_credential_details(ctx, from_json, mana @cli_util.wrap_exceptions def create_sql_tuning_set_database_password_credential_details(ctx, from_json, managed_database_id, name, database_credential_password, credential_details, owner, description, show_sql_only, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -654,10 +653,10 @@ def create_sql_tuning_set_database_password_credential_details(ctx, from_json, m @cli_util.wrap_exceptions def drop_sql_tuning_set(ctx, from_json, managed_database_id, sql_tuning_set_id, name, credential_details, database_credential, owner, show_sql_only): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -705,10 +704,10 @@ def drop_sql_tuning_set(ctx, from_json, managed_database_id, sql_tuning_set_id, @cli_util.wrap_exceptions def drop_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, credential_details_username, credential_details_role, credential_details_password, database_credential, owner, show_sql_only): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -759,10 +758,10 @@ def drop_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, fr @cli_util.wrap_exceptions def drop_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, credential_details_username, credential_details_role, credential_details_secret_id, database_credential, owner, show_sql_only): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -813,10 +812,10 @@ def drop_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, from @cli_util.wrap_exceptions def drop_sql_tuning_set_database_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, database_credential_password_secret_id, credential_details, owner, show_sql_only, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -869,10 +868,10 @@ def drop_sql_tuning_set_database_secret_credential_details(ctx, from_json, manag @cli_util.wrap_exceptions def drop_sql_tuning_set_database_named_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, database_credential_named_credential_id, credential_details, owner, show_sql_only): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -921,10 +920,10 @@ def drop_sql_tuning_set_database_named_credential_details(ctx, from_json, manage @cli_util.wrap_exceptions def drop_sql_tuning_set_database_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, database_credential_password, credential_details, owner, show_sql_only, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -974,7 +973,7 @@ def drop_sql_tuning_set_database_password_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def drop_sql_tuning_task(ctx, from_json, managed_database_id, task_id, credential_details, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1012,7 +1011,7 @@ def drop_sql_tuning_task(ctx, from_json, managed_database_id, task_id, credentia @cli_util.wrap_exceptions def drop_sql_tuning_task_sql_tuning_task_secret_credential_details(ctx, from_json, managed_database_id, task_id, credential_details_username, credential_details_role, credential_details_password_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1053,7 +1052,7 @@ def drop_sql_tuning_task_sql_tuning_task_secret_credential_details(ctx, from_jso @cli_util.wrap_exceptions def drop_sql_tuning_task_sql_tuning_task_password_credential_details(ctx, from_json, managed_database_id, task_id, credential_details_username, credential_details_role, credential_details_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1094,7 +1093,7 @@ def drop_sql_tuning_task_sql_tuning_task_password_credential_details(ctx, from_j @cli_util.wrap_exceptions def drop_sql_tuning_task_database_secret_credential_details(ctx, from_json, managed_database_id, task_id, database_credential_password_secret_id, credential_details, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1137,7 +1136,7 @@ def drop_sql_tuning_task_database_secret_credential_details(ctx, from_json, mana @cli_util.wrap_exceptions def drop_sql_tuning_task_database_named_credential_details(ctx, from_json, managed_database_id, task_id, database_credential_named_credential_id, credential_details): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1176,7 +1175,7 @@ def drop_sql_tuning_task_database_named_credential_details(ctx, from_json, manag @cli_util.wrap_exceptions def drop_sql_tuning_task_database_password_credential_details(ctx, from_json, managed_database_id, task_id, database_credential_password, credential_details, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1223,10 +1222,10 @@ def drop_sql_tuning_task_database_password_credential_details(ctx, from_json, ma @cli_util.wrap_exceptions def drop_sqls_in_sql_tuning_set(ctx, from_json, managed_database_id, sql_tuning_set_id, name, credential_details, database_credential, show_sql_only, owner, basic_filter): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1278,10 +1277,10 @@ def drop_sqls_in_sql_tuning_set(ctx, from_json, managed_database_id, sql_tuning_ @cli_util.wrap_exceptions def drop_sqls_in_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, credential_details_username, credential_details_role, credential_details_password, database_credential, show_sql_only, owner, basic_filter): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1336,10 +1335,10 @@ def drop_sqls_in_sql_tuning_set_sql_tuning_set_admin_password_credential_details @cli_util.wrap_exceptions def drop_sqls_in_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, credential_details_username, credential_details_role, credential_details_secret_id, database_credential, show_sql_only, owner, basic_filter): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1394,10 +1393,10 @@ def drop_sqls_in_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(c @cli_util.wrap_exceptions def drop_sqls_in_sql_tuning_set_database_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, database_credential_password_secret_id, credential_details, show_sql_only, owner, basic_filter, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1454,10 +1453,10 @@ def drop_sqls_in_sql_tuning_set_database_secret_credential_details(ctx, from_jso @cli_util.wrap_exceptions def drop_sqls_in_sql_tuning_set_database_named_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, database_credential_named_credential_id, credential_details, show_sql_only, owner, basic_filter): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1510,10 +1509,10 @@ def drop_sqls_in_sql_tuning_set_database_named_credential_details(ctx, from_json @cli_util.wrap_exceptions def drop_sqls_in_sql_tuning_set_database_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, database_credential_password, credential_details, show_sql_only, owner, basic_filter, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1575,10 +1574,10 @@ def drop_sqls_in_sql_tuning_set_database_password_credential_details(ctx, from_j @cli_util.wrap_exceptions def fetch_sql_tuning_set(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, credential_details, database_credential, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1648,10 +1647,10 @@ def fetch_sql_tuning_set(ctx, from_json, managed_database_id, sql_tuning_set_id, @cli_util.wrap_exceptions def fetch_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, credential_details_username, credential_details_role, credential_details_password, database_credential, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1724,10 +1723,10 @@ def fetch_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, f @cli_util.wrap_exceptions def fetch_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, credential_details_username, credential_details_role, credential_details_secret_id, database_credential, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1800,10 +1799,10 @@ def fetch_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, fro @cli_util.wrap_exceptions def fetch_sql_tuning_set_database_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, database_credential_password_secret_id, credential_details, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1878,10 +1877,10 @@ def fetch_sql_tuning_set_database_secret_credential_details(ctx, from_json, mana @cli_util.wrap_exceptions def fetch_sql_tuning_set_database_named_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, database_credential_named_credential_id, credential_details, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -1952,10 +1951,10 @@ def fetch_sql_tuning_set_database_named_credential_details(ctx, from_json, manag @cli_util.wrap_exceptions def fetch_sql_tuning_set_database_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, database_credential_password, credential_details, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -2022,10 +2021,10 @@ def fetch_sql_tuning_set_database_password_credential_details(ctx, from_json, ma @cli_util.wrap_exceptions def get_execution_plan_stats_comparision(ctx, from_json, managed_database_id, sql_tuning_advisor_task_id, sql_object_id, execution_id, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_advisor_task_id, six.string_types) and len(sql_tuning_advisor_task_id.strip()) == 0: + if isinstance(sql_tuning_advisor_task_id, str) and len(sql_tuning_advisor_task_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-advisor-task-id cannot be whitespace or empty string') kwargs = {} @@ -2056,10 +2055,10 @@ def get_execution_plan_stats_comparision(ctx, from_json, managed_database_id, sq @cli_util.wrap_exceptions def get_sql_execution_plan(ctx, from_json, managed_database_id, sql_tuning_advisor_task_id, sql_object_id, attribute, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_advisor_task_id, six.string_types) and len(sql_tuning_advisor_task_id.strip()) == 0: + if isinstance(sql_tuning_advisor_task_id, str) and len(sql_tuning_advisor_task_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-advisor-task-id cannot be whitespace or empty string') kwargs = {} @@ -2093,10 +2092,10 @@ def get_sql_execution_plan(ctx, from_json, managed_database_id, sql_tuning_advis @cli_util.wrap_exceptions def get_sql_tuning_advisor_task_summary_report(ctx, from_json, managed_database_id, sql_tuning_advisor_task_id, search_period, time_greater_than_or_equal_to, time_less_than_or_equal_to, begin_exec_id_greater_than_or_equal_to, end_exec_id_less_than_or_equal_to, opc_named_credential_id): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_advisor_task_id, six.string_types) and len(sql_tuning_advisor_task_id.strip()) == 0: + if isinstance(sql_tuning_advisor_task_id, str) and len(sql_tuning_advisor_task_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-advisor-task-id cannot be whitespace or empty string') kwargs = {} @@ -2148,10 +2147,10 @@ def list_sql_tuning_advisor_task_findings(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_advisor_task_id, six.string_types) and len(sql_tuning_advisor_task_id.strip()) == 0: + if isinstance(sql_tuning_advisor_task_id, str) and len(sql_tuning_advisor_task_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-advisor-task-id cannot be whitespace or empty string') kwargs = {} @@ -2229,10 +2228,10 @@ def list_sql_tuning_advisor_task_recommendations(ctx, from_json, all_pages, page if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_advisor_task_id, six.string_types) and len(sql_tuning_advisor_task_id.strip()) == 0: + if isinstance(sql_tuning_advisor_task_id, str) and len(sql_tuning_advisor_task_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-advisor-task-id cannot be whitespace or empty string') kwargs = {} @@ -2305,7 +2304,7 @@ def list_sql_tuning_advisor_tasks(ctx, from_json, all_pages, page_size, managed_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2375,7 +2374,7 @@ def list_sql_tuning_sets(ctx, from_json, all_pages, page_size, managed_database_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -2457,10 +2456,10 @@ def list_sql_tuning_sets(ctx, from_json, all_pages, page_size, managed_database_ @cli_util.wrap_exceptions def load_sql_tuning_set(ctx, from_json, managed_database_id, sql_tuning_set_id, name, load_type, credential_details, database_credential, show_sql_only, owner, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, total_time_limit, repeat_interval, capture_option, capture_mode, attribute_list, load_option, update_option, update_attributes, update_condition, is_ignore_null, commit_rows, begin_snapshot, end_snapshot, baseline_name): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -2594,10 +2593,10 @@ def load_sql_tuning_set(ctx, from_json, managed_database_id, sql_tuning_set_id, @cli_util.wrap_exceptions def load_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, load_type, credential_details_username, credential_details_role, credential_details_password, database_credential, show_sql_only, owner, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, total_time_limit, repeat_interval, capture_option, capture_mode, attribute_list, load_option, update_option, update_attributes, update_condition, is_ignore_null, commit_rows, begin_snapshot, end_snapshot, baseline_name): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -2734,10 +2733,10 @@ def load_sql_tuning_set_sql_tuning_set_admin_password_credential_details(ctx, fr @cli_util.wrap_exceptions def load_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, load_type, credential_details_username, credential_details_role, credential_details_secret_id, database_credential, show_sql_only, owner, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, total_time_limit, repeat_interval, capture_option, capture_mode, attribute_list, load_option, update_option, update_attributes, update_condition, is_ignore_null, commit_rows, begin_snapshot, end_snapshot, baseline_name): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -2874,10 +2873,10 @@ def load_sql_tuning_set_sql_tuning_set_admin_secret_credential_details(ctx, from @cli_util.wrap_exceptions def load_sql_tuning_set_database_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, load_type, database_credential_password_secret_id, credential_details, show_sql_only, owner, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, total_time_limit, repeat_interval, capture_option, capture_mode, attribute_list, load_option, update_option, update_attributes, update_condition, is_ignore_null, commit_rows, begin_snapshot, end_snapshot, baseline_name, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -3016,10 +3015,10 @@ def load_sql_tuning_set_database_secret_credential_details(ctx, from_json, manag @cli_util.wrap_exceptions def load_sql_tuning_set_database_named_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, load_type, database_credential_named_credential_id, credential_details, show_sql_only, owner, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, total_time_limit, repeat_interval, capture_option, capture_mode, attribute_list, load_option, update_option, update_attributes, update_condition, is_ignore_null, commit_rows, begin_snapshot, end_snapshot, baseline_name): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -3154,10 +3153,10 @@ def load_sql_tuning_set_database_named_credential_details(ctx, from_json, manage @cli_util.wrap_exceptions def load_sql_tuning_set_database_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, load_type, database_credential_password, credential_details, show_sql_only, owner, basic_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, total_time_limit, repeat_interval, capture_option, capture_mode, attribute_list, load_option, update_option, update_attributes, update_condition, is_ignore_null, commit_rows, begin_snapshot, end_snapshot, baseline_name, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -3293,10 +3292,10 @@ def load_sql_tuning_set_database_password_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def save_sql_tuning_set_as(ctx, from_json, managed_database_id, sql_tuning_set_id, name, destination_sql_tuning_set_name, create_new, credential_details, database_credential, show_sql_only, owner, destination_sql_tuning_set_description, destination_sql_tuning_set_owner, basic_filter, plan_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, attribute_list, load_option, update_option, update_condition, update_attributes, is_ignore_null, commit_rows): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -3416,10 +3415,10 @@ def save_sql_tuning_set_as(ctx, from_json, managed_database_id, sql_tuning_set_i @cli_util.wrap_exceptions def save_sql_tuning_set_as_sql_tuning_set_admin_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, destination_sql_tuning_set_name, create_new, credential_details_username, credential_details_role, credential_details_password, database_credential, show_sql_only, owner, destination_sql_tuning_set_description, destination_sql_tuning_set_owner, basic_filter, plan_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, attribute_list, load_option, update_option, update_condition, update_attributes, is_ignore_null, commit_rows): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -3542,10 +3541,10 @@ def save_sql_tuning_set_as_sql_tuning_set_admin_password_credential_details(ctx, @cli_util.wrap_exceptions def save_sql_tuning_set_as_sql_tuning_set_admin_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, destination_sql_tuning_set_name, create_new, credential_details_username, credential_details_role, credential_details_secret_id, database_credential, show_sql_only, owner, destination_sql_tuning_set_description, destination_sql_tuning_set_owner, basic_filter, plan_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, attribute_list, load_option, update_option, update_condition, update_attributes, is_ignore_null, commit_rows): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -3668,10 +3667,10 @@ def save_sql_tuning_set_as_sql_tuning_set_admin_secret_credential_details(ctx, f @cli_util.wrap_exceptions def save_sql_tuning_set_as_database_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, destination_sql_tuning_set_name, create_new, database_credential_password_secret_id, credential_details, show_sql_only, owner, destination_sql_tuning_set_description, destination_sql_tuning_set_owner, basic_filter, plan_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, attribute_list, load_option, update_option, update_condition, update_attributes, is_ignore_null, commit_rows, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -3796,10 +3795,10 @@ def save_sql_tuning_set_as_database_secret_credential_details(ctx, from_json, ma @cli_util.wrap_exceptions def save_sql_tuning_set_as_database_named_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, destination_sql_tuning_set_name, create_new, database_credential_named_credential_id, credential_details, show_sql_only, owner, destination_sql_tuning_set_description, destination_sql_tuning_set_owner, basic_filter, plan_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, attribute_list, load_option, update_option, update_condition, update_attributes, is_ignore_null, commit_rows): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -3920,10 +3919,10 @@ def save_sql_tuning_set_as_database_named_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def save_sql_tuning_set_as_database_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, name, destination_sql_tuning_set_name, create_new, database_credential_password, credential_details, show_sql_only, owner, destination_sql_tuning_set_description, destination_sql_tuning_set_owner, basic_filter, plan_filter, recursive_sql, result_percentage, result_limit, ranking_measure1, ranking_measure2, ranking_measure3, attribute_list, load_option, update_option, update_condition, update_attributes, is_ignore_null, commit_rows, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -4036,7 +4035,7 @@ def save_sql_tuning_set_as_database_password_credential_details(ctx, from_json, @cli_util.wrap_exceptions def start_sql_tuning_task(ctx, from_json, managed_database_id, task_name, total_time_limit_in_minutes, scope, task_description, credential_details, database_credential, statement_time_limit_in_minutes, sql_tuning_set, sql_details, time_started, time_ended): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4104,7 +4103,7 @@ def start_sql_tuning_task(ctx, from_json, managed_database_id, task_name, total_ @cli_util.wrap_exceptions def start_sql_tuning_task_sql_tuning_task_secret_credential_details(ctx, from_json, managed_database_id, task_name, total_time_limit_in_minutes, scope, credential_details_username, credential_details_role, credential_details_password_secret_id, task_description, database_credential, statement_time_limit_in_minutes, sql_tuning_set, sql_details, time_started, time_ended): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4175,7 +4174,7 @@ def start_sql_tuning_task_sql_tuning_task_secret_credential_details(ctx, from_js @cli_util.wrap_exceptions def start_sql_tuning_task_sql_tuning_task_password_credential_details(ctx, from_json, managed_database_id, task_name, total_time_limit_in_minutes, scope, credential_details_username, credential_details_role, credential_details_password, task_description, database_credential, statement_time_limit_in_minutes, sql_tuning_set, sql_details, time_started, time_ended): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4246,7 +4245,7 @@ def start_sql_tuning_task_sql_tuning_task_password_credential_details(ctx, from_ @cli_util.wrap_exceptions def start_sql_tuning_task_database_secret_credential_details(ctx, from_json, managed_database_id, task_name, total_time_limit_in_minutes, scope, database_credential_password_secret_id, task_description, credential_details, statement_time_limit_in_minutes, sql_tuning_set, sql_details, time_started, time_ended, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4319,7 +4318,7 @@ def start_sql_tuning_task_database_secret_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def start_sql_tuning_task_database_named_credential_details(ctx, from_json, managed_database_id, task_name, total_time_limit_in_minutes, scope, database_credential_named_credential_id, task_description, credential_details, statement_time_limit_in_minutes, sql_tuning_set, sql_details, time_started, time_ended): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4388,7 +4387,7 @@ def start_sql_tuning_task_database_named_credential_details(ctx, from_json, mana @cli_util.wrap_exceptions def start_sql_tuning_task_database_password_credential_details(ctx, from_json, managed_database_id, task_name, total_time_limit_in_minutes, scope, database_credential_password, task_description, credential_details, statement_time_limit_in_minutes, sql_tuning_set, sql_details, time_started, time_ended, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') kwargs = {} @@ -4454,10 +4453,10 @@ def start_sql_tuning_task_database_password_credential_details(ctx, from_json, m @cli_util.wrap_exceptions def validate_basic_filter(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, basic_filter, credential_details, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -4501,10 +4500,10 @@ def validate_basic_filter(ctx, from_json, managed_database_id, sql_tuning_set_id @cli_util.wrap_exceptions def validate_basic_filter_sql_tuning_set_admin_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, basic_filter, credential_details_username, credential_details_role, credential_details_password, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -4551,10 +4550,10 @@ def validate_basic_filter_sql_tuning_set_admin_password_credential_details(ctx, @cli_util.wrap_exceptions def validate_basic_filter_sql_tuning_set_admin_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, basic_filter, credential_details_username, credential_details_role, credential_details_secret_id, database_credential): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -4601,10 +4600,10 @@ def validate_basic_filter_sql_tuning_set_admin_secret_credential_details(ctx, fr @cli_util.wrap_exceptions def validate_basic_filter_database_secret_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, basic_filter, database_credential_password_secret_id, credential_details, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -4653,10 +4652,10 @@ def validate_basic_filter_database_secret_credential_details(ctx, from_json, man @cli_util.wrap_exceptions def validate_basic_filter_database_named_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, basic_filter, database_credential_named_credential_id, credential_details): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} @@ -4701,10 +4700,10 @@ def validate_basic_filter_database_named_credential_details(ctx, from_json, mana @cli_util.wrap_exceptions def validate_basic_filter_database_password_credential_details(ctx, from_json, managed_database_id, sql_tuning_set_id, owner, name, basic_filter, database_credential_password, credential_details, database_credential_username, database_credential_role): - if isinstance(managed_database_id, six.string_types) and len(managed_database_id.strip()) == 0: + if isinstance(managed_database_id, str) and len(managed_database_id.strip()) == 0: raise click.UsageError('Parameter --managed-database-id cannot be whitespace or empty string') - if isinstance(sql_tuning_set_id, six.string_types) and len(sql_tuning_set_id.strip()) == 0: + if isinstance(sql_tuning_set_id, str) and len(sql_tuning_set_id.strip()) == 0: raise click.UsageError('Parameter --sql-tuning-set-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/database_migration/src/oci_cli_database_migration/generated/databasemigration_cli.py b/services/database_migration/src/oci_cli_database_migration/generated/databasemigration_cli.py index e5309c1dc..2adfaebc7 100644 --- a/services/database_migration/src/oci_cli_database_migration/generated/databasemigration_cli.py +++ b/services/database_migration/src/oci_cli_database_migration/generated/databasemigration_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -142,7 +141,7 @@ def job_output_summary_group(): @cli_util.wrap_exceptions def abort_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -191,7 +190,7 @@ def abort_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_se @cli_util.wrap_exceptions def add_migration_objects(ctx, from_json, migration_id, database_combination, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -223,7 +222,7 @@ def add_migration_objects(ctx, from_json, migration_id, database_combination, if @cli_util.wrap_exceptions def add_migration_objects_my_sql_migration_object_collection(ctx, from_json, migration_id, items, bulk_include_exclude_data, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -260,7 +259,7 @@ def add_migration_objects_my_sql_migration_object_collection(ctx, from_json, mig @cli_util.wrap_exceptions def add_migration_objects_oracle_migration_object_collection(ctx, from_json, migration_id, items, bulk_include_exclude_data, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -296,7 +295,7 @@ def add_migration_objects_oracle_migration_object_collection(ctx, from_json, mig @cli_util.wrap_exceptions def change_connection_compartment(ctx, from_json, connection_id, compartment_id, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -327,7 +326,7 @@ def change_connection_compartment(ctx, from_json, connection_id, compartment_id, @cli_util.wrap_exceptions def change_migration_compartment(ctx, from_json, migration_id, compartment_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -367,7 +366,7 @@ def change_migration_compartment(ctx, from_json, migration_id, compartment_id, i @cli_util.wrap_exceptions def clone_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, database_combination, source_database_connection_id, target_database_connection_id, display_name, compartment_id, freeform_tags, defined_tags, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -449,7 +448,7 @@ def clone_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def clone_migration_oracle_clone_migration_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, source_database_connection_id, target_database_connection_id, display_name, compartment_id, freeform_tags, defined_tags, source_container_database_connection_id, source_standby_database_connection_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -536,7 +535,7 @@ def clone_migration_oracle_clone_migration_details(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def clone_migration_my_sql_clone_migration_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, source_database_connection_id, target_database_connection_id, display_name, compartment_id, freeform_tags, defined_tags, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -614,7 +613,7 @@ def clone_migration_my_sql_clone_migration_details(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def collect_traces(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, bucket_name, namespace, object_name_prefix, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -673,7 +672,7 @@ def collect_traces(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def connection_diagnostics(ctx, from_json, connection_id, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -1375,7 +1374,7 @@ def create_migration_create_oracle_migration_details(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def create_parameter_file_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, kind, content, description, name, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -1443,7 +1442,7 @@ def create_parameter_file_version(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -1499,7 +1498,7 @@ def delete_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -1563,7 +1562,7 @@ def delete_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -1620,10 +1619,10 @@ def delete_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_parameter_file_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, parameter_file_name, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') - if isinstance(parameter_file_name, six.string_types) and len(parameter_file_name.strip()) == 0: + if isinstance(parameter_file_name, str) and len(parameter_file_name.strip()) == 0: raise click.UsageError('Parameter --parameter-file-name cannot be whitespace or empty string') kwargs = {} @@ -1679,7 +1678,7 @@ def delete_parameter_file_version(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def evaluate_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -1730,7 +1729,7 @@ def evaluate_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_advisor_report(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -1752,7 +1751,7 @@ def get_advisor_report(ctx, from_json, job_id): @cli_util.wrap_exceptions def get_connection(ctx, from_json, connection_id): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -1774,7 +1773,7 @@ def get_connection(ctx, from_json, connection_id): @cli_util.wrap_exceptions def get_job(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -1797,7 +1796,7 @@ def get_job(ctx, from_json, job_id): @cli_util.wrap_exceptions def get_job_output_content(ctx, from_json, file, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -1842,7 +1841,7 @@ def get_job_output_content(ctx, from_json, file, job_id): @cli_util.wrap_exceptions def get_migration(ctx, from_json, migration_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -1867,10 +1866,10 @@ def get_migration(ctx, from_json, migration_id, if_match): @cli_util.wrap_exceptions def get_parameter_file_version(ctx, from_json, parameter_file_name, job_id): - if isinstance(parameter_file_name, six.string_types) and len(parameter_file_name.strip()) == 0: + if isinstance(parameter_file_name, str) and len(parameter_file_name.strip()) == 0: raise click.UsageError('Parameter --parameter-file-name cannot be whitespace or empty string') - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -1893,7 +1892,7 @@ def get_parameter_file_version(ctx, from_json, parameter_file_name, job_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2000,7 +1999,7 @@ def list_excluded_objects(ctx, from_json, all_pages, page_size, job_id, limit, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2069,7 +2068,7 @@ def list_job_outputs(ctx, from_json, all_pages, page_size, job_id, limit, page): if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2235,7 +2234,7 @@ def list_migration_objects(ctx, from_json, all_pages, page_size, migration_id, i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -2410,7 +2409,7 @@ def list_parameter_file_versions(ctx, from_json, all_pages, page_size, job_id, n if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2469,7 +2468,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2526,7 +2525,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2639,10 +2638,10 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, res @cli_util.wrap_exceptions def make_current_parameter_file_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, parameter_file_name, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') - if isinstance(parameter_file_name, six.string_types) and len(parameter_file_name.strip()) == 0: + if isinstance(parameter_file_name, str) and len(parameter_file_name.strip()) == 0: raise click.UsageError('Parameter --parameter-file-name cannot be whitespace or empty string') kwargs = {} @@ -2692,7 +2691,7 @@ def make_current_parameter_file_version(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def remove_migration_objects(ctx, from_json, migration_id, database_combination, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -2724,7 +2723,7 @@ def remove_migration_objects(ctx, from_json, migration_id, database_combination, @cli_util.wrap_exceptions def remove_migration_objects_my_sql_migration_object_collection(ctx, from_json, migration_id, items, bulk_include_exclude_data, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -2761,7 +2760,7 @@ def remove_migration_objects_my_sql_migration_object_collection(ctx, from_json, @cli_util.wrap_exceptions def remove_migration_objects_oracle_migration_object_collection(ctx, from_json, migration_id, items, bulk_include_exclude_data, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -2800,7 +2799,7 @@ def remove_migration_objects_oracle_migration_object_collection(ctx, from_json, @cli_util.wrap_exceptions def resume_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, if_match, wait_after): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2854,7 +2853,7 @@ def resume_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def retrieve_supported_phases(ctx, from_json, migration_id): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -2881,7 +2880,7 @@ def retrieve_supported_phases(ctx, from_json, migration_id): @cli_util.wrap_exceptions def start_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, if_match, wait_after): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') kwargs = {} @@ -2943,7 +2942,7 @@ def start_migration(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def suspend_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -3008,7 +3007,7 @@ def suspend_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def update_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, connection_type, display_name, description, freeform_tags, defined_tags, vault_id, key_id, subnet_id, nsg_ids, username, password, replication_username, replication_password, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -3130,7 +3129,7 @@ def update_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_connection_update_oracle_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, subnet_id, nsg_ids, username, password, replication_username, replication_password, connection_string, wallet, database_id, ssh_host, ssh_key, ssh_user, ssh_sudo_location, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -3278,7 +3277,7 @@ def update_connection_update_oracle_connection_details(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_connection_update_mysql_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, subnet_id, nsg_ids, username, password, replication_username, replication_password, host, port, database_name, security_protocol, ssl_mode, ssl_ca, ssl_crl, ssl_cert, ssl_key, additional_attributes, db_system_id, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or additional_attributes: @@ -3416,7 +3415,7 @@ def update_connection_update_mysql_connection_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3493,7 +3492,7 @@ def update_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_migration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, database_combination, description, type, display_name, source_database_connection_id, target_database_connection_id, freeform_tags, defined_tags, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3591,7 +3590,7 @@ def update_migration(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_migration_update_my_sql_migration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, description, type, display_name, source_database_connection_id, target_database_connection_id, freeform_tags, defined_tags, data_transfer_medium_details, initial_load_settings, advisor_settings, hub_details, ggs_details, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or data_transfer_medium_details or initial_load_settings or advisor_settings or hub_details or ggs_details: @@ -3710,7 +3709,7 @@ def update_migration_update_my_sql_migration_details(ctx, from_json, force, wait @cli_util.wrap_exceptions def update_migration_update_oracle_migration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, migration_id, description, type, display_name, source_database_connection_id, target_database_connection_id, freeform_tags, defined_tags, data_transfer_medium_details, initial_load_settings, advisor_settings, hub_details, ggs_details, advanced_parameters, source_container_database_connection_id, source_standby_database_connection_id, if_match): - if isinstance(migration_id, six.string_types) and len(migration_id.strip()) == 0: + if isinstance(migration_id, str) and len(migration_id.strip()) == 0: raise click.UsageError('Parameter --migration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or data_transfer_medium_details or initial_load_settings or advisor_settings or hub_details or ggs_details or advanced_parameters: diff --git a/services/database_tools/src/oci_cli_database_tools/generated/databasetools_cli.py b/services/database_tools/src/oci_cli_database_tools/generated/databasetools_cli.py index f7543cf86..a03080b8d 100644 --- a/services/database_tools/src/oci_cli_database_tools/generated/databasetools_cli.py +++ b/services/database_tools/src/oci_cli_database_tools/generated/databasetools_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -83,7 +82,7 @@ def database_tools_connection_group(): @cli_util.wrap_exceptions def add_database_tools_connection_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, type, related_resource_id, message, time_created, if_match): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} @@ -152,7 +151,7 @@ def add_database_tools_connection_lock(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def add_database_tools_private_endpoint_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_private_endpoint_id, type, related_resource_id, message, time_created, if_match): - if isinstance(database_tools_private_endpoint_id, six.string_types) and len(database_tools_private_endpoint_id.strip()) == 0: + if isinstance(database_tools_private_endpoint_id, str) and len(database_tools_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -219,7 +218,7 @@ def add_database_tools_private_endpoint_lock(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def change_database_tools_connection_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, compartment_id, if_match, is_lock_override): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} @@ -283,7 +282,7 @@ def change_database_tools_connection_compartment(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_database_tools_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_private_endpoint_id, compartment_id, if_match, is_lock_override): - if isinstance(database_tools_private_endpoint_id, six.string_types) and len(database_tools_private_endpoint_id.strip()) == 0: + if isinstance(database_tools_private_endpoint_id, str) and len(database_tools_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -899,7 +898,7 @@ def create_database_tools_private_endpoint(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def delete_database_tools_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, if_match, is_lock_override): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} @@ -958,7 +957,7 @@ def delete_database_tools_connection(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_database_tools_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_private_endpoint_id, if_match, is_lock_override): - if isinstance(database_tools_private_endpoint_id, six.string_types) and len(database_tools_private_endpoint_id.strip()) == 0: + if isinstance(database_tools_private_endpoint_id, str) and len(database_tools_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1011,7 +1010,7 @@ def delete_database_tools_private_endpoint(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def get_database_tools_connection(ctx, from_json, database_tools_connection_id): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} @@ -1033,7 +1032,7 @@ def get_database_tools_connection(ctx, from_json, database_tools_connection_id): @cli_util.wrap_exceptions def get_database_tools_endpoint_service(ctx, from_json, database_tools_endpoint_service_id): - if isinstance(database_tools_endpoint_service_id, six.string_types) and len(database_tools_endpoint_service_id.strip()) == 0: + if isinstance(database_tools_endpoint_service_id, str) and len(database_tools_endpoint_service_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-endpoint-service-id cannot be whitespace or empty string') kwargs = {} @@ -1055,7 +1054,7 @@ def get_database_tools_endpoint_service(ctx, from_json, database_tools_endpoint_ @cli_util.wrap_exceptions def get_database_tools_private_endpoint(ctx, from_json, database_tools_private_endpoint_id): - if isinstance(database_tools_private_endpoint_id, six.string_types) and len(database_tools_private_endpoint_id.strip()) == 0: + if isinstance(database_tools_private_endpoint_id, str) and len(database_tools_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1077,7 +1076,7 @@ def get_database_tools_private_endpoint(ctx, from_json, database_tools_private_e @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1306,7 +1305,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1363,7 +1362,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1476,7 +1475,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, res @cli_util.wrap_exceptions def remove_database_tools_connection_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, type, related_resource_id, message, time_created, if_match): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} @@ -1545,7 +1544,7 @@ def remove_database_tools_connection_lock(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def remove_database_tools_private_endpoint_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_private_endpoint_id, type, related_resource_id, message, time_created, if_match): - if isinstance(database_tools_private_endpoint_id, six.string_types) and len(database_tools_private_endpoint_id.strip()) == 0: + if isinstance(database_tools_private_endpoint_id, str) and len(database_tools_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1616,7 +1615,7 @@ def remove_database_tools_private_endpoint_lock(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def update_database_tools_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, type, display_name, defined_tags, freeform_tags, if_match, is_lock_override): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -1703,7 +1702,7 @@ def update_database_tools_connection(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_database_tools_connection_update_database_tools_connection_generic_jdbc_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, display_name, defined_tags, freeform_tags, url, user_name, user_password, advanced_properties, key_stores, if_match, is_lock_override): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or user_password or advanced_properties or key_stores: @@ -1808,7 +1807,7 @@ def update_database_tools_connection_update_database_tools_connection_generic_jd @cli_util.wrap_exceptions def update_database_tools_connection_update_database_tools_connection_postgresql_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, display_name, defined_tags, freeform_tags, related_resource, connection_string, user_name, user_password, advanced_properties, key_stores, private_endpoint_id, if_match, is_lock_override): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or related_resource or user_password or advanced_properties or key_stores: @@ -1919,7 +1918,7 @@ def update_database_tools_connection_update_database_tools_connection_postgresql @cli_util.wrap_exceptions def update_database_tools_connection_update_database_tools_connection_my_sql_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, display_name, defined_tags, freeform_tags, related_resource, connection_string, user_name, user_password, advanced_properties, key_stores, private_endpoint_id, if_match, is_lock_override): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or related_resource or user_password or advanced_properties or key_stores: @@ -2031,7 +2030,7 @@ def update_database_tools_connection_update_database_tools_connection_my_sql_det @cli_util.wrap_exceptions def update_database_tools_connection_update_database_tools_connection_oracle_database_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_connection_id, display_name, defined_tags, freeform_tags, related_resource, connection_string, user_name, user_password, advanced_properties, key_stores, private_endpoint_id, proxy_client, if_match, is_lock_override): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or related_resource or user_password or advanced_properties or key_stores or proxy_client: @@ -2138,7 +2137,7 @@ def update_database_tools_connection_update_database_tools_connection_oracle_dat @cli_util.wrap_exceptions def update_database_tools_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_tools_private_endpoint_id, defined_tags, freeform_tags, display_name, description, nsg_ids, if_match, is_lock_override): - if isinstance(database_tools_private_endpoint_id, six.string_types) and len(database_tools_private_endpoint_id.strip()) == 0: + if isinstance(database_tools_private_endpoint_id, str) and len(database_tools_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-private-endpoint-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or nsg_ids: @@ -2216,7 +2215,7 @@ def update_database_tools_private_endpoint(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def validate_database_tools_connection(ctx, from_json, database_tools_connection_id, type, if_match): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} @@ -2246,7 +2245,7 @@ def validate_database_tools_connection(ctx, from_json, database_tools_connection @cli_util.wrap_exceptions def validate_database_tools_connection_validate_database_tools_connection_postgresql_details(ctx, from_json, database_tools_connection_id, if_match): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} @@ -2277,7 +2276,7 @@ def validate_database_tools_connection_validate_database_tools_connection_postgr @cli_util.wrap_exceptions def validate_database_tools_connection_validate_database_tools_connection_oracle_database_details(ctx, from_json, database_tools_connection_id, if_match): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} @@ -2308,7 +2307,7 @@ def validate_database_tools_connection_validate_database_tools_connection_oracle @cli_util.wrap_exceptions def validate_database_tools_connection_validate_database_tools_connection_my_sql_details(ctx, from_json, database_tools_connection_id, if_match): - if isinstance(database_tools_connection_id, six.string_types) and len(database_tools_connection_id.strip()) == 0: + if isinstance(database_tools_connection_id, str) and len(database_tools_connection_id.strip()) == 0: raise click.UsageError('Parameter --database-tools-connection-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/dblm/src/oci_cli_db_life_cycle_management/generated/dblifecyclemanagement_cli.py b/services/dblm/src/oci_cli_db_life_cycle_management/generated/dblifecyclemanagement_cli.py index 522439eff..70c5efd33 100644 --- a/services/dblm/src/oci_cli_db_life_cycle_management/generated/dblifecyclemanagement_cli.py +++ b/services/dblm/src/oci_cli_db_life_cycle_management/generated/dblifecyclemanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -218,7 +217,7 @@ def get_vulnerability(ctx, from_json, compartment_id, database_release, lifecycl @cli_util.wrap_exceptions def get_vulnerability_scan(ctx, from_json, vulnerability_scan_id): - if isinstance(vulnerability_scan_id, six.string_types) and len(vulnerability_scan_id.strip()) == 0: + if isinstance(vulnerability_scan_id, str) and len(vulnerability_scan_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-scan-id cannot be whitespace or empty string') kwargs = {} @@ -240,7 +239,7 @@ def get_vulnerability_scan(ctx, from_json, vulnerability_scan_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -644,7 +643,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -701,7 +700,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/dbmulticloud/src/oci_cli_db_multicloud_gcp_provider/generated/dbmulticloudgcpprovider_cli.py b/services/dbmulticloud/src/oci_cli_db_multicloud_gcp_provider/generated/dbmulticloudgcpprovider_cli.py index cfb23d576..b2166e559 100644 --- a/services/dbmulticloud/src/oci_cli_db_multicloud_gcp_provider/generated/dbmulticloudgcpprovider_cli.py +++ b/services/dbmulticloud/src/oci_cli_db_multicloud_gcp_provider/generated/dbmulticloudgcpprovider_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -88,7 +87,7 @@ def oracle_db_gcp_key_group(): @cli_util.wrap_exceptions def change_oracle_db_gcp_identity_connector_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_gcp_identity_connector_id, compartment_id, if_match): - if isinstance(oracle_db_gcp_identity_connector_id, six.string_types) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: + if isinstance(oracle_db_gcp_identity_connector_id, str) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-identity-connector-id cannot be whitespace or empty string') kwargs = {} @@ -151,7 +150,7 @@ def change_oracle_db_gcp_identity_connector_compartment(ctx, from_json, wait_for @cli_util.wrap_exceptions def change_oracle_db_gcp_key_ring_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_gcp_key_ring_id, compartment_id, if_match): - if isinstance(oracle_db_gcp_key_ring_id, six.string_types) and len(oracle_db_gcp_key_ring_id.strip()) == 0: + if isinstance(oracle_db_gcp_key_ring_id, str) and len(oracle_db_gcp_key_ring_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-key-ring-id cannot be whitespace or empty string') kwargs = {} @@ -383,7 +382,7 @@ def create_oracle_db_gcp_key_ring(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_oracle_db_gcp_identity_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_gcp_identity_connector_id, if_match): - if isinstance(oracle_db_gcp_identity_connector_id, six.string_types) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: + if isinstance(oracle_db_gcp_identity_connector_id, str) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-identity-connector-id cannot be whitespace or empty string') kwargs = {} @@ -439,7 +438,7 @@ def delete_oracle_db_gcp_identity_connector(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def delete_oracle_db_gcp_key_ring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_gcp_key_ring_id, if_match): - if isinstance(oracle_db_gcp_key_ring_id, six.string_types) and len(oracle_db_gcp_key_ring_id.strip()) == 0: + if isinstance(oracle_db_gcp_key_ring_id, str) and len(oracle_db_gcp_key_ring_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-key-ring-id cannot be whitespace or empty string') kwargs = {} @@ -490,7 +489,7 @@ def delete_oracle_db_gcp_key_ring(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def get_oracle_db_gcp_identity_connector(ctx, from_json, oracle_db_gcp_identity_connector_id): - if isinstance(oracle_db_gcp_identity_connector_id, six.string_types) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: + if isinstance(oracle_db_gcp_identity_connector_id, str) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-identity-connector-id cannot be whitespace or empty string') kwargs = {} @@ -512,7 +511,7 @@ def get_oracle_db_gcp_identity_connector(ctx, from_json, oracle_db_gcp_identity_ @cli_util.wrap_exceptions def get_oracle_db_gcp_key(ctx, from_json, oracle_db_gcp_key_id): - if isinstance(oracle_db_gcp_key_id, six.string_types) and len(oracle_db_gcp_key_id.strip()) == 0: + if isinstance(oracle_db_gcp_key_id, str) and len(oracle_db_gcp_key_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-key-id cannot be whitespace or empty string') kwargs = {} @@ -537,7 +536,7 @@ def get_oracle_db_gcp_key(ctx, from_json, oracle_db_gcp_key_id): @cli_util.wrap_exceptions def get_oracle_db_gcp_key_ring(ctx, from_json, oracle_db_gcp_key_ring_id, limit, page, sort_order): - if isinstance(oracle_db_gcp_key_ring_id, six.string_types) and len(oracle_db_gcp_key_ring_id.strip()) == 0: + if isinstance(oracle_db_gcp_key_ring_id, str) and len(oracle_db_gcp_key_ring_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-key-ring-id cannot be whitespace or empty string') kwargs = {} @@ -764,7 +763,7 @@ def list_oracle_db_gcp_keys(ctx, from_json, all_pages, page_size, compartment_id @cli_util.wrap_exceptions def refresh_oracle_db_gcp_identity_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_gcp_identity_connector_id, if_match): - if isinstance(oracle_db_gcp_identity_connector_id, six.string_types) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: + if isinstance(oracle_db_gcp_identity_connector_id, str) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-identity-connector-id cannot be whitespace or empty string') kwargs = {} @@ -820,7 +819,7 @@ def refresh_oracle_db_gcp_identity_connector(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def refresh_oracle_db_gcp_key_ring(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_gcp_key_ring_id, oracle_db_gcp_connector_id, if_match): - if isinstance(oracle_db_gcp_key_ring_id, six.string_types) and len(oracle_db_gcp_key_ring_id.strip()) == 0: + if isinstance(oracle_db_gcp_key_ring_id, str) and len(oracle_db_gcp_key_ring_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-key-ring-id cannot be whitespace or empty string') kwargs = {} @@ -897,7 +896,7 @@ def refresh_oracle_db_gcp_key_ring(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_oracle_db_gcp_identity_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_gcp_identity_connector_id, display_name, issuer_url, project_id, resource_id, gcp_location, gcp_workload_identity_pool_id, gcp_workload_identity_provider_id, gcp_resource_service_agent_id, freeform_tags, defined_tags, if_match): - if isinstance(oracle_db_gcp_identity_connector_id, six.string_types) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: + if isinstance(oracle_db_gcp_identity_connector_id, str) and len(oracle_db_gcp_identity_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-identity-connector-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -998,7 +997,7 @@ def update_oracle_db_gcp_identity_connector(ctx, from_json, force, wait_for_stat @cli_util.wrap_exceptions def update_oracle_db_gcp_key_ring(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_gcp_key_ring_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(oracle_db_gcp_key_ring_id, six.string_types) and len(oracle_db_gcp_key_ring_id.strip()) == 0: + if isinstance(oracle_db_gcp_key_ring_id, str) and len(oracle_db_gcp_key_ring_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-gcp-key-ring-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/dbmulticloud/src/oci_cli_multi_cloud_resource_discovery/generated/multicloudresourcediscovery_cli.py b/services/dbmulticloud/src/oci_cli_multi_cloud_resource_discovery/generated/multicloudresourcediscovery_cli.py index 214786dc9..3be78f8c9 100644 --- a/services/dbmulticloud/src/oci_cli_multi_cloud_resource_discovery/generated/multicloudresourcediscovery_cli.py +++ b/services/dbmulticloud/src/oci_cli_multi_cloud_resource_discovery/generated/multicloudresourcediscovery_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -83,7 +82,7 @@ def multi_cloud_resource_discovery_group(): @cli_util.wrap_exceptions def change_multi_cloud_resource_discovery_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, multi_cloud_resource_discovery_id, compartment_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(multi_cloud_resource_discovery_id, six.string_types) and len(multi_cloud_resource_discovery_id.strip()) == 0: + if isinstance(multi_cloud_resource_discovery_id, str) and len(multi_cloud_resource_discovery_id.strip()) == 0: raise click.UsageError('Parameter --multi-cloud-resource-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -233,7 +232,7 @@ def create_multi_cloud_resource_discovery(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def delete_multi_cloud_resource_discovery(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, multi_cloud_resource_discovery_id, if_match): - if isinstance(multi_cloud_resource_discovery_id, six.string_types) and len(multi_cloud_resource_discovery_id.strip()) == 0: + if isinstance(multi_cloud_resource_discovery_id, str) and len(multi_cloud_resource_discovery_id.strip()) == 0: raise click.UsageError('Parameter --multi-cloud-resource-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -287,7 +286,7 @@ def delete_multi_cloud_resource_discovery(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def get_multi_cloud_resource_discovery(ctx, from_json, multi_cloud_resource_discovery_id, limit, page, sort_order): - if isinstance(multi_cloud_resource_discovery_id, six.string_types) and len(multi_cloud_resource_discovery_id.strip()) == 0: + if isinstance(multi_cloud_resource_discovery_id, str) and len(multi_cloud_resource_discovery_id.strip()) == 0: raise click.UsageError('Parameter --multi-cloud-resource-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -402,7 +401,7 @@ def list_multi_cloud_resource_discoveries(ctx, from_json, all_pages, page_size, @cli_util.wrap_exceptions def update_multi_cloud_resource_discovery(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, multi_cloud_resource_discovery_id, compartment_id, display_name, oracle_db_connector_id, resource_type, freeform_tags, defined_tags, if_match): - if isinstance(multi_cloud_resource_discovery_id, six.string_types) and len(multi_cloud_resource_discovery_id.strip()) == 0: + if isinstance(multi_cloud_resource_discovery_id, str) and len(multi_cloud_resource_discovery_id.strip()) == 0: raise click.UsageError('Parameter --multi-cloud-resource-discovery-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/dbmulticloud/src/oci_cli_oracle_db_azure_blob_container/generated/oracledbazureblobcontainer_cli.py b/services/dbmulticloud/src/oci_cli_oracle_db_azure_blob_container/generated/oracledbazureblobcontainer_cli.py index b534c7e54..4919bfca6 100644 --- a/services/dbmulticloud/src/oci_cli_oracle_db_azure_blob_container/generated/oracledbazureblobcontainer_cli.py +++ b/services/dbmulticloud/src/oci_cli_oracle_db_azure_blob_container/generated/oracledbazureblobcontainer_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -83,7 +82,7 @@ def oracle_db_azure_blob_container_group(): @cli_util.wrap_exceptions def change_oracle_db_azure_blob_container_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_blob_container_id, compartment_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(oracle_db_azure_blob_container_id, six.string_types) and len(oracle_db_azure_blob_container_id.strip()) == 0: + if isinstance(oracle_db_azure_blob_container_id, str) and len(oracle_db_azure_blob_container_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-blob-container-id cannot be whitespace or empty string') kwargs = {} @@ -237,7 +236,7 @@ def create_oracle_db_azure_blob_container(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def delete_oracle_db_azure_blob_container(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_blob_container_id, if_match): - if isinstance(oracle_db_azure_blob_container_id, six.string_types) and len(oracle_db_azure_blob_container_id.strip()) == 0: + if isinstance(oracle_db_azure_blob_container_id, str) and len(oracle_db_azure_blob_container_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-blob-container-id cannot be whitespace or empty string') kwargs = {} @@ -291,7 +290,7 @@ def delete_oracle_db_azure_blob_container(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def get_oracle_db_azure_blob_container(ctx, from_json, oracle_db_azure_blob_container_id, limit, page, sort_order): - if isinstance(oracle_db_azure_blob_container_id, six.string_types) and len(oracle_db_azure_blob_container_id.strip()) == 0: + if isinstance(oracle_db_azure_blob_container_id, str) and len(oracle_db_azure_blob_container_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-blob-container-id cannot be whitespace or empty string') kwargs = {} @@ -405,7 +404,7 @@ def list_oracle_db_azure_blob_containers(ctx, from_json, all_pages, page_size, c @cli_util.wrap_exceptions def update_oracle_db_azure_blob_container(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_blob_container_id, compartment_id, display_name, private_endpoint_ip_address, private_endpoint_dns_alias, azure_storage_account_name, azure_storage_container_name, freeform_tags, defined_tags, if_match): - if isinstance(oracle_db_azure_blob_container_id, six.string_types) and len(oracle_db_azure_blob_container_id.strip()) == 0: + if isinstance(oracle_db_azure_blob_container_id, str) and len(oracle_db_azure_blob_container_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-blob-container-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/dbmulticloud/src/oci_cli_oracle_db_azure_blob_mount/generated/oracledbazureblobmount_cli.py b/services/dbmulticloud/src/oci_cli_oracle_db_azure_blob_mount/generated/oracledbazureblobmount_cli.py index 98d33e4d5..14d046d48 100644 --- a/services/dbmulticloud/src/oci_cli_oracle_db_azure_blob_mount/generated/oracledbazureblobmount_cli.py +++ b/services/dbmulticloud/src/oci_cli_oracle_db_azure_blob_mount/generated/oracledbazureblobmount_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -83,7 +82,7 @@ def oracle_db_azure_blob_mount_group(): @cli_util.wrap_exceptions def change_oracle_db_azure_blob_mount_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_blob_mount_id, compartment_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(oracle_db_azure_blob_mount_id, six.string_types) and len(oracle_db_azure_blob_mount_id.strip()) == 0: + if isinstance(oracle_db_azure_blob_mount_id, str) and len(oracle_db_azure_blob_mount_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-blob-mount-id cannot be whitespace or empty string') kwargs = {} @@ -229,7 +228,7 @@ def create_oracle_db_azure_blob_mount(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def delete_oracle_db_azure_blob_mount(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_blob_mount_id, if_match): - if isinstance(oracle_db_azure_blob_mount_id, six.string_types) and len(oracle_db_azure_blob_mount_id.strip()) == 0: + if isinstance(oracle_db_azure_blob_mount_id, str) and len(oracle_db_azure_blob_mount_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-blob-mount-id cannot be whitespace or empty string') kwargs = {} @@ -283,7 +282,7 @@ def delete_oracle_db_azure_blob_mount(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def get_oracle_db_azure_blob_mount(ctx, from_json, oracle_db_azure_blob_mount_id, limit, page, sort_order): - if isinstance(oracle_db_azure_blob_mount_id, six.string_types) and len(oracle_db_azure_blob_mount_id.strip()) == 0: + if isinstance(oracle_db_azure_blob_mount_id, str) and len(oracle_db_azure_blob_mount_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-blob-mount-id cannot be whitespace or empty string') kwargs = {} @@ -395,7 +394,7 @@ def list_oracle_db_azure_blob_mounts(ctx, from_json, all_pages, page_size, compa @cli_util.wrap_exceptions def update_oracle_db_azure_blob_mount(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_blob_mount_id, compartment_id, display_name, oracle_db_azure_connector_id, oracle_db_azure_blob_container_id, freeform_tags, defined_tags, if_match): - if isinstance(oracle_db_azure_blob_mount_id, six.string_types) and len(oracle_db_azure_blob_mount_id.strip()) == 0: + if isinstance(oracle_db_azure_blob_mount_id, str) and len(oracle_db_azure_blob_mount_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-blob-mount-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/dbmulticloud/src/oci_cli_oracle_db_azure_connector/generated/oracledbazureconnector_cli.py b/services/dbmulticloud/src/oci_cli_oracle_db_azure_connector/generated/oracledbazureconnector_cli.py index be874626c..8258ad8f2 100644 --- a/services/dbmulticloud/src/oci_cli_oracle_db_azure_connector/generated/oracledbazureconnector_cli.py +++ b/services/dbmulticloud/src/oci_cli_oracle_db_azure_connector/generated/oracledbazureconnector_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -83,7 +82,7 @@ def oracle_db_azure_connector_group(): @cli_util.wrap_exceptions def change_oracle_db_azure_connector_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_connector_id, compartment_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(oracle_db_azure_connector_id, six.string_types) and len(oracle_db_azure_connector_id.strip()) == 0: + if isinstance(oracle_db_azure_connector_id, str) and len(oracle_db_azure_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-connector-id cannot be whitespace or empty string') kwargs = {} @@ -244,7 +243,7 @@ def create_oracle_db_azure_connector(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_oracle_db_azure_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_connector_id, if_match): - if isinstance(oracle_db_azure_connector_id, six.string_types) and len(oracle_db_azure_connector_id.strip()) == 0: + if isinstance(oracle_db_azure_connector_id, str) and len(oracle_db_azure_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-connector-id cannot be whitespace or empty string') kwargs = {} @@ -298,7 +297,7 @@ def delete_oracle_db_azure_connector(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def get_oracle_db_azure_connector(ctx, from_json, oracle_db_azure_connector_id, limit, page, sort_order): - if isinstance(oracle_db_azure_connector_id, six.string_types) and len(oracle_db_azure_connector_id.strip()) == 0: + if isinstance(oracle_db_azure_connector_id, str) and len(oracle_db_azure_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-connector-id cannot be whitespace or empty string') kwargs = {} @@ -406,7 +405,7 @@ def list_oracle_db_azure_connectors(ctx, from_json, all_pages, page_size, compar @cli_util.wrap_exceptions def patch_oracle_db_azure_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_connector_id, new_version, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(oracle_db_azure_connector_id, six.string_types) and len(oracle_db_azure_connector_id.strip()) == 0: + if isinstance(oracle_db_azure_connector_id, str) and len(oracle_db_azure_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-connector-id cannot be whitespace or empty string') kwargs = {} @@ -477,7 +476,7 @@ def patch_oracle_db_azure_connector(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def refresh_oracle_db_azure_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_connector_id, if_match): - if isinstance(oracle_db_azure_connector_id, six.string_types) and len(oracle_db_azure_connector_id.strip()) == 0: + if isinstance(oracle_db_azure_connector_id, str) and len(oracle_db_azure_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-connector-id cannot be whitespace or empty string') kwargs = {} @@ -549,7 +548,7 @@ def refresh_oracle_db_azure_connector(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_oracle_db_azure_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_connector_id, compartment_id, display_name, db_cluster_resource_id, azure_identity_mechanism, azure_tenant_id, azure_subscription_id, azure_resource_group, access_token, private_endpoint_ip_address, private_endpoint_dns_alias, freeform_tags, defined_tags, if_match): - if isinstance(oracle_db_azure_connector_id, six.string_types) and len(oracle_db_azure_connector_id.strip()) == 0: + if isinstance(oracle_db_azure_connector_id, str) and len(oracle_db_azure_connector_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-connector-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/dbmulticloud/src/oci_cli_oracle_db_azure_key/generated/oracledbazurekey_cli.py b/services/dbmulticloud/src/oci_cli_oracle_db_azure_key/generated/oracledbazurekey_cli.py index da0c11e56..b6b30fe5c 100644 --- a/services/dbmulticloud/src/oci_cli_oracle_db_azure_key/generated/oracledbazurekey_cli.py +++ b/services/dbmulticloud/src/oci_cli_oracle_db_azure_key/generated/oracledbazurekey_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -72,7 +71,7 @@ def oracle_db_azure_key_group(): @cli_util.wrap_exceptions def get_oracle_db_azure_key(ctx, from_json, oracle_db_azure_key_id, limit, page, sort_order): - if isinstance(oracle_db_azure_key_id, six.string_types) and len(oracle_db_azure_key_id.strip()) == 0: + if isinstance(oracle_db_azure_key_id, str) and len(oracle_db_azure_key_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-key-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/dbmulticloud/src/oci_cli_oracle_db_azure_vault/generated/oracledbazurevault_cli.py b/services/dbmulticloud/src/oci_cli_oracle_db_azure_vault/generated/oracledbazurevault_cli.py index 45f285c8e..113ee3b41 100644 --- a/services/dbmulticloud/src/oci_cli_oracle_db_azure_vault/generated/oracledbazurevault_cli.py +++ b/services/dbmulticloud/src/oci_cli_oracle_db_azure_vault/generated/oracledbazurevault_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -83,7 +82,7 @@ def oracle_db_azure_vault_group(): @cli_util.wrap_exceptions def change_oracle_db_azure_vault_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_vault_id, compartment_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(oracle_db_azure_vault_id, six.string_types) and len(oracle_db_azure_vault_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_id, str) and len(oracle_db_azure_vault_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-id cannot be whitespace or empty string') kwargs = {} @@ -247,7 +246,7 @@ def create_oracle_db_azure_vault(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_oracle_db_azure_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_vault_id, if_match): - if isinstance(oracle_db_azure_vault_id, six.string_types) and len(oracle_db_azure_vault_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_id, str) and len(oracle_db_azure_vault_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-id cannot be whitespace or empty string') kwargs = {} @@ -301,7 +300,7 @@ def delete_oracle_db_azure_vault(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def get_oracle_db_azure_vault(ctx, from_json, oracle_db_azure_vault_id, limit, page, sort_order): - if isinstance(oracle_db_azure_vault_id, six.string_types) and len(oracle_db_azure_vault_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_id, str) and len(oracle_db_azure_vault_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-id cannot be whitespace or empty string') kwargs = {} @@ -403,7 +402,7 @@ def list_oracle_db_azure_vaults(ctx, from_json, all_pages, page_size, compartmen @cli_util.wrap_exceptions def refresh_oracle_db_azure_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_vault_id, oracle_db_azure_connector_id, if_match): - if isinstance(oracle_db_azure_vault_id, six.string_types) and len(oracle_db_azure_vault_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_id, str) and len(oracle_db_azure_vault_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-id cannot be whitespace or empty string') kwargs = {} @@ -480,7 +479,7 @@ def refresh_oracle_db_azure_vault(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_oracle_db_azure_vault(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_vault_id, compartment_id, oracle_db_connector_id, display_name, oracle_db_azure_resource_group, azure_vault_id, type, location, properties, freeform_tags, defined_tags, if_match): - if isinstance(oracle_db_azure_vault_id, six.string_types) and len(oracle_db_azure_vault_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_id, str) and len(oracle_db_azure_vault_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-id cannot be whitespace or empty string') if not force: if properties or freeform_tags or defined_tags: diff --git a/services/dbmulticloud/src/oci_cli_oracle_db_azure_vault_association/generated/oracledbazurevaultassociation_cli.py b/services/dbmulticloud/src/oci_cli_oracle_db_azure_vault_association/generated/oracledbazurevaultassociation_cli.py index a063d9170..cfd81eae4 100644 --- a/services/dbmulticloud/src/oci_cli_oracle_db_azure_vault_association/generated/oracledbazurevaultassociation_cli.py +++ b/services/dbmulticloud/src/oci_cli_oracle_db_azure_vault_association/generated/oracledbazurevaultassociation_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -73,7 +72,7 @@ def oracle_db_azure_vault_association_group(): @cli_util.wrap_exceptions def cascading_delete_oracle_db_azure_vault_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_vault_association_id, if_match): - if isinstance(oracle_db_azure_vault_association_id, six.string_types) and len(oracle_db_azure_vault_association_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_association_id, str) and len(oracle_db_azure_vault_association_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-association-id cannot be whitespace or empty string') kwargs = {} @@ -138,7 +137,7 @@ def cascading_delete_oracle_db_azure_vault_association(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def change_oracle_db_azure_vault_association_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_vault_association_id, compartment_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(oracle_db_azure_vault_association_id, six.string_types) and len(oracle_db_azure_vault_association_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_association_id, str) and len(oracle_db_azure_vault_association_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-association-id cannot be whitespace or empty string') kwargs = {} @@ -284,7 +283,7 @@ def create_oracle_db_azure_vault_association(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def delete_oracle_db_azure_vault_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_vault_association_id, if_match): - if isinstance(oracle_db_azure_vault_association_id, six.string_types) and len(oracle_db_azure_vault_association_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_association_id, str) and len(oracle_db_azure_vault_association_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-association-id cannot be whitespace or empty string') kwargs = {} @@ -338,7 +337,7 @@ def delete_oracle_db_azure_vault_association(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def get_oracle_db_azure_vault_association(ctx, from_json, oracle_db_azure_vault_association_id, limit, page, sort_order): - if isinstance(oracle_db_azure_vault_association_id, six.string_types) and len(oracle_db_azure_vault_association_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_association_id, str) and len(oracle_db_azure_vault_association_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-association-id cannot be whitespace or empty string') kwargs = {} @@ -450,7 +449,7 @@ def list_oracle_db_azure_vault_associations(ctx, from_json, all_pages, page_size @cli_util.wrap_exceptions def update_oracle_db_azure_vault_association(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oracle_db_azure_vault_association_id, compartment_id, display_name, oracle_db_azure_vault_id, oracle_db_azure_connector_id, freeform_tags, defined_tags, if_match): - if isinstance(oracle_db_azure_vault_association_id, six.string_types) and len(oracle_db_azure_vault_association_id.strip()) == 0: + if isinstance(oracle_db_azure_vault_association_id, str) and len(oracle_db_azure_vault_association_id.strip()) == 0: raise click.UsageError('Parameter --oracle-db-azure-vault-association-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/dbmulticloud/src/oci_cli_work_request/generated/workrequest_cli.py b/services/dbmulticloud/src/oci_cli_work_request/generated/workrequest_cli.py index 2d72bc439..2afeb415d 100644 --- a/services/dbmulticloud/src/oci_cli_work_request/generated/workrequest_cli.py +++ b/services/dbmulticloud/src/oci_cli_work_request/generated/workrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -85,7 +84,7 @@ def work_request_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -109,7 +108,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -140,7 +139,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -197,7 +196,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/delegate_access_control/src/oci_cli_delegate_access_control/generated/delegateaccesscontrol_cli.py b/services/delegate_access_control/src/oci_cli_delegate_access_control/generated/delegateaccesscontrol_cli.py index eb46ef72d..329df7eef 100644 --- a/services/delegate_access_control/src/oci_cli_delegate_access_control/generated/delegateaccesscontrol_cli.py +++ b/services/delegate_access_control/src/oci_cli_delegate_access_control/generated/delegateaccesscontrol_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -97,7 +96,7 @@ def delegation_subscription_group(): @cli_util.wrap_exceptions def approve_delegated_resource_access_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, delegated_resource_access_request_id, approver_comment, additional_message, time_approved_for_access, if_match): - if isinstance(delegated_resource_access_request_id, six.string_types) and len(delegated_resource_access_request_id.strip()) == 0: + if isinstance(delegated_resource_access_request_id, str) and len(delegated_resource_access_request_id.strip()) == 0: raise click.UsageError('Parameter --delegated-resource-access-request-id cannot be whitespace or empty string') kwargs = {} @@ -166,7 +165,7 @@ def approve_delegated_resource_access_request(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def change_delegation_control_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, delegation_control_id, compartment_id, if_match): - if isinstance(delegation_control_id, six.string_types) and len(delegation_control_id.strip()) == 0: + if isinstance(delegation_control_id, str) and len(delegation_control_id.strip()) == 0: raise click.UsageError('Parameter --delegation-control-id cannot be whitespace or empty string') kwargs = {} @@ -229,7 +228,7 @@ def change_delegation_control_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_delegation_subscription_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, delegation_subscription_id, compartment_id, if_match): - if isinstance(delegation_subscription_id, six.string_types) and len(delegation_subscription_id.strip()) == 0: + if isinstance(delegation_subscription_id, str) and len(delegation_subscription_id.strip()) == 0: raise click.UsageError('Parameter --delegation-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -467,7 +466,7 @@ def create_delegation_subscription(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_delegation_control(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, delegation_control_id, description, if_match): - if isinstance(delegation_control_id, six.string_types) and len(delegation_control_id.strip()) == 0: + if isinstance(delegation_control_id, str) and len(delegation_control_id.strip()) == 0: raise click.UsageError('Parameter --delegation-control-id cannot be whitespace or empty string') kwargs = {} @@ -525,7 +524,7 @@ def delete_delegation_control(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_delegation_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, delegation_subscription_id, if_match): - if isinstance(delegation_subscription_id, six.string_types) and len(delegation_subscription_id.strip()) == 0: + if isinstance(delegation_subscription_id, str) and len(delegation_subscription_id.strip()) == 0: raise click.UsageError('Parameter --delegation-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -576,7 +575,7 @@ def delete_delegation_subscription(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def get_delegated_resource_access_request(ctx, from_json, delegated_resource_access_request_id): - if isinstance(delegated_resource_access_request_id, six.string_types) and len(delegated_resource_access_request_id.strip()) == 0: + if isinstance(delegated_resource_access_request_id, str) and len(delegated_resource_access_request_id.strip()) == 0: raise click.UsageError('Parameter --delegated-resource-access-request-id cannot be whitespace or empty string') kwargs = {} @@ -599,7 +598,7 @@ def get_delegated_resource_access_request(ctx, from_json, delegated_resource_acc @cli_util.wrap_exceptions def get_delegated_resource_access_request_audit_log_report(ctx, from_json, delegated_resource_access_request_id, is_process_tree_enabled): - if isinstance(delegated_resource_access_request_id, six.string_types) and len(delegated_resource_access_request_id.strip()) == 0: + if isinstance(delegated_resource_access_request_id, str) and len(delegated_resource_access_request_id.strip()) == 0: raise click.UsageError('Parameter --delegated-resource-access-request-id cannot be whitespace or empty string') kwargs = {} @@ -623,7 +622,7 @@ def get_delegated_resource_access_request_audit_log_report(ctx, from_json, deleg @cli_util.wrap_exceptions def get_delegation_control(ctx, from_json, delegation_control_id): - if isinstance(delegation_control_id, six.string_types) and len(delegation_control_id.strip()) == 0: + if isinstance(delegation_control_id, str) and len(delegation_control_id.strip()) == 0: raise click.UsageError('Parameter --delegation-control-id cannot be whitespace or empty string') kwargs = {} @@ -645,7 +644,7 @@ def get_delegation_control(ctx, from_json, delegation_control_id): @cli_util.wrap_exceptions def get_delegation_subscription(ctx, from_json, delegation_subscription_id): - if isinstance(delegation_subscription_id, six.string_types) and len(delegation_subscription_id.strip()) == 0: + if isinstance(delegation_subscription_id, str) and len(delegation_subscription_id.strip()) == 0: raise click.UsageError('Parameter --delegation-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -667,7 +666,7 @@ def get_delegation_subscription(ctx, from_json, delegation_subscription_id): @cli_util.wrap_exceptions def get_service_provider(ctx, from_json, service_provider_id): - if isinstance(service_provider_id, six.string_types) and len(service_provider_id.strip()) == 0: + if isinstance(service_provider_id, str) and len(service_provider_id.strip()) == 0: raise click.UsageError('Parameter --service-provider-id cannot be whitespace or empty string') kwargs = {} @@ -689,7 +688,7 @@ def get_service_provider(ctx, from_json, service_provider_id): @cli_util.wrap_exceptions def get_service_provider_action(ctx, from_json, service_provider_action_id): - if isinstance(service_provider_action_id, six.string_types) and len(service_provider_action_id.strip()) == 0: + if isinstance(service_provider_action_id, str) and len(service_provider_action_id.strip()) == 0: raise click.UsageError('Parameter --service-provider-action-id cannot be whitespace or empty string') kwargs = {} @@ -720,7 +719,7 @@ def list_delegated_resource_access_request_histories(ctx, from_json, all_pages, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(delegated_resource_access_request_id, six.string_types) and len(delegated_resource_access_request_id.strip()) == 0: + if isinstance(delegated_resource_access_request_id, str) and len(delegated_resource_access_request_id.strip()) == 0: raise click.UsageError('Parameter --delegated-resource-access-request-id cannot be whitespace or empty string') kwargs = {} @@ -847,7 +846,7 @@ def list_delegation_control_resources(ctx, from_json, all_pages, page_size, dele if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(delegation_control_id, six.string_types) and len(delegation_control_id.strip()) == 0: + if isinstance(delegation_control_id, str) and len(delegation_control_id.strip()) == 0: raise click.UsageError('Parameter --delegation-control-id cannot be whitespace or empty string') kwargs = {} @@ -1090,7 +1089,7 @@ def list_service_provider_interactions(ctx, from_json, all_pages, page_size, del if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(delegated_resource_access_request_id, six.string_types) and len(delegated_resource_access_request_id.strip()) == 0: + if isinstance(delegated_resource_access_request_id, str) and len(delegated_resource_access_request_id.strip()) == 0: raise click.UsageError('Parameter --delegated-resource-access-request-id cannot be whitespace or empty string') kwargs = {} @@ -1205,7 +1204,7 @@ def list_service_providers(ctx, from_json, all_pages, page_size, compartment_id, @cli_util.wrap_exceptions def reject_delegated_resource_access_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, delegated_resource_access_request_id, approver_comment, if_match): - if isinstance(delegated_resource_access_request_id, six.string_types) and len(delegated_resource_access_request_id.strip()) == 0: + if isinstance(delegated_resource_access_request_id, str) and len(delegated_resource_access_request_id.strip()) == 0: raise click.UsageError('Parameter --delegated-resource-access-request-id cannot be whitespace or empty string') kwargs = {} @@ -1268,7 +1267,7 @@ def reject_delegated_resource_access_request(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def revoke_delegated_resource_access_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, delegated_resource_access_request_id, approver_comment, if_match): - if isinstance(delegated_resource_access_request_id, six.string_types) and len(delegated_resource_access_request_id.strip()) == 0: + if isinstance(delegated_resource_access_request_id, str) and len(delegated_resource_access_request_id.strip()) == 0: raise click.UsageError('Parameter --delegated-resource-access-request-id cannot be whitespace or empty string') kwargs = {} @@ -1328,7 +1327,7 @@ def revoke_delegated_resource_access_request(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def service_provider_interaction_request(ctx, from_json, delegated_resource_access_request_id, more_info_details, if_match): - if isinstance(delegated_resource_access_request_id, six.string_types) and len(delegated_resource_access_request_id.strip()) == 0: + if isinstance(delegated_resource_access_request_id, str) and len(delegated_resource_access_request_id.strip()) == 0: raise click.UsageError('Parameter --delegated-resource-access-request-id cannot be whitespace or empty string') kwargs = {} @@ -1379,7 +1378,7 @@ def service_provider_interaction_request(ctx, from_json, delegated_resource_acce @cli_util.wrap_exceptions def update_delegation_control(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, delegation_control_id, display_name, description, num_approvals_required, delegation_subscription_ids, is_auto_approve_during_maintenance, resource_ids, pre_approved_service_provider_action_names, notification_topic_id, notification_message_format, freeform_tags, defined_tags, if_match): - if isinstance(delegation_control_id, six.string_types) and len(delegation_control_id.strip()) == 0: + if isinstance(delegation_control_id, str) and len(delegation_control_id.strip()) == 0: raise click.UsageError('Parameter --delegation-control-id cannot be whitespace or empty string') if not force: if delegation_subscription_ids or resource_ids or pre_approved_service_provider_action_names or freeform_tags or defined_tags: @@ -1483,7 +1482,7 @@ def update_delegation_control(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_delegation_subscription(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, delegation_subscription_id, description, freeform_tags, defined_tags, if_match): - if isinstance(delegation_subscription_id, six.string_types) and len(delegation_subscription_id.strip()) == 0: + if isinstance(delegation_subscription_id, str) and len(delegation_subscription_id.strip()) == 0: raise click.UsageError('Parameter --delegation-subscription-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/delegate_access_control/src/oci_cli_work_request/generated/workrequest_cli.py b/services/delegate_access_control/src/oci_cli_work_request/generated/workrequest_cli.py index 44996a521..f1f98a1d1 100644 --- a/services/delegate_access_control/src/oci_cli_work_request/generated/workrequest_cli.py +++ b/services/delegate_access_control/src/oci_cli_work_request/generated/workrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -59,7 +58,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -90,7 +89,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -147,7 +146,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/demand_signal/src/oci_cli_occ_demand_signal/generated/occdemandsignal_cli.py b/services/demand_signal/src/oci_cli_occ_demand_signal/generated/occdemandsignal_cli.py index a6a787424..dcf6eae79 100644 --- a/services/demand_signal/src/oci_cli_occ_demand_signal/generated/occdemandsignal_cli.py +++ b/services/demand_signal/src/oci_cli_occ_demand_signal/generated/occdemandsignal_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -51,7 +50,7 @@ def occ_demand_signal_group(): @cli_util.wrap_exceptions def change_occ_demand_signal_compartment(ctx, from_json, occ_demand_signal_id, compartment_id, if_match): - if isinstance(occ_demand_signal_id, six.string_types) and len(occ_demand_signal_id.strip()) == 0: + if isinstance(occ_demand_signal_id, str) and len(occ_demand_signal_id.strip()) == 0: raise click.UsageError('Parameter --occ-demand-signal-id cannot be whitespace or empty string') kwargs = {} @@ -154,7 +153,7 @@ def create_occ_demand_signal(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_occ_demand_signal(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, occ_demand_signal_id, if_match): - if isinstance(occ_demand_signal_id, six.string_types) and len(occ_demand_signal_id.strip()) == 0: + if isinstance(occ_demand_signal_id, str) and len(occ_demand_signal_id.strip()) == 0: raise click.UsageError('Parameter --occ-demand-signal-id cannot be whitespace or empty string') kwargs = {} @@ -213,7 +212,7 @@ def delete_occ_demand_signal(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def get_occ_demand_signal(ctx, from_json, occ_demand_signal_id): - if isinstance(occ_demand_signal_id, six.string_types) and len(occ_demand_signal_id.strip()) == 0: + if isinstance(occ_demand_signal_id, str) and len(occ_demand_signal_id.strip()) == 0: raise click.UsageError('Parameter --occ-demand-signal-id cannot be whitespace or empty string') kwargs = {} @@ -301,7 +300,7 @@ def list_occ_demand_signals(ctx, from_json, all_pages, page_size, compartment_id @cli_util.wrap_exceptions def patch_occ_demand_signal(ctx, from_json, occ_demand_signal_id, items, if_match): - if isinstance(occ_demand_signal_id, six.string_types) and len(occ_demand_signal_id.strip()) == 0: + if isinstance(occ_demand_signal_id, str) and len(occ_demand_signal_id.strip()) == 0: raise click.UsageError('Parameter --occ-demand-signal-id cannot be whitespace or empty string') kwargs = {} @@ -345,7 +344,7 @@ def patch_occ_demand_signal(ctx, from_json, occ_demand_signal_id, items, if_matc @cli_util.wrap_exceptions def update_occ_demand_signal(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, occ_demand_signal_id, display_name, is_active, freeform_tags, defined_tags, if_match): - if isinstance(occ_demand_signal_id, six.string_types) and len(occ_demand_signal_id.strip()) == 0: + if isinstance(occ_demand_signal_id, str) and len(occ_demand_signal_id.strip()) == 0: raise click.UsageError('Parameter --occ-demand-signal-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/desktops/src/oci_cli_desktop_service/generated/desktopservice_cli.py b/services/desktops/src/oci_cli_desktop_service/generated/desktopservice_cli.py index c5544a424..8c3460544 100644 --- a/services/desktops/src/oci_cli_desktop_service/generated/desktopservice_cli.py +++ b/services/desktops/src/oci_cli_desktop_service/generated/desktopservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -70,7 +69,7 @@ def desktop_pool_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -99,7 +98,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_desktop_pool_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_pool_id, compartment_id, if_match): - if isinstance(desktop_pool_id, six.string_types) and len(desktop_pool_id.strip()) == 0: + if isinstance(desktop_pool_id, str) and len(desktop_pool_id.strip()) == 0: raise click.UsageError('Parameter --desktop-pool-id cannot be whitespace or empty string') kwargs = {} @@ -281,7 +280,7 @@ def create_desktop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_desktop(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_id, if_match): - if isinstance(desktop_id, six.string_types) and len(desktop_id.strip()) == 0: + if isinstance(desktop_id, str) and len(desktop_id.strip()) == 0: raise click.UsageError('Parameter --desktop-id cannot be whitespace or empty string') kwargs = {} @@ -338,7 +337,7 @@ def delete_desktop(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_desktop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_pool_id, if_match, are_volumes_preserved): - if isinstance(desktop_pool_id, six.string_types) and len(desktop_pool_id.strip()) == 0: + if isinstance(desktop_pool_id, str) and len(desktop_pool_id.strip()) == 0: raise click.UsageError('Parameter --desktop-pool-id cannot be whitespace or empty string') kwargs = {} @@ -391,7 +390,7 @@ def delete_desktop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_desktop(ctx, from_json, desktop_id): - if isinstance(desktop_id, six.string_types) and len(desktop_id.strip()) == 0: + if isinstance(desktop_id, str) and len(desktop_id.strip()) == 0: raise click.UsageError('Parameter --desktop-id cannot be whitespace or empty string') kwargs = {} @@ -413,7 +412,7 @@ def get_desktop(ctx, from_json, desktop_id): @cli_util.wrap_exceptions def get_desktop_pool(ctx, from_json, desktop_pool_id): - if isinstance(desktop_pool_id, six.string_types) and len(desktop_pool_id.strip()) == 0: + if isinstance(desktop_pool_id, str) and len(desktop_pool_id.strip()) == 0: raise click.UsageError('Parameter --desktop-pool-id cannot be whitespace or empty string') kwargs = {} @@ -435,7 +434,7 @@ def get_desktop_pool(ctx, from_json, desktop_pool_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -473,7 +472,7 @@ def list_desktop_pool_desktops(ctx, from_json, all_pages, page_size, compartment if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(desktop_pool_id, six.string_types) and len(desktop_pool_id.strip()) == 0: + if isinstance(desktop_pool_id, str) and len(desktop_pool_id.strip()) == 0: raise click.UsageError('Parameter --desktop-pool-id cannot be whitespace or empty string') kwargs = {} @@ -548,7 +547,7 @@ def list_desktop_pool_volumes(ctx, from_json, all_pages, page_size, desktop_pool if sort_by and not availability_domain and not all_pages: raise click.UsageError('You must provide an --availability-domain when doing a --sort-by, unless you specify the --all parameter') - if isinstance(desktop_pool_id, six.string_types) and len(desktop_pool_id.strip()) == 0: + if isinstance(desktop_pool_id, str) and len(desktop_pool_id.strip()) == 0: raise click.UsageError('Parameter --desktop-pool-id cannot be whitespace or empty string') kwargs = {} @@ -755,7 +754,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -812,7 +811,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -927,7 +926,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def start_desktop(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_id, if_match): - if isinstance(desktop_id, six.string_types) and len(desktop_id.strip()) == 0: + if isinstance(desktop_id, str) and len(desktop_id.strip()) == 0: raise click.UsageError('Parameter --desktop-id cannot be whitespace or empty string') kwargs = {} @@ -982,7 +981,7 @@ def start_desktop(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def start_desktop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_pool_id, if_match): - if isinstance(desktop_pool_id, six.string_types) and len(desktop_pool_id.strip()) == 0: + if isinstance(desktop_pool_id, str) and len(desktop_pool_id.strip()) == 0: raise click.UsageError('Parameter --desktop-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1038,7 +1037,7 @@ def start_desktop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def stop_desktop(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_id, if_match, is_soft_stop): - if isinstance(desktop_id, six.string_types) and len(desktop_id.strip()) == 0: + if isinstance(desktop_id, str) and len(desktop_id.strip()) == 0: raise click.UsageError('Parameter --desktop-id cannot be whitespace or empty string') kwargs = {} @@ -1095,7 +1094,7 @@ def stop_desktop(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def stop_desktop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_pool_id, if_match): - if isinstance(desktop_pool_id, six.string_types) and len(desktop_pool_id.strip()) == 0: + if isinstance(desktop_pool_id, str) and len(desktop_pool_id.strip()) == 0: raise click.UsageError('Parameter --desktop-pool-id cannot be whitespace or empty string') kwargs = {} @@ -1154,7 +1153,7 @@ def stop_desktop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_desktop(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(desktop_id, six.string_types) and len(desktop_id.strip()) == 0: + if isinstance(desktop_id, str) and len(desktop_id.strip()) == 0: raise click.UsageError('Parameter --desktop-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1239,7 +1238,7 @@ def update_desktop(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_desktop_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, desktop_pool_id, display_name, description, maximum_size, standby_size, device_policy, availability_policy, contact_details, time_start_scheduled, time_stop_scheduled, freeform_tags, defined_tags, session_lifecycle_actions, if_match): - if isinstance(desktop_pool_id, six.string_types) and len(desktop_pool_id.strip()) == 0: + if isinstance(desktop_pool_id, str) and len(desktop_pool_id.strip()) == 0: raise click.UsageError('Parameter --desktop-pool-id cannot be whitespace or empty string') if not force: if device_policy or availability_policy or freeform_tags or defined_tags or session_lifecycle_actions: diff --git a/services/devops/src/oci_cli_devops/devops_cli_extended.py b/services/devops/src/oci_cli_devops/devops_cli_extended.py index 919f43a5e..c1d3c619c 100644 --- a/services/devops/src/oci_cli_devops/devops_cli_extended.py +++ b/services/devops/src/oci_cli_devops/devops_cli_extended.py @@ -9,7 +9,6 @@ from oci_cli import custom_types # noqa: F401 from oci_cli import json_skeleton_utils # noqa: F401 from oci_cli.aliasing import CommandGroupWithAlias -import six # oci devops deploy-artifact deploy-artifact-summary list-deploy-artifacts -> oci devops deploy-artifact deploy-artifact-summary list cli_util.rename_command(devops_cli, devops_cli.deploy_artifact_summary_group, devops_cli.list_deploy_artifacts, "list") @@ -1435,7 +1434,7 @@ def pull_request_comment_group(): @cli_util.wrap_exceptions def summarize_repository_analytics(ctx, from_json, repository_id, repository_metrics, start_time, author_email, aggregation_duration, end_time, group_by, limit, page): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -1487,7 +1486,7 @@ def summarize_repository_analytics(ctx, from_json, repository_id, repository_met @cli_util.wrap_exceptions def summarize_project_repository_analytics(ctx, from_json, project_id, repository_metrics, start_time, author_email, aggregation_duration, end_time, group_by, limit, page): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/devops/src/oci_cli_devops/generated/devops_cli.py b/services/devops/src/oci_cli_devops/generated/devops_cli.py index 5f865daa1..9ea89ae99 100644 --- a/services/devops/src/oci_cli_devops/generated/devops_cli.py +++ b/services/devops/src/oci_cli_devops/generated/devops_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -320,7 +319,7 @@ def repository_ref_group(): @cli_util.wrap_exceptions def approve_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, deploy_stage_id, action, reason, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -381,7 +380,7 @@ def approve_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def cancel_build_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, reason, build_run_id, if_match): - if isinstance(build_run_id, six.string_types) and len(build_run_id.strip()) == 0: + if isinstance(build_run_id, str) and len(build_run_id.strip()) == 0: raise click.UsageError('Parameter --build-run-id cannot be whitespace or empty string') kwargs = {} @@ -438,7 +437,7 @@ def cancel_build_run(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def cancel_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, reason, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -494,7 +493,7 @@ def cancel_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def cancel_scheduled_cascading_project_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -550,7 +549,7 @@ def cancel_scheduled_cascading_project_deletion(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_project_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, compartment_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -4574,7 +4573,7 @@ def create_deployment_create_single_deploy_stage_redeployment_details(ctx, from_ @cli_util.wrap_exceptions def create_or_update_git_ref(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, ref_name, ref_type, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -4637,7 +4636,7 @@ def create_or_update_git_ref(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_or_update_git_ref_create_or_update_git_branch_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, ref_name, commit_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -4702,7 +4701,7 @@ def create_or_update_git_ref_create_or_update_git_branch_details(ctx, from_json, @cli_util.wrap_exceptions def create_or_update_git_ref_create_or_update_git_tag_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, ref_name, object_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -4764,7 +4763,7 @@ def create_or_update_git_ref_create_or_update_git_tag_details(ctx, from_json, wa @cli_util.wrap_exceptions def create_or_update_protected_branch(ctx, from_json, repository_id, branch_name, protection_levels, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -4950,7 +4949,7 @@ def create_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def create_pull_request_attachment(ctx, from_json, pull_request_id, content_disposition, create_pull_request_attachment_body): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -4984,7 +4983,7 @@ def create_pull_request_attachment(ctx, from_json, pull_request_id, content_disp @cli_util.wrap_exceptions def create_pull_request_comment(ctx, from_json, pull_request_id, data, parent_id, file_path, commit_id, file_type, line_number): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -5715,7 +5714,7 @@ def create_trigger_create_bitbucket_server_trigger_details(ctx, from_json, wait_ @cli_util.wrap_exceptions def decline_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pull_request_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -5767,7 +5766,7 @@ def decline_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_build_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, build_pipeline_id, if_match): - if isinstance(build_pipeline_id, six.string_types) and len(build_pipeline_id.strip()) == 0: + if isinstance(build_pipeline_id, str) and len(build_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -5823,7 +5822,7 @@ def delete_build_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_build_pipeline_stage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, build_pipeline_stage_id, if_match): - if isinstance(build_pipeline_stage_id, six.string_types) and len(build_pipeline_stage_id.strip()) == 0: + if isinstance(build_pipeline_stage_id, str) and len(build_pipeline_stage_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-stage-id cannot be whitespace or empty string') kwargs = {} @@ -5879,7 +5878,7 @@ def delete_build_pipeline_stage(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -5935,7 +5934,7 @@ def delete_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_deploy_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_artifact_id, if_match): - if isinstance(deploy_artifact_id, six.string_types) and len(deploy_artifact_id.strip()) == 0: + if isinstance(deploy_artifact_id, str) and len(deploy_artifact_id.strip()) == 0: raise click.UsageError('Parameter --deploy-artifact-id cannot be whitespace or empty string') kwargs = {} @@ -5991,7 +5990,7 @@ def delete_deploy_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_deploy_environment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_environment_id, if_match): - if isinstance(deploy_environment_id, six.string_types) and len(deploy_environment_id.strip()) == 0: + if isinstance(deploy_environment_id, str) and len(deploy_environment_id.strip()) == 0: raise click.UsageError('Parameter --deploy-environment-id cannot be whitespace or empty string') kwargs = {} @@ -6047,7 +6046,7 @@ def delete_deploy_environment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_deploy_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_pipeline_id, if_match): - if isinstance(deploy_pipeline_id, six.string_types) and len(deploy_pipeline_id.strip()) == 0: + if isinstance(deploy_pipeline_id, str) and len(deploy_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --deploy-pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -6103,7 +6102,7 @@ def delete_deploy_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_deploy_stage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') kwargs = {} @@ -6159,7 +6158,7 @@ def delete_deploy_stage(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_git_ref(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, ref_name, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -6220,7 +6219,7 @@ def delete_git_ref(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -6273,7 +6272,7 @@ def delete_project(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_project_repository_settings(ctx, from_json, project_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -6299,7 +6298,7 @@ def delete_project_repository_settings(ctx, from_json, project_id, if_match): @cli_util.wrap_exceptions def delete_protected_branch(ctx, from_json, repository_id, branch_name, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -6333,7 +6332,7 @@ def delete_protected_branch(ctx, from_json, repository_id, branch_name, if_match @cli_util.wrap_exceptions def delete_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pull_request_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -6395,10 +6394,10 @@ def delete_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_pull_request_attachment(ctx, from_json, pull_request_id, attachment_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') kwargs = {} @@ -6426,10 +6425,10 @@ def delete_pull_request_attachment(ctx, from_json, pull_request_id, attachment_i @cli_util.wrap_exceptions def delete_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(comment_id, six.string_types) and len(comment_id.strip()) == 0: + if isinstance(comment_id, str) and len(comment_id.strip()) == 0: raise click.UsageError('Parameter --comment-id cannot be whitespace or empty string') kwargs = {} @@ -6460,10 +6459,10 @@ def delete_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if_ @cli_util.wrap_exceptions def delete_ref(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, ref_name, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(ref_name, six.string_types) and len(ref_name.strip()) == 0: + if isinstance(ref_name, str) and len(ref_name.strip()) == 0: raise click.UsageError('Parameter --ref-name cannot be whitespace or empty string') kwargs = {} @@ -6520,7 +6519,7 @@ def delete_ref(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_repository(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -6573,7 +6572,7 @@ def delete_repository(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_repository_settings(ctx, from_json, repository_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -6602,7 +6601,7 @@ def delete_repository_settings(ctx, from_json, repository_id, if_match): @cli_util.wrap_exceptions def delete_trigger(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') kwargs = {} @@ -6653,7 +6652,7 @@ def delete_trigger(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_build_pipeline(ctx, from_json, build_pipeline_id): - if isinstance(build_pipeline_id, six.string_types) and len(build_pipeline_id.strip()) == 0: + if isinstance(build_pipeline_id, str) and len(build_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -6675,7 +6674,7 @@ def get_build_pipeline(ctx, from_json, build_pipeline_id): @cli_util.wrap_exceptions def get_build_pipeline_stage(ctx, from_json, build_pipeline_stage_id): - if isinstance(build_pipeline_stage_id, six.string_types) and len(build_pipeline_stage_id.strip()) == 0: + if isinstance(build_pipeline_stage_id, str) and len(build_pipeline_stage_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-stage-id cannot be whitespace or empty string') kwargs = {} @@ -6697,7 +6696,7 @@ def get_build_pipeline_stage(ctx, from_json, build_pipeline_stage_id): @cli_util.wrap_exceptions def get_build_run(ctx, from_json, build_run_id): - if isinstance(build_run_id, six.string_types) and len(build_run_id.strip()) == 0: + if isinstance(build_run_id, str) and len(build_run_id.strip()) == 0: raise click.UsageError('Parameter --build-run-id cannot be whitespace or empty string') kwargs = {} @@ -6720,10 +6719,10 @@ def get_build_run(ctx, from_json, build_run_id): @cli_util.wrap_exceptions def get_commit(ctx, from_json, repository_id, commit_id): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(commit_id, six.string_types) and len(commit_id.strip()) == 0: + if isinstance(commit_id, str) and len(commit_id.strip()) == 0: raise click.UsageError('Parameter --commit-id cannot be whitespace or empty string') kwargs = {} @@ -6750,7 +6749,7 @@ def get_commit(ctx, from_json, repository_id, commit_id): @cli_util.wrap_exceptions def get_commit_diff(ctx, from_json, repository_id, target_version, base_version, target_repository_id, is_comparison_from_merge_base): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -6779,7 +6778,7 @@ def get_commit_diff(ctx, from_json, repository_id, target_version, base_version, @cli_util.wrap_exceptions def get_connection(ctx, from_json, connection_id): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -6801,7 +6800,7 @@ def get_connection(ctx, from_json, connection_id): @cli_util.wrap_exceptions def get_deploy_artifact(ctx, from_json, deploy_artifact_id): - if isinstance(deploy_artifact_id, six.string_types) and len(deploy_artifact_id.strip()) == 0: + if isinstance(deploy_artifact_id, str) and len(deploy_artifact_id.strip()) == 0: raise click.UsageError('Parameter --deploy-artifact-id cannot be whitespace or empty string') kwargs = {} @@ -6823,7 +6822,7 @@ def get_deploy_artifact(ctx, from_json, deploy_artifact_id): @cli_util.wrap_exceptions def get_deploy_environment(ctx, from_json, deploy_environment_id): - if isinstance(deploy_environment_id, six.string_types) and len(deploy_environment_id.strip()) == 0: + if isinstance(deploy_environment_id, str) and len(deploy_environment_id.strip()) == 0: raise click.UsageError('Parameter --deploy-environment-id cannot be whitespace or empty string') kwargs = {} @@ -6845,7 +6844,7 @@ def get_deploy_environment(ctx, from_json, deploy_environment_id): @cli_util.wrap_exceptions def get_deploy_pipeline(ctx, from_json, deploy_pipeline_id): - if isinstance(deploy_pipeline_id, six.string_types) and len(deploy_pipeline_id.strip()) == 0: + if isinstance(deploy_pipeline_id, str) and len(deploy_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --deploy-pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -6867,7 +6866,7 @@ def get_deploy_pipeline(ctx, from_json, deploy_pipeline_id): @cli_util.wrap_exceptions def get_deploy_stage(ctx, from_json, deploy_stage_id): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') kwargs = {} @@ -6889,7 +6888,7 @@ def get_deploy_stage(ctx, from_json, deploy_stage_id): @cli_util.wrap_exceptions def get_deployment(ctx, from_json, deployment_id): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6915,10 +6914,10 @@ def get_deployment(ctx, from_json, deployment_id): @cli_util.wrap_exceptions def get_file_diff(ctx, from_json, repository_id, file_path, base_version, target_version, is_comparison_from_merge_base): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(file_path, six.string_types) and len(file_path.strip()) == 0: + if isinstance(file_path, str) and len(file_path.strip()) == 0: raise click.UsageError('Parameter --file-path cannot be whitespace or empty string') kwargs = {} @@ -6946,10 +6945,10 @@ def get_file_diff(ctx, from_json, repository_id, file_path, base_version, target @cli_util.wrap_exceptions def get_mirror_record(ctx, from_json, repository_id, mirror_record_type): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(mirror_record_type, six.string_types) and len(mirror_record_type.strip()) == 0: + if isinstance(mirror_record_type, str) and len(mirror_record_type.strip()) == 0: raise click.UsageError('Parameter --mirror-record-type cannot be whitespace or empty string') kwargs = {} @@ -6974,7 +6973,7 @@ def get_mirror_record(ctx, from_json, repository_id, mirror_record_type): @cli_util.wrap_exceptions def get_object(ctx, from_json, repository_id, file_path, ref_name): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -7003,10 +7002,10 @@ def get_object(ctx, from_json, repository_id, file_path, ref_name): @cli_util.wrap_exceptions def get_object_content(ctx, from_json, file, repository_id, sha, file_path): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(sha, six.string_types) and len(sha.strip()) == 0: + if isinstance(sha, str) and len(sha.strip()) == 0: raise click.UsageError('Parameter --sha cannot be whitespace or empty string') kwargs = {} @@ -7053,7 +7052,7 @@ def get_object_content(ctx, from_json, file, repository_id, sha, file_path): @cli_util.wrap_exceptions def get_project(ctx, from_json, project_id): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -7076,10 +7075,10 @@ def get_project(ctx, from_json, project_id): @cli_util.wrap_exceptions def get_project_notification_preference(ctx, from_json, project_id, principal_id): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') - if isinstance(principal_id, six.string_types) and len(principal_id.strip()) == 0: + if isinstance(principal_id, str) and len(principal_id.strip()) == 0: raise click.UsageError('Parameter --principal-id cannot be whitespace or empty string') kwargs = {} @@ -7102,7 +7101,7 @@ def get_project_notification_preference(ctx, from_json, project_id, principal_id @cli_util.wrap_exceptions def get_project_repository_settings(ctx, from_json, project_id): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -7124,7 +7123,7 @@ def get_project_repository_settings(ctx, from_json, project_id): @cli_util.wrap_exceptions def get_pull_request(ctx, from_json, pull_request_id): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -7147,10 +7146,10 @@ def get_pull_request(ctx, from_json, pull_request_id): @cli_util.wrap_exceptions def get_pull_request_attachment(ctx, from_json, pull_request_id, attachment_id): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') kwargs = {} @@ -7175,10 +7174,10 @@ def get_pull_request_attachment(ctx, from_json, pull_request_id, attachment_id): @cli_util.wrap_exceptions def get_pull_request_attachment_content(ctx, from_json, file, pull_request_id, attachment_id): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') kwargs = {} @@ -7223,7 +7222,7 @@ def get_pull_request_attachment_content(ctx, from_json, file, pull_request_id, a @cli_util.wrap_exceptions def get_pull_request_change_summary_metrics(ctx, from_json, pull_request_id): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -7246,10 +7245,10 @@ def get_pull_request_change_summary_metrics(ctx, from_json, pull_request_id): @cli_util.wrap_exceptions def get_pull_request_comment(ctx, from_json, pull_request_id, comment_id): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(comment_id, six.string_types) and len(comment_id.strip()) == 0: + if isinstance(comment_id, str) and len(comment_id.strip()) == 0: raise click.UsageError('Parameter --comment-id cannot be whitespace or empty string') kwargs = {} @@ -7273,10 +7272,10 @@ def get_pull_request_comment(ctx, from_json, pull_request_id, comment_id): @cli_util.wrap_exceptions def get_pull_request_notification_preference(ctx, from_json, pull_request_id, principal_id): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(principal_id, six.string_types) and len(principal_id.strip()) == 0: + if isinstance(principal_id, str) and len(principal_id.strip()) == 0: raise click.UsageError('Parameter --principal-id cannot be whitespace or empty string') kwargs = {} @@ -7300,10 +7299,10 @@ def get_pull_request_notification_preference(ctx, from_json, pull_request_id, pr @cli_util.wrap_exceptions def get_ref(ctx, from_json, repository_id, ref_name): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(ref_name, six.string_types) and len(ref_name.strip()) == 0: + if isinstance(ref_name, str) and len(ref_name.strip()) == 0: raise click.UsageError('Parameter --ref-name cannot be whitespace or empty string') kwargs = {} @@ -7330,7 +7329,7 @@ def get_ref(ctx, from_json, repository_id, ref_name): @cli_util.wrap_exceptions def get_repo_file_diff(ctx, from_json, repository_id, base_version, target_version, file_path, is_comparison_from_merge_base): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -7362,7 +7361,7 @@ def get_repo_file_diff(ctx, from_json, repository_id, base_version, target_versi @cli_util.wrap_exceptions def get_repo_file_lines(ctx, from_json, repository_id, revision, file_path, start_line_number, limit): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -7392,7 +7391,7 @@ def get_repo_file_lines(ctx, from_json, repository_id, revision, file_path, star @cli_util.wrap_exceptions def get_repository(ctx, from_json, repository_id, fields): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -7419,7 +7418,7 @@ def get_repository(ctx, from_json, repository_id, fields): @cli_util.wrap_exceptions def get_repository_archive_content(ctx, from_json, file, repository_id, ref_name, format): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -7471,10 +7470,10 @@ def get_repository_archive_content(ctx, from_json, file, repository_id, ref_name @cli_util.wrap_exceptions def get_repository_file_lines(ctx, from_json, repository_id, file_path, revision, start_line_number, limit): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(file_path, six.string_types) and len(file_path.strip()) == 0: + if isinstance(file_path, str) and len(file_path.strip()) == 0: raise click.UsageError('Parameter --file-path cannot be whitespace or empty string') kwargs = {} @@ -7503,10 +7502,10 @@ def get_repository_file_lines(ctx, from_json, repository_id, file_path, revision @cli_util.wrap_exceptions def get_repository_notification_preference(ctx, from_json, repository_id, principal_id): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(principal_id, six.string_types) and len(principal_id.strip()) == 0: + if isinstance(principal_id, str) and len(principal_id.strip()) == 0: raise click.UsageError('Parameter --principal-id cannot be whitespace or empty string') kwargs = {} @@ -7529,7 +7528,7 @@ def get_repository_notification_preference(ctx, from_json, repository_id, princi @cli_util.wrap_exceptions def get_repository_settings(ctx, from_json, repository_id): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -7551,7 +7550,7 @@ def get_repository_settings(ctx, from_json, repository_id): @cli_util.wrap_exceptions def get_trigger(ctx, from_json, trigger_id): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') kwargs = {} @@ -7573,7 +7572,7 @@ def get_trigger(ctx, from_json, trigger_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -7597,10 +7596,10 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def like_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(comment_id, six.string_types) and len(comment_id.strip()) == 0: + if isinstance(comment_id, str) and len(comment_id.strip()) == 0: raise click.UsageError('Parameter --comment-id cannot be whitespace or empty string') kwargs = {} @@ -7634,7 +7633,7 @@ def list_authors(ctx, from_json, all_pages, page_size, repository_id, ref_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -7824,7 +7823,7 @@ def list_build_run_snapshots(ctx, from_json, all_pages, page_size, pull_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -7957,7 +7956,7 @@ def list_commit_diffs(ctx, from_json, all_pages, page_size, repository_id, base_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -8025,7 +8024,7 @@ def list_commits(ctx, from_json, all_pages, page_size, repository_id, ref_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -8488,7 +8487,7 @@ def list_deployments(ctx, from_json, all_pages, page_size, deploy_pipeline_id, i @cli_util.wrap_exceptions def list_fork_sync_statuses(ctx, from_json, all_pages, repository_id, branch_name_query_param, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -8521,7 +8520,7 @@ def list_mirror_records(ctx, from_json, all_pages, page_size, repository_id, lim if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -8580,7 +8579,7 @@ def list_paths(ctx, from_json, all_pages, page_size, repository_id, ref, paths_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -8645,7 +8644,7 @@ def list_project_commit_analytics_authors(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -8766,7 +8765,7 @@ def list_protected_branches(ctx, from_json, all_pages, page_size, repository_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -8825,7 +8824,7 @@ def list_pull_request_activities(ctx, from_json, all_pages, page_size, pull_requ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -8884,7 +8883,7 @@ def list_pull_request_attachments(ctx, from_json, all_pages, page_size, pull_req if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -8944,7 +8943,7 @@ def list_pull_request_authors(ctx, from_json, all_pages, page_size, repository_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -9003,7 +9002,7 @@ def list_pull_request_comments(ctx, from_json, all_pages, page_size, pull_reques if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -9066,7 +9065,7 @@ def list_pull_request_commits(ctx, from_json, all_pages, page_size, pull_request if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -9118,7 +9117,7 @@ def list_pull_request_file_changes(ctx, from_json, all_pages, page_size, pull_re if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -9259,7 +9258,7 @@ def list_refs(ctx, from_json, all_pages, page_size, repository_id, ref_type, com if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -9387,7 +9386,7 @@ def list_repository_commit_analytics_authors(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -9509,7 +9508,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -9566,7 +9565,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -9685,7 +9684,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def merge_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pull_request_id, action_type, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -9748,7 +9747,7 @@ def merge_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def merge_pull_request_execute_merge_pull_request_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pull_request_id, commit_message, merge_strategy, post_merge_action, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -9814,7 +9813,7 @@ def merge_pull_request_execute_merge_pull_request_details(ctx, from_json, wait_f @cli_util.wrap_exceptions def merge_pull_request_validate_merge_pull_request_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pull_request_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -9875,7 +9874,7 @@ def merge_pull_request_validate_merge_pull_request_details(ctx, from_json, wait_ @cli_util.wrap_exceptions def mirror_repository(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -9930,7 +9929,7 @@ def mirror_repository(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def patch_pull_request(ctx, from_json, pull_request_id, items, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -9967,10 +9966,10 @@ def patch_pull_request(ctx, from_json, pull_request_id, items, if_match): @cli_util.wrap_exceptions def put_repository_ref(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, ref_name, ref_type, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(ref_name, six.string_types) and len(ref_name.strip()) == 0: + if isinstance(ref_name, str) and len(ref_name.strip()) == 0: raise click.UsageError('Parameter --ref-name cannot be whitespace or empty string') kwargs = {} @@ -10033,10 +10032,10 @@ def put_repository_ref(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def put_repository_ref_put_repository_tag_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, ref_name, object_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(ref_name, six.string_types) and len(ref_name.strip()) == 0: + if isinstance(ref_name, str) and len(ref_name.strip()) == 0: raise click.UsageError('Parameter --ref-name cannot be whitespace or empty string') kwargs = {} @@ -10101,10 +10100,10 @@ def put_repository_ref_put_repository_tag_details(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def put_repository_ref_put_repository_branch_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, ref_name, commit_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(ref_name, six.string_types) and len(ref_name.strip()) == 0: + if isinstance(ref_name, str) and len(ref_name.strip()) == 0: raise click.UsageError('Parameter --ref-name cannot be whitespace or empty string') kwargs = {} @@ -10167,7 +10166,7 @@ def put_repository_ref_put_repository_branch_details(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def reopen_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pull_request_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -10216,10 +10215,10 @@ def reopen_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def reopen_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(comment_id, six.string_types) and len(comment_id.strip()) == 0: + if isinstance(comment_id, str) and len(comment_id.strip()) == 0: raise click.UsageError('Parameter --comment-id cannot be whitespace or empty string') kwargs = {} @@ -10246,10 +10245,10 @@ def reopen_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if_ @cli_util.wrap_exceptions def resolve_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(comment_id, six.string_types) and len(comment_id.strip()) == 0: + if isinstance(comment_id, str) and len(comment_id.strip()) == 0: raise click.UsageError('Parameter --comment-id cannot be whitespace or empty string') kwargs = {} @@ -10279,7 +10278,7 @@ def resolve_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if @cli_util.wrap_exceptions def review_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pull_request_id, action, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -10335,7 +10334,7 @@ def review_pull_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def schedule_cascading_project_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -10394,7 +10393,7 @@ def schedule_cascading_project_deletion(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def summarize_project_repository_analytics(ctx, from_json, project_id, repository_metrics, start_time, author_email, aggregation_duration, end_time, group_by, limit, page): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') kwargs = {} @@ -10446,7 +10445,7 @@ def summarize_project_repository_analytics(ctx, from_json, project_id, repositor @cli_util.wrap_exceptions def summarize_repository_analytics(ctx, from_json, repository_id, repository_metrics, start_time, author_email, aggregation_duration, end_time, group_by, limit, page): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -10497,7 +10496,7 @@ def summarize_repository_analytics(ctx, from_json, repository_id, repository_met @cli_util.wrap_exceptions def sync_repository(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, sync_merge_strategy, source_branch, destination_branch, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') kwargs = {} @@ -10557,10 +10556,10 @@ def sync_repository(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def unlike_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(comment_id, six.string_types) and len(comment_id.strip()) == 0: + if isinstance(comment_id, str) and len(comment_id.strip()) == 0: raise click.UsageError('Parameter --comment-id cannot be whitespace or empty string') kwargs = {} @@ -10588,7 +10587,7 @@ def unlike_pull_request_comment(ctx, from_json, pull_request_id, comment_id, if_ @cli_util.wrap_exceptions def unsubscribe_pull_request(ctx, from_json, file, pull_request_id, token, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') kwargs = {} @@ -10645,7 +10644,7 @@ def unsubscribe_pull_request(ctx, from_json, file, pull_request_id, token, if_ma @cli_util.wrap_exceptions def update_build_pipeline(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, build_pipeline_id, description, display_name, build_pipeline_parameters, freeform_tags, defined_tags, if_match): - if isinstance(build_pipeline_id, six.string_types) and len(build_pipeline_id.strip()) == 0: + if isinstance(build_pipeline_id, str) and len(build_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-id cannot be whitespace or empty string') if not force: if build_pipeline_parameters or freeform_tags or defined_tags: @@ -10730,7 +10729,7 @@ def update_build_pipeline(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_build_pipeline_stage(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, build_pipeline_stage_id, build_pipeline_stage_type, display_name, description, build_pipeline_stage_predecessor_collection, freeform_tags, defined_tags, if_match): - if isinstance(build_pipeline_stage_id, six.string_types) and len(build_pipeline_stage_id.strip()) == 0: + if isinstance(build_pipeline_stage_id, str) and len(build_pipeline_stage_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-stage-id cannot be whitespace or empty string') if not force: if build_pipeline_stage_predecessor_collection or freeform_tags or defined_tags: @@ -10816,7 +10815,7 @@ def update_build_pipeline_stage(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_build_pipeline_stage_update_wait_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, build_pipeline_stage_id, display_name, description, build_pipeline_stage_predecessor_collection, freeform_tags, defined_tags, wait_criteria, if_match): - if isinstance(build_pipeline_stage_id, six.string_types) and len(build_pipeline_stage_id.strip()) == 0: + if isinstance(build_pipeline_stage_id, str) and len(build_pipeline_stage_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-stage-id cannot be whitespace or empty string') if not force: if build_pipeline_stage_predecessor_collection or freeform_tags or defined_tags or wait_criteria: @@ -10912,7 +10911,7 @@ def update_build_pipeline_stage_update_wait_stage_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_build_pipeline_stage_update_build_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, build_pipeline_stage_id, display_name, description, build_pipeline_stage_predecessor_collection, freeform_tags, defined_tags, image, build_spec_file, stage_execution_timeout_in_seconds, build_source_collection, primary_build_source, build_runner_shape_config, private_access_config, if_match): - if isinstance(build_pipeline_stage_id, six.string_types) and len(build_pipeline_stage_id.strip()) == 0: + if isinstance(build_pipeline_stage_id, str) and len(build_pipeline_stage_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-stage-id cannot be whitespace or empty string') if not force: if build_pipeline_stage_predecessor_collection or freeform_tags or defined_tags or build_source_collection or build_runner_shape_config or private_access_config: @@ -11021,7 +11020,7 @@ def update_build_pipeline_stage_update_build_stage_details(ctx, from_json, force @cli_util.wrap_exceptions def update_build_pipeline_stage_update_trigger_deployment_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, build_pipeline_stage_id, display_name, description, build_pipeline_stage_predecessor_collection, freeform_tags, defined_tags, deploy_pipeline_id, is_pass_all_parameters_enabled, if_match): - if isinstance(build_pipeline_stage_id, six.string_types) and len(build_pipeline_stage_id.strip()) == 0: + if isinstance(build_pipeline_stage_id, str) and len(build_pipeline_stage_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-stage-id cannot be whitespace or empty string') if not force: if build_pipeline_stage_predecessor_collection or freeform_tags or defined_tags: @@ -11114,7 +11113,7 @@ def update_build_pipeline_stage_update_trigger_deployment_stage_details(ctx, fro @cli_util.wrap_exceptions def update_build_pipeline_stage_update_deliver_artifact_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, build_pipeline_stage_id, display_name, description, build_pipeline_stage_predecessor_collection, freeform_tags, defined_tags, deliver_artifact_collection, if_match): - if isinstance(build_pipeline_stage_id, six.string_types) and len(build_pipeline_stage_id.strip()) == 0: + if isinstance(build_pipeline_stage_id, str) and len(build_pipeline_stage_id.strip()) == 0: raise click.UsageError('Parameter --build-pipeline-stage-id cannot be whitespace or empty string') if not force: if build_pipeline_stage_predecessor_collection or freeform_tags or defined_tags or deliver_artifact_collection: @@ -11201,7 +11200,7 @@ def update_build_pipeline_stage_update_deliver_artifact_stage_details(ctx, from_ @cli_util.wrap_exceptions def update_build_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, build_run_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(build_run_id, six.string_types) and len(build_run_id.strip()) == 0: + if isinstance(build_run_id, str) and len(build_run_id.strip()) == 0: raise click.UsageError('Parameter --build-run-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11275,7 +11274,7 @@ def update_build_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, connection_type, description, display_name, freeform_tags, defined_tags, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11357,7 +11356,7 @@ def update_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_connection_update_github_access_token_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, description, display_name, freeform_tags, defined_tags, access_token, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11444,7 +11443,7 @@ def update_connection_update_github_access_token_connection_details(ctx, from_js @cli_util.wrap_exceptions def update_connection_update_vbs_access_token_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, description, display_name, freeform_tags, defined_tags, access_token, base_url, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11535,7 +11534,7 @@ def update_connection_update_vbs_access_token_connection_details(ctx, from_json, @cli_util.wrap_exceptions def update_connection_update_bitbucket_server_access_token_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, description, display_name, freeform_tags, defined_tags, access_token, base_url, tls_verify_config, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or tls_verify_config: @@ -11627,7 +11626,7 @@ def update_connection_update_bitbucket_server_access_token_connection_details(ct @cli_util.wrap_exceptions def update_connection_update_gitlab_access_token_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, description, display_name, freeform_tags, defined_tags, access_token, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11714,7 +11713,7 @@ def update_connection_update_gitlab_access_token_connection_details(ctx, from_js @cli_util.wrap_exceptions def update_connection_update_bitbucket_cloud_app_password_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, description, display_name, freeform_tags, defined_tags, username, app_password, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -11805,7 +11804,7 @@ def update_connection_update_bitbucket_cloud_app_password_connection_details(ctx @cli_util.wrap_exceptions def update_connection_update_gitlab_server_access_token_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, description, display_name, freeform_tags, defined_tags, access_token, base_url, tls_verify_config, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or tls_verify_config: @@ -11899,7 +11898,7 @@ def update_connection_update_gitlab_server_access_token_connection_details(ctx, @cli_util.wrap_exceptions def update_deploy_artifact(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_artifact_id, description, display_name, deploy_artifact_type, deploy_artifact_source, argument_substitution_mode, freeform_tags, defined_tags, if_match): - if isinstance(deploy_artifact_id, six.string_types) and len(deploy_artifact_id.strip()) == 0: + if isinstance(deploy_artifact_id, str) and len(deploy_artifact_id.strip()) == 0: raise click.UsageError('Parameter --deploy-artifact-id cannot be whitespace or empty string') if not force: if deploy_artifact_source or freeform_tags or defined_tags: @@ -11993,7 +11992,7 @@ def update_deploy_artifact(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_deploy_artifact_generic_deploy_artifact_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_artifact_id, deploy_artifact_source_repository_id, deploy_artifact_source_deploy_artifact_path, deploy_artifact_source_deploy_artifact_version, description, display_name, deploy_artifact_type, argument_substitution_mode, freeform_tags, defined_tags, if_match): - if isinstance(deploy_artifact_id, six.string_types) and len(deploy_artifact_id.strip()) == 0: + if isinstance(deploy_artifact_id, str) and len(deploy_artifact_id.strip()) == 0: raise click.UsageError('Parameter --deploy-artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12090,7 +12089,7 @@ def update_deploy_artifact_generic_deploy_artifact_source(ctx, from_json, force, @cli_util.wrap_exceptions def update_deploy_artifact_helm_repository_deploy_artifact_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_artifact_id, deploy_artifact_source_chart_url, deploy_artifact_source_deploy_artifact_version, description, display_name, deploy_artifact_type, argument_substitution_mode, freeform_tags, defined_tags, if_match, deploy_artifact_source_helm_verification_key_source): - if isinstance(deploy_artifact_id, six.string_types) and len(deploy_artifact_id.strip()) == 0: + if isinstance(deploy_artifact_id, str) and len(deploy_artifact_id.strip()) == 0: raise click.UsageError('Parameter --deploy-artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12188,7 +12187,7 @@ def update_deploy_artifact_helm_repository_deploy_artifact_source(ctx, from_json @cli_util.wrap_exceptions def update_deploy_artifact_ocir_deploy_artifact_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_artifact_id, deploy_artifact_source_image_uri, description, display_name, deploy_artifact_type, argument_substitution_mode, freeform_tags, defined_tags, if_match, deploy_artifact_source_image_digest): - if isinstance(deploy_artifact_id, six.string_types) and len(deploy_artifact_id.strip()) == 0: + if isinstance(deploy_artifact_id, str) and len(deploy_artifact_id.strip()) == 0: raise click.UsageError('Parameter --deploy-artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12285,7 +12284,7 @@ def update_deploy_artifact_ocir_deploy_artifact_source(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_deploy_artifact_helm_command_spec_artifact_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_artifact_id, deploy_artifact_source_base64_encoded_content, deploy_artifact_source_helm_artifact_source_type, description, display_name, deploy_artifact_type, argument_substitution_mode, freeform_tags, defined_tags, if_match): - if isinstance(deploy_artifact_id, six.string_types) and len(deploy_artifact_id.strip()) == 0: + if isinstance(deploy_artifact_id, str) and len(deploy_artifact_id.strip()) == 0: raise click.UsageError('Parameter --deploy-artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12379,7 +12378,7 @@ def update_deploy_artifact_helm_command_spec_artifact_source(ctx, from_json, for @cli_util.wrap_exceptions def update_deploy_artifact_inline_deploy_artifact_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_artifact_id, deploy_artifact_source_base64_encoded_content, description, display_name, deploy_artifact_type, argument_substitution_mode, freeform_tags, defined_tags, if_match): - if isinstance(deploy_artifact_id, six.string_types) and len(deploy_artifact_id.strip()) == 0: + if isinstance(deploy_artifact_id, str) and len(deploy_artifact_id.strip()) == 0: raise click.UsageError('Parameter --deploy-artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12470,7 +12469,7 @@ def update_deploy_artifact_inline_deploy_artifact_source(ctx, from_json, force, @cli_util.wrap_exceptions def update_deploy_environment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_environment_id, deploy_environment_type, description, display_name, freeform_tags, defined_tags, if_match): - if isinstance(deploy_environment_id, six.string_types) and len(deploy_environment_id.strip()) == 0: + if isinstance(deploy_environment_id, str) and len(deploy_environment_id.strip()) == 0: raise click.UsageError('Parameter --deploy-environment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12552,7 +12551,7 @@ def update_deploy_environment(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_deploy_environment_update_function_deploy_environment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_environment_id, description, display_name, freeform_tags, defined_tags, function_id, if_match): - if isinstance(deploy_environment_id, six.string_types) and len(deploy_environment_id.strip()) == 0: + if isinstance(deploy_environment_id, str) and len(deploy_environment_id.strip()) == 0: raise click.UsageError('Parameter --deploy-environment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -12638,7 +12637,7 @@ def update_deploy_environment_update_function_deploy_environment_details(ctx, fr @cli_util.wrap_exceptions def update_deploy_environment_update_compute_instance_group_deploy_environment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_environment_id, description, display_name, freeform_tags, defined_tags, compute_instance_group_selectors, if_match): - if isinstance(deploy_environment_id, six.string_types) and len(deploy_environment_id.strip()) == 0: + if isinstance(deploy_environment_id, str) and len(deploy_environment_id.strip()) == 0: raise click.UsageError('Parameter --deploy-environment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or compute_instance_group_selectors: @@ -12725,7 +12724,7 @@ def update_deploy_environment_update_compute_instance_group_deploy_environment_d @cli_util.wrap_exceptions def update_deploy_environment_update_oke_cluster_deploy_environment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_environment_id, description, display_name, freeform_tags, defined_tags, cluster_id, network_channel, if_match): - if isinstance(deploy_environment_id, six.string_types) and len(deploy_environment_id.strip()) == 0: + if isinstance(deploy_environment_id, str) and len(deploy_environment_id.strip()) == 0: raise click.UsageError('Parameter --deploy-environment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or network_channel: @@ -12814,7 +12813,7 @@ def update_deploy_environment_update_oke_cluster_deploy_environment_details(ctx, @cli_util.wrap_exceptions def update_deploy_pipeline(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_pipeline_id, description, display_name, deploy_pipeline_parameters, freeform_tags, defined_tags, if_match): - if isinstance(deploy_pipeline_id, six.string_types) and len(deploy_pipeline_id.strip()) == 0: + if isinstance(deploy_pipeline_id, str) and len(deploy_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --deploy-pipeline-id cannot be whitespace or empty string') if not force: if deploy_pipeline_parameters or freeform_tags or defined_tags: @@ -12899,7 +12898,7 @@ def update_deploy_pipeline(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_deploy_stage(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, deploy_stage_type, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags: @@ -12985,7 +12984,7 @@ def update_deploy_stage(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_deploy_stage_update_oke_canary_traffic_shift_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, rollout_policy, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or rollout_policy: @@ -13075,7 +13074,7 @@ def update_deploy_stage_update_oke_canary_traffic_shift_deploy_stage_details(ctx @cli_util.wrap_exceptions def update_deploy_stage_update_oke_canary_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, kubernetes_manifest_deploy_artifact_ids, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or kubernetes_manifest_deploy_artifact_ids: @@ -13186,7 +13185,7 @@ def update_deploy_stage_update_oke_canary_deploy_stage_details(ctx, from_json, f @cli_util.wrap_exceptions def update_deploy_stage_update_oke_helm_chart_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, oke_cluster_deploy_environment_id, helm_chart_deploy_artifact_id, values_artifact_ids, release_name, is_uninstall_on_stage_delete, helm_command_artifact_ids, purpose, namespace, timeout_in_seconds, rollback_policy, set_values, set_string, are_hooks_enabled, should_reuse_values, should_reset_values, is_force_enabled, should_cleanup_on_fail, max_history, should_skip_crds, should_skip_render_subchart_notes, should_not_wait, is_debug_enabled, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or values_artifact_ids or helm_command_artifact_ids or rollback_policy or set_values or set_string: @@ -13345,7 +13344,7 @@ def update_deploy_stage_update_oke_helm_chart_deploy_stage_details(ctx, from_jso @cli_util.wrap_exceptions def update_deploy_stage_update_compute_instance_group_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, compute_instance_group_deploy_environment_id, deployment_spec_deploy_artifact_id, deploy_artifact_ids, rollout_policy, rollback_policy, failure_policy, load_balancer_config, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or deploy_artifact_ids or rollout_policy or rollback_policy or failure_policy or load_balancer_config: @@ -13453,7 +13452,7 @@ def update_deploy_stage_update_compute_instance_group_deploy_stage_details(ctx, @cli_util.wrap_exceptions def update_deploy_stage_update_oke_canary_approval_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, approval_policy, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or approval_policy: @@ -13545,7 +13544,7 @@ def update_deploy_stage_update_oke_canary_approval_deploy_stage_details(ctx, fro @cli_util.wrap_exceptions def update_deploy_stage_update_shell_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, container_config, command_spec_deploy_artifact_id, timeout_in_seconds, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or container_config: @@ -13644,7 +13643,7 @@ def update_deploy_stage_update_shell_deploy_stage_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_deploy_stage_update_oke_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, oke_cluster_deploy_environment_id, kubernetes_manifest_deploy_artifact_ids, namespace, rollback_policy, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or kubernetes_manifest_deploy_artifact_ids or rollback_policy: @@ -13743,7 +13742,7 @@ def update_deploy_stage_update_oke_deploy_stage_details(ctx, from_json, force, w @cli_util.wrap_exceptions def update_deploy_stage_update_compute_instance_group_canary_approval_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, approval_policy, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or approval_policy: @@ -13838,7 +13837,7 @@ def update_deploy_stage_update_compute_instance_group_canary_approval_deploy_sta @cli_util.wrap_exceptions def update_deploy_stage_update_load_balancer_traffic_shift_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, blue_backend_ips, green_backend_ips, traffic_shift_target, rollout_policy, load_balancer_config, rollback_policy, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or blue_backend_ips or green_backend_ips or rollout_policy or load_balancer_config or rollback_policy: @@ -13943,7 +13942,7 @@ def update_deploy_stage_update_load_balancer_traffic_shift_deploy_stage_details( @cli_util.wrap_exceptions def update_deploy_stage_update_oke_blue_green_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, kubernetes_manifest_deploy_artifact_ids, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or kubernetes_manifest_deploy_artifact_ids: @@ -14033,7 +14032,7 @@ def update_deploy_stage_update_oke_blue_green_deploy_stage_details(ctx, from_jso @cli_util.wrap_exceptions def update_deploy_stage_update_wait_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, wait_criteria, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or wait_criteria: @@ -14122,7 +14121,7 @@ def update_deploy_stage_update_wait_deploy_stage_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_deploy_stage_update_oke_blue_green_traffic_shift_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags: @@ -14209,7 +14208,7 @@ def update_deploy_stage_update_oke_blue_green_traffic_shift_deploy_stage_details @cli_util.wrap_exceptions def update_deploy_stage_update_manual_approval_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, approval_policy, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or approval_policy: @@ -14303,7 +14302,7 @@ def update_deploy_stage_update_manual_approval_deploy_stage_details(ctx, from_js @cli_util.wrap_exceptions def update_deploy_stage_update_compute_instance_group_blue_green_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, deployment_spec_deploy_artifact_id, deploy_artifact_ids, rollout_policy, failure_policy, test_load_balancer_config, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or deploy_artifact_ids or rollout_policy or failure_policy or test_load_balancer_config: @@ -14408,7 +14407,7 @@ def update_deploy_stage_update_compute_instance_group_blue_green_deploy_stage_de @cli_util.wrap_exceptions def update_deploy_stage_update_compute_instance_group_canary_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, deployment_spec_deploy_artifact_id, deploy_artifact_ids, rollout_policy, test_load_balancer_config, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or deploy_artifact_ids or rollout_policy or test_load_balancer_config: @@ -14511,7 +14510,7 @@ def update_deploy_stage_update_compute_instance_group_canary_deploy_stage_detail @cli_util.wrap_exceptions def update_deploy_stage_update_function_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, function_deploy_environment_id, docker_image_deploy_artifact_id, config, max_memory_in_mbs, function_timeout_in_seconds, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or config: @@ -14612,7 +14611,7 @@ def update_deploy_stage_update_function_deploy_stage_details(ctx, from_json, for @cli_util.wrap_exceptions def update_deploy_stage_update_compute_instance_group_blue_green_traffic_shift_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags: @@ -14699,7 +14698,7 @@ def update_deploy_stage_update_compute_instance_group_blue_green_traffic_shift_d @cli_util.wrap_exceptions def update_deploy_stage_update_compute_instance_group_canary_traffic_shift_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, rollout_policy, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags or rollout_policy: @@ -14792,7 +14791,7 @@ def update_deploy_stage_update_compute_instance_group_canary_traffic_shift_deplo @cli_util.wrap_exceptions def update_deploy_stage_update_invoke_function_deploy_stage_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deploy_stage_id, description, display_name, deploy_stage_predecessor_collection, freeform_tags, defined_tags, function_deploy_environment_id, deploy_artifact_id, is_async, is_validation_enabled, if_match): - if isinstance(deploy_stage_id, six.string_types) and len(deploy_stage_id.strip()) == 0: + if isinstance(deploy_stage_id, str) and len(deploy_stage_id.strip()) == 0: raise click.UsageError('Parameter --deploy-stage-id cannot be whitespace or empty string') if not force: if deploy_stage_predecessor_collection or freeform_tags or defined_tags: @@ -14889,7 +14888,7 @@ def update_deploy_stage_update_invoke_function_deploy_stage_details(ctx, from_js @cli_util.wrap_exceptions def update_deployment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, deployment_type, display_name, freeform_tags, defined_tags, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -14962,7 +14961,7 @@ def update_deployment(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_deployment_update_single_deploy_stage_deployment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15036,7 +15035,7 @@ def update_deployment_update_single_deploy_stage_deployment_details(ctx, from_js @cli_util.wrap_exceptions def update_deployment_update_deploy_pipeline_redeployment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15110,7 +15109,7 @@ def update_deployment_update_deploy_pipeline_redeployment_details(ctx, from_json @cli_util.wrap_exceptions def update_deployment_update_deploy_pipeline_deployment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15184,7 +15183,7 @@ def update_deployment_update_deploy_pipeline_deployment_details(ctx, from_json, @cli_util.wrap_exceptions def update_deployment_update_single_deploy_stage_redeployment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15259,7 +15258,7 @@ def update_deployment_update_single_deploy_stage_redeployment_details(ctx, from_ @cli_util.wrap_exceptions def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, project_id, description, notification_config, freeform_tags, defined_tags, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') if not force: if notification_config or freeform_tags or defined_tags: @@ -15333,10 +15332,10 @@ def update_project(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_project_notification_preference(ctx, from_json, notification_preference, project_id, principal_id, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') - if isinstance(principal_id, six.string_types) and len(principal_id.strip()) == 0: + if isinstance(principal_id, str) and len(principal_id.strip()) == 0: raise click.UsageError('Parameter --principal-id cannot be whitespace or empty string') kwargs = {} @@ -15370,7 +15369,7 @@ def update_project_notification_preference(ctx, from_json, notification_preferen @cli_util.wrap_exceptions def update_project_repository_settings(ctx, from_json, force, project_id, merge_settings, approval_rules, if_match): - if isinstance(project_id, six.string_types) and len(project_id.strip()) == 0: + if isinstance(project_id, str) and len(project_id.strip()) == 0: raise click.UsageError('Parameter --project-id cannot be whitespace or empty string') if not force: if merge_settings or approval_rules: @@ -15421,7 +15420,7 @@ def update_project_repository_settings(ctx, from_json, force, project_id, merge_ @cli_util.wrap_exceptions def update_pull_request(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, pull_request_id, display_name, description, destination_branch, reviewers, freeform_tags, defined_tags, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') if not force: if reviewers or freeform_tags or defined_tags: @@ -15501,10 +15500,10 @@ def update_pull_request(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_pull_request_comment(ctx, from_json, pull_request_id, comment_id, data, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(comment_id, six.string_types) and len(comment_id.strip()) == 0: + if isinstance(comment_id, str) and len(comment_id.strip()) == 0: raise click.UsageError('Parameter --comment-id cannot be whitespace or empty string') kwargs = {} @@ -15539,10 +15538,10 @@ def update_pull_request_comment(ctx, from_json, pull_request_id, comment_id, dat @cli_util.wrap_exceptions def update_pull_request_notification_preference(ctx, from_json, notification_preference, pull_request_id, principal_id, if_match): - if isinstance(pull_request_id, six.string_types) and len(pull_request_id.strip()) == 0: + if isinstance(pull_request_id, str) and len(pull_request_id.strip()) == 0: raise click.UsageError('Parameter --pull-request-id cannot be whitespace or empty string') - if isinstance(principal_id, six.string_types) and len(principal_id.strip()) == 0: + if isinstance(principal_id, str) and len(principal_id.strip()) == 0: raise click.UsageError('Parameter --principal-id cannot be whitespace or empty string') kwargs = {} @@ -15584,7 +15583,7 @@ def update_pull_request_notification_preference(ctx, from_json, notification_pre @cli_util.wrap_exceptions def update_repository(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, repository_id, name, description, default_branch, repository_type, mirror_repository_config, freeform_tags, defined_tags, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') if not force: if mirror_repository_config or freeform_tags or defined_tags: @@ -15667,10 +15666,10 @@ def update_repository(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_repository_notification_preference(ctx, from_json, notification_preference, repository_id, principal_id, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(principal_id, six.string_types) and len(principal_id.strip()) == 0: + if isinstance(principal_id, str) and len(principal_id.strip()) == 0: raise click.UsageError('Parameter --principal-id cannot be whitespace or empty string') kwargs = {} @@ -15705,7 +15704,7 @@ def update_repository_notification_preference(ctx, from_json, notification_prefe @cli_util.wrap_exceptions def update_repository_settings(ctx, from_json, force, repository_id, merge_checks, merge_settings, approval_rules, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') if not force: if merge_checks or merge_settings or approval_rules: @@ -15759,7 +15758,7 @@ def update_repository_settings(ctx, from_json, force, repository_id, merge_check @cli_util.wrap_exceptions def update_trigger(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, trigger_source, display_name, description, actions, freeform_tags, defined_tags, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: @@ -15846,7 +15845,7 @@ def update_trigger(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_trigger_update_bitbucket_server_trigger_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, display_name, description, actions, freeform_tags, defined_tags, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: @@ -15935,7 +15934,7 @@ def update_trigger_update_bitbucket_server_trigger_details(ctx, from_json, force @cli_util.wrap_exceptions def update_trigger_update_vbs_trigger_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, display_name, description, actions, freeform_tags, defined_tags, connection_id, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: @@ -16026,7 +16025,7 @@ def update_trigger_update_vbs_trigger_details(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_trigger_update_gitlab_server_trigger_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, display_name, description, actions, freeform_tags, defined_tags, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: @@ -16115,7 +16114,7 @@ def update_trigger_update_gitlab_server_trigger_details(ctx, from_json, force, w @cli_util.wrap_exceptions def update_trigger_update_devops_code_repository_trigger_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, display_name, description, actions, freeform_tags, defined_tags, repository_id, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: @@ -16207,7 +16206,7 @@ def update_trigger_update_devops_code_repository_trigger_details(ctx, from_json, @cli_util.wrap_exceptions def update_trigger_update_github_trigger_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, display_name, description, actions, freeform_tags, defined_tags, connection_id, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: @@ -16299,7 +16298,7 @@ def update_trigger_update_github_trigger_details(ctx, from_json, force, wait_for @cli_util.wrap_exceptions def update_trigger_update_gitlab_trigger_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, display_name, description, actions, freeform_tags, defined_tags, connection_id, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: @@ -16391,7 +16390,7 @@ def update_trigger_update_gitlab_trigger_details(ctx, from_json, force, wait_for @cli_util.wrap_exceptions def update_trigger_update_bitbucket_cloud_trigger_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, trigger_id, display_name, description, actions, freeform_tags, defined_tags, connection_id, if_match): - if isinstance(trigger_id, six.string_types) and len(trigger_id.strip()) == 0: + if isinstance(trigger_id, str) and len(trigger_id.strip()) == 0: raise click.UsageError('Parameter --trigger-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: @@ -16474,7 +16473,7 @@ def update_trigger_update_bitbucket_cloud_trigger_details(ctx, from_json, force, @cli_util.wrap_exceptions def validate_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/disaster_recovery/src/oci_cli_disaster_recovery/generated/disasterrecovery_cli.py b/services/disaster_recovery/src/oci_cli_disaster_recovery/generated/disasterrecovery_cli.py index a1076493b..1653210f5 100644 --- a/services/disaster_recovery/src/oci_cli_disaster_recovery/generated/disasterrecovery_cli.py +++ b/services/disaster_recovery/src/oci_cli_disaster_recovery/generated/disasterrecovery_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -93,7 +92,7 @@ def dr_plan_group(): @cli_util.wrap_exceptions def associate_dr_protection_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, role, dr_protection_group_id, peer_id, peer_region, if_match): - if isinstance(dr_protection_group_id, six.string_types) and len(dr_protection_group_id.strip()) == 0: + if isinstance(dr_protection_group_id, str) and len(dr_protection_group_id.strip()) == 0: raise click.UsageError('Parameter --dr-protection-group-id cannot be whitespace or empty string') kwargs = {} @@ -162,7 +161,7 @@ def associate_dr_protection_group(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def cancel_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, action_type, dr_plan_execution_id, if_match): - if isinstance(dr_plan_execution_id, six.string_types) and len(dr_plan_execution_id.strip()) == 0: + if isinstance(dr_plan_execution_id, str) and len(dr_plan_execution_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-execution-id cannot be whitespace or empty string') kwargs = {} @@ -224,7 +223,7 @@ def cancel_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -257,7 +256,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_dr_protection_group_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, dr_protection_group_id, if_match): - if isinstance(dr_protection_group_id, six.string_types) and len(dr_protection_group_id.strip()) == 0: + if isinstance(dr_protection_group_id, str) and len(dr_protection_group_id.strip()) == 0: raise click.UsageError('Parameter --dr-protection-group-id cannot be whitespace or empty string') kwargs = {} @@ -1237,7 +1236,7 @@ def create_dr_protection_group(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_dr_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_plan_id, if_match): - if isinstance(dr_plan_id, six.string_types) and len(dr_plan_id.strip()) == 0: + if isinstance(dr_plan_id, str) and len(dr_plan_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-id cannot be whitespace or empty string') kwargs = {} @@ -1303,7 +1302,7 @@ def delete_dr_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_plan_execution_id, if_match): - if isinstance(dr_plan_execution_id, six.string_types) and len(dr_plan_execution_id.strip()) == 0: + if isinstance(dr_plan_execution_id, str) and len(dr_plan_execution_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-execution-id cannot be whitespace or empty string') kwargs = {} @@ -1361,7 +1360,7 @@ def delete_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_dr_protection_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_protection_group_id, if_match): - if isinstance(dr_protection_group_id, six.string_types) and len(dr_protection_group_id.strip()) == 0: + if isinstance(dr_protection_group_id, str) and len(dr_protection_group_id.strip()) == 0: raise click.UsageError('Parameter --dr-protection-group-id cannot be whitespace or empty string') kwargs = {} @@ -1419,7 +1418,7 @@ def delete_dr_protection_group(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def disassociate_dr_protection_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, dr_protection_group_id, if_match): - if isinstance(dr_protection_group_id, six.string_types) and len(dr_protection_group_id.strip()) == 0: + if isinstance(dr_protection_group_id, str) and len(dr_protection_group_id.strip()) == 0: raise click.UsageError('Parameter --dr-protection-group-id cannot be whitespace or empty string') kwargs = {} @@ -1481,7 +1480,7 @@ def disassociate_dr_protection_group(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def disassociate_dr_protection_group_disassociate_dr_protection_group_default_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_protection_group_id, if_match): - if isinstance(dr_protection_group_id, six.string_types) and len(dr_protection_group_id.strip()) == 0: + if isinstance(dr_protection_group_id, str) and len(dr_protection_group_id.strip()) == 0: raise click.UsageError('Parameter --dr-protection-group-id cannot be whitespace or empty string') kwargs = {} @@ -1540,7 +1539,7 @@ def disassociate_dr_protection_group_disassociate_dr_protection_group_default_de @cli_util.wrap_exceptions def get_dr_plan(ctx, from_json, dr_plan_id): - if isinstance(dr_plan_id, six.string_types) and len(dr_plan_id.strip()) == 0: + if isinstance(dr_plan_id, str) and len(dr_plan_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-id cannot be whitespace or empty string') kwargs = {} @@ -1564,7 +1563,7 @@ def get_dr_plan(ctx, from_json, dr_plan_id): @cli_util.wrap_exceptions def get_dr_plan_execution(ctx, from_json, dr_plan_execution_id): - if isinstance(dr_plan_execution_id, six.string_types) and len(dr_plan_execution_id.strip()) == 0: + if isinstance(dr_plan_execution_id, str) and len(dr_plan_execution_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-execution-id cannot be whitespace or empty string') kwargs = {} @@ -1588,7 +1587,7 @@ def get_dr_plan_execution(ctx, from_json, dr_plan_execution_id): @cli_util.wrap_exceptions def get_dr_protection_group(ctx, from_json, dr_protection_group_id): - if isinstance(dr_protection_group_id, six.string_types) and len(dr_protection_group_id.strip()) == 0: + if isinstance(dr_protection_group_id, str) and len(dr_protection_group_id.strip()) == 0: raise click.UsageError('Parameter --dr-protection-group-id cannot be whitespace or empty string') kwargs = {} @@ -1612,7 +1611,7 @@ def get_dr_protection_group(ctx, from_json, dr_protection_group_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1646,7 +1645,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def ignore_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, group_id, dr_plan_execution_id, step_id, if_match): - if isinstance(dr_plan_execution_id, six.string_types) and len(dr_plan_execution_id.strip()) == 0: + if isinstance(dr_plan_execution_id, str) and len(dr_plan_execution_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-execution-id cannot be whitespace or empty string') kwargs = {} @@ -1965,7 +1964,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2030,7 +2029,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2159,7 +2158,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def pause_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, action_type, dr_plan_execution_id, if_match): - if isinstance(dr_plan_execution_id, six.string_types) and len(dr_plan_execution_id.strip()) == 0: + if isinstance(dr_plan_execution_id, str) and len(dr_plan_execution_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-execution-id cannot be whitespace or empty string') kwargs = {} @@ -2224,7 +2223,7 @@ def pause_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def refresh_dr_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, dr_plan_id, if_match): - if isinstance(dr_plan_id, six.string_types) and len(dr_plan_id.strip()) == 0: + if isinstance(dr_plan_id, str) and len(dr_plan_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-id cannot be whitespace or empty string') kwargs = {} @@ -2286,7 +2285,7 @@ def refresh_dr_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def refresh_dr_plan_refresh_dr_plan_default_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_plan_id, if_match): - if isinstance(dr_plan_id, six.string_types) and len(dr_plan_id.strip()) == 0: + if isinstance(dr_plan_id, str) and len(dr_plan_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-id cannot be whitespace or empty string') kwargs = {} @@ -2350,7 +2349,7 @@ def refresh_dr_plan_refresh_dr_plan_default_details(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def resume_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, action_type, dr_plan_execution_id, if_match): - if isinstance(dr_plan_execution_id, six.string_types) and len(dr_plan_execution_id.strip()) == 0: + if isinstance(dr_plan_execution_id, str) and len(dr_plan_execution_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-execution-id cannot be whitespace or empty string') kwargs = {} @@ -2420,7 +2419,7 @@ def resume_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def retry_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, group_id, dr_plan_execution_id, step_id, if_match): - if isinstance(dr_plan_execution_id, six.string_types) and len(dr_plan_execution_id.strip()) == 0: + if isinstance(dr_plan_execution_id, str) and len(dr_plan_execution_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-execution-id cannot be whitespace or empty string') kwargs = {} @@ -2498,7 +2497,7 @@ def retry_dr_plan_execution(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_dr_plan(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_plan_id, display_name, plan_groups, freeform_tags, defined_tags, if_match): - if isinstance(dr_plan_id, six.string_types) and len(dr_plan_id.strip()) == 0: + if isinstance(dr_plan_id, str) and len(dr_plan_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-id cannot be whitespace or empty string') if not force: if plan_groups or freeform_tags or defined_tags: @@ -2585,7 +2584,7 @@ def update_dr_plan(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_dr_plan_execution(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_plan_execution_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(dr_plan_execution_id, six.string_types) and len(dr_plan_execution_id.strip()) == 0: + if isinstance(dr_plan_execution_id, str) and len(dr_plan_execution_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-execution-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2673,7 +2672,7 @@ def update_dr_plan_execution(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_dr_protection_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_protection_group_id, display_name, log_location, members, freeform_tags, defined_tags, if_match): - if isinstance(dr_protection_group_id, six.string_types) and len(dr_protection_group_id.strip()) == 0: + if isinstance(dr_protection_group_id, str) and len(dr_protection_group_id.strip()) == 0: raise click.UsageError('Parameter --dr-protection-group-id cannot be whitespace or empty string') if not force: if log_location or members or freeform_tags or defined_tags: @@ -2754,7 +2753,7 @@ def update_dr_protection_group(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_dr_protection_group_role(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, role, dr_protection_group_id, if_match): - if isinstance(dr_protection_group_id, six.string_types) and len(dr_protection_group_id.strip()) == 0: + if isinstance(dr_protection_group_id, str) and len(dr_protection_group_id.strip()) == 0: raise click.UsageError('Parameter --dr-protection-group-id cannot be whitespace or empty string') kwargs = {} @@ -2817,7 +2816,7 @@ def update_dr_protection_group_role(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def verify_dr_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, dr_plan_id, if_match): - if isinstance(dr_plan_id, six.string_types) and len(dr_plan_id.strip()) == 0: + if isinstance(dr_plan_id, str) and len(dr_plan_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-id cannot be whitespace or empty string') kwargs = {} @@ -2879,7 +2878,7 @@ def verify_dr_plan(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def verify_dr_plan_verify_dr_plan_default_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dr_plan_id, if_match): - if isinstance(dr_plan_id, six.string_types) and len(dr_plan_id.strip()) == 0: + if isinstance(dr_plan_id, str) and len(dr_plan_id.strip()) == 0: raise click.UsageError('Parameter --dr-plan-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/distributed_database/src/oci_cli_distributed_autonomous_db_service/generated/distributedautonomousdbservice_cli.py b/services/distributed_database/src/oci_cli_distributed_autonomous_db_service/generated/distributedautonomousdbservice_cli.py index a27797c95..1e8f9dc2f 100644 --- a/services/distributed_database/src/oci_cli_distributed_autonomous_db_service/generated/distributedautonomousdbservice_cli.py +++ b/services/distributed_database/src/oci_cli_distributed_autonomous_db_service/generated/distributedautonomousdbservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -54,7 +53,7 @@ def distributed_autonomous_database_group(): @cli_util.wrap_exceptions def add_distributed_autonomous_database_gds_control_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, public_ssh_key, subnet_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -118,7 +117,7 @@ def add_distributed_autonomous_database_gds_control_node(ctx, from_json, wait_fo @cli_util.wrap_exceptions def change_distributed_autonomous_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, distributed_autonomous_database_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -180,7 +179,7 @@ def change_distributed_autonomous_database_compartment(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def configure_distributed_autonomous_database_gsms(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, old_gsm_names, is_latest_gsm_image, distributed_autonomous_database_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -242,7 +241,7 @@ def configure_distributed_autonomous_database_gsms(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def configure_distributed_autonomous_database_sharding(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, is_rebalance_required, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -409,7 +408,7 @@ def create_distributed_autonomous_database(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def delete_distributed_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -462,7 +461,7 @@ def delete_distributed_autonomous_database(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def download_distributed_autonomous_database_gsm_certificate_signing_request(ctx, from_json, file, distributed_autonomous_database_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -513,7 +512,7 @@ def download_distributed_autonomous_database_gsm_certificate_signing_request(ctx @cli_util.wrap_exceptions def generate_distributed_autonomous_database_gsm_certificate_signing_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, ca_bundle_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -568,7 +567,7 @@ def generate_distributed_autonomous_database_gsm_certificate_signing_request(ctx @cli_util.wrap_exceptions def generate_distributed_autonomous_database_wallet(ctx, from_json, file, distributed_autonomous_database_id, password, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -621,7 +620,7 @@ def generate_distributed_autonomous_database_wallet(ctx, from_json, file, distri @cli_util.wrap_exceptions def get_distributed_autonomous_database(ctx, from_json, distributed_autonomous_database_id, metadata, if_none_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -720,7 +719,7 @@ def list_distributed_autonomous_databases(ctx, from_json, all_pages, page_size, @cli_util.wrap_exceptions def patch_distributed_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, items, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -782,7 +781,7 @@ def patch_distributed_autonomous_database(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def rotate_distributed_autonomous_database_passwords(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -837,7 +836,7 @@ def rotate_distributed_autonomous_database_passwords(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def start_distributed_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -892,7 +891,7 @@ def start_distributed_autonomous_database(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def stop_distributed_autonomous_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -951,7 +950,7 @@ def stop_distributed_autonomous_database(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def update_distributed_autonomous_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1020,7 +1019,7 @@ def update_distributed_autonomous_database(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def upload_distributed_autonomous_database_signed_certificate_and_generate_wallet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, ca_signed_certificate, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} @@ -1083,7 +1082,7 @@ def upload_distributed_autonomous_database_signed_certificate_and_generate_walle @cli_util.wrap_exceptions def validate_distributed_autonomous_database_network(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_autonomous_database_id, is_surrogate, resource_name, shard_group, if_match): - if isinstance(distributed_autonomous_database_id, six.string_types) and len(distributed_autonomous_database_id.strip()) == 0: + if isinstance(distributed_autonomous_database_id, str) and len(distributed_autonomous_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-autonomous-database-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/distributed_database/src/oci_cli_distributed_db_private_endpoint_service/generated/distributeddbprivateendpointservice_cli.py b/services/distributed_database/src/oci_cli_distributed_db_private_endpoint_service/generated/distributeddbprivateendpointservice_cli.py index b2dd0cfc2..54da1b0aa 100644 --- a/services/distributed_database/src/oci_cli_distributed_db_private_endpoint_service/generated/distributeddbprivateendpointservice_cli.py +++ b/services/distributed_database/src/oci_cli_distributed_db_private_endpoint_service/generated/distributeddbprivateendpointservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -53,7 +52,7 @@ def distributed_database_private_endpoint_group(): @cli_util.wrap_exceptions def change_distributed_database_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, distributed_database_private_endpoint_id, if_match): - if isinstance(distributed_database_private_endpoint_id, six.string_types) and len(distributed_database_private_endpoint_id.strip()) == 0: + if isinstance(distributed_database_private_endpoint_id, str) and len(distributed_database_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -187,7 +186,7 @@ def create_distributed_database_private_endpoint(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def delete_distributed_database_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_private_endpoint_id, if_match): - if isinstance(distributed_database_private_endpoint_id, six.string_types) and len(distributed_database_private_endpoint_id.strip()) == 0: + if isinstance(distributed_database_private_endpoint_id, str) and len(distributed_database_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -239,7 +238,7 @@ def delete_distributed_database_private_endpoint(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def get_distributed_database_private_endpoint(ctx, from_json, distributed_database_private_endpoint_id, if_none_match): - if isinstance(distributed_database_private_endpoint_id, six.string_types) and len(distributed_database_private_endpoint_id.strip()) == 0: + if isinstance(distributed_database_private_endpoint_id, str) and len(distributed_database_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -327,7 +326,7 @@ def list_distributed_database_private_endpoints(ctx, from_json, all_pages, page_ @cli_util.wrap_exceptions def reinstate_proxy_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_private_endpoint_id, if_match): - if isinstance(distributed_database_private_endpoint_id, six.string_types) and len(distributed_database_private_endpoint_id.strip()) == 0: + if isinstance(distributed_database_private_endpoint_id, str) and len(distributed_database_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -388,7 +387,7 @@ def reinstate_proxy_instance(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_distributed_database_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_private_endpoint_id, display_name, description, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(distributed_database_private_endpoint_id, six.string_types) and len(distributed_database_private_endpoint_id.strip()) == 0: + if isinstance(distributed_database_private_endpoint_id, str) and len(distributed_database_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-private-endpoint-id cannot be whitespace or empty string') if not force: if nsg_ids or freeform_tags or defined_tags: diff --git a/services/distributed_database/src/oci_cli_distributed_db_service/generated/distributeddbservice_cli.py b/services/distributed_database/src/oci_cli_distributed_db_service/generated/distributeddbservice_cli.py index d5df48569..6fd5e8f94 100644 --- a/services/distributed_database/src/oci_cli_distributed_db_service/generated/distributeddbservice_cli.py +++ b/services/distributed_database/src/oci_cli_distributed_db_service/generated/distributeddbservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -54,7 +53,7 @@ def distributed_database_group(): @cli_util.wrap_exceptions def add_distributed_database_gds_control_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, public_ssh_key, subnet_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -118,7 +117,7 @@ def add_distributed_database_gds_control_node(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def change_distributed_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, distributed_database_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -179,7 +178,7 @@ def change_distributed_database_compartment(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def change_distributed_db_backup_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, db_backup_config, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -241,7 +240,7 @@ def change_distributed_db_backup_config(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def configure_distributed_database_gsms(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, old_gsm_names, is_latest_gsm_image, distributed_database_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -303,7 +302,7 @@ def configure_distributed_database_gsms(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def configure_distributed_database_sharding(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, is_rebalance_required, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -476,7 +475,7 @@ def create_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -529,7 +528,7 @@ def delete_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def download_distributed_database_gsm_certificate_signing_request(ctx, from_json, file, distributed_database_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -580,7 +579,7 @@ def download_distributed_database_gsm_certificate_signing_request(ctx, from_json @cli_util.wrap_exceptions def generate_distributed_database_gsm_certificate_signing_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, ca_bundle_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -635,7 +634,7 @@ def generate_distributed_database_gsm_certificate_signing_request(ctx, from_json @cli_util.wrap_exceptions def generate_distributed_database_wallet(ctx, from_json, file, distributed_database_id, password, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -688,7 +687,7 @@ def generate_distributed_database_wallet(ctx, from_json, file, distributed_datab @cli_util.wrap_exceptions def get_distributed_database(ctx, from_json, distributed_database_id, metadata, if_none_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -787,7 +786,7 @@ def list_distributed_databases(ctx, from_json, all_pages, page_size, compartment @cli_util.wrap_exceptions def patch_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, items, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -849,7 +848,7 @@ def patch_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def rotate_distributed_database_passwords(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -904,7 +903,7 @@ def rotate_distributed_database_passwords(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def start_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -959,7 +958,7 @@ def start_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def stop_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1018,7 +1017,7 @@ def stop_distributed_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_distributed_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1087,7 +1086,7 @@ def update_distributed_database(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def upload_distributed_database_signed_certificate_and_generate_wallet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, ca_signed_certificate, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} @@ -1150,7 +1149,7 @@ def upload_distributed_database_signed_certificate_and_generate_wallet(ctx, from @cli_util.wrap_exceptions def validate_distributed_database_network(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, distributed_database_id, is_surrogate, resource_name, shard_group, if_match): - if isinstance(distributed_database_id, six.string_types) and len(distributed_database_id.strip()) == 0: + if isinstance(distributed_database_id, str) and len(distributed_database_id.strip()) == 0: raise click.UsageError('Parameter --distributed-database-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/distributed_database/src/oci_cli_distributed_db_work_request_service/generated/distributeddbworkrequestservice_cli.py b/services/distributed_database/src/oci_cli_distributed_db_work_request_service/generated/distributeddbworkrequestservice_cli.py index 5103c26b4..187522797 100644 --- a/services/distributed_database/src/oci_cli_distributed_db_work_request_service/generated/distributeddbworkrequestservice_cli.py +++ b/services/distributed_database/src/oci_cli_distributed_db_work_request_service/generated/distributeddbworkrequestservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -55,7 +54,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -86,7 +85,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -143,7 +142,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/dns/src/oci_cli_dns/generated/dns_cli.py b/services/dns/src/oci_cli_dns/generated/dns_cli.py index 7bc7edafb..1b09ef110 100644 --- a/services/dns/src/oci_cli_dns/generated/dns_cli.py +++ b/services/dns/src/oci_cli_dns/generated/dns_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -124,7 +123,7 @@ def records_group(): @cli_util.wrap_exceptions def change_resolver_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, resolver_id, compartment_id, if_match, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') kwargs = {} @@ -196,7 +195,7 @@ def change_resolver_compartment(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def change_steering_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, steering_policy_id, compartment_id, if_match, scope): - if isinstance(steering_policy_id, six.string_types) and len(steering_policy_id.strip()) == 0: + if isinstance(steering_policy_id, str) and len(steering_policy_id.strip()) == 0: raise click.UsageError('Parameter --steering-policy-id cannot be whitespace or empty string') kwargs = {} @@ -265,7 +264,7 @@ def change_steering_policy_compartment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def change_tsig_key_compartment(ctx, from_json, tsig_key_id, compartment_id, if_match, scope): - if isinstance(tsig_key_id, six.string_types) and len(tsig_key_id.strip()) == 0: + if isinstance(tsig_key_id, str) and len(tsig_key_id.strip()) == 0: raise click.UsageError('Parameter --tsig-key-id cannot be whitespace or empty string') kwargs = {} @@ -304,7 +303,7 @@ def change_tsig_key_compartment(ctx, from_json, tsig_key_id, compartment_id, if_ @cli_util.wrap_exceptions def change_view_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, view_id, compartment_id, if_match, scope): - if isinstance(view_id, six.string_types) and len(view_id.strip()) == 0: + if isinstance(view_id, str) and len(view_id.strip()) == 0: raise click.UsageError('Parameter --view-id cannot be whitespace or empty string') kwargs = {} @@ -380,7 +379,7 @@ def change_view_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def change_zone_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, zone_id, compartment_id, if_match, scope): - if isinstance(zone_id, six.string_types) and len(zone_id.strip()) == 0: + if isinstance(zone_id, str) and len(zone_id.strip()) == 0: raise click.UsageError('Parameter --zone-id cannot be whitespace or empty string') kwargs = {} @@ -456,7 +455,7 @@ def change_zone_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def create_resolver_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, resolver_id, name, is_forwarding, is_listening, endpoint_type, forwarding_address, listening_address, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') kwargs = {} @@ -530,7 +529,7 @@ def create_resolver_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_resolver_endpoint_create_resolver_vnic_endpoint_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, resolver_id, name, is_forwarding, is_listening, subnet_id, forwarding_address, listening_address, nsg_ids, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') kwargs = {} @@ -1237,10 +1236,10 @@ def create_zone_from_zone_file(ctx, from_json, compartment_id, create_zone_from_ @cli_util.wrap_exceptions def delete_domain_records(ctx, from_json, zone_name_or_id, domain, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') - if isinstance(domain, six.string_types) and len(domain.strip()) == 0: + if isinstance(domain, str) and len(domain.strip()) == 0: raise click.UsageError('Parameter --domain cannot be whitespace or empty string') kwargs = {} @@ -1283,10 +1282,10 @@ def delete_domain_records(ctx, from_json, zone_name_or_id, domain, if_match, if_ @cli_util.wrap_exceptions def delete_resolver_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, resolver_id, resolver_endpoint_name, if_match, if_unmodified_since, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') - if isinstance(resolver_endpoint_name, six.string_types) and len(resolver_endpoint_name.strip()) == 0: + if isinstance(resolver_endpoint_name, str) and len(resolver_endpoint_name.strip()) == 0: raise click.UsageError('Parameter --resolver-endpoint-name cannot be whitespace or empty string') kwargs = {} @@ -1355,13 +1354,13 @@ def delete_resolver_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_rr_set(ctx, from_json, zone_name_or_id, domain, rtype, if_match, if_unmodified_since, compartment_id, scope, view_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') - if isinstance(domain, six.string_types) and len(domain.strip()) == 0: + if isinstance(domain, str) and len(domain.strip()) == 0: raise click.UsageError('Parameter --domain cannot be whitespace or empty string') - if isinstance(rtype, six.string_types) and len(rtype.strip()) == 0: + if isinstance(rtype, str) and len(rtype.strip()) == 0: raise click.UsageError('Parameter --rtype cannot be whitespace or empty string') kwargs = {} @@ -1404,7 +1403,7 @@ def delete_rr_set(ctx, from_json, zone_name_or_id, domain, rtype, if_match, if_u @cli_util.wrap_exceptions def delete_steering_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, steering_policy_id, if_match, if_unmodified_since, scope): - if isinstance(steering_policy_id, six.string_types) and len(steering_policy_id.strip()) == 0: + if isinstance(steering_policy_id, str) and len(steering_policy_id.strip()) == 0: raise click.UsageError('Parameter --steering-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1467,7 +1466,7 @@ def delete_steering_policy(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_steering_policy_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, steering_policy_attachment_id, if_match, if_unmodified_since, scope): - if isinstance(steering_policy_attachment_id, six.string_types) and len(steering_policy_attachment_id.strip()) == 0: + if isinstance(steering_policy_attachment_id, str) and len(steering_policy_attachment_id.strip()) == 0: raise click.UsageError('Parameter --steering-policy-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -1530,7 +1529,7 @@ def delete_steering_policy_attachment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def delete_tsig_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tsig_key_id, if_match, if_unmodified_since, scope): - if isinstance(tsig_key_id, six.string_types) and len(tsig_key_id.strip()) == 0: + if isinstance(tsig_key_id, str) and len(tsig_key_id.strip()) == 0: raise click.UsageError('Parameter --tsig-key-id cannot be whitespace or empty string') kwargs = {} @@ -1595,7 +1594,7 @@ def delete_tsig_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_view(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, view_id, if_match, if_unmodified_since, scope): - if isinstance(view_id, six.string_types) and len(view_id.strip()) == 0: + if isinstance(view_id, str) and len(view_id.strip()) == 0: raise click.UsageError('Parameter --view-id cannot be whitespace or empty string') kwargs = {} @@ -1664,7 +1663,7 @@ def delete_view(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_zone(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, zone_name_or_id, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -1745,10 +1744,10 @@ def get_domain_records(ctx, from_json, all_pages, page_size, zone_name_or_id, do if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') - if isinstance(domain, six.string_types) and len(domain.strip()) == 0: + if isinstance(domain, str) and len(domain.strip()) == 0: raise click.UsageError('Parameter --domain cannot be whitespace or empty string') kwargs = {} @@ -1818,7 +1817,7 @@ def get_domain_records(ctx, from_json, all_pages, page_size, zone_name_or_id, do @cli_util.wrap_exceptions def get_resolver(ctx, from_json, resolver_id, if_modified_since, if_none_match, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') kwargs = {} @@ -1852,10 +1851,10 @@ def get_resolver(ctx, from_json, resolver_id, if_modified_since, if_none_match, @cli_util.wrap_exceptions def get_resolver_endpoint(ctx, from_json, resolver_id, resolver_endpoint_name, if_modified_since, if_none_match, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') - if isinstance(resolver_endpoint_name, six.string_types) and len(resolver_endpoint_name.strip()) == 0: + if isinstance(resolver_endpoint_name, str) and len(resolver_endpoint_name.strip()) == 0: raise click.UsageError('Parameter --resolver-endpoint-name cannot be whitespace or empty string') kwargs = {} @@ -1903,13 +1902,13 @@ def get_rr_set(ctx, from_json, all_pages, page_size, zone_name_or_id, domain, rt if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') - if isinstance(domain, six.string_types) and len(domain.strip()) == 0: + if isinstance(domain, str) and len(domain.strip()) == 0: raise click.UsageError('Parameter --domain cannot be whitespace or empty string') - if isinstance(rtype, six.string_types) and len(rtype.strip()) == 0: + if isinstance(rtype, str) and len(rtype.strip()) == 0: raise click.UsageError('Parameter --rtype cannot be whitespace or empty string') kwargs = {} @@ -1974,7 +1973,7 @@ def get_rr_set(ctx, from_json, all_pages, page_size, zone_name_or_id, domain, rt @cli_util.wrap_exceptions def get_steering_policy(ctx, from_json, steering_policy_id, if_none_match, if_modified_since, scope): - if isinstance(steering_policy_id, six.string_types) and len(steering_policy_id.strip()) == 0: + if isinstance(steering_policy_id, str) and len(steering_policy_id.strip()) == 0: raise click.UsageError('Parameter --steering-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2005,7 +2004,7 @@ def get_steering_policy(ctx, from_json, steering_policy_id, if_none_match, if_mo @cli_util.wrap_exceptions def get_steering_policy_attachment(ctx, from_json, steering_policy_attachment_id, if_none_match, if_modified_since, scope): - if isinstance(steering_policy_attachment_id, six.string_types) and len(steering_policy_attachment_id.strip()) == 0: + if isinstance(steering_policy_attachment_id, str) and len(steering_policy_attachment_id.strip()) == 0: raise click.UsageError('Parameter --steering-policy-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -2036,7 +2035,7 @@ def get_steering_policy_attachment(ctx, from_json, steering_policy_attachment_id @cli_util.wrap_exceptions def get_tsig_key(ctx, from_json, tsig_key_id, if_none_match, if_modified_since, scope): - if isinstance(tsig_key_id, six.string_types) and len(tsig_key_id.strip()) == 0: + if isinstance(tsig_key_id, str) and len(tsig_key_id.strip()) == 0: raise click.UsageError('Parameter --tsig-key-id cannot be whitespace or empty string') kwargs = {} @@ -2069,7 +2068,7 @@ def get_tsig_key(ctx, from_json, tsig_key_id, if_none_match, if_modified_since, @cli_util.wrap_exceptions def get_view(ctx, from_json, view_id, if_modified_since, if_none_match, scope): - if isinstance(view_id, six.string_types) and len(view_id.strip()) == 0: + if isinstance(view_id, str) and len(view_id.strip()) == 0: raise click.UsageError('Parameter --view-id cannot be whitespace or empty string') kwargs = {} @@ -2106,7 +2105,7 @@ def get_view(ctx, from_json, view_id, if_modified_since, if_none_match, scope): @cli_util.wrap_exceptions def get_zone(ctx, from_json, zone_name_or_id, if_none_match, if_modified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -2143,7 +2142,7 @@ def get_zone(ctx, from_json, zone_name_or_id, if_none_match, if_modified_since, @cli_util.wrap_exceptions def get_zone_content(ctx, from_json, file, zone_name_or_id, if_none_match, if_modified_since, scope, view_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -2217,7 +2216,7 @@ def get_zone_records(ctx, from_json, all_pages, page_size, zone_name_or_id, if_n if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -2295,7 +2294,7 @@ def list_resolver_endpoints(ctx, from_json, all_pages, page_size, resolver_id, n if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') kwargs = {} @@ -2848,10 +2847,10 @@ def list_zones(ctx, from_json, all_pages, page_size, compartment_id, limit, page @cli_util.wrap_exceptions def patch_domain_records(ctx, from_json, zone_name_or_id, domain, items, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') - if isinstance(domain, six.string_types) and len(domain.strip()) == 0: + if isinstance(domain, str) and len(domain.strip()) == 0: raise click.UsageError('Parameter --domain cannot be whitespace or empty string') kwargs = {} @@ -2905,13 +2904,13 @@ def patch_domain_records(ctx, from_json, zone_name_or_id, domain, items, if_matc @cli_util.wrap_exceptions def patch_rr_set(ctx, from_json, zone_name_or_id, domain, rtype, items, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') - if isinstance(domain, six.string_types) and len(domain.strip()) == 0: + if isinstance(domain, str) and len(domain.strip()) == 0: raise click.UsageError('Parameter --domain cannot be whitespace or empty string') - if isinstance(rtype, six.string_types) and len(rtype.strip()) == 0: + if isinstance(rtype, str) and len(rtype.strip()) == 0: raise click.UsageError('Parameter --rtype cannot be whitespace or empty string') kwargs = {} @@ -2964,7 +2963,7 @@ def patch_rr_set(ctx, from_json, zone_name_or_id, domain, rtype, items, if_match @cli_util.wrap_exceptions def patch_zone_records(ctx, from_json, zone_name_or_id, items, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -3016,7 +3015,7 @@ def patch_zone_records(ctx, from_json, zone_name_or_id, items, if_match, if_unmo @cli_util.wrap_exceptions def promote_zone_dnssec_key_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, zone_id, dnssec_key_version_uuid, if_match, if_unmodified_since, scope): - if isinstance(zone_id, six.string_types) and len(zone_id.strip()) == 0: + if isinstance(zone_id, str) and len(zone_id.strip()) == 0: raise click.UsageError('Parameter --zone-id cannot be whitespace or empty string') kwargs = {} @@ -3093,7 +3092,7 @@ def promote_zone_dnssec_key_version(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def stage_zone_dnssec_key_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, zone_id, predecessor_dnssec_key_version_uuid, if_match, if_unmodified_since, scope): - if isinstance(zone_id, six.string_types) and len(zone_id.strip()) == 0: + if isinstance(zone_id, str) and len(zone_id.strip()) == 0: raise click.UsageError('Parameter --zone-id cannot be whitespace or empty string') kwargs = {} @@ -3175,10 +3174,10 @@ def stage_zone_dnssec_key_version(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_domain_records(ctx, from_json, force, zone_name_or_id, domain, items, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') - if isinstance(domain, six.string_types) and len(domain.strip()) == 0: + if isinstance(domain, str) and len(domain.strip()) == 0: raise click.UsageError('Parameter --domain cannot be whitespace or empty string') if not force: if items: @@ -3242,7 +3241,7 @@ def update_domain_records(ctx, from_json, force, zone_name_or_id, domain, items, @cli_util.wrap_exceptions def update_resolver(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, resolver_id, display_name, freeform_tags, defined_tags, attached_views, rules, if_match, if_unmodified_since, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or attached_views or rules: @@ -3324,10 +3323,10 @@ def update_resolver(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_resolver_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, resolver_id, resolver_endpoint_name, endpoint_type, if_match, if_unmodified_since, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') - if isinstance(resolver_endpoint_name, six.string_types) and len(resolver_endpoint_name.strip()) == 0: + if isinstance(resolver_endpoint_name, str) and len(resolver_endpoint_name.strip()) == 0: raise click.UsageError('Parameter --resolver-endpoint-name cannot be whitespace or empty string') kwargs = {} @@ -3395,10 +3394,10 @@ def update_resolver_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_resolver_endpoint_update_resolver_vnic_endpoint_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, resolver_id, resolver_endpoint_name, nsg_ids, if_match, if_unmodified_since, scope): - if isinstance(resolver_id, six.string_types) and len(resolver_id.strip()) == 0: + if isinstance(resolver_id, str) and len(resolver_id.strip()) == 0: raise click.UsageError('Parameter --resolver-id cannot be whitespace or empty string') - if isinstance(resolver_endpoint_name, six.string_types) and len(resolver_endpoint_name.strip()) == 0: + if isinstance(resolver_endpoint_name, str) and len(resolver_endpoint_name.strip()) == 0: raise click.UsageError('Parameter --resolver-endpoint-name cannot be whitespace or empty string') if not force: if nsg_ids: @@ -3478,13 +3477,13 @@ def update_resolver_endpoint_update_resolver_vnic_endpoint_details(ctx, from_jso @cli_util.wrap_exceptions def update_rr_set(ctx, from_json, force, zone_name_or_id, domain, rtype, items, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') - if isinstance(domain, six.string_types) and len(domain.strip()) == 0: + if isinstance(domain, str) and len(domain.strip()) == 0: raise click.UsageError('Parameter --domain cannot be whitespace or empty string') - if isinstance(rtype, six.string_types) and len(rtype.strip()) == 0: + if isinstance(rtype, str) and len(rtype.strip()) == 0: raise click.UsageError('Parameter --rtype cannot be whitespace or empty string') if not force: if items: @@ -3576,7 +3575,7 @@ def update_rr_set(ctx, from_json, force, zone_name_or_id, domain, rtype, items, @cli_util.wrap_exceptions def update_steering_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, steering_policy_id, display_name, ttl, health_check_monitor_id, template, freeform_tags, defined_tags, answers, rules, if_match, if_unmodified_since, scope): - if isinstance(steering_policy_id, six.string_types) and len(steering_policy_id.strip()) == 0: + if isinstance(steering_policy_id, str) and len(steering_policy_id.strip()) == 0: raise click.UsageError('Parameter --steering-policy-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or answers or rules: @@ -3666,7 +3665,7 @@ def update_steering_policy(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_steering_policy_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, steering_policy_attachment_id, display_name, if_match, if_unmodified_since, scope): - if isinstance(steering_policy_attachment_id, six.string_types) and len(steering_policy_attachment_id.strip()) == 0: + if isinstance(steering_policy_attachment_id, str) and len(steering_policy_attachment_id.strip()) == 0: raise click.UsageError('Parameter --steering-policy-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -3737,7 +3736,7 @@ def update_steering_policy_attachment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_tsig_key(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tsig_key_id, freeform_tags, defined_tags, if_match, if_unmodified_since, scope): - if isinstance(tsig_key_id, six.string_types) and len(tsig_key_id.strip()) == 0: + if isinstance(tsig_key_id, str) and len(tsig_key_id.strip()) == 0: raise click.UsageError('Parameter --tsig-key-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3816,7 +3815,7 @@ def update_tsig_key(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_view(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, view_id, display_name, freeform_tags, defined_tags, if_match, if_unmodified_since, scope): - if isinstance(view_id, six.string_types) and len(view_id.strip()) == 0: + if isinstance(view_id, str) and len(view_id.strip()) == 0: raise click.UsageError('Parameter --view-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3922,7 +3921,7 @@ def update_view(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_zone(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, zone_name_or_id, freeform_tags, defined_tags, dnssec_state, external_masters, external_downstreams, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or external_masters or external_downstreams: @@ -4013,7 +4012,7 @@ def update_zone(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_zone_records(ctx, from_json, force, zone_name_or_id, items, if_match, if_unmodified_since, scope, view_id, compartment_id): - if isinstance(zone_name_or_id, six.string_types) and len(zone_name_or_id.strip()) == 0: + if isinstance(zone_name_or_id, str) and len(zone_name_or_id.strip()) == 0: raise click.UsageError('Parameter --zone-name-or-id cannot be whitespace or empty string') if not force: if items: diff --git a/services/em_warehouse/src/oci_cli_em_warehouse/generated/emwarehouse_cli.py b/services/em_warehouse/src/oci_cli_em_warehouse/generated/emwarehouse_cli.py index ec596b355..713ed1fad 100644 --- a/services/em_warehouse/src/oci_cli_em_warehouse/generated/emwarehouse_cli.py +++ b/services/em_warehouse/src/oci_cli_em_warehouse/generated/emwarehouse_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -84,7 +83,7 @@ def etl_run_collection_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -113,7 +112,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_em_warehouse_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, em_warehouse_id, compartment_id, if_match): - if isinstance(em_warehouse_id, six.string_types) and len(em_warehouse_id.strip()) == 0: + if isinstance(em_warehouse_id, str) and len(em_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --em-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -243,7 +242,7 @@ def create_em_warehouse(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_em_warehouse(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, em_warehouse_id, if_match): - if isinstance(em_warehouse_id, six.string_types) and len(em_warehouse_id.strip()) == 0: + if isinstance(em_warehouse_id, str) and len(em_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --em-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -294,7 +293,7 @@ def delete_em_warehouse(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_em_warehouse(ctx, from_json, em_warehouse_id): - if isinstance(em_warehouse_id, six.string_types) and len(em_warehouse_id.strip()) == 0: + if isinstance(em_warehouse_id, str) and len(em_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --em-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -316,7 +315,7 @@ def get_em_warehouse(ctx, from_json, em_warehouse_id): @cli_util.wrap_exceptions def get_em_warehouse_resource_usage(ctx, from_json, em_warehouse_id): - if isinstance(em_warehouse_id, six.string_types) and len(em_warehouse_id.strip()) == 0: + if isinstance(em_warehouse_id, str) and len(em_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --em-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -338,7 +337,7 @@ def get_em_warehouse_resource_usage(ctx, from_json, em_warehouse_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -436,7 +435,7 @@ def list_etl_runs(ctx, from_json, all_pages, page_size, em_warehouse_id, compart if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(em_warehouse_id, six.string_types) and len(em_warehouse_id.strip()) == 0: + if isinstance(em_warehouse_id, str) and len(em_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --em-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -497,7 +496,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -554,7 +553,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -673,7 +672,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_em_warehouse(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, em_warehouse_id, compartment_id, em_bridge_id, freeform_tags, defined_tags, if_match): - if isinstance(em_warehouse_id, six.string_types) and len(em_warehouse_id.strip()) == 0: + if isinstance(em_warehouse_id, str) and len(em_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --em-warehouse-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/email/src/oci_cli_email/generated/email_cli.py b/services/email/src/oci_cli_email/generated/email_cli.py index 6ab087b64..70b1ac41f 100644 --- a/services/email/src/oci_cli_email/generated/email_cli.py +++ b/services/email/src/oci_cli_email/generated/email_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -115,7 +114,7 @@ def work_request_log_entry_collection_group(): @cli_util.wrap_exceptions def add_email_domain_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, email_domain_id, type, compartment_id, related_resource_id, message, if_match): - if isinstance(email_domain_id, six.string_types) and len(email_domain_id.strip()) == 0: + if isinstance(email_domain_id, str) and len(email_domain_id.strip()) == 0: raise click.UsageError('Parameter --email-domain-id cannot be whitespace or empty string') kwargs = {} @@ -184,7 +183,7 @@ def add_email_domain_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def add_return_path_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, email_return_path_id, type, compartment_id, related_resource_id, message, if_match): - if isinstance(email_return_path_id, six.string_types) and len(email_return_path_id.strip()) == 0: + if isinstance(email_return_path_id, str) and len(email_return_path_id.strip()) == 0: raise click.UsageError('Parameter --email-return-path-id cannot be whitespace or empty string') kwargs = {} @@ -253,7 +252,7 @@ def add_return_path_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def add_sender_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sender_id, type, compartment_id, related_resource_id, message, if_match): - if isinstance(sender_id, six.string_types) and len(sender_id.strip()) == 0: + if isinstance(sender_id, str) and len(sender_id.strip()) == 0: raise click.UsageError('Parameter --sender-id cannot be whitespace or empty string') kwargs = {} @@ -322,7 +321,7 @@ def add_sender_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def change_email_domain_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, email_domain_id, compartment_id, if_match, is_lock_override): - if isinstance(email_domain_id, six.string_types) and len(email_domain_id.strip()) == 0: + if isinstance(email_domain_id, str) and len(email_domain_id.strip()) == 0: raise click.UsageError('Parameter --email-domain-id cannot be whitespace or empty string') kwargs = {} @@ -383,7 +382,7 @@ def change_email_domain_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_sender_compartment(ctx, from_json, sender_id, compartment_id, if_match, is_lock_override): - if isinstance(sender_id, six.string_types) and len(sender_id.strip()) == 0: + if isinstance(sender_id, str) and len(sender_id.strip()) == 0: raise click.UsageError('Parameter --sender-id cannot be whitespace or empty string') kwargs = {} @@ -736,7 +735,7 @@ def create_suppression(ctx, from_json, compartment_id, email_address): @cli_util.wrap_exceptions def delete_dkim(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dkim_id, if_match): - if isinstance(dkim_id, six.string_types) and len(dkim_id.strip()) == 0: + if isinstance(dkim_id, str) and len(dkim_id.strip()) == 0: raise click.UsageError('Parameter --dkim-id cannot be whitespace or empty string') kwargs = {} @@ -793,7 +792,7 @@ def delete_dkim(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_email_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, email_domain_id, if_match, is_lock_override): - if isinstance(email_domain_id, six.string_types) and len(email_domain_id.strip()) == 0: + if isinstance(email_domain_id, str) and len(email_domain_id.strip()) == 0: raise click.UsageError('Parameter --email-domain-id cannot be whitespace or empty string') kwargs = {} @@ -852,7 +851,7 @@ def delete_email_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_email_return_path(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, email_return_path_id, if_match, is_lock_override): - if isinstance(email_return_path_id, six.string_types) and len(email_return_path_id.strip()) == 0: + if isinstance(email_return_path_id, str) and len(email_return_path_id.strip()) == 0: raise click.UsageError('Parameter --email-return-path-id cannot be whitespace or empty string') kwargs = {} @@ -911,7 +910,7 @@ def delete_email_return_path(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_sender(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sender_id, if_match, is_lock_override): - if isinstance(sender_id, six.string_types) and len(sender_id.strip()) == 0: + if isinstance(sender_id, str) and len(sender_id.strip()) == 0: raise click.UsageError('Parameter --sender-id cannot be whitespace or empty string') kwargs = {} @@ -973,7 +972,7 @@ def delete_sender(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_suppression(ctx, from_json, suppression_id): - if isinstance(suppression_id, six.string_types) and len(suppression_id.strip()) == 0: + if isinstance(suppression_id, str) and len(suppression_id.strip()) == 0: raise click.UsageError('Parameter --suppression-id cannot be whitespace or empty string') kwargs = {} @@ -995,7 +994,7 @@ def delete_suppression(ctx, from_json, suppression_id): @cli_util.wrap_exceptions def get_dkim(ctx, from_json, dkim_id): - if isinstance(dkim_id, six.string_types) and len(dkim_id.strip()) == 0: + if isinstance(dkim_id, str) and len(dkim_id.strip()) == 0: raise click.UsageError('Parameter --dkim-id cannot be whitespace or empty string') kwargs = {} @@ -1036,7 +1035,7 @@ def get_email_configuration(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_email_domain(ctx, from_json, email_domain_id): - if isinstance(email_domain_id, six.string_types) and len(email_domain_id.strip()) == 0: + if isinstance(email_domain_id, str) and len(email_domain_id.strip()) == 0: raise click.UsageError('Parameter --email-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1058,7 +1057,7 @@ def get_email_domain(ctx, from_json, email_domain_id): @cli_util.wrap_exceptions def get_email_return_path(ctx, from_json, email_return_path_id): - if isinstance(email_return_path_id, six.string_types) and len(email_return_path_id.strip()) == 0: + if isinstance(email_return_path_id, str) and len(email_return_path_id.strip()) == 0: raise click.UsageError('Parameter --email-return-path-id cannot be whitespace or empty string') kwargs = {} @@ -1080,7 +1079,7 @@ def get_email_return_path(ctx, from_json, email_return_path_id): @cli_util.wrap_exceptions def get_sender(ctx, from_json, sender_id): - if isinstance(sender_id, six.string_types) and len(sender_id.strip()) == 0: + if isinstance(sender_id, str) and len(sender_id.strip()) == 0: raise click.UsageError('Parameter --sender-id cannot be whitespace or empty string') kwargs = {} @@ -1102,7 +1101,7 @@ def get_sender(ctx, from_json, sender_id): @cli_util.wrap_exceptions def get_suppression(ctx, from_json, suppression_id): - if isinstance(suppression_id, six.string_types) and len(suppression_id.strip()) == 0: + if isinstance(suppression_id, str) and len(suppression_id.strip()) == 0: raise click.UsageError('Parameter --suppression-id cannot be whitespace or empty string') kwargs = {} @@ -1124,7 +1123,7 @@ def get_suppression(ctx, from_json, suppression_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1486,7 +1485,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1537,7 +1536,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1638,7 +1637,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def remove_email_domain_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, email_domain_id, type, compartment_id, if_match): - if isinstance(email_domain_id, six.string_types) and len(email_domain_id.strip()) == 0: + if isinstance(email_domain_id, str) and len(email_domain_id.strip()) == 0: raise click.UsageError('Parameter --email-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1699,7 +1698,7 @@ def remove_email_domain_lock(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def remove_return_path_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, email_return_path_id, type, compartment_id, if_match): - if isinstance(email_return_path_id, six.string_types) and len(email_return_path_id.strip()) == 0: + if isinstance(email_return_path_id, str) and len(email_return_path_id.strip()) == 0: raise click.UsageError('Parameter --email-return-path-id cannot be whitespace or empty string') kwargs = {} @@ -1760,7 +1759,7 @@ def remove_return_path_lock(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def remove_sender_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sender_id, type, compartment_id, if_match): - if isinstance(sender_id, six.string_types) and len(sender_id.strip()) == 0: + if isinstance(sender_id, str) and len(sender_id.strip()) == 0: raise click.UsageError('Parameter --sender-id cannot be whitespace or empty string') kwargs = {} @@ -1827,7 +1826,7 @@ def remove_sender_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_dkim(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dkim_id, description, freeform_tags, defined_tags, if_match): - if isinstance(dkim_id, six.string_types) and len(dkim_id.strip()) == 0: + if isinstance(dkim_id, str) and len(dkim_id.strip()) == 0: raise click.UsageError('Parameter --dkim-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1909,7 +1908,7 @@ def update_dkim(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_email_domain(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, email_domain_id, domain_verification_id, description, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(email_domain_id, six.string_types) and len(email_domain_id.strip()) == 0: + if isinstance(email_domain_id, str) and len(email_domain_id.strip()) == 0: raise click.UsageError('Parameter --email-domain-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1995,7 +1994,7 @@ def update_email_domain(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_email_return_path(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, email_return_path_id, description, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(email_return_path_id, six.string_types) and len(email_return_path_id.strip()) == 0: + if isinstance(email_return_path_id, str) and len(email_return_path_id.strip()) == 0: raise click.UsageError('Parameter --email-return-path-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2077,7 +2076,7 @@ def update_email_return_path(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_sender(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sender_id, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(sender_id, six.string_types) and len(sender_id.strip()) == 0: + if isinstance(sender_id, str) and len(sender_id.strip()) == 0: raise click.UsageError('Parameter --sender-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/email_data_plane/src/oci_cli_email_dp/generated/emaildp_cli.py b/services/email_data_plane/src/oci_cli_email_dp/generated/emaildp_cli.py index e0194e888..a4fdc9581 100644 --- a/services/email_data_plane/src/oci_cli_email_dp/generated/emaildp_cli.py +++ b/services/email_data_plane/src/oci_cli_email_dp/generated/emaildp_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 diff --git a/services/events/src/oci_cli_events/generated/events_cli.py b/services/events/src/oci_cli_events/generated/events_cli.py index b83d38eab..6e81aae43 100644 --- a/services/events/src/oci_cli_events/generated/events_cli.py +++ b/services/events/src/oci_cli_events/generated/events_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -43,7 +42,7 @@ def rule_group(): @cli_util.wrap_exceptions def change_rule_compartment(ctx, from_json, rule_id, compartment_id, if_match): - if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: + if isinstance(rule_id, str) and len(rule_id.strip()) == 0: raise click.UsageError('Parameter --rule-id cannot be whitespace or empty string') kwargs = {} @@ -162,7 +161,7 @@ def create_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, rule_id, if_match): - if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: + if isinstance(rule_id, str) and len(rule_id.strip()) == 0: raise click.UsageError('Parameter --rule-id cannot be whitespace or empty string') kwargs = {} @@ -221,7 +220,7 @@ def delete_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def get_rule(ctx, from_json, rule_id): - if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: + if isinstance(rule_id, str) and len(rule_id.strip()) == 0: raise click.UsageError('Parameter --rule-id cannot be whitespace or empty string') kwargs = {} @@ -341,7 +340,7 @@ def list_rules(ctx, from_json, all_pages, page_size, compartment_id, limit, page @cli_util.wrap_exceptions def update_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, rule_id, display_name, description, is_enabled, condition, actions, freeform_tags, defined_tags, if_match): - if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: + if isinstance(rule_id, str) and len(rule_id.strip()) == 0: raise click.UsageError('Parameter --rule-id cannot be whitespace or empty string') if not force: if actions or freeform_tags or defined_tags: diff --git a/services/file_storage/src/oci_cli_file_storage/generated/filestorage_cli.py b/services/file_storage/src/oci_cli_file_storage/generated/filestorage_cli.py index 876a48d26..c12c74b34 100644 --- a/services/file_storage/src/oci_cli_file_storage/generated/filestorage_cli.py +++ b/services/file_storage/src/oci_cli_file_storage/generated/filestorage_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -127,7 +126,7 @@ def snapshot_group(): @cli_util.wrap_exceptions def add_export_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, export_id, type, related_resource_id, message, time_created, if_match): - if isinstance(export_id, six.string_types) and len(export_id.strip()) == 0: + if isinstance(export_id, str) and len(export_id.strip()) == 0: raise click.UsageError('Parameter --export-id cannot be whitespace or empty string') kwargs = {} @@ -196,7 +195,7 @@ def add_export_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def add_file_system_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, file_system_id, type, related_resource_id, message, time_created, if_match): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -265,7 +264,7 @@ def add_file_system_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def add_filesystem_snapshot_policy_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, filesystem_snapshot_policy_id, type, related_resource_id, message, time_created, if_match): - if isinstance(filesystem_snapshot_policy_id, six.string_types) and len(filesystem_snapshot_policy_id.strip()) == 0: + if isinstance(filesystem_snapshot_policy_id, str) and len(filesystem_snapshot_policy_id.strip()) == 0: raise click.UsageError('Parameter --filesystem-snapshot-policy-id cannot be whitespace or empty string') kwargs = {} @@ -334,7 +333,7 @@ def add_filesystem_snapshot_policy_lock(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def add_mount_target_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mount_target_id, type, related_resource_id, message, time_created, if_match): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') kwargs = {} @@ -403,7 +402,7 @@ def add_mount_target_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def add_outbound_connector_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, outbound_connector_id, type, related_resource_id, message, time_created, if_match): - if isinstance(outbound_connector_id, six.string_types) and len(outbound_connector_id.strip()) == 0: + if isinstance(outbound_connector_id, str) and len(outbound_connector_id.strip()) == 0: raise click.UsageError('Parameter --outbound-connector-id cannot be whitespace or empty string') kwargs = {} @@ -472,7 +471,7 @@ def add_outbound_connector_lock(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def add_replication_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, replication_id, type, related_resource_id, message, time_created, if_match): - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') kwargs = {} @@ -541,7 +540,7 @@ def add_replication_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def add_snapshot_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, snapshot_id, type, related_resource_id, message, time_created, if_match): - if isinstance(snapshot_id, six.string_types) and len(snapshot_id.strip()) == 0: + if isinstance(snapshot_id, str) and len(snapshot_id.strip()) == 0: raise click.UsageError('Parameter --snapshot-id cannot be whitespace or empty string') kwargs = {} @@ -606,7 +605,7 @@ def add_snapshot_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def cancel_downgrade_shape_mount_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mount_target_id, if_match): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') kwargs = {} @@ -656,7 +655,7 @@ def cancel_downgrade_shape_mount_target(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def change_file_system_compartment(ctx, from_json, file_system_id, compartment_id, if_match, is_lock_override): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -690,7 +689,7 @@ def change_file_system_compartment(ctx, from_json, file_system_id, compartment_i @cli_util.wrap_exceptions def change_filesystem_snapshot_policy_compartment(ctx, from_json, filesystem_snapshot_policy_id, compartment_id, if_match, is_lock_override): - if isinstance(filesystem_snapshot_policy_id, six.string_types) and len(filesystem_snapshot_policy_id.strip()) == 0: + if isinstance(filesystem_snapshot_policy_id, str) and len(filesystem_snapshot_policy_id.strip()) == 0: raise click.UsageError('Parameter --filesystem-snapshot-policy-id cannot be whitespace or empty string') kwargs = {} @@ -724,7 +723,7 @@ def change_filesystem_snapshot_policy_compartment(ctx, from_json, filesystem_sna @cli_util.wrap_exceptions def change_mount_target_compartment(ctx, from_json, mount_target_id, compartment_id, if_match, is_lock_override): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') kwargs = {} @@ -758,7 +757,7 @@ def change_mount_target_compartment(ctx, from_json, mount_target_id, compartment @cli_util.wrap_exceptions def change_outbound_connector_compartment(ctx, from_json, outbound_connector_id, compartment_id, if_match, is_lock_override): - if isinstance(outbound_connector_id, six.string_types) and len(outbound_connector_id.strip()) == 0: + if isinstance(outbound_connector_id, str) and len(outbound_connector_id.strip()) == 0: raise click.UsageError('Parameter --outbound-connector-id cannot be whitespace or empty string') kwargs = {} @@ -792,7 +791,7 @@ def change_outbound_connector_compartment(ctx, from_json, outbound_connector_id, @cli_util.wrap_exceptions def change_replication_compartment(ctx, from_json, replication_id, compartment_id, if_match, is_lock_override): - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') kwargs = {} @@ -1406,7 +1405,7 @@ def create_outbound_connector_create_ldap_bind_account_details(ctx, from_json, w @cli_util.wrap_exceptions def create_quota_rule(ctx, from_json, principal_type, is_hard_quota, quota_limit_in_gigabytes, file_system_id, principal_id, display_name, if_match): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -1603,7 +1602,7 @@ def create_snapshot(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_export(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, export_id, if_match, is_lock_override): - if isinstance(export_id, six.string_types) and len(export_id.strip()) == 0: + if isinstance(export_id, str) and len(export_id.strip()) == 0: raise click.UsageError('Parameter --export-id cannot be whitespace or empty string') kwargs = {} @@ -1671,7 +1670,7 @@ def delete_export(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_file_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, file_system_id, if_match, is_lock_override, can_detach_child_file_system): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -1740,7 +1739,7 @@ def delete_file_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_filesystem_snapshot_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, filesystem_snapshot_policy_id, if_match, is_lock_override): - if isinstance(filesystem_snapshot_policy_id, six.string_types) and len(filesystem_snapshot_policy_id.strip()) == 0: + if isinstance(filesystem_snapshot_policy_id, str) and len(filesystem_snapshot_policy_id.strip()) == 0: raise click.UsageError('Parameter --filesystem-snapshot-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1807,7 +1806,7 @@ def delete_filesystem_snapshot_policy(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def delete_mount_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mount_target_id, if_match, is_lock_override): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') kwargs = {} @@ -1874,7 +1873,7 @@ def delete_mount_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_outbound_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, outbound_connector_id, if_match, is_lock_override): - if isinstance(outbound_connector_id, six.string_types) and len(outbound_connector_id.strip()) == 0: + if isinstance(outbound_connector_id, str) and len(outbound_connector_id.strip()) == 0: raise click.UsageError('Parameter --outbound-connector-id cannot be whitespace or empty string') kwargs = {} @@ -1938,10 +1937,10 @@ def delete_outbound_connector(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_quota_rule(ctx, from_json, file_system_id, quota_rule_id, if_match): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') - if isinstance(quota_rule_id, six.string_types) and len(quota_rule_id.strip()) == 0: + if isinstance(quota_rule_id, str) and len(quota_rule_id.strip()) == 0: raise click.UsageError('Parameter --quota-rule-id cannot be whitespace or empty string') kwargs = {} @@ -1973,7 +1972,7 @@ def delete_quota_rule(ctx, from_json, file_system_id, quota_rule_id, if_match): @cli_util.wrap_exceptions def delete_replication(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, replication_id, if_match, delete_mode, is_lock_override): - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') kwargs = {} @@ -2042,7 +2041,7 @@ def delete_replication(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_replication_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, replication_target_id, if_match, is_lock_override): - if isinstance(replication_target_id, six.string_types) and len(replication_target_id.strip()) == 0: + if isinstance(replication_target_id, str) and len(replication_target_id.strip()) == 0: raise click.UsageError('Parameter --replication-target-id cannot be whitespace or empty string') kwargs = {} @@ -2109,7 +2108,7 @@ def delete_replication_target(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_snapshot(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, snapshot_id, if_match, is_lock_override): - if isinstance(snapshot_id, six.string_types) and len(snapshot_id.strip()) == 0: + if isinstance(snapshot_id, str) and len(snapshot_id.strip()) == 0: raise click.UsageError('Parameter --snapshot-id cannot be whitespace or empty string') kwargs = {} @@ -2171,7 +2170,7 @@ def delete_snapshot(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def detach_clone(ctx, from_json, file_system_id, if_match): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -2197,7 +2196,7 @@ def detach_clone(ctx, from_json, file_system_id, if_match): @cli_util.wrap_exceptions def estimate_replication(ctx, from_json, file_system_id, if_match, change_rate_in_m_bps): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -2223,7 +2222,7 @@ def estimate_replication(ctx, from_json, file_system_id, if_match, change_rate_i @cli_util.wrap_exceptions def get_export(ctx, from_json, export_id): - if isinstance(export_id, six.string_types) and len(export_id.strip()) == 0: + if isinstance(export_id, str) and len(export_id.strip()) == 0: raise click.UsageError('Parameter --export-id cannot be whitespace or empty string') kwargs = {} @@ -2245,7 +2244,7 @@ def get_export(ctx, from_json, export_id): @cli_util.wrap_exceptions def get_export_set(ctx, from_json, export_set_id): - if isinstance(export_set_id, six.string_types) and len(export_set_id.strip()) == 0: + if isinstance(export_set_id, str) and len(export_set_id.strip()) == 0: raise click.UsageError('Parameter --export-set-id cannot be whitespace or empty string') kwargs = {} @@ -2267,7 +2266,7 @@ def get_export_set(ctx, from_json, export_set_id): @cli_util.wrap_exceptions def get_file_system(ctx, from_json, file_system_id): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -2289,7 +2288,7 @@ def get_file_system(ctx, from_json, file_system_id): @cli_util.wrap_exceptions def get_filesystem_snapshot_policy(ctx, from_json, filesystem_snapshot_policy_id): - if isinstance(filesystem_snapshot_policy_id, six.string_types) and len(filesystem_snapshot_policy_id.strip()) == 0: + if isinstance(filesystem_snapshot_policy_id, str) and len(filesystem_snapshot_policy_id.strip()) == 0: raise click.UsageError('Parameter --filesystem-snapshot-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2311,7 +2310,7 @@ def get_filesystem_snapshot_policy(ctx, from_json, filesystem_snapshot_policy_id @cli_util.wrap_exceptions def get_mount_target(ctx, from_json, mount_target_id): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') kwargs = {} @@ -2333,7 +2332,7 @@ def get_mount_target(ctx, from_json, mount_target_id): @cli_util.wrap_exceptions def get_outbound_connector(ctx, from_json, outbound_connector_id): - if isinstance(outbound_connector_id, six.string_types) and len(outbound_connector_id.strip()) == 0: + if isinstance(outbound_connector_id, str) and len(outbound_connector_id.strip()) == 0: raise click.UsageError('Parameter --outbound-connector-id cannot be whitespace or empty string') kwargs = {} @@ -2357,10 +2356,10 @@ def get_outbound_connector(ctx, from_json, outbound_connector_id): @cli_util.wrap_exceptions def get_quota_rule(ctx, from_json, file_system_id, quota_rule_id, if_match): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') - if isinstance(quota_rule_id, six.string_types) and len(quota_rule_id.strip()) == 0: + if isinstance(quota_rule_id, str) and len(quota_rule_id.strip()) == 0: raise click.UsageError('Parameter --quota-rule-id cannot be whitespace or empty string') kwargs = {} @@ -2385,7 +2384,7 @@ def get_quota_rule(ctx, from_json, file_system_id, quota_rule_id, if_match): @cli_util.wrap_exceptions def get_replication(ctx, from_json, replication_id): - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') kwargs = {} @@ -2407,7 +2406,7 @@ def get_replication(ctx, from_json, replication_id): @cli_util.wrap_exceptions def get_replication_target(ctx, from_json, replication_target_id): - if isinstance(replication_target_id, six.string_types) and len(replication_target_id.strip()) == 0: + if isinstance(replication_target_id, str) and len(replication_target_id.strip()) == 0: raise click.UsageError('Parameter --replication-target-id cannot be whitespace or empty string') kwargs = {} @@ -2429,7 +2428,7 @@ def get_replication_target(ctx, from_json, replication_target_id): @cli_util.wrap_exceptions def get_snapshot(ctx, from_json, snapshot_id): - if isinstance(snapshot_id, six.string_types) and len(snapshot_id.strip()) == 0: + if isinstance(snapshot_id, str) and len(snapshot_id.strip()) == 0: raise click.UsageError('Parameter --snapshot-id cannot be whitespace or empty string') kwargs = {} @@ -2947,7 +2946,7 @@ def list_quota_rules(ctx, from_json, all_pages, page_size, file_system_id, princ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -3242,7 +3241,7 @@ def list_snapshots(ctx, from_json, all_pages, page_size, limit, page, lifecycle_ @cli_util.wrap_exceptions def pause_filesystem_snapshot_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, filesystem_snapshot_policy_id, if_match, is_lock_override): - if isinstance(filesystem_snapshot_policy_id, six.string_types) and len(filesystem_snapshot_policy_id.strip()) == 0: + if isinstance(filesystem_snapshot_policy_id, str) and len(filesystem_snapshot_policy_id.strip()) == 0: raise click.UsageError('Parameter --filesystem-snapshot-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3299,7 +3298,7 @@ def pause_filesystem_snapshot_policy(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def remove_export_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, export_id, type, related_resource_id, message, time_created, if_match): - if isinstance(export_id, six.string_types) and len(export_id.strip()) == 0: + if isinstance(export_id, str) and len(export_id.strip()) == 0: raise click.UsageError('Parameter --export-id cannot be whitespace or empty string') kwargs = {} @@ -3368,7 +3367,7 @@ def remove_export_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def remove_file_system_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, file_system_id, type, related_resource_id, message, time_created, if_match): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -3437,7 +3436,7 @@ def remove_file_system_lock(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def remove_filesystem_snapshot_policy_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, filesystem_snapshot_policy_id, type, related_resource_id, message, time_created, if_match): - if isinstance(filesystem_snapshot_policy_id, six.string_types) and len(filesystem_snapshot_policy_id.strip()) == 0: + if isinstance(filesystem_snapshot_policy_id, str) and len(filesystem_snapshot_policy_id.strip()) == 0: raise click.UsageError('Parameter --filesystem-snapshot-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3506,7 +3505,7 @@ def remove_filesystem_snapshot_policy_lock(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def remove_mount_target_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mount_target_id, type, related_resource_id, message, time_created, if_match): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') kwargs = {} @@ -3575,7 +3574,7 @@ def remove_mount_target_lock(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def remove_outbound_connector_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, outbound_connector_id, type, related_resource_id, message, time_created, if_match): - if isinstance(outbound_connector_id, six.string_types) and len(outbound_connector_id.strip()) == 0: + if isinstance(outbound_connector_id, str) and len(outbound_connector_id.strip()) == 0: raise click.UsageError('Parameter --outbound-connector-id cannot be whitespace or empty string') kwargs = {} @@ -3644,7 +3643,7 @@ def remove_outbound_connector_lock(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def remove_replication_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, replication_id, type, related_resource_id, message, time_created, if_match): - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') kwargs = {} @@ -3713,7 +3712,7 @@ def remove_replication_lock(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def remove_snapshot_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, snapshot_id, type, related_resource_id, message, time_created, if_match): - if isinstance(snapshot_id, six.string_types) and len(snapshot_id.strip()) == 0: + if isinstance(snapshot_id, str) and len(snapshot_id.strip()) == 0: raise click.UsageError('Parameter --snapshot-id cannot be whitespace or empty string') kwargs = {} @@ -3779,7 +3778,7 @@ def remove_snapshot_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def schedule_downgrade_shape_mount_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mount_target_id, requested_throughput, if_match): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') kwargs = {} @@ -3835,7 +3834,7 @@ def schedule_downgrade_shape_mount_target(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def toggle_quota_rules(ctx, from_json, file_system_id, are_quota_rules_enabled, if_match): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') kwargs = {} @@ -3871,7 +3870,7 @@ def toggle_quota_rules(ctx, from_json, file_system_id, are_quota_rules_enabled, @cli_util.wrap_exceptions def unpause_filesystem_snapshot_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, filesystem_snapshot_policy_id, if_match, is_lock_override): - if isinstance(filesystem_snapshot_policy_id, six.string_types) and len(filesystem_snapshot_policy_id.strip()) == 0: + if isinstance(filesystem_snapshot_policy_id, str) and len(filesystem_snapshot_policy_id.strip()) == 0: raise click.UsageError('Parameter --filesystem-snapshot-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3934,7 +3933,7 @@ def unpause_filesystem_snapshot_policy(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_export(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, export_id, is_idmap_groups_for_sys_auth, export_options, if_match, is_lock_override): - if isinstance(export_id, six.string_types) and len(export_id.strip()) == 0: + if isinstance(export_id, str) and len(export_id.strip()) == 0: raise click.UsageError('Parameter --export-id cannot be whitespace or empty string') if not force: if export_options: @@ -4006,7 +4005,7 @@ def update_export(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_export_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, export_set_id, display_name, max_fs_stat_bytes, max_fs_stat_files, if_match): - if isinstance(export_set_id, six.string_types) and len(export_set_id.strip()) == 0: + if isinstance(export_set_id, str) and len(export_set_id.strip()) == 0: raise click.UsageError('Parameter --export-set-id cannot be whitespace or empty string') kwargs = {} @@ -4083,7 +4082,7 @@ def update_export_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_file_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, file_system_id, display_name, freeform_tags, defined_tags, kms_key_id, filesystem_snapshot_policy_id, if_match, is_lock_override): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4174,7 +4173,7 @@ def update_file_system(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_filesystem_snapshot_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, filesystem_snapshot_policy_id, display_name, policy_prefix, schedules, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(filesystem_snapshot_policy_id, six.string_types) and len(filesystem_snapshot_policy_id.strip()) == 0: + if isinstance(filesystem_snapshot_policy_id, str) and len(filesystem_snapshot_policy_id.strip()) == 0: raise click.UsageError('Parameter --filesystem-snapshot-policy-id cannot be whitespace or empty string') if not force: if schedules or freeform_tags or defined_tags: @@ -4261,7 +4260,7 @@ def update_filesystem_snapshot_policy(ctx, from_json, force, wait_for_state, max @cli_util.wrap_exceptions def update_mount_target(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, mount_target_id, display_name, idmap_type, ldap_idmap, nsg_ids, kerberos, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') if not force: if ldap_idmap or nsg_ids or kerberos or freeform_tags or defined_tags: @@ -4350,7 +4349,7 @@ def update_mount_target(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_outbound_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, outbound_connector_id, display_name, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(outbound_connector_id, six.string_types) and len(outbound_connector_id.strip()) == 0: + if isinstance(outbound_connector_id, str) and len(outbound_connector_id.strip()) == 0: raise click.UsageError('Parameter --outbound-connector-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4420,10 +4419,10 @@ def update_outbound_connector(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_quota_rule(ctx, from_json, file_system_id, quota_rule_id, display_name, quota_limit_in_gigabytes, if_match): - if isinstance(file_system_id, six.string_types) and len(file_system_id.strip()) == 0: + if isinstance(file_system_id, str) and len(file_system_id.strip()) == 0: raise click.UsageError('Parameter --file-system-id cannot be whitespace or empty string') - if isinstance(quota_rule_id, six.string_types) and len(quota_rule_id.strip()) == 0: + if isinstance(quota_rule_id, str) and len(quota_rule_id.strip()) == 0: raise click.UsageError('Parameter --quota-rule-id cannot be whitespace or empty string') kwargs = {} @@ -4468,7 +4467,7 @@ def update_quota_rule(ctx, from_json, file_system_id, quota_rule_id, display_nam @cli_util.wrap_exceptions def update_replication(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, replication_id, display_name, replication_interval, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4548,7 +4547,7 @@ def update_replication(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_snapshot(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, snapshot_id, freeform_tags, defined_tags, expiration_time, if_match, is_lock_override): - if isinstance(snapshot_id, six.string_types) and len(snapshot_id.strip()) == 0: + if isinstance(snapshot_id, str) and len(snapshot_id.strip()) == 0: raise click.UsageError('Parameter --snapshot-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4619,7 +4618,7 @@ def update_snapshot(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def upgrade_shape_mount_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mount_target_id, requested_throughput, if_match): - if isinstance(mount_target_id, six.string_types) and len(mount_target_id.strip()) == 0: + if isinstance(mount_target_id, str) and len(mount_target_id.strip()) == 0: raise click.UsageError('Parameter --mount-target-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/fleet_apps_management/src/oci_cli_fleet_apps_management/generated/fleetappsmanagement_cli.py b/services/fleet_apps_management/src/oci_cli_fleet_apps_management/generated/fleetappsmanagement_cli.py index 87ec15109..f6420f22e 100644 --- a/services/fleet_apps_management/src/oci_cli_fleet_apps_management/generated/fleetappsmanagement_cli.py +++ b/services/fleet_apps_management/src/oci_cli_fleet_apps_management/generated/fleetappsmanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -145,7 +144,7 @@ def fleet_collection_group(): @cli_util.wrap_exceptions def change_fleet_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, compartment_id, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -234,7 +233,7 @@ def check_resource_tagging(ctx, from_json, compartment_id, resource_ids, fleet_d @cli_util.wrap_exceptions def confirm_targets(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, targets, fleet_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1102,7 +1101,7 @@ def create_fleet_environment_fleet_details(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def create_fleet_credential(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, display_name, entity_specifics, user, password, fleet_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1164,7 +1163,7 @@ def create_fleet_credential(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def create_fleet_property(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, value, property_id, fleet_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1223,7 +1222,7 @@ def create_fleet_property(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def create_fleet_resource(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, resource_id, tenancy_id, compartment_id, fleet_id, resource_region, resource_type): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1290,7 +1289,7 @@ def create_fleet_resource(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_fleet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1347,10 +1346,10 @@ def delete_fleet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_fleet_credential(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_credential_id, fleet_id, if_match): - if isinstance(fleet_credential_id, six.string_types) and len(fleet_credential_id.strip()) == 0: + if isinstance(fleet_credential_id, str) and len(fleet_credential_id.strip()) == 0: raise click.UsageError('Parameter --fleet-credential-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1405,10 +1404,10 @@ def delete_fleet_credential(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_fleet_property(ctx, from_json, fleet_property_id, fleet_id, if_match): - if isinstance(fleet_property_id, six.string_types) and len(fleet_property_id.strip()) == 0: + if isinstance(fleet_property_id, str) and len(fleet_property_id.strip()) == 0: raise click.UsageError('Parameter --fleet-property-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1439,10 +1438,10 @@ def delete_fleet_property(ctx, from_json, fleet_property_id, fleet_id, if_match) @cli_util.wrap_exceptions def delete_fleet_resource(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_resource_id, fleet_id, if_match): - if isinstance(fleet_resource_id, six.string_types) and len(fleet_resource_id.strip()) == 0: + if isinstance(fleet_resource_id, str) and len(fleet_resource_id.strip()) == 0: raise click.UsageError('Parameter --fleet-resource-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1498,7 +1497,7 @@ def delete_fleet_resource(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def generate_compliance_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, are_details_required): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1555,10 +1554,10 @@ def generate_compliance_report(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_compliance_report(ctx, from_json, fleet_id, compliance_report_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(compliance_report_id, six.string_types) and len(compliance_report_id.strip()) == 0: + if isinstance(compliance_report_id, str) and len(compliance_report_id.strip()) == 0: raise click.UsageError('Parameter --compliance-report-id cannot be whitespace or empty string') kwargs = {} @@ -1581,7 +1580,7 @@ def get_compliance_report(ctx, from_json, fleet_id, compliance_report_id): @cli_util.wrap_exceptions def get_fleet(ctx, from_json, fleet_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1604,10 +1603,10 @@ def get_fleet(ctx, from_json, fleet_id): @cli_util.wrap_exceptions def get_fleet_credential(ctx, from_json, fleet_credential_id, fleet_id): - if isinstance(fleet_credential_id, six.string_types) and len(fleet_credential_id.strip()) == 0: + if isinstance(fleet_credential_id, str) and len(fleet_credential_id.strip()) == 0: raise click.UsageError('Parameter --fleet-credential-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1631,10 +1630,10 @@ def get_fleet_credential(ctx, from_json, fleet_credential_id, fleet_id): @cli_util.wrap_exceptions def get_fleet_property(ctx, from_json, fleet_property_id, fleet_id): - if isinstance(fleet_property_id, six.string_types) and len(fleet_property_id.strip()) == 0: + if isinstance(fleet_property_id, str) and len(fleet_property_id.strip()) == 0: raise click.UsageError('Parameter --fleet-property-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1658,10 +1657,10 @@ def get_fleet_property(ctx, from_json, fleet_property_id, fleet_id): @cli_util.wrap_exceptions def get_fleet_resource(ctx, from_json, fleet_resource_id, fleet_id): - if isinstance(fleet_resource_id, six.string_types) and len(fleet_resource_id.strip()) == 0: + if isinstance(fleet_resource_id, str) and len(fleet_resource_id.strip()) == 0: raise click.UsageError('Parameter --fleet-resource-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1759,7 +1758,7 @@ def list_fleet_credentials(ctx, from_json, all_pages, page_size, fleet_id, lifec if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1832,7 +1831,7 @@ def list_fleet_products(ctx, from_json, all_pages, page_size, fleet_id, compartm if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1900,7 +1899,7 @@ def list_fleet_properties(ctx, from_json, all_pages, page_size, fleet_id, lifecy if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1967,7 +1966,7 @@ def list_fleet_resources(ctx, from_json, all_pages, page_size, fleet_id, lifecyc if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2036,7 +2035,7 @@ def list_fleet_targets(ctx, from_json, all_pages, page_size, fleet_id, display_n if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2255,7 +2254,7 @@ def list_targets(ctx, from_json, all_pages, page_size, fleet_id, display_name, l if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2310,7 +2309,7 @@ def list_targets(ctx, from_json, all_pages, page_size, fleet_id, display_name, l @cli_util.wrap_exceptions def request_resource_validation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, is_applicable_to_all_resources, resource_ids): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2374,7 +2373,7 @@ def request_resource_validation(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def request_target_discovery(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, is_applicable_to_all_resources, resource_ids): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2450,7 +2449,7 @@ def request_target_discovery(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_fleet(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, display_name, description, notification_preferences, is_target_auto_confirm, resource_selection, products, freeform_tags, defined_tags, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') if not force: if notification_preferences or resource_selection or products or freeform_tags or defined_tags: @@ -2546,7 +2545,7 @@ def update_fleet(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_fleet_dynamic_resource_selection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, resource_selection_rule_selection_criteria, display_name, description, notification_preferences, is_target_auto_confirm, products, freeform_tags, defined_tags, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') if not force: if notification_preferences or products or freeform_tags or defined_tags: @@ -2642,7 +2641,7 @@ def update_fleet_dynamic_resource_selection(ctx, from_json, force, wait_for_stat @cli_util.wrap_exceptions def update_fleet_manual_resource_selection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, display_name, description, notification_preferences, is_target_auto_confirm, products, freeform_tags, defined_tags, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') if not force: if notification_preferences or products or freeform_tags or defined_tags: @@ -2733,10 +2732,10 @@ def update_fleet_manual_resource_selection(ctx, from_json, force, wait_for_state @cli_util.wrap_exceptions def update_fleet_credential(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_credential_id, fleet_id, display_name, entity_specifics, user, password, if_match): - if isinstance(fleet_credential_id, six.string_types) and len(fleet_credential_id.strip()) == 0: + if isinstance(fleet_credential_id, str) and len(fleet_credential_id.strip()) == 0: raise click.UsageError('Parameter --fleet-credential-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') if not force: if entity_specifics or user or password: @@ -2814,10 +2813,10 @@ def update_fleet_credential(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_fleet_property(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_property_id, fleet_id, value, if_match): - if isinstance(fleet_property_id, six.string_types) and len(fleet_property_id.strip()) == 0: + if isinstance(fleet_property_id, str) and len(fleet_property_id.strip()) == 0: raise click.UsageError('Parameter --fleet-property-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2879,10 +2878,10 @@ def update_fleet_property(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_fleet_resource(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_resource_id, fleet_id, tenancy_id, compartment_id, if_match): - if isinstance(fleet_resource_id, six.string_types) and len(fleet_resource_id.strip()) == 0: + if isinstance(fleet_resource_id, str) and len(fleet_resource_id.strip()) == 0: raise click.UsageError('Parameter --fleet-resource-id cannot be whitespace or empty string') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_admin/generated/fleetappsmanagementadmin_cli.py b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_admin/generated/fleetappsmanagementadmin_cli.py index 679b0a7ad..e1089742e 100644 --- a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_admin/generated/fleetappsmanagementadmin_cli.py +++ b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_admin/generated/fleetappsmanagementadmin_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -116,7 +115,7 @@ def compliance_policy_group(): @cli_util.wrap_exceptions def change_platform_configuration_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, compartment_id, if_match): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -177,7 +176,7 @@ def change_platform_configuration_compartment(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def change_property_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, property_id, compartment_id, if_match): - if isinstance(property_id, six.string_types) and len(property_id.strip()) == 0: + if isinstance(property_id, str) and len(property_id.strip()) == 0: raise click.UsageError('Parameter --property-id cannot be whitespace or empty string') kwargs = {} @@ -1234,7 +1233,7 @@ def create_property(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_compliance_policy_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compliance_policy_rule_id, if_match): - if isinstance(compliance_policy_rule_id, six.string_types) and len(compliance_policy_rule_id.strip()) == 0: + if isinstance(compliance_policy_rule_id, str) and len(compliance_policy_rule_id.strip()) == 0: raise click.UsageError('Parameter --compliance-policy-rule-id cannot be whitespace or empty string') kwargs = {} @@ -1290,7 +1289,7 @@ def delete_compliance_policy_rule(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_onboarding(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, onboarding_id, if_match): - if isinstance(onboarding_id, six.string_types) and len(onboarding_id.strip()) == 0: + if isinstance(onboarding_id, str) and len(onboarding_id.strip()) == 0: raise click.UsageError('Parameter --onboarding-id cannot be whitespace or empty string') kwargs = {} @@ -1346,7 +1345,7 @@ def delete_onboarding(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_platform_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, if_match): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -1402,7 +1401,7 @@ def delete_platform_configuration(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_property(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, property_id, if_match): - if isinstance(property_id, six.string_types) and len(property_id.strip()) == 0: + if isinstance(property_id, str) and len(property_id.strip()) == 0: raise click.UsageError('Parameter --property-id cannot be whitespace or empty string') kwargs = {} @@ -1463,7 +1462,7 @@ def delete_property(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def enable_latest_policy(ctx, from_json, onboarding_id, can_latest_fams_policies_be_enabled, if_match): - if isinstance(onboarding_id, six.string_types) and len(onboarding_id.strip()) == 0: + if isinstance(onboarding_id, str) and len(onboarding_id.strip()) == 0: raise click.UsageError('Parameter --onboarding-id cannot be whitespace or empty string') kwargs = {} @@ -1494,7 +1493,7 @@ def enable_latest_policy(ctx, from_json, onboarding_id, can_latest_fams_policies @cli_util.wrap_exceptions def get_compliance_policy(ctx, from_json, compliance_policy_id): - if isinstance(compliance_policy_id, six.string_types) and len(compliance_policy_id.strip()) == 0: + if isinstance(compliance_policy_id, str) and len(compliance_policy_id.strip()) == 0: raise click.UsageError('Parameter --compliance-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1516,7 +1515,7 @@ def get_compliance_policy(ctx, from_json, compliance_policy_id): @cli_util.wrap_exceptions def get_compliance_policy_rule(ctx, from_json, compliance_policy_rule_id): - if isinstance(compliance_policy_rule_id, six.string_types) and len(compliance_policy_rule_id.strip()) == 0: + if isinstance(compliance_policy_rule_id, str) and len(compliance_policy_rule_id.strip()) == 0: raise click.UsageError('Parameter --compliance-policy-rule-id cannot be whitespace or empty string') kwargs = {} @@ -1538,7 +1537,7 @@ def get_compliance_policy_rule(ctx, from_json, compliance_policy_rule_id): @cli_util.wrap_exceptions def get_onboarding(ctx, from_json, onboarding_id): - if isinstance(onboarding_id, six.string_types) and len(onboarding_id.strip()) == 0: + if isinstance(onboarding_id, str) and len(onboarding_id.strip()) == 0: raise click.UsageError('Parameter --onboarding-id cannot be whitespace or empty string') kwargs = {} @@ -1560,7 +1559,7 @@ def get_onboarding(ctx, from_json, onboarding_id): @cli_util.wrap_exceptions def get_platform_configuration(ctx, from_json, platform_configuration_id): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -1582,7 +1581,7 @@ def get_platform_configuration(ctx, from_json, platform_configuration_id): @cli_util.wrap_exceptions def get_property(ctx, from_json, property_id): - if isinstance(property_id, six.string_types) and len(property_id.strip()) == 0: + if isinstance(property_id, str) and len(property_id.strip()) == 0: raise click.UsageError('Parameter --property-id cannot be whitespace or empty string') kwargs = {} @@ -1991,7 +1990,7 @@ def list_properties(ctx, from_json, all_pages, page_size, compartment_id, lifecy @cli_util.wrap_exceptions def manage_settings(ctx, from_json, onboarding_id, discovery_frequency, if_match): - if isinstance(onboarding_id, six.string_types) and len(onboarding_id.strip()) == 0: + if isinstance(onboarding_id, str) and len(onboarding_id.strip()) == 0: raise click.UsageError('Parameter --onboarding-id cannot be whitespace or empty string') kwargs = {} @@ -2034,7 +2033,7 @@ def manage_settings(ctx, from_json, onboarding_id, discovery_frequency, if_match @cli_util.wrap_exceptions def update_compliance_policy_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compliance_policy_rule_id, product_version, patch_type_id, severity, patch_selection, grace_period, freeform_tags, defined_tags, if_match): - if isinstance(compliance_policy_rule_id, six.string_types) and len(compliance_policy_rule_id.strip()) == 0: + if isinstance(compliance_policy_rule_id, str) and len(compliance_policy_rule_id.strip()) == 0: raise click.UsageError('Parameter --compliance-policy-rule-id cannot be whitespace or empty string') if not force: if product_version or patch_type_id or severity or patch_selection or freeform_tags or defined_tags: @@ -2126,7 +2125,7 @@ def update_compliance_policy_rule(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_compliance_policy_rule_patch_level_selection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compliance_policy_rule_id, patch_selection_patch_level, product_version, patch_type_id, severity, grace_period, freeform_tags, defined_tags, if_match): - if isinstance(compliance_policy_rule_id, six.string_types) and len(compliance_policy_rule_id.strip()) == 0: + if isinstance(compliance_policy_rule_id, str) and len(compliance_policy_rule_id.strip()) == 0: raise click.UsageError('Parameter --compliance-policy-rule-id cannot be whitespace or empty string') if not force: if product_version or patch_type_id or severity or freeform_tags or defined_tags: @@ -2219,7 +2218,7 @@ def update_compliance_policy_rule_patch_level_selection_details(ctx, from_json, @cli_util.wrap_exceptions def update_compliance_policy_rule_patch_release_date_selection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compliance_policy_rule_id, patch_selection_days_since_release, product_version, patch_type_id, severity, grace_period, freeform_tags, defined_tags, if_match): - if isinstance(compliance_policy_rule_id, six.string_types) and len(compliance_policy_rule_id.strip()) == 0: + if isinstance(compliance_policy_rule_id, str) and len(compliance_policy_rule_id.strip()) == 0: raise click.UsageError('Parameter --compliance-policy-rule-id cannot be whitespace or empty string') if not force: if product_version or patch_type_id or severity or freeform_tags or defined_tags: @@ -2312,7 +2311,7 @@ def update_compliance_policy_rule_patch_release_date_selection_details(ctx, from @cli_util.wrap_exceptions def update_compliance_policy_rule_patch_name_selection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compliance_policy_rule_id, patch_selection_patch_name, product_version, patch_type_id, severity, grace_period, freeform_tags, defined_tags, if_match): - if isinstance(compliance_policy_rule_id, six.string_types) and len(compliance_policy_rule_id.strip()) == 0: + if isinstance(compliance_policy_rule_id, str) and len(compliance_policy_rule_id.strip()) == 0: raise click.UsageError('Parameter --compliance-policy-rule-id cannot be whitespace or empty string') if not force: if product_version or patch_type_id or severity or freeform_tags or defined_tags: @@ -2399,7 +2398,7 @@ def update_compliance_policy_rule_patch_name_selection_details(ctx, from_json, f @cli_util.wrap_exceptions def update_onboarding(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, onboarding_id, is_fams_tag_enabled, is_cost_tracking_tag_enabled, if_match): - if isinstance(onboarding_id, six.string_types) and len(onboarding_id.strip()) == 0: + if isinstance(onboarding_id, str) and len(onboarding_id.strip()) == 0: raise click.UsageError('Parameter --onboarding-id cannot be whitespace or empty string') kwargs = {} @@ -2470,7 +2469,7 @@ def update_onboarding(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_platform_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, display_name, description, config_category_details, if_match): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') if not force: if config_category_details: @@ -2548,7 +2547,7 @@ def update_platform_configuration(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_platform_configuration_product_stack_config_category_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, config_category_details_products, display_name, description, if_match, config_category_details_sub_category_details): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2624,7 +2623,7 @@ def update_platform_configuration_product_stack_config_category_details(ctx, fro @cli_util.wrap_exceptions def update_platform_configuration_environment_config_category_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, display_name, description, if_match): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2696,7 +2695,7 @@ def update_platform_configuration_environment_config_category_details(ctx, from_ @cli_util.wrap_exceptions def update_platform_configuration_credential_config_category_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, display_name, description, if_match): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2768,7 +2767,7 @@ def update_platform_configuration_credential_config_category_details(ctx, from_j @cli_util.wrap_exceptions def update_platform_configuration_patch_type_config_category_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, display_name, description, if_match): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2840,7 +2839,7 @@ def update_platform_configuration_patch_type_config_category_details(ctx, from_j @cli_util.wrap_exceptions def update_platform_configuration_lifecycle_operation_config_category_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, display_name, description, if_match): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2923,7 +2922,7 @@ def update_platform_configuration_lifecycle_operation_config_category_details(ct @cli_util.wrap_exceptions def update_platform_configuration_product_config_category_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, config_category_details_versions, display_name, description, if_match, config_category_details_credentials, config_category_details_components, config_category_details_compatible_products, config_category_details_patch_types): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3012,7 +3011,7 @@ def update_platform_configuration_product_config_category_details(ctx, from_json @cli_util.wrap_exceptions def update_platform_configuration_self_hosted_instance_config_category_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, platform_configuration_id, config_category_details_instance_id, display_name, description, if_match, config_category_details_instance_name): - if isinstance(platform_configuration_id, six.string_types) and len(platform_configuration_id.strip()) == 0: + if isinstance(platform_configuration_id, str) and len(platform_configuration_id.strip()) == 0: raise click.UsageError('Parameter --platform-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3091,7 +3090,7 @@ def update_platform_configuration_self_hosted_instance_config_category_details(c @cli_util.wrap_exceptions def update_property(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, property_id, display_name, selection, value_type, values, if_match): - if isinstance(property_id, six.string_types) and len(property_id.strip()) == 0: + if isinstance(property_id, str) and len(property_id.strip()) == 0: raise click.UsageError('Parameter --property-id cannot be whitespace or empty string') if not force: if values: diff --git a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_catalog/generated/fleetappsmanagementcatalog_cli.py b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_catalog/generated/fleetappsmanagementcatalog_cli.py index 350ac9f2f..a06661e96 100644 --- a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_catalog/generated/fleetappsmanagementcatalog_cli.py +++ b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_catalog/generated/fleetappsmanagementcatalog_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -55,7 +54,7 @@ def catalog_item_collection_group(): @cli_util.wrap_exceptions def change_catalog_item_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_item_id, compartment_id, if_match): - if isinstance(catalog_item_id, six.string_types) and len(catalog_item_id.strip()) == 0: + if isinstance(catalog_item_id, str) and len(catalog_item_id.strip()) == 0: raise click.UsageError('Parameter --catalog-item-id cannot be whitespace or empty string') kwargs = {} @@ -117,7 +116,7 @@ def change_catalog_item_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def clone_catalog_item(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_item_id, compartment_id, version_description, if_match): - if isinstance(catalog_item_id, six.string_types) and len(catalog_item_id.strip()) == 0: + if isinstance(catalog_item_id, str) and len(catalog_item_id.strip()) == 0: raise click.UsageError('Parameter --catalog-item-id cannot be whitespace or empty string') kwargs = {} @@ -716,7 +715,7 @@ def create_catalog_item_catalog_marketplace_source_config(ctx, from_json, wait_f @cli_util.wrap_exceptions def delete_catalog_item(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_item_id, if_match): - if isinstance(catalog_item_id, six.string_types) and len(catalog_item_id.strip()) == 0: + if isinstance(catalog_item_id, str) and len(catalog_item_id.strip()) == 0: raise click.UsageError('Parameter --catalog-item-id cannot be whitespace or empty string') kwargs = {} @@ -767,7 +766,7 @@ def delete_catalog_item(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_catalog_item(ctx, from_json, catalog_item_id): - if isinstance(catalog_item_id, six.string_types) and len(catalog_item_id.strip()) == 0: + if isinstance(catalog_item_id, str) and len(catalog_item_id.strip()) == 0: raise click.UsageError('Parameter --catalog-item-id cannot be whitespace or empty string') kwargs = {} @@ -872,7 +871,7 @@ def list_catalog_items(ctx, from_json, all_pages, page_size, compartment_id, con @cli_util.wrap_exceptions def update_catalog_item(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, catalog_item_id, description, version_description, short_description, display_name, freeform_tags, defined_tags, if_match): - if isinstance(catalog_item_id, six.string_types) and len(catalog_item_id.strip()) == 0: + if isinstance(catalog_item_id, str) and len(catalog_item_id.strip()) == 0: raise click.UsageError('Parameter --catalog-item-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_maintenance_window/generated/fleetappsmanagementmaintenancewindow_cli.py b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_maintenance_window/generated/fleetappsmanagementmaintenancewindow_cli.py index de92509d8..9524a085c 100644 --- a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_maintenance_window/generated/fleetappsmanagementmaintenancewindow_cli.py +++ b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_maintenance_window/generated/fleetappsmanagementmaintenancewindow_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -136,7 +135,7 @@ def create_maintenance_window(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_maintenance_window(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_window_id, if_match): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') kwargs = {} @@ -187,7 +186,7 @@ def delete_maintenance_window(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_maintenance_window(ctx, from_json, maintenance_window_id): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') kwargs = {} @@ -290,7 +289,7 @@ def list_maintenance_windows(ctx, from_json, all_pages, page_size, compartment_i @cli_util.wrap_exceptions def update_maintenance_window(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_window_id, display_name, description, is_outage, time_schedule_start, duration, is_recurring, recurrences, freeform_tags, defined_tags, if_match): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_operations/generated/fleetappsmanagementoperations_cli.py b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_operations/generated/fleetappsmanagementoperations_cli.py index a5a12f9ef..bc5268b92 100644 --- a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_operations/generated/fleetappsmanagementoperations_cli.py +++ b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_operations/generated/fleetappsmanagementoperations_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -172,7 +171,7 @@ def step_collection_group(): @cli_util.wrap_exceptions def change_patch_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, patch_id, compartment_id, if_match): - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') kwargs = {} @@ -733,7 +732,7 @@ def create_scheduler_definition_maintenance_window_schedule(ctx, from_json, wait @cli_util.wrap_exceptions def delete_patch(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, patch_id, if_match): - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') kwargs = {} @@ -789,7 +788,7 @@ def delete_patch(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_scheduler_definition(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduler_definition_id, if_match): - if isinstance(scheduler_definition_id, six.string_types) and len(scheduler_definition_id.strip()) == 0: + if isinstance(scheduler_definition_id, str) and len(scheduler_definition_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-definition-id cannot be whitespace or empty string') kwargs = {} @@ -853,7 +852,7 @@ def delete_scheduler_definition(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_scheduler_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduler_job_id, if_match): - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') kwargs = {} @@ -984,16 +983,16 @@ def export_compliance_report(ctx, from_json, file, compartment_id, entity_id, re @cli_util.wrap_exceptions def get_execution(ctx, from_json, scheduler_job_id, job_activity_id, resource_id, execution_id): - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') - if isinstance(job_activity_id, six.string_types) and len(job_activity_id.strip()) == 0: + if isinstance(job_activity_id, str) and len(job_activity_id.strip()) == 0: raise click.UsageError('Parameter --job-activity-id cannot be whitespace or empty string') - if isinstance(resource_id, six.string_types) and len(resource_id.strip()) == 0: + if isinstance(resource_id, str) and len(resource_id.strip()) == 0: raise click.UsageError('Parameter --resource-id cannot be whitespace or empty string') - if isinstance(execution_id, six.string_types) and len(execution_id.strip()) == 0: + if isinstance(execution_id, str) and len(execution_id.strip()) == 0: raise click.UsageError('Parameter --execution-id cannot be whitespace or empty string') kwargs = {} @@ -1019,10 +1018,10 @@ def get_execution(ctx, from_json, scheduler_job_id, job_activity_id, resource_id @cli_util.wrap_exceptions def get_job_activity(ctx, from_json, scheduler_job_id, job_activity_id): - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') - if isinstance(job_activity_id, six.string_types) and len(job_activity_id.strip()) == 0: + if isinstance(job_activity_id, str) and len(job_activity_id.strip()) == 0: raise click.UsageError('Parameter --job-activity-id cannot be whitespace or empty string') kwargs = {} @@ -1045,7 +1044,7 @@ def get_job_activity(ctx, from_json, scheduler_job_id, job_activity_id): @cli_util.wrap_exceptions def get_patch(ctx, from_json, patch_id): - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') kwargs = {} @@ -1067,7 +1066,7 @@ def get_patch(ctx, from_json, patch_id): @cli_util.wrap_exceptions def get_scheduler_definition(ctx, from_json, scheduler_definition_id): - if isinstance(scheduler_definition_id, six.string_types) and len(scheduler_definition_id.strip()) == 0: + if isinstance(scheduler_definition_id, str) and len(scheduler_definition_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-definition-id cannot be whitespace or empty string') kwargs = {} @@ -1089,7 +1088,7 @@ def get_scheduler_definition(ctx, from_json, scheduler_definition_id): @cli_util.wrap_exceptions def get_scheduler_job(ctx, from_json, scheduler_job_id): - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') kwargs = {} @@ -1201,13 +1200,13 @@ def list_executions(ctx, from_json, all_pages, page_size, scheduler_job_id, job_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') - if isinstance(job_activity_id, six.string_types) and len(job_activity_id.strip()) == 0: + if isinstance(job_activity_id, str) and len(job_activity_id.strip()) == 0: raise click.UsageError('Parameter --job-activity-id cannot be whitespace or empty string') - if isinstance(resource_id, six.string_types) and len(resource_id.strip()) == 0: + if isinstance(resource_id, str) and len(resource_id.strip()) == 0: raise click.UsageError('Parameter --resource-id cannot be whitespace or empty string') kwargs = {} @@ -1429,10 +1428,10 @@ def list_resources(ctx, from_json, all_pages, page_size, scheduler_job_id, job_a if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') - if isinstance(job_activity_id, six.string_types) and len(job_activity_id.strip()) == 0: + if isinstance(job_activity_id, str) and len(job_activity_id.strip()) == 0: raise click.UsageError('Parameter --job-activity-id cannot be whitespace or empty string') kwargs = {} @@ -1501,7 +1500,7 @@ def list_scheduled_fleets(ctx, from_json, all_pages, page_size, scheduler_defini if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(scheduler_definition_id, six.string_types) and len(scheduler_definition_id.strip()) == 0: + if isinstance(scheduler_definition_id, str) and len(scheduler_definition_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-definition-id cannot be whitespace or empty string') kwargs = {} @@ -1811,10 +1810,10 @@ def list_steps(ctx, from_json, all_pages, page_size, scheduler_job_id, job_activ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') - if isinstance(job_activity_id, six.string_types) and len(job_activity_id.strip()) == 0: + if isinstance(job_activity_id, str) and len(job_activity_id.strip()) == 0: raise click.UsageError('Parameter --job-activity-id cannot be whitespace or empty string') kwargs = {} @@ -1878,7 +1877,7 @@ def list_steps(ctx, from_json, all_pages, page_size, scheduler_job_id, job_activ @cli_util.wrap_exceptions def manage_job_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, action_details, scheduler_job_id, if_match): - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') kwargs = {} @@ -1943,7 +1942,7 @@ def manage_job_execution(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def manage_job_execution_step_based_user_action_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduler_job_id, action_details_action, action_details_action_group_id, action_details_resource_id, action_details_step_name, if_match, action_details_target_id): - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') kwargs = {} @@ -2014,7 +2013,7 @@ def manage_job_execution_step_based_user_action_details(ctx, from_json, wait_for @cli_util.wrap_exceptions def manage_job_execution_action_group_based_user_action_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduler_job_id, action_details_action, action_details_action_group_id, if_match): - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') kwargs = {} @@ -2186,7 +2185,7 @@ def summarize_scheduler_job_counts(ctx, from_json, compartment_id, compartment_i @cli_util.wrap_exceptions def update_patch(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, patch_id, description, patch_type, severity, time_released, artifact_details, product, dependent_patches, freeform_tags, defined_tags, if_match): - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') if not force: if patch_type or artifact_details or product or dependent_patches or freeform_tags or defined_tags: @@ -2288,7 +2287,7 @@ def update_patch(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_patch_platform_specific_artifact_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, patch_id, artifact_details_artifacts, description, patch_type, severity, time_released, product, dependent_patches, freeform_tags, defined_tags, if_match): - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') if not force: if patch_type or product or dependent_patches or freeform_tags or defined_tags: @@ -2391,7 +2390,7 @@ def update_patch_platform_specific_artifact_details(ctx, from_json, force, wait_ @cli_util.wrap_exceptions def update_patch_generic_artifact_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, patch_id, artifact_details_artifact, description, patch_type, severity, time_released, product, dependent_patches, freeform_tags, defined_tags, if_match): - if isinstance(patch_id, six.string_types) and len(patch_id.strip()) == 0: + if isinstance(patch_id, str) and len(patch_id.strip()) == 0: raise click.UsageError('Parameter --patch-id cannot be whitespace or empty string') if not force: if patch_type or product or dependent_patches or freeform_tags or defined_tags: @@ -2496,7 +2495,7 @@ def update_patch_generic_artifact_details(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_scheduler_definition(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduler_definition_id, display_name, description, schedule, action_groups, run_books, freeform_tags, defined_tags, if_match): - if isinstance(scheduler_definition_id, six.string_types) and len(scheduler_definition_id.strip()) == 0: + if isinstance(scheduler_definition_id, str) and len(scheduler_definition_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-definition-id cannot be whitespace or empty string') if not force: if schedule or action_groups or run_books or freeform_tags or defined_tags: @@ -2596,7 +2595,7 @@ def update_scheduler_definition(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_scheduler_definition_custom_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduler_definition_id, schedule_execution_startdate, schedule_duration, display_name, description, action_groups, run_books, freeform_tags, defined_tags, if_match, schedule_recurrences): - if isinstance(scheduler_definition_id, six.string_types) and len(scheduler_definition_id.strip()) == 0: + if isinstance(scheduler_definition_id, str) and len(scheduler_definition_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-definition-id cannot be whitespace or empty string') if not force: if action_groups or run_books or freeform_tags or defined_tags: @@ -2700,7 +2699,7 @@ def update_scheduler_definition_custom_schedule(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_scheduler_definition_maintenance_window_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduler_definition_id, schedule_execution_startdate, schedule_maintenance_window_id, display_name, description, action_groups, run_books, freeform_tags, defined_tags, if_match): - if isinstance(scheduler_definition_id, six.string_types) and len(scheduler_definition_id.strip()) == 0: + if isinstance(scheduler_definition_id, str) and len(scheduler_definition_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-definition-id cannot be whitespace or empty string') if not force: if action_groups or run_books or freeform_tags or defined_tags: @@ -2790,7 +2789,7 @@ def update_scheduler_definition_maintenance_window_schedule(ctx, from_json, forc @cli_util.wrap_exceptions def update_scheduler_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduler_job_id, time_scheduled, freeform_tags, defined_tags, if_match): - if isinstance(scheduler_job_id, six.string_types) and len(scheduler_job_id.strip()) == 0: + if isinstance(scheduler_job_id, str) and len(scheduler_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduler-job-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_provision/generated/fleetappsmanagementprovision_cli.py b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_provision/generated/fleetappsmanagementprovision_cli.py index dd62a8630..595762399 100644 --- a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_provision/generated/fleetappsmanagementprovision_cli.py +++ b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_provision/generated/fleetappsmanagementprovision_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -55,7 +54,7 @@ def provision_collection_group(): @cli_util.wrap_exceptions def change_provision_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, provision_id, compartment_id, if_match): - if isinstance(provision_id, six.string_types) and len(provision_id.strip()) == 0: + if isinstance(provision_id, str) and len(provision_id.strip()) == 0: raise click.UsageError('Parameter --provision-id cannot be whitespace or empty string') kwargs = {} @@ -203,7 +202,7 @@ def create_provision(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_provision(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, provision_id, if_match): - if isinstance(provision_id, six.string_types) and len(provision_id.strip()) == 0: + if isinstance(provision_id, str) and len(provision_id.strip()) == 0: raise click.UsageError('Parameter --provision-id cannot be whitespace or empty string') kwargs = {} @@ -254,7 +253,7 @@ def delete_provision(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def get_provision(ctx, from_json, provision_id): - if isinstance(provision_id, six.string_types) and len(provision_id.strip()) == 0: + if isinstance(provision_id, str) and len(provision_id.strip()) == 0: raise click.UsageError('Parameter --provision-id cannot be whitespace or empty string') kwargs = {} @@ -350,7 +349,7 @@ def list_provisions(ctx, from_json, all_pages, page_size, compartment_id, lifecy @cli_util.wrap_exceptions def update_provision(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, provision_id, display_name, provision_description, freeform_tags, defined_tags, if_match): - if isinstance(provision_id, six.string_types) and len(provision_id.strip()) == 0: + if isinstance(provision_id, str) and len(provision_id.strip()) == 0: raise click.UsageError('Parameter --provision-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_runbooks/generated/fleetappsmanagementrunbooks_cli.py b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_runbooks/generated/fleetappsmanagementrunbooks_cli.py index 9e262bcb9..096ea8c50 100644 --- a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_runbooks/generated/fleetappsmanagementrunbooks_cli.py +++ b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_runbooks/generated/fleetappsmanagementrunbooks_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -81,7 +80,7 @@ def task_record_group(): @cli_util.wrap_exceptions def change_runbook_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, runbook_id, compartment_id, if_match): - if isinstance(runbook_id, six.string_types) and len(runbook_id.strip()) == 0: + if isinstance(runbook_id, str) and len(runbook_id.strip()) == 0: raise click.UsageError('Parameter --runbook-id cannot be whitespace or empty string') kwargs = {} @@ -142,7 +141,7 @@ def change_runbook_compartment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_task_record_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, task_record_id, compartment_id, if_match): - if isinstance(task_record_id, six.string_types) and len(task_record_id.strip()) == 0: + if isinstance(task_record_id, str) and len(task_record_id.strip()) == 0: raise click.UsageError('Parameter --task-record-id cannot be whitespace or empty string') kwargs = {} @@ -434,7 +433,7 @@ def create_task_record(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_runbook(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, runbook_id, if_match): - if isinstance(runbook_id, six.string_types) and len(runbook_id.strip()) == 0: + if isinstance(runbook_id, str) and len(runbook_id.strip()) == 0: raise click.UsageError('Parameter --runbook-id cannot be whitespace or empty string') kwargs = {} @@ -490,7 +489,7 @@ def delete_runbook(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_runbook_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, runbook_version_id, if_match): - if isinstance(runbook_version_id, six.string_types) and len(runbook_version_id.strip()) == 0: + if isinstance(runbook_version_id, str) and len(runbook_version_id.strip()) == 0: raise click.UsageError('Parameter --runbook-version-id cannot be whitespace or empty string') kwargs = {} @@ -546,7 +545,7 @@ def delete_runbook_version(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_task_record(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, task_record_id, if_match): - if isinstance(task_record_id, six.string_types) and len(task_record_id.strip()) == 0: + if isinstance(task_record_id, str) and len(task_record_id.strip()) == 0: raise click.UsageError('Parameter --task-record-id cannot be whitespace or empty string') kwargs = {} @@ -597,7 +596,7 @@ def delete_task_record(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_runbook(ctx, from_json, runbook_id): - if isinstance(runbook_id, six.string_types) and len(runbook_id.strip()) == 0: + if isinstance(runbook_id, str) and len(runbook_id.strip()) == 0: raise click.UsageError('Parameter --runbook-id cannot be whitespace or empty string') kwargs = {} @@ -619,7 +618,7 @@ def get_runbook(ctx, from_json, runbook_id): @cli_util.wrap_exceptions def get_runbook_version(ctx, from_json, runbook_version_id): - if isinstance(runbook_version_id, six.string_types) and len(runbook_version_id.strip()) == 0: + if isinstance(runbook_version_id, str) and len(runbook_version_id.strip()) == 0: raise click.UsageError('Parameter --runbook-version-id cannot be whitespace or empty string') kwargs = {} @@ -641,7 +640,7 @@ def get_runbook_version(ctx, from_json, runbook_version_id): @cli_util.wrap_exceptions def get_task_record(ctx, from_json, task_record_id): - if isinstance(task_record_id, six.string_types) and len(task_record_id.strip()) == 0: + if isinstance(task_record_id, str) and len(task_record_id.strip()) == 0: raise click.UsageError('Parameter --task-record-id cannot be whitespace or empty string') kwargs = {} @@ -971,7 +970,7 @@ def set_default_runbook(ctx, from_json, runbook_id, if_match): @cli_util.wrap_exceptions def update_runbook(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, runbook_id, display_name, description, is_sudo_access_needed, operation, os_type, platform, is_default, estimated_time, freeform_tags, defined_tags, if_match): - if isinstance(runbook_id, six.string_types) and len(runbook_id.strip()) == 0: + if isinstance(runbook_id, str) and len(runbook_id.strip()) == 0: raise click.UsageError('Parameter --runbook-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1073,7 +1072,7 @@ def update_runbook(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_runbook_version(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, runbook_version_id, tasks, groups, execution_workflow_details, rollback_workflow_details, if_match): - if isinstance(runbook_version_id, six.string_types) and len(runbook_version_id.strip()) == 0: + if isinstance(runbook_version_id, str) and len(runbook_version_id.strip()) == 0: raise click.UsageError('Parameter --runbook-version-id cannot be whitespace or empty string') if not force: if tasks or groups or execution_workflow_details or rollback_workflow_details: @@ -1156,7 +1155,7 @@ def update_runbook_version(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_task_record(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, task_record_id, display_name, description, details, freeform_tags, defined_tags, if_match): - if isinstance(task_record_id, six.string_types) and len(task_record_id.strip()) == 0: + if isinstance(task_record_id, str) and len(task_record_id.strip()) == 0: raise click.UsageError('Parameter --task-record-id cannot be whitespace or empty string') if not force: if details or freeform_tags or defined_tags: diff --git a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_work_request/generated/fleetappsmanagementworkrequest_cli.py b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_work_request/generated/fleetappsmanagementworkrequest_cli.py index 3f418b28b..36f5c23b0 100644 --- a/services/fleet_apps_management/src/oci_cli_fleet_apps_management_work_request/generated/fleetappsmanagementworkrequest_cli.py +++ b/services/fleet_apps_management/src/oci_cli_fleet_apps_management_work_request/generated/fleetappsmanagementworkrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -55,7 +54,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -86,7 +85,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -143,7 +142,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/fleet_software_update/src/oci_cli_fleet_software_update/generated/fleetsoftwareupdate_cli.py b/services/fleet_software_update/src/oci_cli_fleet_software_update/generated/fleetsoftwareupdate_cli.py index 3c7c77dbf..2f4342950 100644 --- a/services/fleet_software_update/src/oci_cli_fleet_software_update/generated/fleetsoftwareupdate_cli.py +++ b/services/fleet_software_update/src/oci_cli_fleet_software_update/generated/fleetsoftwareupdate_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -147,7 +146,7 @@ def fsu_discovery_summary_group(): @cli_util.wrap_exceptions def abort_fsu_discovery(ctx, from_json, fsu_discovery_id, if_match): - if isinstance(fsu_discovery_id, six.string_types) and len(fsu_discovery_id.strip()) == 0: + if isinstance(fsu_discovery_id, str) and len(fsu_discovery_id.strip()) == 0: raise click.UsageError('Parameter --fsu-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -176,7 +175,7 @@ def abort_fsu_discovery(ctx, from_json, fsu_discovery_id, if_match): @cli_util.wrap_exceptions def add_fsu_collection_targets(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_collection_id, targets, if_match): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') kwargs = {} @@ -233,7 +232,7 @@ def add_fsu_collection_targets(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def cancel_fsu_action(ctx, from_json, fsu_action_id, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') kwargs = {} @@ -262,7 +261,7 @@ def cancel_fsu_action(ctx, from_json, fsu_action_id, if_match): @cli_util.wrap_exceptions def change_fsu_action_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, compartment_id, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') kwargs = {} @@ -323,7 +322,7 @@ def change_fsu_action_compartment(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def change_fsu_collection_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_collection_id, compartment_id, if_match): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') kwargs = {} @@ -384,7 +383,7 @@ def change_fsu_collection_compartment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def change_fsu_cycle_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, compartment_id, if_match): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') kwargs = {} @@ -442,7 +441,7 @@ def change_fsu_cycle_compartment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def change_fsu_discovery_compartment(ctx, from_json, fsu_discovery_id, compartment_id, if_match): - if isinstance(fsu_discovery_id, six.string_types) and len(fsu_discovery_id.strip()) == 0: + if isinstance(fsu_discovery_id, str) and len(fsu_discovery_id.strip()) == 0: raise click.UsageError('Parameter --fsu-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -481,7 +480,7 @@ def change_fsu_discovery_compartment(ctx, from_json, fsu_discovery_id, compartme @cli_util.wrap_exceptions def clone_fsu_cycle(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, goal_version_details, display_name, compartment_id, fsu_collection_id, batching_strategy, stage_action_schedule, apply_action_schedule): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') kwargs = {} @@ -1776,7 +1775,7 @@ def create_fsu_discovery_db_discovery_details(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def delete_fsu_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') kwargs = {} @@ -1832,7 +1831,7 @@ def delete_fsu_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_fsu_collection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_collection_id, if_match): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') kwargs = {} @@ -1889,10 +1888,10 @@ def delete_fsu_collection(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_fsu_collection_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_collection_id, target_id, if_match): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') kwargs = {} @@ -1949,7 +1948,7 @@ def delete_fsu_collection_target(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_fsu_cycle(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, if_match): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') kwargs = {} @@ -2005,7 +2004,7 @@ def delete_fsu_cycle(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_fsu_discovery(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_discovery_id, if_match): - if isinstance(fsu_discovery_id, six.string_types) and len(fsu_discovery_id.strip()) == 0: + if isinstance(fsu_discovery_id, str) and len(fsu_discovery_id.strip()) == 0: raise click.UsageError('Parameter --fsu-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -2061,7 +2060,7 @@ def delete_fsu_discovery(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_fsu_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_job_id, if_match): - if isinstance(fsu_job_id, six.string_types) and len(fsu_job_id.strip()) == 0: + if isinstance(fsu_job_id, str) and len(fsu_job_id.strip()) == 0: raise click.UsageError('Parameter --fsu-job-id cannot be whitespace or empty string') kwargs = {} @@ -2120,7 +2119,7 @@ def delete_fsu_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_fsu_action(ctx, from_json, fsu_action_id): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') kwargs = {} @@ -2143,7 +2142,7 @@ def get_fsu_action(ctx, from_json, fsu_action_id): @cli_util.wrap_exceptions def get_fsu_action_output_content(ctx, from_json, file, fsu_action_id): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') kwargs = {} @@ -2187,7 +2186,7 @@ def get_fsu_action_output_content(ctx, from_json, file, fsu_action_id): @cli_util.wrap_exceptions def get_fsu_collection(ctx, from_json, fsu_collection_id): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') kwargs = {} @@ -2210,10 +2209,10 @@ def get_fsu_collection(ctx, from_json, fsu_collection_id): @cli_util.wrap_exceptions def get_fsu_collection_target(ctx, from_json, fsu_collection_id, target_id): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') - if isinstance(target_id, six.string_types) and len(target_id.strip()) == 0: + if isinstance(target_id, str) and len(target_id.strip()) == 0: raise click.UsageError('Parameter --target-id cannot be whitespace or empty string') kwargs = {} @@ -2236,7 +2235,7 @@ def get_fsu_collection_target(ctx, from_json, fsu_collection_id, target_id): @cli_util.wrap_exceptions def get_fsu_cycle(ctx, from_json, fsu_cycle_id): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') kwargs = {} @@ -2258,7 +2257,7 @@ def get_fsu_cycle(ctx, from_json, fsu_cycle_id): @cli_util.wrap_exceptions def get_fsu_discovery(ctx, from_json, fsu_discovery_id): - if isinstance(fsu_discovery_id, six.string_types) and len(fsu_discovery_id.strip()) == 0: + if isinstance(fsu_discovery_id, str) and len(fsu_discovery_id.strip()) == 0: raise click.UsageError('Parameter --fsu-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -2280,7 +2279,7 @@ def get_fsu_discovery(ctx, from_json, fsu_discovery_id): @cli_util.wrap_exceptions def get_fsu_job(ctx, from_json, fsu_job_id): - if isinstance(fsu_job_id, six.string_types) and len(fsu_job_id.strip()) == 0: + if isinstance(fsu_job_id, str) and len(fsu_job_id.strip()) == 0: raise click.UsageError('Parameter --fsu-job-id cannot be whitespace or empty string') kwargs = {} @@ -2303,7 +2302,7 @@ def get_fsu_job(ctx, from_json, fsu_job_id): @cli_util.wrap_exceptions def get_fsu_job_output_content(ctx, from_json, file, fsu_job_id): - if isinstance(fsu_job_id, six.string_types) and len(fsu_job_id.strip()) == 0: + if isinstance(fsu_job_id, str) and len(fsu_job_id.strip()) == 0: raise click.UsageError('Parameter --fsu-job-id cannot be whitespace or empty string') kwargs = {} @@ -2347,7 +2346,7 @@ def get_fsu_job_output_content(ctx, from_json, file, fsu_job_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2447,7 +2446,7 @@ def list_fsu_collection_targets(ctx, from_json, all_pages, page_size, fsu_collec if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') kwargs = {} @@ -2705,7 +2704,7 @@ def list_fsu_discovery_targets(ctx, from_json, all_pages, page_size, fsu_discove if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fsu_discovery_id, six.string_types) and len(fsu_discovery_id.strip()) == 0: + if isinstance(fsu_discovery_id, str) and len(fsu_discovery_id.strip()) == 0: raise click.UsageError('Parameter --fsu-discovery-id cannot be whitespace or empty string') kwargs = {} @@ -2766,7 +2765,7 @@ def list_fsu_job_outputs(ctx, from_json, all_pages, page_size, fsu_job_id, limit if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fsu_job_id, six.string_types) and len(fsu_job_id.strip()) == 0: + if isinstance(fsu_job_id, str) and len(fsu_job_id.strip()) == 0: raise click.UsageError('Parameter --fsu-job-id cannot be whitespace or empty string') kwargs = {} @@ -2879,7 +2878,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2936,7 +2935,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3052,7 +3051,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def remove_fsu_collection_targets(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_collection_id, removal_strategy, if_match): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') kwargs = {} @@ -3114,7 +3113,7 @@ def remove_fsu_collection_targets(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def remove_fsu_collection_targets_target_ids_remove_targets_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_collection_id, targets, if_match): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') if not force: if targets: @@ -3177,7 +3176,7 @@ def remove_fsu_collection_targets_target_ids_remove_targets_details(ctx, from_js @cli_util.wrap_exceptions def resume_fsu_action(ctx, from_json, fsu_action_id, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') kwargs = {} @@ -3202,7 +3201,7 @@ def resume_fsu_action(ctx, from_json, fsu_action_id, if_match): @cli_util.wrap_exceptions def retry_fsu_job(ctx, from_json, fsu_job_id, if_match): - if isinstance(fsu_job_id, six.string_types) and len(fsu_job_id.strip()) == 0: + if isinstance(fsu_job_id, str) and len(fsu_job_id.strip()) == 0: raise click.UsageError('Parameter --fsu-job-id cannot be whitespace or empty string') kwargs = {} @@ -3235,7 +3234,7 @@ def retry_fsu_job(ctx, from_json, fsu_job_id, if_match): @cli_util.wrap_exceptions def update_fsu_action(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, type, display_name, freeform_tags, defined_tags, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3312,7 +3311,7 @@ def update_fsu_action(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_fsu_action_update_rollback_cycle_action_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3391,7 +3390,7 @@ def update_fsu_action_update_rollback_cycle_action_details(ctx, from_json, force @cli_util.wrap_exceptions def update_fsu_action_update_stage_action_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, display_name, freeform_tags, defined_tags, schedule_details, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or schedule_details: @@ -3473,7 +3472,7 @@ def update_fsu_action_update_stage_action_details(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_fsu_action_update_apply_action_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, display_name, freeform_tags, defined_tags, schedule_details, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or schedule_details: @@ -3555,7 +3554,7 @@ def update_fsu_action_update_apply_action_details(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_fsu_action_update_rollback_action_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, display_name, freeform_tags, defined_tags, schedule_details, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or schedule_details: @@ -3637,7 +3636,7 @@ def update_fsu_action_update_rollback_action_details(ctx, from_json, force, wait @cli_util.wrap_exceptions def update_fsu_action_update_precheck_action_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, display_name, freeform_tags, defined_tags, schedule_details, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or schedule_details: @@ -3719,7 +3718,7 @@ def update_fsu_action_update_precheck_action_details(ctx, from_json, force, wait @cli_util.wrap_exceptions def update_fsu_action_update_cleanup_action_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_action_id, display_name, freeform_tags, defined_tags, schedule_details, if_match): - if isinstance(fsu_action_id, six.string_types) and len(fsu_action_id.strip()) == 0: + if isinstance(fsu_action_id, str) and len(fsu_action_id.strip()) == 0: raise click.UsageError('Parameter --fsu-action-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or schedule_details: @@ -3800,7 +3799,7 @@ def update_fsu_action_update_cleanup_action_details(ctx, from_json, force, wait_ @cli_util.wrap_exceptions def update_fsu_collection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_collection_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(fsu_collection_id, six.string_types) and len(fsu_collection_id.strip()) == 0: + if isinstance(fsu_collection_id, str) and len(fsu_collection_id.strip()) == 0: raise click.UsageError('Parameter --fsu-collection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3880,7 +3879,7 @@ def update_fsu_collection(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_fsu_cycle(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, type, display_name, goal_version_details, batching_strategy, diagnostics_collection, freeform_tags, defined_tags, if_match): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if goal_version_details or batching_strategy or diagnostics_collection or freeform_tags or defined_tags: @@ -3973,7 +3972,7 @@ def update_fsu_cycle(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_fsu_cycle_update_patch_fsu_cycle(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, display_name, goal_version_details, batching_strategy, diagnostics_collection, freeform_tags, defined_tags, is_ignore_patches, is_ignore_missing_patches, max_drain_timeout_in_seconds, is_keep_placement, if_match): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if goal_version_details or batching_strategy or diagnostics_collection or freeform_tags or defined_tags or is_ignore_missing_patches: @@ -4076,7 +4075,7 @@ def update_fsu_cycle_update_patch_fsu_cycle(ctx, from_json, force, wait_for_stat @cli_util.wrap_exceptions def update_fsu_cycle_update_upgrade_fsu_cycle(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, display_name, goal_version_details, batching_strategy, diagnostics_collection, freeform_tags, defined_tags, upgrade_details, if_match): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if goal_version_details or batching_strategy or diagnostics_collection or freeform_tags or defined_tags or upgrade_details: @@ -4171,7 +4170,7 @@ def update_fsu_cycle_update_upgrade_fsu_cycle(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_fsu_cycle_version_fsu_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, goal_version_details_version, display_name, batching_strategy, diagnostics_collection, freeform_tags, defined_tags, if_match, goal_version_details_home_policy, goal_version_details_new_home_prefix): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if batching_strategy or diagnostics_collection or freeform_tags or defined_tags: @@ -4268,7 +4267,7 @@ def update_fsu_cycle_version_fsu_target_details(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_fsu_cycle_image_id_fsu_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, goal_version_details_software_image_id, display_name, batching_strategy, diagnostics_collection, freeform_tags, defined_tags, if_match, goal_version_details_home_policy, goal_version_details_new_home_prefix): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if batching_strategy or diagnostics_collection or freeform_tags or defined_tags: @@ -4363,7 +4362,7 @@ def update_fsu_cycle_image_id_fsu_target_details(ctx, from_json, force, wait_for @cli_util.wrap_exceptions def update_fsu_cycle_update_sequential_batching_strategy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, display_name, goal_version_details, diagnostics_collection, freeform_tags, defined_tags, if_match, batching_strategy_is_force_rolling): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if goal_version_details or diagnostics_collection or freeform_tags or defined_tags: @@ -4453,7 +4452,7 @@ def update_fsu_cycle_update_sequential_batching_strategy_details(ctx, from_json, @cli_util.wrap_exceptions def update_fsu_cycle_update_non_rolling_batching_strategy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, display_name, goal_version_details, diagnostics_collection, freeform_tags, defined_tags, if_match): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if goal_version_details or diagnostics_collection or freeform_tags or defined_tags: @@ -4542,7 +4541,7 @@ def update_fsu_cycle_update_non_rolling_batching_strategy_details(ctx, from_json @cli_util.wrap_exceptions def update_fsu_cycle_update_service_availability_factor_batching_strategy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, display_name, goal_version_details, diagnostics_collection, freeform_tags, defined_tags, if_match, batching_strategy_percentage, batching_strategy_is_force_rolling): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if goal_version_details or diagnostics_collection or freeform_tags or defined_tags: @@ -4637,7 +4636,7 @@ def update_fsu_cycle_update_service_availability_factor_batching_strategy_detail @cli_util.wrap_exceptions def update_fsu_cycle_update_fifty_fifty_batching_strategy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, display_name, goal_version_details, diagnostics_collection, freeform_tags, defined_tags, if_match, batching_strategy_is_wait_for_batch_resume, batching_strategy_is_force_rolling): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if goal_version_details or diagnostics_collection or freeform_tags or defined_tags: @@ -4730,7 +4729,7 @@ def update_fsu_cycle_update_fifty_fifty_batching_strategy_details(ctx, from_json @cli_util.wrap_exceptions def update_fsu_cycle_none_batching_strategy_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_cycle_id, display_name, goal_version_details, diagnostics_collection, freeform_tags, defined_tags, if_match): - if isinstance(fsu_cycle_id, six.string_types) and len(fsu_cycle_id.strip()) == 0: + if isinstance(fsu_cycle_id, str) and len(fsu_cycle_id.strip()) == 0: raise click.UsageError('Parameter --fsu-cycle-id cannot be whitespace or empty string') if not force: if goal_version_details or diagnostics_collection or freeform_tags or defined_tags: @@ -4812,7 +4811,7 @@ def update_fsu_cycle_none_batching_strategy_details(ctx, from_json, force, wait_ @cli_util.wrap_exceptions def update_fsu_discovery(ctx, from_json, force, fsu_discovery_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(fsu_discovery_id, six.string_types) and len(fsu_discovery_id.strip()) == 0: + if isinstance(fsu_discovery_id, str) and len(fsu_discovery_id.strip()) == 0: raise click.UsageError('Parameter --fsu-discovery-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4861,7 +4860,7 @@ def update_fsu_discovery(ctx, from_json, force, fsu_discovery_id, display_name, @cli_util.wrap_exceptions def update_fsu_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fsu_job_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(fsu_job_id, six.string_types) and len(fsu_job_id.strip()) == 0: + if isinstance(fsu_job_id, str) and len(fsu_job_id.strip()) == 0: raise click.UsageError('Parameter --fsu-job-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/functions/src/oci_cli_functions_invoke/generated/functionsinvoke_cli.py b/services/functions/src/oci_cli_functions_invoke/generated/functionsinvoke_cli.py index 7d2138b2f..dad5317b3 100644 --- a/services/functions/src/oci_cli_functions_invoke/generated/functionsinvoke_cli.py +++ b/services/functions/src/oci_cli_functions_invoke/generated/functionsinvoke_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -46,7 +45,7 @@ def function_group(): @cli_util.wrap_exceptions def invoke_function(ctx, from_json, file, function_id, invoke_function_body, fn_intent, fn_invoke_type, is_dry_run): - if isinstance(function_id, six.string_types) and len(function_id.strip()) == 0: + if isinstance(function_id, str) and len(function_id.strip()) == 0: raise click.UsageError('Parameter --function-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/functions/src/oci_cli_functions_management/generated/functionsmanagement_cli.py b/services/functions/src/oci_cli_functions_management/generated/functionsmanagement_cli.py index c95701ddf..e00594668 100644 --- a/services/functions/src/oci_cli_functions_management/generated/functionsmanagement_cli.py +++ b/services/functions/src/oci_cli_functions_management/generated/functionsmanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -71,7 +70,7 @@ def pbf_listing_version_group(): @cli_util.wrap_exceptions def change_application_compartment(ctx, from_json, application_id, compartment_id, if_match): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') kwargs = {} @@ -589,7 +588,7 @@ def create_function_constant_provisioned_concurrency_config(ctx, from_json, wait @cli_util.wrap_exceptions def delete_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, application_id, if_match): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') kwargs = {} @@ -653,7 +652,7 @@ def delete_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_function(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, function_id, if_match): - if isinstance(function_id, six.string_types) and len(function_id.strip()) == 0: + if isinstance(function_id, str) and len(function_id.strip()) == 0: raise click.UsageError('Parameter --function-id cannot be whitespace or empty string') kwargs = {} @@ -712,7 +711,7 @@ def delete_function(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def get_application(ctx, from_json, application_id): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') kwargs = {} @@ -734,7 +733,7 @@ def get_application(ctx, from_json, application_id): @cli_util.wrap_exceptions def get_function(ctx, from_json, function_id): - if isinstance(function_id, six.string_types) and len(function_id.strip()) == 0: + if isinstance(function_id, str) and len(function_id.strip()) == 0: raise click.UsageError('Parameter --function-id cannot be whitespace or empty string') kwargs = {} @@ -756,7 +755,7 @@ def get_function(ctx, from_json, function_id): @cli_util.wrap_exceptions def get_pbf_listing(ctx, from_json, pbf_listing_id): - if isinstance(pbf_listing_id, six.string_types) and len(pbf_listing_id.strip()) == 0: + if isinstance(pbf_listing_id, str) and len(pbf_listing_id.strip()) == 0: raise click.UsageError('Parameter --pbf-listing-id cannot be whitespace or empty string') kwargs = {} @@ -778,7 +777,7 @@ def get_pbf_listing(ctx, from_json, pbf_listing_id): @cli_util.wrap_exceptions def get_pbf_listing_version(ctx, from_json, pbf_listing_version_id): - if isinstance(pbf_listing_version_id, six.string_types) and len(pbf_listing_version_id.strip()) == 0: + if isinstance(pbf_listing_version_id, str) and len(pbf_listing_version_id.strip()) == 0: raise click.UsageError('Parameter --pbf-listing-version-id cannot be whitespace or empty string') kwargs = {} @@ -1162,7 +1161,7 @@ def list_triggers(ctx, from_json, all_pages, page_size, name, limit, page, sort_ @cli_util.wrap_exceptions def update_application(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, application_id, config, network_security_group_ids, syslog_url, trace_config, freeform_tags, defined_tags, image_policy_config, if_match): - if isinstance(application_id, six.string_types) and len(application_id.strip()) == 0: + if isinstance(application_id, str) and len(application_id.strip()) == 0: raise click.UsageError('Parameter --application-id cannot be whitespace or empty string') if not force: if config or network_security_group_ids or trace_config or freeform_tags or defined_tags or image_policy_config: @@ -1258,7 +1257,7 @@ def update_application(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_function(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, function_id, image, image_digest, memory_in_mbs, config, timeout_in_seconds, provisioned_concurrency_config, trace_config, freeform_tags, defined_tags, if_match): - if isinstance(function_id, six.string_types) and len(function_id.strip()) == 0: + if isinstance(function_id, str) and len(function_id.strip()) == 0: raise click.UsageError('Parameter --function-id cannot be whitespace or empty string') if not force: if config or provisioned_concurrency_config or trace_config or freeform_tags or defined_tags: @@ -1359,7 +1358,7 @@ def update_function(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_function_none_provisioned_concurrency_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, function_id, image, image_digest, memory_in_mbs, config, timeout_in_seconds, trace_config, freeform_tags, defined_tags, if_match): - if isinstance(function_id, six.string_types) and len(function_id.strip()) == 0: + if isinstance(function_id, str) and len(function_id.strip()) == 0: raise click.UsageError('Parameter --function-id cannot be whitespace or empty string') if not force: if config or trace_config or freeform_tags or defined_tags: @@ -1461,7 +1460,7 @@ def update_function_none_provisioned_concurrency_config(ctx, from_json, force, w @cli_util.wrap_exceptions def update_function_constant_provisioned_concurrency_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, function_id, provisioned_concurrency_config_count, image, image_digest, memory_in_mbs, config, timeout_in_seconds, trace_config, freeform_tags, defined_tags, if_match): - if isinstance(function_id, six.string_types) and len(function_id.strip()) == 0: + if isinstance(function_id, str) and len(function_id.strip()) == 0: raise click.UsageError('Parameter --function-id cannot be whitespace or empty string') if not force: if config or trace_config or freeform_tags or defined_tags: diff --git a/services/fusion_apps/src/oci_cli_fusion_applications/generated/fusionapplications_cli.py b/services/fusion_apps/src/oci_cli_fusion_applications/generated/fusionapplications_cli.py index e697af766..58fb0048b 100644 --- a/services/fusion_apps/src/oci_cli_fusion_applications/generated/fusionapplications_cli.py +++ b/services/fusion_apps/src/oci_cli_fusion_applications/generated/fusionapplications_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -136,7 +135,7 @@ def scheduled_activity_group(): @cli_util.wrap_exceptions def change_fusion_environment_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id, compartment_id, if_match): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -197,7 +196,7 @@ def change_fusion_environment_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_fusion_environment_family_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_family_id, compartment_id, if_match): - if isinstance(fusion_environment_family_id, six.string_types) and len(fusion_environment_family_id.strip()) == 0: + if isinstance(fusion_environment_family_id, str) and len(fusion_environment_family_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-family-id cannot be whitespace or empty string') kwargs = {} @@ -257,7 +256,7 @@ def change_fusion_environment_family_compartment(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def create_data_masking_activity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id, is_resume_data_masking): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -412,7 +411,7 @@ def create_fusion_environment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def create_fusion_environment_admin_user(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, username, email_address, first_name, last_name, fusion_environment_id, password): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -547,7 +546,7 @@ def create_fusion_environment_family(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def create_refresh_activity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id, source_fusion_environment_id, is_data_masking_opted, time_scheduled_start): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -612,7 +611,7 @@ def create_refresh_activity(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def create_service_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_instance_type, service_instance_id, fusion_environment_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -672,7 +671,7 @@ def create_service_attachment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_fusion_environment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id, if_match): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -729,10 +728,10 @@ def delete_fusion_environment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_fusion_environment_admin_user(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, admin_username, fusion_environment_id, if_match): - if isinstance(admin_username, six.string_types) and len(admin_username.strip()) == 0: + if isinstance(admin_username, str) and len(admin_username.strip()) == 0: raise click.UsageError('Parameter --admin-username cannot be whitespace or empty string') - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -789,7 +788,7 @@ def delete_fusion_environment_admin_user(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def delete_fusion_environment_family(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_family_id, if_match): - if isinstance(fusion_environment_family_id, six.string_types) and len(fusion_environment_family_id.strip()) == 0: + if isinstance(fusion_environment_family_id, str) and len(fusion_environment_family_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-family-id cannot be whitespace or empty string') kwargs = {} @@ -846,10 +845,10 @@ def delete_fusion_environment_family(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_refresh_activity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id, refresh_activity_id, if_match): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') - if isinstance(refresh_activity_id, six.string_types) and len(refresh_activity_id.strip()) == 0: + if isinstance(refresh_activity_id, str) and len(refresh_activity_id.strip()) == 0: raise click.UsageError('Parameter --refresh-activity-id cannot be whitespace or empty string') kwargs = {} @@ -907,10 +906,10 @@ def delete_refresh_activity(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_service_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id, service_attachment_id, if_match): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') - if isinstance(service_attachment_id, six.string_types) and len(service_attachment_id.strip()) == 0: + if isinstance(service_attachment_id, str) and len(service_attachment_id.strip()) == 0: raise click.UsageError('Parameter --service-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -962,7 +961,7 @@ def delete_service_attachment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def generate_extract_details(ctx, from_json, fusion_environment_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -985,10 +984,10 @@ def generate_extract_details(ctx, from_json, fusion_environment_id): @cli_util.wrap_exceptions def get_data_masking_activity(ctx, from_json, fusion_environment_id, data_masking_activity_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') - if isinstance(data_masking_activity_id, six.string_types) and len(data_masking_activity_id.strip()) == 0: + if isinstance(data_masking_activity_id, str) and len(data_masking_activity_id.strip()) == 0: raise click.UsageError('Parameter --data-masking-activity-id cannot be whitespace or empty string') kwargs = {} @@ -1011,7 +1010,7 @@ def get_data_masking_activity(ctx, from_json, fusion_environment_id, data_maskin @cli_util.wrap_exceptions def get_fusion_environment(ctx, from_json, fusion_environment_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1033,7 +1032,7 @@ def get_fusion_environment(ctx, from_json, fusion_environment_id): @cli_util.wrap_exceptions def get_fusion_environment_family(ctx, from_json, fusion_environment_family_id): - if isinstance(fusion_environment_family_id, six.string_types) and len(fusion_environment_family_id.strip()) == 0: + if isinstance(fusion_environment_family_id, str) and len(fusion_environment_family_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-family-id cannot be whitespace or empty string') kwargs = {} @@ -1055,7 +1054,7 @@ def get_fusion_environment_family(ctx, from_json, fusion_environment_family_id): @cli_util.wrap_exceptions def get_fusion_environment_family_limits_and_usage(ctx, from_json, fusion_environment_family_id): - if isinstance(fusion_environment_family_id, six.string_types) and len(fusion_environment_family_id.strip()) == 0: + if isinstance(fusion_environment_family_id, str) and len(fusion_environment_family_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-family-id cannot be whitespace or empty string') kwargs = {} @@ -1077,7 +1076,7 @@ def get_fusion_environment_family_limits_and_usage(ctx, from_json, fusion_enviro @cli_util.wrap_exceptions def get_fusion_environment_family_subscription_detail(ctx, from_json, fusion_environment_family_id): - if isinstance(fusion_environment_family_id, six.string_types) and len(fusion_environment_family_id.strip()) == 0: + if isinstance(fusion_environment_family_id, str) and len(fusion_environment_family_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-family-id cannot be whitespace or empty string') kwargs = {} @@ -1099,7 +1098,7 @@ def get_fusion_environment_family_subscription_detail(ctx, from_json, fusion_env @cli_util.wrap_exceptions def get_fusion_environment_status(ctx, from_json, fusion_environment_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1122,10 +1121,10 @@ def get_fusion_environment_status(ctx, from_json, fusion_environment_id): @cli_util.wrap_exceptions def get_refresh_activity(ctx, from_json, fusion_environment_id, refresh_activity_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') - if isinstance(refresh_activity_id, six.string_types) and len(refresh_activity_id.strip()) == 0: + if isinstance(refresh_activity_id, str) and len(refresh_activity_id.strip()) == 0: raise click.UsageError('Parameter --refresh-activity-id cannot be whitespace or empty string') kwargs = {} @@ -1149,10 +1148,10 @@ def get_refresh_activity(ctx, from_json, fusion_environment_id, refresh_activity @cli_util.wrap_exceptions def get_scheduled_activity(ctx, from_json, fusion_environment_id, scheduled_activity_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') - if isinstance(scheduled_activity_id, six.string_types) and len(scheduled_activity_id.strip()) == 0: + if isinstance(scheduled_activity_id, str) and len(scheduled_activity_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-activity-id cannot be whitespace or empty string') kwargs = {} @@ -1176,10 +1175,10 @@ def get_scheduled_activity(ctx, from_json, fusion_environment_id, scheduled_acti @cli_util.wrap_exceptions def get_service_attachment(ctx, from_json, fusion_environment_id, service_attachment_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') - if isinstance(service_attachment_id, six.string_types) and len(service_attachment_id.strip()) == 0: + if isinstance(service_attachment_id, str) and len(service_attachment_id.strip()) == 0: raise click.UsageError('Parameter --service-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -1202,7 +1201,7 @@ def get_service_attachment(ctx, from_json, fusion_environment_id, service_attach @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1227,7 +1226,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def initiate_extract(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1277,7 +1276,7 @@ def initiate_extract(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def list_admin_users(ctx, from_json, all_pages, fusion_environment_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1309,7 +1308,7 @@ def list_data_masking_activities(ctx, from_json, all_pages, page_size, fusion_en if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1498,7 +1497,7 @@ def list_refresh_activities(ctx, from_json, all_pages, page_size, fusion_environ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1570,7 +1569,7 @@ def list_scheduled_activities(ctx, from_json, all_pages, page_size, fusion_envir if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1644,7 +1643,7 @@ def list_service_attachments(ctx, from_json, all_pages, page_size, fusion_enviro if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1707,7 +1706,7 @@ def list_time_available_for_refreshes(ctx, from_json, all_pages, page_size, fusi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} @@ -1764,7 +1763,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1821,7 +1820,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1935,10 +1934,10 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, sta @cli_util.wrap_exceptions def reset_fusion_environment_password(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, password, fusion_environment_id, admin_username, if_match): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') - if isinstance(admin_username, six.string_types) and len(admin_username.strip()) == 0: + if isinstance(admin_username, str) and len(admin_username.strip()) == 0: raise click.UsageError('Parameter --admin-username cannot be whitespace or empty string') kwargs = {} @@ -2009,7 +2008,7 @@ def reset_fusion_environment_password(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_fusion_environment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id, display_name, kms_key_id, maintenance_policy, additional_language_packs, rules, freeform_tags, defined_tags, if_match): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') if not force: if maintenance_policy or additional_language_packs or rules or freeform_tags or defined_tags: @@ -2099,7 +2098,7 @@ def update_fusion_environment(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_fusion_environment_family(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_family_id, display_name, family_maintenance_policy, subscription_ids, freeform_tags, defined_tags, if_match): - if isinstance(fusion_environment_family_id, six.string_types) and len(fusion_environment_family_id.strip()) == 0: + if isinstance(fusion_environment_family_id, str) and len(fusion_environment_family_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-family-id cannot be whitespace or empty string') if not force: if family_maintenance_policy or subscription_ids or freeform_tags or defined_tags: @@ -2179,10 +2178,10 @@ def update_fusion_environment_family(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_refresh_activity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fusion_environment_id, refresh_activity_id, time_scheduled_start, if_match): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') - if isinstance(refresh_activity_id, six.string_types) and len(refresh_activity_id.strip()) == 0: + if isinstance(refresh_activity_id, str) and len(refresh_activity_id.strip()) == 0: raise click.UsageError('Parameter --refresh-activity-id cannot be whitespace or empty string') kwargs = {} @@ -2239,7 +2238,7 @@ def update_refresh_activity(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def verify_service_attachment(ctx, from_json, service_instance_type, service_instance_id, fusion_environment_id): - if isinstance(fusion_environment_id, six.string_types) and len(fusion_environment_id.strip()) == 0: + if isinstance(fusion_environment_id, str) and len(fusion_environment_id.strip()) == 0: raise click.UsageError('Parameter --fusion-environment-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/generative_ai/src/oci_cli_generative_ai/generated/generativeai_cli.py b/services/generative_ai/src/oci_cli_generative_ai/generated/generativeai_cli.py index de0c4697e..a70bd25a6 100644 --- a/services/generative_ai/src/oci_cli_generative_ai/generated/generativeai_cli.py +++ b/services/generative_ai/src/oci_cli_generative_ai/generated/generativeai_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -112,7 +111,7 @@ def model_collection_group(): @cli_util.wrap_exceptions def change_dedicated_ai_cluster_compartment(ctx, from_json, dedicated_ai_cluster_id, compartment_id, if_match): - if isinstance(dedicated_ai_cluster_id, six.string_types) and len(dedicated_ai_cluster_id.strip()) == 0: + if isinstance(dedicated_ai_cluster_id, str) and len(dedicated_ai_cluster_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-ai-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -143,7 +142,7 @@ def change_dedicated_ai_cluster_compartment(ctx, from_json, dedicated_ai_cluster @cli_util.wrap_exceptions def change_endpoint_compartment(ctx, from_json, endpoint_id, compartment_id, if_match): - if isinstance(endpoint_id, six.string_types) and len(endpoint_id.strip()) == 0: + if isinstance(endpoint_id, str) and len(endpoint_id.strip()) == 0: raise click.UsageError('Parameter --endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -174,7 +173,7 @@ def change_endpoint_compartment(ctx, from_json, endpoint_id, compartment_id, if_ @cli_util.wrap_exceptions def change_model_compartment(ctx, from_json, model_id, compartment_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -463,7 +462,7 @@ def create_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_dedicated_ai_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dedicated_ai_cluster_id, if_match): - if isinstance(dedicated_ai_cluster_id, six.string_types) and len(dedicated_ai_cluster_id.strip()) == 0: + if isinstance(dedicated_ai_cluster_id, str) and len(dedicated_ai_cluster_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-ai-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -519,7 +518,7 @@ def delete_dedicated_ai_cluster(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, endpoint_id, if_match): - if isinstance(endpoint_id, six.string_types) and len(endpoint_id.strip()) == 0: + if isinstance(endpoint_id, str) and len(endpoint_id.strip()) == 0: raise click.UsageError('Parameter --endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -575,7 +574,7 @@ def delete_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -626,7 +625,7 @@ def delete_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def get_dedicated_ai_cluster(ctx, from_json, dedicated_ai_cluster_id): - if isinstance(dedicated_ai_cluster_id, six.string_types) and len(dedicated_ai_cluster_id.strip()) == 0: + if isinstance(dedicated_ai_cluster_id, str) and len(dedicated_ai_cluster_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-ai-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -648,7 +647,7 @@ def get_dedicated_ai_cluster(ctx, from_json, dedicated_ai_cluster_id): @cli_util.wrap_exceptions def get_endpoint(ctx, from_json, endpoint_id): - if isinstance(endpoint_id, six.string_types) and len(endpoint_id.strip()) == 0: + if isinstance(endpoint_id, str) and len(endpoint_id.strip()) == 0: raise click.UsageError('Parameter --endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -670,7 +669,7 @@ def get_endpoint(ctx, from_json, endpoint_id): @cli_util.wrap_exceptions def get_model(ctx, from_json, model_id): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') kwargs = {} @@ -692,7 +691,7 @@ def get_model(ctx, from_json, model_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -921,7 +920,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -978,7 +977,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1103,7 +1102,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_dedicated_ai_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dedicated_ai_cluster_id, display_name, description, unit_count, freeform_tags, defined_tags, if_match): - if isinstance(dedicated_ai_cluster_id, six.string_types) and len(dedicated_ai_cluster_id.strip()) == 0: + if isinstance(dedicated_ai_cluster_id, str) and len(dedicated_ai_cluster_id.strip()) == 0: raise click.UsageError('Parameter --dedicated-ai-cluster-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1191,7 +1190,7 @@ def update_dedicated_ai_cluster(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, endpoint_id, display_name, description, content_moderation_config, freeform_tags, defined_tags, if_match): - if isinstance(endpoint_id, six.string_types) and len(endpoint_id.strip()) == 0: + if isinstance(endpoint_id, str) and len(endpoint_id.strip()) == 0: raise click.UsageError('Parameter --endpoint-id cannot be whitespace or empty string') if not force: if content_moderation_config or freeform_tags or defined_tags: @@ -1280,7 +1279,7 @@ def update_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_model(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, model_id, display_name, description, vendor, version_parameterconflict, freeform_tags, defined_tags, if_match): - if isinstance(model_id, six.string_types) and len(model_id.strip()) == 0: + if isinstance(model_id, str) and len(model_id.strip()) == 0: raise click.UsageError('Parameter --model-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/generative_ai_agent/src/oci_cli_generative_ai_agent/generated/generativeaiagent_cli.py b/services/generative_ai_agent/src/oci_cli_generative_ai_agent/generated/generativeaiagent_cli.py index 20a053235..27a265a3c 100644 --- a/services/generative_ai_agent/src/oci_cli_generative_ai_agent/generated/generativeaiagent_cli.py +++ b/services/generative_ai_agent/src/oci_cli_generative_ai_agent/generated/generativeaiagent_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -118,7 +117,7 @@ def tool_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -147,7 +146,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_agent_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_id, compartment_id, if_match): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') kwargs = {} @@ -208,7 +207,7 @@ def change_agent_compartment(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def change_agent_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_endpoint_id, compartment_id, if_match): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -269,7 +268,7 @@ def change_agent_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def change_knowledge_base_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, compartment_id, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') kwargs = {} @@ -1624,7 +1623,7 @@ def create_tool_rag_tool_config(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_agent(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_id, if_match): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') kwargs = {} @@ -1680,7 +1679,7 @@ def delete_agent(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_agent_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_endpoint_id, if_match): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1736,7 +1735,7 @@ def delete_agent_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_data_ingestion_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_ingestion_job_id, if_match): - if isinstance(data_ingestion_job_id, six.string_types) and len(data_ingestion_job_id.strip()) == 0: + if isinstance(data_ingestion_job_id, str) and len(data_ingestion_job_id.strip()) == 0: raise click.UsageError('Parameter --data-ingestion-job-id cannot be whitespace or empty string') kwargs = {} @@ -1792,7 +1791,7 @@ def delete_data_ingestion_job(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, data_source_id, if_match): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') kwargs = {} @@ -1848,7 +1847,7 @@ def delete_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_knowledge_base(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') kwargs = {} @@ -1904,7 +1903,7 @@ def delete_knowledge_base(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_tool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tool_id, if_match): - if isinstance(tool_id, six.string_types) and len(tool_id.strip()) == 0: + if isinstance(tool_id, str) and len(tool_id.strip()) == 0: raise click.UsageError('Parameter --tool-id cannot be whitespace or empty string') kwargs = {} @@ -1955,7 +1954,7 @@ def delete_tool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def get_agent(ctx, from_json, agent_id): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') kwargs = {} @@ -1977,7 +1976,7 @@ def get_agent(ctx, from_json, agent_id): @cli_util.wrap_exceptions def get_agent_endpoint(ctx, from_json, agent_endpoint_id): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1999,7 +1998,7 @@ def get_agent_endpoint(ctx, from_json, agent_endpoint_id): @cli_util.wrap_exceptions def get_data_ingestion_job(ctx, from_json, data_ingestion_job_id): - if isinstance(data_ingestion_job_id, six.string_types) and len(data_ingestion_job_id.strip()) == 0: + if isinstance(data_ingestion_job_id, str) and len(data_ingestion_job_id.strip()) == 0: raise click.UsageError('Parameter --data-ingestion-job-id cannot be whitespace or empty string') kwargs = {} @@ -2022,7 +2021,7 @@ def get_data_ingestion_job(ctx, from_json, data_ingestion_job_id): @cli_util.wrap_exceptions def get_data_ingestion_job_log_content(ctx, from_json, file, data_ingestion_job_id): - if isinstance(data_ingestion_job_id, six.string_types) and len(data_ingestion_job_id.strip()) == 0: + if isinstance(data_ingestion_job_id, str) and len(data_ingestion_job_id.strip()) == 0: raise click.UsageError('Parameter --data-ingestion-job-id cannot be whitespace or empty string') kwargs = {} @@ -2066,7 +2065,7 @@ def get_data_ingestion_job_log_content(ctx, from_json, file, data_ingestion_job_ @cli_util.wrap_exceptions def get_data_source(ctx, from_json, data_source_id): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') kwargs = {} @@ -2088,7 +2087,7 @@ def get_data_source(ctx, from_json, data_source_id): @cli_util.wrap_exceptions def get_knowledge_base(ctx, from_json, knowledge_base_id): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') kwargs = {} @@ -2110,7 +2109,7 @@ def get_knowledge_base(ctx, from_json, knowledge_base_id): @cli_util.wrap_exceptions def get_tool(ctx, from_json, tool_id): - if isinstance(tool_id, six.string_types) and len(tool_id.strip()) == 0: + if isinstance(tool_id, str) and len(tool_id.strip()) == 0: raise click.UsageError('Parameter --tool-id cannot be whitespace or empty string') kwargs = {} @@ -2132,7 +2131,7 @@ def get_tool(ctx, from_json, tool_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2529,7 +2528,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2586,7 +2585,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2712,7 +2711,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_agent(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_id, display_name, description, knowledge_base_ids, welcome_message, llm_config, freeform_tags, defined_tags, if_match): - if isinstance(agent_id, six.string_types) and len(agent_id.strip()) == 0: + if isinstance(agent_id, str) and len(agent_id.strip()) == 0: raise click.UsageError('Parameter --agent-id cannot be whitespace or empty string') if not force: if knowledge_base_ids or llm_config or freeform_tags or defined_tags: @@ -2814,7 +2813,7 @@ def update_agent(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_agent_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, agent_endpoint_id, display_name, description, content_moderation_config, guardrail_config, metadata, human_input_config, output_config, should_enable_trace, should_enable_citation, should_enable_multi_language, session_config, freeform_tags, defined_tags, if_match): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') if not force: if content_moderation_config or guardrail_config or metadata or human_input_config or output_config or session_config or freeform_tags or defined_tags: @@ -2927,7 +2926,7 @@ def update_agent_endpoint(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_data_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_source_id, display_name, description, data_source_config, metadata, freeform_tags, defined_tags, if_match): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') if not force: if data_source_config or metadata or freeform_tags or defined_tags: @@ -3022,7 +3021,7 @@ def update_data_source(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_data_source_oci_object_storage_data_source_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, data_source_id, display_name, description, metadata, freeform_tags, defined_tags, if_match, data_source_config_should_enable_multi_modality, data_source_config_object_storage_prefixes): - if isinstance(data_source_id, six.string_types) and len(data_source_id.strip()) == 0: + if isinstance(data_source_id, str) and len(data_source_id.strip()) == 0: raise click.UsageError('Parameter --data-source-id cannot be whitespace or empty string') if not force: if metadata or freeform_tags or defined_tags: @@ -3119,7 +3118,7 @@ def update_data_source_oci_object_storage_data_source_config(ctx, from_json, for @cli_util.wrap_exceptions def update_knowledge_base(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, display_name, description, index_config, freeform_tags, defined_tags, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') if not force: if index_config or freeform_tags or defined_tags: @@ -3207,7 +3206,7 @@ def update_knowledge_base(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_knowledge_base_default_index_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, display_name, description, freeform_tags, defined_tags, if_match, index_config_should_enable_hybrid_search): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3299,7 +3298,7 @@ def update_knowledge_base_default_index_config(ctx, from_json, force, wait_for_s @cli_util.wrap_exceptions def update_knowledge_base_oci_database_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, index_config_database_connection, index_config_database_functions, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3391,7 +3390,7 @@ def update_knowledge_base_oci_database_config(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_knowledge_base_oci_open_search_index_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, knowledge_base_id, index_config_cluster_id, index_config_secret_detail, index_config_indexes, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3483,7 +3482,7 @@ def update_knowledge_base_oci_open_search_index_config(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_tool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tool_id, display_name, description, tool_config, metadata, freeform_tags, defined_tags, if_match): - if isinstance(tool_id, six.string_types) and len(tool_id.strip()) == 0: + if isinstance(tool_id, str) and len(tool_id.strip()) == 0: raise click.UsageError('Parameter --tool-id cannot be whitespace or empty string') if not force: if tool_config or metadata or freeform_tags or defined_tags: @@ -3583,7 +3582,7 @@ def update_tool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_tool_sql_tool_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tool_id, tool_config_dialect, display_name, description, metadata, freeform_tags, defined_tags, if_match, tool_config_icl_examples, tool_config_database_schema, tool_config_should_enable_sql_execution, tool_config_model_size, tool_config_should_enable_self_correction, tool_config_table_and_column_description, tool_config_generation_llm_customization, tool_config_database_connection): - if isinstance(tool_id, six.string_types) and len(tool_id.strip()) == 0: + if isinstance(tool_id, str) and len(tool_id.strip()) == 0: raise click.UsageError('Parameter --tool-id cannot be whitespace or empty string') if not force: if metadata or freeform_tags or defined_tags: @@ -3700,7 +3699,7 @@ def update_tool_sql_tool_config(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_tool_function_calling_tool_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tool_id, tool_config_function, display_name, description, metadata, freeform_tags, defined_tags, if_match): - if isinstance(tool_id, six.string_types) and len(tool_id.strip()) == 0: + if isinstance(tool_id, str) and len(tool_id.strip()) == 0: raise click.UsageError('Parameter --tool-id cannot be whitespace or empty string') if not force: if metadata or freeform_tags or defined_tags: @@ -3795,7 +3794,7 @@ def update_tool_function_calling_tool_config(ctx, from_json, force, wait_for_sta @cli_util.wrap_exceptions def update_tool_http_endpoint_tool_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tool_id, tool_config_api_schema, tool_config_subnet_id, tool_config_http_endpoint_auth_config, display_name, description, metadata, freeform_tags, defined_tags, if_match): - if isinstance(tool_id, six.string_types) and len(tool_id.strip()) == 0: + if isinstance(tool_id, str) and len(tool_id.strip()) == 0: raise click.UsageError('Parameter --tool-id cannot be whitespace or empty string') if not force: if metadata or freeform_tags or defined_tags: @@ -3890,7 +3889,7 @@ def update_tool_http_endpoint_tool_config(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_tool_agent_tool_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tool_id, tool_config_agent_endpoint_id, display_name, description, metadata, freeform_tags, defined_tags, if_match): - if isinstance(tool_id, six.string_types) and len(tool_id.strip()) == 0: + if isinstance(tool_id, str) and len(tool_id.strip()) == 0: raise click.UsageError('Parameter --tool-id cannot be whitespace or empty string') if not force: if metadata or freeform_tags or defined_tags: @@ -3984,7 +3983,7 @@ def update_tool_agent_tool_config(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_tool_rag_tool_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tool_id, tool_config_knowledge_base_configs, display_name, description, metadata, freeform_tags, defined_tags, if_match, tool_config_generation_llm_customization): - if isinstance(tool_id, six.string_types) and len(tool_id.strip()) == 0: + if isinstance(tool_id, str) and len(tool_id.strip()) == 0: raise click.UsageError('Parameter --tool-id cannot be whitespace or empty string') if not force: if metadata or freeform_tags or defined_tags: diff --git a/services/generative_ai_agent_runtime/src/oci_cli_generative_ai_agent_runtime/generated/generativeaiagentruntime_cli.py b/services/generative_ai_agent_runtime/src/oci_cli_generative_ai_agent_runtime/generated/generativeaiagentruntime_cli.py index 64d161dfd..ae2d6e075 100644 --- a/services/generative_ai_agent_runtime/src/oci_cli_generative_ai_agent_runtime/generated/generativeaiagentruntime_cli.py +++ b/services/generative_ai_agent_runtime/src/oci_cli_generative_ai_agent_runtime/generated/generativeaiagentruntime_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -73,7 +72,7 @@ def agent_endpoint_group(): @cli_util.wrap_exceptions def chat(ctx, from_json, agent_endpoint_id, user_message, should_stream, session_id, tool_parameters, tool_inputs, performed_actions, if_match): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -123,7 +122,7 @@ def chat(ctx, from_json, agent_endpoint_id, user_message, should_stream, session @cli_util.wrap_exceptions def create_session(ctx, from_json, agent_endpoint_id, display_name, description): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -158,10 +157,10 @@ def create_session(ctx, from_json, agent_endpoint_id, display_name, description) @cli_util.wrap_exceptions def delete_session(ctx, from_json, agent_endpoint_id, session_id, if_match): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') - if isinstance(session_id, six.string_types) and len(session_id.strip()) == 0: + if isinstance(session_id, str) and len(session_id.strip()) == 0: raise click.UsageError('Parameter --session-id cannot be whitespace or empty string') kwargs = {} @@ -187,10 +186,10 @@ def delete_session(ctx, from_json, agent_endpoint_id, session_id, if_match): @cli_util.wrap_exceptions def get_session(ctx, from_json, agent_endpoint_id, session_id): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') - if isinstance(session_id, six.string_types) and len(session_id.strip()) == 0: + if isinstance(session_id, str) and len(session_id.strip()) == 0: raise click.UsageError('Parameter --session-id cannot be whitespace or empty string') kwargs = {} @@ -217,7 +216,7 @@ def get_session(ctx, from_json, agent_endpoint_id, session_id): @cli_util.wrap_exceptions def retrieve_metadata(ctx, from_json, knowledge_base_id, filters, if_match): - if isinstance(knowledge_base_id, six.string_types) and len(knowledge_base_id.strip()) == 0: + if isinstance(knowledge_base_id, str) and len(knowledge_base_id.strip()) == 0: raise click.UsageError('Parameter --knowledge-base-id cannot be whitespace or empty string') kwargs = {} @@ -252,10 +251,10 @@ def retrieve_metadata(ctx, from_json, knowledge_base_id, filters, if_match): @cli_util.wrap_exceptions def update_session(ctx, from_json, agent_endpoint_id, session_id, display_name, description, if_match): - if isinstance(agent_endpoint_id, six.string_types) and len(agent_endpoint_id.strip()) == 0: + if isinstance(agent_endpoint_id, str) and len(agent_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --agent-endpoint-id cannot be whitespace or empty string') - if isinstance(session_id, six.string_types) and len(session_id.strip()) == 0: + if isinstance(session_id, str) and len(session_id.strip()) == 0: raise click.UsageError('Parameter --session-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/generative_ai_inference/src/oci_cli_generative_ai_inference/generated/generativeaiinference_cli.py b/services/generative_ai_inference/src/oci_cli_generative_ai_inference/generated/generativeaiinference_cli.py index 4f5425669..0ffccce0c 100644 --- a/services/generative_ai_inference/src/oci_cli_generative_ai_inference/generated/generativeaiinference_cli.py +++ b/services/generative_ai_inference/src/oci_cli_generative_ai_inference/generated/generativeaiinference_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 diff --git a/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated/genericartifactscontent_cli.py b/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated/genericartifactscontent_cli.py index 3446326de..caa131a2b 100644 --- a/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated/genericartifactscontent_cli.py +++ b/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated/genericartifactscontent_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -44,7 +43,7 @@ def generic_artifact_group(): @cli_util.wrap_exceptions def get_generic_artifact_content(ctx, from_json, file, artifact_id): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') kwargs = {} @@ -97,13 +96,13 @@ def get_generic_artifact_content(ctx, from_json, file, artifact_id): @cli_util.wrap_exceptions def get_generic_artifact_content_by_path(ctx, from_json, file, repository_id, artifact_path, version_parameterconflict): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(artifact_path, six.string_types) and len(artifact_path.strip()) == 0: + if isinstance(artifact_path, str) and len(artifact_path.strip()) == 0: raise click.UsageError('Parameter --artifact-path cannot be whitespace or empty string') - if isinstance(version_parameterconflict, six.string_types) and len(version_parameterconflict.strip()) == 0: + if isinstance(version_parameterconflict, str) and len(version_parameterconflict.strip()) == 0: raise click.UsageError('Parameter --version-parameterconflict cannot be whitespace or empty string') kwargs = {} @@ -159,13 +158,13 @@ def get_generic_artifact_content_by_path(ctx, from_json, file, repository_id, ar @cli_util.wrap_exceptions def put_generic_artifact_content_by_path(ctx, from_json, repository_id, artifact_path, version_parameterconflict, generic_artifact_content_body, if_match): - if isinstance(repository_id, six.string_types) and len(repository_id.strip()) == 0: + if isinstance(repository_id, str) and len(repository_id.strip()) == 0: raise click.UsageError('Parameter --repository-id cannot be whitespace or empty string') - if isinstance(artifact_path, six.string_types) and len(artifact_path.strip()) == 0: + if isinstance(artifact_path, str) and len(artifact_path.strip()) == 0: raise click.UsageError('Parameter --artifact-path cannot be whitespace or empty string') - if isinstance(version_parameterconflict, six.string_types) and len(version_parameterconflict.strip()) == 0: + if isinstance(version_parameterconflict, str) and len(version_parameterconflict.strip()) == 0: raise click.UsageError('Parameter --version-parameterconflict cannot be whitespace or empty string') kwargs = {} diff --git a/services/globally_distributed_database/src/oci_cli_sharded_database_service/generated/shardeddatabaseservice_cli.py b/services/globally_distributed_database/src/oci_cli_sharded_database_service/generated/shardeddatabaseservice_cli.py index 4152b29ef..0cf3db9da 100644 --- a/services/globally_distributed_database/src/oci_cli_sharded_database_service/generated/shardeddatabaseservice_cli.py +++ b/services/globally_distributed_database/src/oci_cli_sharded_database_service/generated/shardeddatabaseservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -87,7 +86,7 @@ def work_request_group(): @cli_util.wrap_exceptions def change_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, private_endpoint_id, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -148,7 +147,7 @@ def change_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def change_sharded_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, sharded_database_id, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -210,7 +209,7 @@ def change_sharded_database_compartment(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def configure_sharded_database_gsms(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, old_gsm_names, is_latest_gsm_image, sharded_database_id, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -272,7 +271,7 @@ def configure_sharded_database_gsms(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def configure_sharding(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, is_rebalance_required, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -577,7 +576,7 @@ def create_sharded_database_create_dedicated_sharded_database(ctx, from_json, wa @cli_util.wrap_exceptions def delete_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, private_endpoint_id, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -633,7 +632,7 @@ def delete_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_sharded_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -686,7 +685,7 @@ def delete_sharded_database(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def download_gsm_certificate_signing_request(ctx, from_json, file, sharded_database_id, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -733,7 +732,7 @@ def download_gsm_certificate_signing_request(ctx, from_json, file, sharded_datab @cli_util.wrap_exceptions def fetch_connection_string(ctx, from_json, sharded_database_id, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -805,7 +804,7 @@ def fetch_shardable_cloud_autonomous_vm_clusters(ctx, from_json, compartment_id, @cli_util.wrap_exceptions def generate_gsm_certificate_signing_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, if_match, ca_bundle_id): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -861,7 +860,7 @@ def generate_gsm_certificate_signing_request(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def generate_wallet(ctx, from_json, file, sharded_database_id, password, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -913,7 +912,7 @@ def generate_wallet(ctx, from_json, file, sharded_database_id, password, if_matc @cli_util.wrap_exceptions def get_private_endpoint(ctx, from_json, private_endpoint_id, if_none_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -939,7 +938,7 @@ def get_private_endpoint(ctx, from_json, private_endpoint_id, if_none_match): @cli_util.wrap_exceptions def get_sharded_database(ctx, from_json, sharded_database_id, metadata, if_none_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -965,7 +964,7 @@ def get_sharded_database(ctx, from_json, sharded_database_id, metadata, if_none_ @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1116,7 +1115,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1173,7 +1172,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1291,7 +1290,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def patch_sharded_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, items, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -1436,7 +1435,7 @@ def prevalidate_sharded_database_prevalidate_create_payload(ctx, from_json, comp @cli_util.wrap_exceptions def reinstate_proxy_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, private_endpoint_id, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1491,7 +1490,7 @@ def reinstate_proxy_instance(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def start_sharded_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -1546,7 +1545,7 @@ def start_sharded_database(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def stop_sharded_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -1607,7 +1606,7 @@ def stop_sharded_database(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, private_endpoint_id, display_name, description, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') if not force: if nsg_ids or freeform_tags or defined_tags: @@ -1685,7 +1684,7 @@ def update_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_sharded_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1754,7 +1753,7 @@ def update_sharded_database(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def upload_signed_certificate_and_generate_wallet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, ca_signed_certificate, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} @@ -1817,7 +1816,7 @@ def upload_signed_certificate_and_generate_wallet(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def validate_network(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sharded_database_id, is_surrogate, resource_name, is_primary, if_match): - if isinstance(sharded_database_id, six.string_types) and len(sharded_database_id.strip()) == 0: + if isinstance(sharded_database_id, str) and len(sharded_database_id.strip()) == 0: raise click.UsageError('Parameter --sharded-database-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/golden_gate/src/oci_cli_golden_gate/generated/goldengate_cli.py b/services/golden_gate/src/oci_cli_golden_gate/generated/goldengate_cli.py index b11686ca9..b4e1290f8 100644 --- a/services/golden_gate/src/oci_cli_golden_gate/generated/goldengate_cli.py +++ b/services/golden_gate/src/oci_cli_golden_gate/generated/goldengate_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -186,7 +185,7 @@ def deployment_group(): @cli_util.wrap_exceptions def add_connection_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, type, message, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -247,7 +246,7 @@ def add_connection_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def add_deployment_backup_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, type, message, if_match): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -308,7 +307,7 @@ def add_deployment_backup_lock(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def add_deployment_local_peer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, availability_domain, fault_domain, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -375,7 +374,7 @@ def add_deployment_local_peer(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def add_deployment_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, type, message, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -436,7 +435,7 @@ def add_deployment_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def cancel_deployment_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, type, if_match, is_lock_override): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -499,7 +498,7 @@ def cancel_deployment_backup(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def cancel_deployment_backup_default_cancel_deployment_backup_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, if_match, is_lock_override): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -563,7 +562,7 @@ def cancel_deployment_backup_default_cancel_deployment_backup_details(ctx, from_ @cli_util.wrap_exceptions def cancel_deployment_upgrade(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_upgrade_id, type, if_match): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -619,7 +618,7 @@ def cancel_deployment_upgrade(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def cancel_deployment_upgrade_default_cancel_deployment_upgrade_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_upgrade_id, if_match): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -674,7 +673,7 @@ def cancel_deployment_upgrade_default_cancel_deployment_upgrade_details(ctx, fro @cli_util.wrap_exceptions def cancel_snooze_deployment_upgrade(ctx, from_json, deployment_upgrade_id, type, if_match): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -704,7 +703,7 @@ def cancel_snooze_deployment_upgrade(ctx, from_json, deployment_upgrade_id, type @cli_util.wrap_exceptions def cancel_snooze_deployment_upgrade_default_cancel_snooze_deployment_upgrade_details(ctx, from_json, deployment_upgrade_id, if_match): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -740,7 +739,7 @@ def cancel_snooze_deployment_upgrade_default_cancel_snooze_deployment_upgrade_de @cli_util.wrap_exceptions def change_connection_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, compartment_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -803,7 +802,7 @@ def change_connection_compartment(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def change_database_registration_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_registration_id, compartment_id, if_match): - if isinstance(database_registration_id, six.string_types) and len(database_registration_id.strip()) == 0: + if isinstance(database_registration_id, str) and len(database_registration_id.strip()) == 0: raise click.UsageError('Parameter --database-registration-id cannot be whitespace or empty string') kwargs = {} @@ -862,7 +861,7 @@ def change_database_registration_compartment(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def change_deployment_backup_compartment(ctx, from_json, deployment_backup_id, compartment_id, if_match, is_lock_override): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -899,7 +898,7 @@ def change_deployment_backup_compartment(ctx, from_json, deployment_backup_id, c @cli_util.wrap_exceptions def change_deployment_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, compartment_id, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -963,7 +962,7 @@ def change_deployment_compartment(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def change_pipeline_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, compartment_id, if_match, is_lock_override): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -1030,7 +1029,7 @@ def change_pipeline_compartment(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def collect_deployment_diagnostic(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, namespace_name, bucket_name, diagnostic_name_prefix, time_diagnostic_start, time_diagnostic_end, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -1101,7 +1100,7 @@ def collect_deployment_diagnostic(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def collect_pipeline_diagnostic(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, namespace_name, bucket_name, diagnostic_name_prefix, if_match): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -1173,7 +1172,7 @@ def collect_pipeline_diagnostic(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def copy_deployment_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, namespace_name, bucket_name, freeform_tags, defined_tags, if_match): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -1242,7 +1241,7 @@ def copy_deployment_backup(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def create_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key, certificate_content, deployment_id, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -5868,10 +5867,10 @@ def create_pipeline_create_zero_etl_pipeline_details(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def delete_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, certificate_key, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') - if isinstance(certificate_key, six.string_types) and len(certificate_key.strip()) == 0: + if isinstance(certificate_key, str) and len(certificate_key.strip()) == 0: raise click.UsageError('Parameter --certificate-key cannot be whitespace or empty string') kwargs = {} @@ -5931,7 +5930,7 @@ def delete_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -5990,7 +5989,7 @@ def delete_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_connection_assignment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_assignment_id, if_match, is_lock_override): - if isinstance(connection_assignment_id, six.string_types) and len(connection_assignment_id.strip()) == 0: + if isinstance(connection_assignment_id, str) and len(connection_assignment_id.strip()) == 0: raise click.UsageError('Parameter --connection-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -6048,7 +6047,7 @@ def delete_connection_assignment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_database_registration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_registration_id, if_match): - if isinstance(database_registration_id, six.string_types) and len(database_registration_id.strip()) == 0: + if isinstance(database_registration_id, str) and len(database_registration_id.strip()) == 0: raise click.UsageError('Parameter --database-registration-id cannot be whitespace or empty string') kwargs = {} @@ -6105,7 +6104,7 @@ def delete_database_registration(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6164,7 +6163,7 @@ def delete_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_deployment_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, if_match, is_lock_override): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -6223,7 +6222,7 @@ def delete_deployment_backup(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, if_match, is_lock_override): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -6278,7 +6277,7 @@ def delete_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def deployment_wallet_exists(ctx, from_json, deployment_id, type, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6308,7 +6307,7 @@ def deployment_wallet_exists(ctx, from_json, deployment_id, type, if_match): @cli_util.wrap_exceptions def deployment_wallet_exists_default_deployment_wallet_exists_details(ctx, from_json, deployment_id, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6347,7 +6346,7 @@ def deployment_wallet_exists_default_deployment_wallet_exists_details(ctx, from_ @cli_util.wrap_exceptions def export_deployment_wallet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, vault_id, master_encryption_key_id, secret_name, secret_compartment_id, description, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6413,7 +6412,7 @@ def export_deployment_wallet(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def generate_library_url(ctx, from_json, deployment_id, library_type, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6443,7 +6442,7 @@ def generate_library_url(ctx, from_json, deployment_id, library_type, if_match): @cli_util.wrap_exceptions def generate_library_url_generate_log_reader_component_library_url_details(ctx, from_json, deployment_id, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6474,10 +6473,10 @@ def generate_library_url_generate_log_reader_component_library_url_details(ctx, @cli_util.wrap_exceptions def get_certificate(ctx, from_json, deployment_id, certificate_key): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') - if isinstance(certificate_key, six.string_types) and len(certificate_key.strip()) == 0: + if isinstance(certificate_key, str) and len(certificate_key.strip()) == 0: raise click.UsageError('Parameter --certificate-key cannot be whitespace or empty string') kwargs = {} @@ -6501,7 +6500,7 @@ def get_certificate(ctx, from_json, deployment_id, certificate_key): @cli_util.wrap_exceptions def get_connection(ctx, from_json, connection_id, view): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -6525,7 +6524,7 @@ def get_connection(ctx, from_json, connection_id, view): @cli_util.wrap_exceptions def get_connection_assignment(ctx, from_json, connection_assignment_id): - if isinstance(connection_assignment_id, six.string_types) and len(connection_assignment_id.strip()) == 0: + if isinstance(connection_assignment_id, str) and len(connection_assignment_id.strip()) == 0: raise click.UsageError('Parameter --connection-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -6547,7 +6546,7 @@ def get_connection_assignment(ctx, from_json, connection_assignment_id): @cli_util.wrap_exceptions def get_database_registration(ctx, from_json, database_registration_id): - if isinstance(database_registration_id, six.string_types) and len(database_registration_id.strip()) == 0: + if isinstance(database_registration_id, str) and len(database_registration_id.strip()) == 0: raise click.UsageError('Parameter --database-registration-id cannot be whitespace or empty string') kwargs = {} @@ -6569,7 +6568,7 @@ def get_database_registration(ctx, from_json, database_registration_id): @cli_util.wrap_exceptions def get_deployment(ctx, from_json, deployment_id): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6591,7 +6590,7 @@ def get_deployment(ctx, from_json, deployment_id): @cli_util.wrap_exceptions def get_deployment_backup(ctx, from_json, deployment_backup_id): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -6613,7 +6612,7 @@ def get_deployment_backup(ctx, from_json, deployment_backup_id): @cli_util.wrap_exceptions def get_deployment_upgrade(ctx, from_json, deployment_upgrade_id): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -6635,7 +6634,7 @@ def get_deployment_upgrade(ctx, from_json, deployment_upgrade_id): @cli_util.wrap_exceptions def get_pipeline(ctx, from_json, pipeline_id): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -6657,7 +6656,7 @@ def get_pipeline(ctx, from_json, pipeline_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -6690,7 +6689,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def import_deployment_wallet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, vault_id, new_wallet_secret_id, wallet_backup_secret_name, wallet_backup_secret_compartment_id, master_encryption_key_id, description, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -6771,7 +6770,7 @@ def list_certificates(ctx, from_json, all_pages, page_size, deployment_id, lifec if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -7150,7 +7149,7 @@ def list_deployment_peers(ctx, from_json, all_pages, page_size, deployment_id, l if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -7398,7 +7397,7 @@ def list_deployment_wallets_operations(ctx, from_json, all_pages, page_size, dep if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -7575,7 +7574,7 @@ def list_messages(ctx, from_json, all_pages, page_size, deployment_id, limit, pa @cli_util.wrap_exceptions def list_pipeline_initialization_steps(ctx, from_json, all_pages, pipeline_id): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -7606,7 +7605,7 @@ def list_pipeline_running_processes(ctx, from_json, all_pages, page_size, pipeli if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -7666,7 +7665,7 @@ def list_pipeline_schema_tables(ctx, from_json, all_pages, page_size, pipeline_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -7732,7 +7731,7 @@ def list_pipeline_schemas(ctx, from_json, all_pages, page_size, pipeline_id, dis if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -8036,7 +8035,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -8087,7 +8086,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -8188,7 +8187,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, res @cli_util.wrap_exceptions def refresh_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, type, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -8251,7 +8250,7 @@ def refresh_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def refresh_connection_default_refresh_connection_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -8315,7 +8314,7 @@ def refresh_connection_default_refresh_connection_details(ctx, from_json, wait_f @cli_util.wrap_exceptions def remove_connection_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, type, if_match): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') kwargs = {} @@ -8372,7 +8371,7 @@ def remove_connection_lock(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def remove_deployment_backup_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, type, if_match): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -8430,7 +8429,7 @@ def remove_deployment_backup_lock(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def remove_deployment_local_peer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, availability_domain, fault_domain, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -8492,7 +8491,7 @@ def remove_deployment_local_peer(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def remove_deployment_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, type, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -8549,7 +8548,7 @@ def remove_deployment_lock(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def reschedule_deployment_upgrade(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_upgrade_id, type, if_match): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -8606,7 +8605,7 @@ def reschedule_deployment_upgrade(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def reschedule_deployment_upgrade_reschedule_deployment_upgrade_to_date_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_upgrade_id, time_schedule, if_match): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -8666,7 +8665,7 @@ def reschedule_deployment_upgrade_reschedule_deployment_upgrade_to_date_details( @cli_util.wrap_exceptions def restore_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, type, if_match, is_lock_override): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -8729,7 +8728,7 @@ def restore_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def restore_deployment_default_restore_deployment_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, if_match, is_lock_override): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') kwargs = {} @@ -8794,7 +8793,7 @@ def restore_deployment_default_restore_deployment_details(ctx, from_json, wait_f @cli_util.wrap_exceptions def rollback_deployment_upgrade(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_upgrade_id, type, if_match, is_lock_override): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -8857,7 +8856,7 @@ def rollback_deployment_upgrade(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def rollback_deployment_upgrade_default_rollback_deployment_upgrade_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_upgrade_id, if_match, is_lock_override): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -8918,7 +8917,7 @@ def rollback_deployment_upgrade_default_rollback_deployment_upgrade_details(ctx, @cli_util.wrap_exceptions def snooze_deployment_upgrade(ctx, from_json, deployment_upgrade_id, type, if_match): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -8948,7 +8947,7 @@ def snooze_deployment_upgrade(ctx, from_json, deployment_upgrade_id, type, if_ma @cli_util.wrap_exceptions def snooze_deployment_upgrade_default_snooze_deployment_upgrade_details(ctx, from_json, deployment_upgrade_id, if_match): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -8984,7 +8983,7 @@ def snooze_deployment_upgrade_default_snooze_deployment_upgrade_details(ctx, fro @cli_util.wrap_exceptions def start_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, type, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -9047,7 +9046,7 @@ def start_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def start_deployment_default_start_deployment_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -9112,7 +9111,7 @@ def start_deployment_default_start_deployment_details(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def start_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, type, if_match, is_lock_override): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -9175,7 +9174,7 @@ def start_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def start_pipeline_default_start_pipeline_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, if_match, is_lock_override): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -9240,7 +9239,7 @@ def start_pipeline_default_start_pipeline_details(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def stop_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, type, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -9303,7 +9302,7 @@ def stop_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def stop_deployment_default_stop_deployment_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -9368,7 +9367,7 @@ def stop_deployment_default_stop_deployment_details(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def stop_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, type, if_match, is_lock_override): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -9431,7 +9430,7 @@ def stop_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def stop_pipeline_default_stop_pipeline_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, if_match, is_lock_override): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -9496,7 +9495,7 @@ def stop_pipeline_default_stop_pipeline_details(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def switchover_deployment_peer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, availability_domain, fault_domain, if_match): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -9555,7 +9554,7 @@ def switchover_deployment_peer(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def test_connection_assignment(ctx, from_json, connection_assignment_id, type, if_match): - if isinstance(connection_assignment_id, six.string_types) and len(connection_assignment_id.strip()) == 0: + if isinstance(connection_assignment_id, str) and len(connection_assignment_id.strip()) == 0: raise click.UsageError('Parameter --connection-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -9585,7 +9584,7 @@ def test_connection_assignment(ctx, from_json, connection_assignment_id, type, i @cli_util.wrap_exceptions def test_connection_assignment_default_test_connection_assignment_details(ctx, from_json, connection_assignment_id, if_match): - if isinstance(connection_assignment_id, six.string_types) and len(connection_assignment_id.strip()) == 0: + if isinstance(connection_assignment_id, str) and len(connection_assignment_id.strip()) == 0: raise click.UsageError('Parameter --connection-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -9617,7 +9616,7 @@ def test_connection_assignment_default_test_connection_assignment_details(ctx, f @cli_util.wrap_exceptions def test_pipeline_connection(ctx, from_json, pipeline_id, type, if_match): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -9648,7 +9647,7 @@ def test_pipeline_connection(ctx, from_json, pipeline_id, type, if_match): @cli_util.wrap_exceptions def test_pipeline_connection_default_test_pipeline_connection_details(ctx, from_json, pipeline_id, connection_id, if_match): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -9700,7 +9699,7 @@ def test_pipeline_connection_default_test_pipeline_connection_details(ctx, from_ @cli_util.wrap_exceptions def update_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, connection_type, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -9821,7 +9820,7 @@ def update_connection(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_connection_update_elasticsearch_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, servers, security_protocol, authentication_type, username, password, password_secret_id, fingerprint, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -9957,7 +9956,7 @@ def update_connection_update_elasticsearch_connection_details(ctx, from_json, fo @cli_util.wrap_exceptions def update_connection_update_google_big_query_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, service_account_key_file, service_account_key_file_secret_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -10088,7 +10087,7 @@ def update_connection_update_google_big_query_connection_details(ctx, from_json, @cli_util.wrap_exceptions def update_connection_update_oracle_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, username, password, password_secret_id, connection_string, authentication_mode, wallet, wallet_secret_id, session_mode, private_ip, database_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -10235,7 +10234,7 @@ def update_connection_update_oracle_connection_details(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_connection_update_amazon_redshift_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, connection_url, username, password, password_secret_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -10369,7 +10368,7 @@ def update_connection_update_amazon_redshift_connection_details(ctx, from_json, @cli_util.wrap_exceptions def update_connection_update_oci_object_storage_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, tenancy_id, region_parameterconflict, user_id, private_key_file, private_key_file_secret_id, private_key_passphrase, private_key_passphrase_secret_id, public_key_fingerprint, should_use_resource_principal, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -10524,7 +10523,7 @@ def update_connection_update_oci_object_storage_connection_details(ctx, from_jso @cli_util.wrap_exceptions def update_connection_update_redis_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, servers, security_protocol, authentication_type, username, password, password_secret_id, trust_store, trust_store_secret_id, trust_store_password, trust_store_password_secret_id, key_store, key_store_secret_id, key_store_password, key_store_password_secret_id, redis_cluster_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -10693,7 +10692,7 @@ def update_connection_update_redis_connection_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_connection_update_mongo_db_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, connection_string, username, password, password_secret_id, database_id, security_protocol, tls_ca_file, tls_certificate_key_file, tls_certificate_key_file_secret_id, tls_certificate_key_file_password, tls_certificate_key_file_password_secret_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -10841,7 +10840,7 @@ def update_connection_update_mongo_db_connection_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_connection_update_google_cloud_storage_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, service_account_key_file, service_account_key_file_secret_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -10965,7 +10964,7 @@ def update_connection_update_google_cloud_storage_connection_details(ctx, from_j @cli_util.wrap_exceptions def update_connection_update_microsoft_fabric_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, tenant_id, client_id, client_secret, client_secret_secret_id, endpoint_parameterconflict, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -11113,7 +11112,7 @@ def update_connection_update_microsoft_fabric_connection_details(ctx, from_json, @cli_util.wrap_exceptions def update_connection_update_postgresql_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, database_name, host, port, username, password, password_secret_id, additional_attributes, security_protocol, ssl_mode, ssl_ca, ssl_crl, ssl_cert, ssl_key, ssl_key_secret_id, private_ip, db_system_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or additional_attributes: @@ -11289,7 +11288,7 @@ def update_connection_update_postgresql_connection_details(ctx, from_json, force @cli_util.wrap_exceptions def update_connection_update_microsoft_sqlserver_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, database_name, host, port, username, password, password_secret_id, additional_attributes, security_protocol, ssl_ca, should_validate_server_certificate, private_ip, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or additional_attributes: @@ -11444,7 +11443,7 @@ def update_connection_update_microsoft_sqlserver_connection_details(ctx, from_js @cli_util.wrap_exceptions def update_connection_update_snowflake_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, connection_url, authentication_type, username, password, password_secret_id, private_key_file, private_key_file_secret_id, private_key_passphrase, private_key_passphrase_secret_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -11585,7 +11584,7 @@ def update_connection_update_snowflake_connection_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_connection_update_hdfs_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, core_site_xml, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -11709,7 +11708,7 @@ def update_connection_update_hdfs_connection_details(ctx, from_json, force, wait @cli_util.wrap_exceptions def update_connection_update_databricks_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, authentication_type, connection_url, password, password_secret_id, client_id, client_secret, client_secret_secret_id, storage_credential_name, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -11866,7 +11865,7 @@ def update_connection_update_databricks_connection_details(ctx, from_json, force @cli_util.wrap_exceptions def update_connection_update_kafka_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, stream_pool_id, bootstrap_servers, security_protocol, username, password, password_secret_id, trust_store, trust_store_secret_id, trust_store_password, trust_store_password_secret_id, key_store, key_store_secret_id, key_store_password, key_store_password_secret_id, ssl_key_password, ssl_key_password_secret_id, consumer_properties, producer_properties, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or bootstrap_servers: @@ -12045,7 +12044,7 @@ def update_connection_update_kafka_connection_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_connection_update_azure_data_lake_storage_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, authentication_type, account_name, account_key, account_key_secret_id, sas_token, sas_token_secret_id, azure_tenant_id, client_id, client_secret, client_secret_secret_id, endpoint_parameterconflict, azure_authority_host, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -12199,7 +12198,7 @@ def update_connection_update_azure_data_lake_storage_connection_details(ctx, fro @cli_util.wrap_exceptions def update_connection_update_amazon_kinesis_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, access_key_id, secret_access_key, secret_access_key_secret_id, endpoint_parameterconflict, region_parameterconflict, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -12354,7 +12353,7 @@ def update_connection_update_amazon_kinesis_connection_details(ctx, from_json, f @cli_util.wrap_exceptions def update_connection_update_java_message_service_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, should_use_jndi, jndi_connection_factory, jndi_provider_url, jndi_initial_context_factory, jndi_security_principal, jndi_security_credentials, jndi_security_credentials_secret_id, connection_url, connection_factory, username, password, password_secret_id, security_protocol, authentication_type, trust_store, trust_store_secret_id, trust_store_password, trust_store_password_secret_id, key_store, key_store_secret_id, key_store_password, key_store_password_secret_id, ssl_key_password, ssl_key_password_secret_id, private_ip, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -12551,7 +12550,7 @@ def update_connection_update_java_message_service_connection_details(ctx, from_j @cli_util.wrap_exceptions def update_connection_update_golden_gate_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, deployment_id, host, port, username, password, password_secret_id, private_ip, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -12687,7 +12686,7 @@ def update_connection_update_golden_gate_connection_details(ctx, from_json, forc @cli_util.wrap_exceptions def update_connection_update_google_pub_sub_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, service_account_key_file, service_account_key_file_secret_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -12815,7 +12814,7 @@ def update_connection_update_google_pub_sub_connection_details(ctx, from_json, f @cli_util.wrap_exceptions def update_connection_update_oracle_nosql_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, tenancy_id, region_parameterconflict, user_id, private_key_file, private_key_file_secret_id, private_key_passphrase, private_key_passphrase_secret_id, public_key_fingerprint, should_use_resource_principal, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -12973,7 +12972,7 @@ def update_connection_update_oracle_nosql_connection_details(ctx, from_json, for @cli_util.wrap_exceptions def update_connection_update_kafka_schema_registry_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, url, authentication_type, username, password, password_secret_id, trust_store, trust_store_secret_id, trust_store_password, trust_store_password_secret_id, key_store, key_store_secret_id, key_store_password, key_store_password_secret_id, ssl_key_password, ssl_key_password_secret_id, private_ip, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -13139,7 +13138,7 @@ def update_connection_update_kafka_schema_registry_connection_details(ctx, from_ @cli_util.wrap_exceptions def update_connection_update_amazon_s3_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, access_key_id, secret_access_key, secret_access_key_secret_id, endpoint_parameterconflict, region_parameterconflict, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -13287,7 +13286,7 @@ def update_connection_update_amazon_s3_connection_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_connection_update_mysql_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, username, password, password_secret_id, host, port, database_name, security_protocol, ssl_mode, ssl_ca, ssl_crl, ssl_cert, ssl_key, ssl_key_secret_id, private_ip, additional_attributes, db_system_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or additional_attributes: @@ -13471,7 +13470,7 @@ def update_connection_update_mysql_connection_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_connection_update_db2_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, database_name, host, port, username, password, password_secret_id, additional_attributes, security_protocol, ssl_client_keystoredb, ssl_client_keystoredb_secret_id, ssl_client_keystash, ssl_client_keystash_secret_id, ssl_server_certificate, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or additional_attributes: @@ -13625,7 +13624,7 @@ def update_connection_update_db2_connection_details(ctx, from_json, force, wait_ @cli_util.wrap_exceptions def update_connection_update_iceberg_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, catalog, storage, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or catalog or storage: @@ -13747,7 +13746,7 @@ def update_connection_update_iceberg_connection_details(ctx, from_json, force, w @cli_util.wrap_exceptions def update_connection_update_generic_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, host, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -13867,7 +13866,7 @@ def update_connection_update_generic_connection_details(ctx, from_json, force, w @cli_util.wrap_exceptions def update_connection_update_azure_synapse_connection_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_id, display_name, description, freeform_tags, defined_tags, vault_id, key_id, nsg_ids, subnet_id, routing_method, does_use_secret_ids, connection_string, username, password, password_secret_id, if_match, is_lock_override): - if isinstance(connection_id, six.string_types) and len(connection_id.strip()) == 0: + if isinstance(connection_id, str) and len(connection_id.strip()) == 0: raise click.UsageError('Parameter --connection-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids: @@ -13992,7 +13991,7 @@ def update_connection_update_azure_synapse_connection_details(ctx, from_json, fo @cli_util.wrap_exceptions def update_database_registration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_registration_id, display_name, description, freeform_tags, defined_tags, fqdn, username, password, connection_string, session_mode, wallet, alias_name, if_match): - if isinstance(database_registration_id, six.string_types) and len(database_registration_id.strip()) == 0: + if isinstance(database_registration_id, str) and len(database_registration_id.strip()) == 0: raise click.UsageError('Parameter --database-registration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -14116,7 +14115,7 @@ def update_database_registration(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_deployment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, display_name, license_model, is_byol_cpu_core_count_limit_enabled, byol_cpu_core_count_limit, environment_type, description, freeform_tags, defined_tags, nsg_ids, subnet_id, load_balancer_subnet_id, is_public, fqdn, cpu_core_count, is_auto_scaling_enabled, placements, ogg_data, maintenance_window, maintenance_configuration, backup_schedule, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or placements or ogg_data or maintenance_window or maintenance_configuration or backup_schedule: @@ -14249,7 +14248,7 @@ def update_deployment(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_deployment_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_backup_id, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(deployment_backup_id, six.string_types) and len(deployment_backup_id.strip()) == 0: + if isinstance(deployment_backup_id, str) and len(deployment_backup_id.strip()) == 0: raise click.UsageError('Parameter --deployment-backup-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -14328,7 +14327,7 @@ def update_deployment_backup(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_pipeline(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, recipe_type, display_name, description, license_model, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -14426,7 +14425,7 @@ def update_pipeline(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_pipeline_update_zero_etl_pipeline_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, pipeline_id, display_name, description, license_model, freeform_tags, defined_tags, process_options, mapping_rules, if_match, is_lock_override): - if isinstance(pipeline_id, six.string_types) and len(pipeline_id.strip()) == 0: + if isinstance(pipeline_id, str) and len(pipeline_id.strip()) == 0: raise click.UsageError('Parameter --pipeline-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or process_options or mapping_rules: @@ -14516,7 +14515,7 @@ def update_pipeline_update_zero_etl_pipeline_details(ctx, from_json, force, wait @cli_util.wrap_exceptions def upgrade_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, type, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -14580,7 +14579,7 @@ def upgrade_deployment(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def upgrade_deployment_upgrade_deployment_specific_release_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, ogg_version, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -14645,7 +14644,7 @@ def upgrade_deployment_upgrade_deployment_specific_release_details(ctx, from_jso @cli_util.wrap_exceptions def upgrade_deployment_upgrade_deployment_current_release_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_id, if_match, is_lock_override): - if isinstance(deployment_id, six.string_types) and len(deployment_id.strip()) == 0: + if isinstance(deployment_id, str) and len(deployment_id.strip()) == 0: raise click.UsageError('Parameter --deployment-id cannot be whitespace or empty string') kwargs = {} @@ -14710,7 +14709,7 @@ def upgrade_deployment_upgrade_deployment_current_release_details(ctx, from_json @cli_util.wrap_exceptions def upgrade_deployment_upgrade(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_upgrade_id, type, if_match, is_lock_override): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} @@ -14773,7 +14772,7 @@ def upgrade_deployment_upgrade(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def upgrade_deployment_upgrade_default_upgrade_deployment_upgrade_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, deployment_upgrade_id, if_match, is_lock_override): - if isinstance(deployment_upgrade_id, six.string_types) and len(deployment_upgrade_id.strip()) == 0: + if isinstance(deployment_upgrade_id, str) and len(deployment_upgrade_id.strip()) == 0: raise click.UsageError('Parameter --deployment-upgrade-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/governance_rules_control_plane/src/oci_cli_governance_rule/generated/governancerule_cli.py b/services/governance_rules_control_plane/src/oci_cli_governance_rule/generated/governancerule_cli.py index 8c9936253..773eb2433 100644 --- a/services/governance_rules_control_plane/src/oci_cli_governance_rule/generated/governancerule_cli.py +++ b/services/governance_rules_control_plane/src/oci_cli_governance_rule/generated/governancerule_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -547,7 +546,7 @@ def create_inclusion_criterion_tenancy_association(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def delete_governance_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_rule_id, if_match): - if isinstance(governance_rule_id, six.string_types) and len(governance_rule_id.strip()) == 0: + if isinstance(governance_rule_id, str) and len(governance_rule_id.strip()) == 0: raise click.UsageError('Parameter --governance-rule-id cannot be whitespace or empty string') kwargs = {} @@ -603,7 +602,7 @@ def delete_governance_rule(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_inclusion_criterion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, inclusion_criterion_id, if_match): - if isinstance(inclusion_criterion_id, six.string_types) and len(inclusion_criterion_id.strip()) == 0: + if isinstance(inclusion_criterion_id, str) and len(inclusion_criterion_id.strip()) == 0: raise click.UsageError('Parameter --inclusion-criterion-id cannot be whitespace or empty string') kwargs = {} @@ -654,7 +653,7 @@ def delete_inclusion_criterion(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_enforced_governance_rule(ctx, from_json, enforced_governance_rule_id): - if isinstance(enforced_governance_rule_id, six.string_types) and len(enforced_governance_rule_id.strip()) == 0: + if isinstance(enforced_governance_rule_id, str) and len(enforced_governance_rule_id.strip()) == 0: raise click.UsageError('Parameter --enforced-governance-rule-id cannot be whitespace or empty string') kwargs = {} @@ -676,7 +675,7 @@ def get_enforced_governance_rule(ctx, from_json, enforced_governance_rule_id): @cli_util.wrap_exceptions def get_governance_rule(ctx, from_json, governance_rule_id): - if isinstance(governance_rule_id, six.string_types) and len(governance_rule_id.strip()) == 0: + if isinstance(governance_rule_id, str) and len(governance_rule_id.strip()) == 0: raise click.UsageError('Parameter --governance-rule-id cannot be whitespace or empty string') kwargs = {} @@ -698,7 +697,7 @@ def get_governance_rule(ctx, from_json, governance_rule_id): @cli_util.wrap_exceptions def get_inclusion_criterion(ctx, from_json, inclusion_criterion_id): - if isinstance(inclusion_criterion_id, six.string_types) and len(inclusion_criterion_id.strip()) == 0: + if isinstance(inclusion_criterion_id, str) and len(inclusion_criterion_id.strip()) == 0: raise click.UsageError('Parameter --inclusion-criterion-id cannot be whitespace or empty string') kwargs = {} @@ -720,7 +719,7 @@ def get_inclusion_criterion(ctx, from_json, inclusion_criterion_id): @cli_util.wrap_exceptions def get_tenancy_attachment(ctx, from_json, tenancy_attachment_id): - if isinstance(tenancy_attachment_id, six.string_types) and len(tenancy_attachment_id.strip()) == 0: + if isinstance(tenancy_attachment_id, str) and len(tenancy_attachment_id.strip()) == 0: raise click.UsageError('Parameter --tenancy-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -998,7 +997,7 @@ def list_tenancy_attachments(ctx, from_json, all_pages, page_size, compartment_i @cli_util.wrap_exceptions def retry_governance_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_rule_id, if_match): - if isinstance(governance_rule_id, six.string_types) and len(governance_rule_id.strip()) == 0: + if isinstance(governance_rule_id, str) and len(governance_rule_id.strip()) == 0: raise click.UsageError('Parameter --governance-rule-id cannot be whitespace or empty string') kwargs = {} @@ -1053,7 +1052,7 @@ def retry_governance_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def retry_tenancy_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tenancy_attachment_id, if_match): - if isinstance(tenancy_attachment_id, six.string_types) and len(tenancy_attachment_id.strip()) == 0: + if isinstance(tenancy_attachment_id, str) and len(tenancy_attachment_id.strip()) == 0: raise click.UsageError('Parameter --tenancy-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -1115,7 +1114,7 @@ def retry_tenancy_attachment(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_governance_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_rule_id, display_name, description, template, related_resource_id, freeform_tags, defined_tags, if_match): - if isinstance(governance_rule_id, six.string_types) and len(governance_rule_id.strip()) == 0: + if isinstance(governance_rule_id, str) and len(governance_rule_id.strip()) == 0: raise click.UsageError('Parameter --governance-rule-id cannot be whitespace or empty string') if not force: if template or freeform_tags or defined_tags: @@ -1210,7 +1209,7 @@ def update_governance_rule(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_governance_rule_tag_template(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_rule_id, template_name, display_name, description, related_resource_id, freeform_tags, defined_tags, if_match, template_description, template_tags, template_tag_defaults): - if isinstance(governance_rule_id, six.string_types) and len(governance_rule_id.strip()) == 0: + if isinstance(governance_rule_id, str) and len(governance_rule_id.strip()) == 0: raise click.UsageError('Parameter --governance-rule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1310,7 +1309,7 @@ def update_governance_rule_tag_template(ctx, from_json, force, wait_for_state, m @cli_util.wrap_exceptions def update_governance_rule_quota_template(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_rule_id, template_display_name, template_statements, display_name, description, related_resource_id, freeform_tags, defined_tags, if_match, template_description): - if isinstance(governance_rule_id, six.string_types) and len(governance_rule_id.strip()) == 0: + if isinstance(governance_rule_id, str) and len(governance_rule_id.strip()) == 0: raise click.UsageError('Parameter --governance-rule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1405,7 +1404,7 @@ def update_governance_rule_quota_template(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_governance_rule_allowed_regions_template(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, governance_rule_id, template_display_name, template_regions, display_name, description, related_resource_id, freeform_tags, defined_tags, if_match, template_description): - if isinstance(governance_rule_id, six.string_types) and len(governance_rule_id.strip()) == 0: + if isinstance(governance_rule_id, str) and len(governance_rule_id.strip()) == 0: raise click.UsageError('Parameter --governance-rule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/governance_rules_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py b/services/governance_rules_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py index e10909379..2fb7142bb 100644 --- a/services/governance_rules_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py +++ b/services/governance_rules_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def work_request_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -81,7 +80,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -112,7 +111,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -169,7 +168,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/healthchecks/src/oci_cli_health_checks/generated/healthchecks_cli.py b/services/healthchecks/src/oci_cli_health_checks/generated/healthchecks_cli.py index a195c46ef..fae438c35 100644 --- a/services/healthchecks/src/oci_cli_health_checks/generated/healthchecks_cli.py +++ b/services/healthchecks/src/oci_cli_health_checks/generated/healthchecks_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -86,7 +85,7 @@ def http_probe_group(): @cli_util.wrap_exceptions def change_http_monitor_compartment(ctx, from_json, monitor_id, compartment_id, if_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -117,7 +116,7 @@ def change_http_monitor_compartment(ctx, from_json, monitor_id, compartment_id, @cli_util.wrap_exceptions def change_ping_monitor_compartment(ctx, from_json, monitor_id, compartment_id, if_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -368,7 +367,7 @@ def create_ping_monitor(ctx, from_json, compartment_id, targets, protocol, displ @cli_util.wrap_exceptions def delete_http_monitor(ctx, from_json, monitor_id, if_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -394,7 +393,7 @@ def delete_http_monitor(ctx, from_json, monitor_id, if_match): @cli_util.wrap_exceptions def delete_ping_monitor(ctx, from_json, monitor_id, if_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -419,7 +418,7 @@ def delete_ping_monitor(ctx, from_json, monitor_id, if_match): @cli_util.wrap_exceptions def get_http_monitor(ctx, from_json, monitor_id, if_none_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -444,7 +443,7 @@ def get_http_monitor(ctx, from_json, monitor_id, if_none_match): @cli_util.wrap_exceptions def get_ping_monitor(ctx, from_json, monitor_id, if_none_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') kwargs = {} @@ -595,7 +594,7 @@ def list_http_probe_results(ctx, from_json, all_pages, page_size, probe_configur if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(probe_configuration_id, six.string_types) and len(probe_configuration_id.strip()) == 0: + if isinstance(probe_configuration_id, str) and len(probe_configuration_id.strip()) == 0: raise click.UsageError('Parameter --probe-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -722,7 +721,7 @@ def list_ping_probe_results(ctx, from_json, all_pages, page_size, probe_configur if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(probe_configuration_id, six.string_types) and len(probe_configuration_id.strip()) == 0: + if isinstance(probe_configuration_id, str) and len(probe_configuration_id.strip()) == 0: raise click.UsageError('Parameter --probe-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -791,7 +790,7 @@ def list_ping_probe_results(ctx, from_json, all_pages, page_size, probe_configur @cli_util.wrap_exceptions def update_http_monitor(ctx, from_json, force, monitor_id, targets, vantage_point_names, port, timeout_in_seconds, protocol, method, path, headers, display_name, interval_in_seconds, is_enabled, freeform_tags, defined_tags, if_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if targets or vantage_point_names or headers or freeform_tags or defined_tags: @@ -874,7 +873,7 @@ def update_http_monitor(ctx, from_json, force, monitor_id, targets, vantage_poin @cli_util.wrap_exceptions def update_ping_monitor(ctx, from_json, force, monitor_id, targets, vantage_point_names, port, timeout_in_seconds, protocol, display_name, interval_in_seconds, is_enabled, freeform_tags, defined_tags, if_match): - if isinstance(monitor_id, six.string_types) and len(monitor_id.strip()) == 0: + if isinstance(monitor_id, str) and len(monitor_id.strip()) == 0: raise click.UsageError('Parameter --monitor-id cannot be whitespace or empty string') if not force: if targets or vantage_point_names or freeform_tags or defined_tags: diff --git a/services/identity/src/oci_cli_identity/generated/identity_cli.py b/services/identity/src/oci_cli_identity/generated/identity_cli.py index ec3d4cd9a..156b93b14 100644 --- a/services/identity/src/oci_cli_identity/generated/identity_cli.py +++ b/services/identity/src/oci_cli_identity/generated/identity_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -389,7 +388,7 @@ def user_group(): @cli_util.wrap_exceptions def activate_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -443,10 +442,10 @@ def activate_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def activate_mfa_totp_device(ctx, from_json, user_id, mfa_totp_device_id, totp_token, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(mfa_totp_device_id, six.string_types) and len(mfa_totp_device_id.strip()) == 0: + if isinstance(mfa_totp_device_id, str) and len(mfa_totp_device_id.strip()) == 0: raise click.UsageError('Parameter --mfa-totp-device-id cannot be whitespace or empty string') kwargs = {} @@ -484,7 +483,7 @@ def activate_mfa_totp_device(ctx, from_json, user_id, mfa_totp_device_id, totp_t @cli_util.wrap_exceptions def add_tag_default_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_default_id, type, related_resource_id, message, if_match): - if isinstance(tag_default_id, six.string_types) and len(tag_default_id.strip()) == 0: + if isinstance(tag_default_id, str) and len(tag_default_id.strip()) == 0: raise click.UsageError('Parameter --tag-default-id cannot be whitespace or empty string') kwargs = {} @@ -549,7 +548,7 @@ def add_tag_default_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def add_tag_namespace_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, type, related_resource_id, message, if_match): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -684,7 +683,7 @@ def assemble_effective_tag_set(ctx, from_json, compartment_id, lifecycle_state): @cli_util.wrap_exceptions def bulk_delete_resources(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, resources): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') kwargs = {} @@ -874,7 +873,7 @@ def bulk_edit_tags(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def bulk_move_resources(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, resources, target_compartment_id): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') kwargs = {} @@ -946,7 +945,7 @@ def bulk_move_resources(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def cascade_delete_tag_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, if_match, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -1006,7 +1005,7 @@ def cascade_delete_tag_namespace(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def change_domain_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, compartment_id, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -1071,7 +1070,7 @@ def change_domain_compartment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_domain_license_type(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, license_type, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -1135,7 +1134,7 @@ def change_domain_license_type(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_tag_namespace_compartment(ctx, from_json, tag_namespace_id, compartment_id, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -1170,7 +1169,7 @@ def change_tag_namespace_compartment(ctx, from_json, tag_namespace_id, compartme @cli_util.wrap_exceptions def create_auth_token(ctx, from_json, description, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -1269,7 +1268,7 @@ def create_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def create_customer_secret_key(ctx, from_json, display_name, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -1299,7 +1298,7 @@ def create_customer_secret_key(ctx, from_json, display_name, user_id): @cli_util.wrap_exceptions def create_db_credential(ctx, from_json, password, description, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -1743,7 +1742,7 @@ def create_identity_provider_create_saml2_identity_provider_details(ctx, from_js @cli_util.wrap_exceptions def create_idp_group_mapping(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, idp_group_name, group_id, identity_provider_id): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -1796,7 +1795,7 @@ def create_idp_group_mapping(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_mfa_totp_device(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -1901,7 +1900,7 @@ def create_network_source(ctx, from_json, compartment_id, name, description, pub @cli_util.wrap_exceptions def create_o_auth_client_credential(ctx, from_json, user_id, name, description, scopes): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -1935,7 +1934,7 @@ def create_o_auth_client_credential(ctx, from_json, user_id, name, description, @cli_util.wrap_exceptions def create_or_reset_ui_password(ctx, from_json, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -2035,7 +2034,7 @@ def create_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def create_region_subscription(ctx, from_json, region_key, tenancy_id): - if isinstance(tenancy_id, six.string_types) and len(tenancy_id.strip()) == 0: + if isinstance(tenancy_id, str) and len(tenancy_id.strip()) == 0: raise click.UsageError('Parameter --tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -2064,7 +2063,7 @@ def create_region_subscription(ctx, from_json, region_key, tenancy_id): @cli_util.wrap_exceptions def create_smtp_credential(ctx, from_json, description, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -2099,7 +2098,7 @@ def create_smtp_credential(ctx, from_json, description, user_id): @cli_util.wrap_exceptions def create_swift_password(ctx, from_json, description, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -2149,7 +2148,7 @@ def create_swift_password(ctx, from_json, description, user_id): @cli_util.wrap_exceptions def create_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, name, description, freeform_tags, defined_tags, is_cost_tracking, validator, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -2236,7 +2235,7 @@ def create_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def create_tag_default_tag_definition_validator(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, name, description, freeform_tags, defined_tags, is_cost_tracking, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -2324,7 +2323,7 @@ def create_tag_default_tag_definition_validator(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def create_tag_enum_tag_definition_validator(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, name, description, freeform_tags, defined_tags, is_cost_tracking, is_lock_override, validator_values): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -2626,7 +2625,7 @@ def create_user(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def deactivate_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -2682,10 +2681,10 @@ def deactivate_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_api_key(ctx, from_json, user_id, fingerprint, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(fingerprint, six.string_types) and len(fingerprint.strip()) == 0: + if isinstance(fingerprint, str) and len(fingerprint.strip()) == 0: raise click.UsageError('Parameter --fingerprint cannot be whitespace or empty string') kwargs = {} @@ -2712,10 +2711,10 @@ def delete_api_key(ctx, from_json, user_id, fingerprint, if_match): @cli_util.wrap_exceptions def delete_auth_token(ctx, from_json, user_id, auth_token_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(auth_token_id, six.string_types) and len(auth_token_id.strip()) == 0: + if isinstance(auth_token_id, str) and len(auth_token_id.strip()) == 0: raise click.UsageError('Parameter --auth-token-id cannot be whitespace or empty string') kwargs = {} @@ -2744,7 +2743,7 @@ def delete_auth_token(ctx, from_json, user_id, auth_token_id, if_match): @cli_util.wrap_exceptions def delete_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, if_match): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') kwargs = {} @@ -2797,10 +2796,10 @@ def delete_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_customer_secret_key(ctx, from_json, user_id, customer_secret_key_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(customer_secret_key_id, six.string_types) and len(customer_secret_key_id.strip()) == 0: + if isinstance(customer_secret_key_id, str) and len(customer_secret_key_id.strip()) == 0: raise click.UsageError('Parameter --customer-secret-key-id cannot be whitespace or empty string') kwargs = {} @@ -2827,10 +2826,10 @@ def delete_customer_secret_key(ctx, from_json, user_id, customer_secret_key_id, @cli_util.wrap_exceptions def delete_db_credential(ctx, from_json, user_id, db_credential_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(db_credential_id, six.string_types) and len(db_credential_id.strip()) == 0: + if isinstance(db_credential_id, str) and len(db_credential_id.strip()) == 0: raise click.UsageError('Parameter --db-credential-id cannot be whitespace or empty string') kwargs = {} @@ -2862,7 +2861,7 @@ def delete_db_credential(ctx, from_json, user_id, db_credential_id, if_match): @cli_util.wrap_exceptions def delete_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -2918,7 +2917,7 @@ def delete_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_dynamic_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, dynamic_group_id, if_match): - if isinstance(dynamic_group_id, six.string_types) and len(dynamic_group_id.strip()) == 0: + if isinstance(dynamic_group_id, str) and len(dynamic_group_id.strip()) == 0: raise click.UsageError('Parameter --dynamic-group-id cannot be whitespace or empty string') kwargs = {} @@ -2981,7 +2980,7 @@ def delete_dynamic_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, group_id, if_match): - if isinstance(group_id, six.string_types) and len(group_id.strip()) == 0: + if isinstance(group_id, str) and len(group_id.strip()) == 0: raise click.UsageError('Parameter --group-id cannot be whitespace or empty string') kwargs = {} @@ -3046,7 +3045,7 @@ def delete_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_identity_provider(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, identity_provider_id, if_match): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -3109,10 +3108,10 @@ def delete_identity_provider(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_idp_group_mapping(ctx, from_json, identity_provider_id, mapping_id, if_match): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') - if isinstance(mapping_id, six.string_types) and len(mapping_id.strip()) == 0: + if isinstance(mapping_id, str) and len(mapping_id.strip()) == 0: raise click.UsageError('Parameter --mapping-id cannot be whitespace or empty string') kwargs = {} @@ -3139,10 +3138,10 @@ def delete_idp_group_mapping(ctx, from_json, identity_provider_id, mapping_id, i @cli_util.wrap_exceptions def delete_mfa_totp_device(ctx, from_json, user_id, mfa_totp_device_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(mfa_totp_device_id, six.string_types) and len(mfa_totp_device_id.strip()) == 0: + if isinstance(mfa_totp_device_id, str) and len(mfa_totp_device_id.strip()) == 0: raise click.UsageError('Parameter --mfa-totp-device-id cannot be whitespace or empty string') kwargs = {} @@ -3168,7 +3167,7 @@ def delete_mfa_totp_device(ctx, from_json, user_id, mfa_totp_device_id, if_match @cli_util.wrap_exceptions def delete_network_source(ctx, from_json, network_source_id, if_match): - if isinstance(network_source_id, six.string_types) and len(network_source_id.strip()) == 0: + if isinstance(network_source_id, str) and len(network_source_id.strip()) == 0: raise click.UsageError('Parameter --network-source-id cannot be whitespace or empty string') kwargs = {} @@ -3194,10 +3193,10 @@ def delete_network_source(ctx, from_json, network_source_id, if_match): @cli_util.wrap_exceptions def delete_o_auth_client_credential(ctx, from_json, user_id, oauth2_client_credential_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(oauth2_client_credential_id, six.string_types) and len(oauth2_client_credential_id.strip()) == 0: + if isinstance(oauth2_client_credential_id, str) and len(oauth2_client_credential_id.strip()) == 0: raise click.UsageError('Parameter --oauth2-client-credential-id cannot be whitespace or empty string') kwargs = {} @@ -3226,7 +3225,7 @@ def delete_o_auth_client_credential(ctx, from_json, user_id, oauth2_client_crede @cli_util.wrap_exceptions def delete_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, policy_id, if_match): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') kwargs = {} @@ -3287,10 +3286,10 @@ def delete_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_smtp_credential(ctx, from_json, user_id, smtp_credential_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(smtp_credential_id, six.string_types) and len(smtp_credential_id.strip()) == 0: + if isinstance(smtp_credential_id, str) and len(smtp_credential_id.strip()) == 0: raise click.UsageError('Parameter --smtp-credential-id cannot be whitespace or empty string') kwargs = {} @@ -3319,10 +3318,10 @@ def delete_smtp_credential(ctx, from_json, user_id, smtp_credential_id, if_match @cli_util.wrap_exceptions def delete_swift_password(ctx, from_json, user_id, swift_password_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(swift_password_id, six.string_types) and len(swift_password_id.strip()) == 0: + if isinstance(swift_password_id, str) and len(swift_password_id.strip()) == 0: raise click.UsageError('Parameter --swift-password-id cannot be whitespace or empty string') kwargs = {} @@ -3363,10 +3362,10 @@ def delete_swift_password(ctx, from_json, user_id, swift_password_id, if_match): @cli_util.wrap_exceptions def delete_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, tag_name, if_match, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') - if isinstance(tag_name, six.string_types) and len(tag_name.strip()) == 0: + if isinstance(tag_name, str) and len(tag_name.strip()) == 0: raise click.UsageError('Parameter --tag-name cannot be whitespace or empty string') kwargs = {} @@ -3425,7 +3424,7 @@ def delete_tag(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_tag_default(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_default_id, if_match, is_lock_override): - if isinstance(tag_default_id, six.string_types) and len(tag_default_id.strip()) == 0: + if isinstance(tag_default_id, str) and len(tag_default_id.strip()) == 0: raise click.UsageError('Parameter --tag-default-id cannot be whitespace or empty string') kwargs = {} @@ -3496,7 +3495,7 @@ def delete_tag_default(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_tag_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, if_match, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -3562,7 +3561,7 @@ def delete_tag_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_user(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -3631,7 +3630,7 @@ def delete_user(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def enable_replication_to_region(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, replica_region, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -3694,10 +3693,10 @@ def enable_replication_to_region(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def generate_totp_seed(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_id, mfa_totp_device_id, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(mfa_totp_device_id, six.string_types) and len(mfa_totp_device_id.strip()) == 0: + if isinstance(mfa_totp_device_id, str) and len(mfa_totp_device_id.strip()) == 0: raise click.UsageError('Parameter --mfa-totp-device-id cannot be whitespace or empty string') kwargs = {} @@ -3744,7 +3743,7 @@ def generate_totp_seed(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_authentication_policy(ctx, from_json, compartment_id): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') kwargs = {} @@ -3767,7 +3766,7 @@ def get_authentication_policy(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_compartment(ctx, from_json, compartment_id): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') kwargs = {} @@ -3788,7 +3787,7 @@ def get_compartment(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_domain(ctx, from_json, domain_id): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -3810,7 +3809,7 @@ def get_domain(ctx, from_json, domain_id): @cli_util.wrap_exceptions def get_dynamic_group(ctx, from_json, dynamic_group_id): - if isinstance(dynamic_group_id, six.string_types) and len(dynamic_group_id.strip()) == 0: + if isinstance(dynamic_group_id, str) and len(dynamic_group_id.strip()) == 0: raise click.UsageError('Parameter --dynamic-group-id cannot be whitespace or empty string') kwargs = {} @@ -3833,7 +3832,7 @@ def get_dynamic_group(ctx, from_json, dynamic_group_id): @cli_util.wrap_exceptions def get_group(ctx, from_json, group_id): - if isinstance(group_id, six.string_types) and len(group_id.strip()) == 0: + if isinstance(group_id, str) and len(group_id.strip()) == 0: raise click.UsageError('Parameter --group-id cannot be whitespace or empty string') kwargs = {} @@ -3854,7 +3853,7 @@ def get_group(ctx, from_json, group_id): @cli_util.wrap_exceptions def get_iam_work_request(ctx, from_json, iam_work_request_id): - if isinstance(iam_work_request_id, six.string_types) and len(iam_work_request_id.strip()) == 0: + if isinstance(iam_work_request_id, str) and len(iam_work_request_id.strip()) == 0: raise click.UsageError('Parameter --iam-work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3878,7 +3877,7 @@ def get_iam_work_request(ctx, from_json, iam_work_request_id): @cli_util.wrap_exceptions def get_identity_provider(ctx, from_json, identity_provider_id): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -3902,10 +3901,10 @@ def get_identity_provider(ctx, from_json, identity_provider_id): @cli_util.wrap_exceptions def get_idp_group_mapping(ctx, from_json, identity_provider_id, mapping_id): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') - if isinstance(mapping_id, six.string_types) and len(mapping_id.strip()) == 0: + if isinstance(mapping_id, str) and len(mapping_id.strip()) == 0: raise click.UsageError('Parameter --mapping-id cannot be whitespace or empty string') kwargs = {} @@ -3928,10 +3927,10 @@ def get_idp_group_mapping(ctx, from_json, identity_provider_id, mapping_id): @cli_util.wrap_exceptions def get_mfa_totp_device(ctx, from_json, user_id, mfa_totp_device_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(mfa_totp_device_id, six.string_types) and len(mfa_totp_device_id.strip()) == 0: + if isinstance(mfa_totp_device_id, str) and len(mfa_totp_device_id.strip()) == 0: raise click.UsageError('Parameter --mfa-totp-device-id cannot be whitespace or empty string') kwargs = {} @@ -3953,7 +3952,7 @@ def get_mfa_totp_device(ctx, from_json, user_id, mfa_totp_device_id): @cli_util.wrap_exceptions def get_network_source(ctx, from_json, network_source_id): - if isinstance(network_source_id, six.string_types) and len(network_source_id.strip()) == 0: + if isinstance(network_source_id, str) and len(network_source_id.strip()) == 0: raise click.UsageError('Parameter --network-source-id cannot be whitespace or empty string') kwargs = {} @@ -3974,7 +3973,7 @@ def get_network_source(ctx, from_json, network_source_id): @cli_util.wrap_exceptions def get_policy(ctx, from_json, policy_id): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') kwargs = {} @@ -3996,7 +3995,7 @@ def get_policy(ctx, from_json, policy_id): @cli_util.wrap_exceptions def get_standard_tag_template(ctx, from_json, compartment_id, standard_tag_namespace_name): - if isinstance(standard_tag_namespace_name, six.string_types) and len(standard_tag_namespace_name.strip()) == 0: + if isinstance(standard_tag_namespace_name, str) and len(standard_tag_namespace_name.strip()) == 0: raise click.UsageError('Parameter --standard-tag-namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4019,10 +4018,10 @@ def get_standard_tag_template(ctx, from_json, compartment_id, standard_tag_names @cli_util.wrap_exceptions def get_tag(ctx, from_json, tag_namespace_id, tag_name): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') - if isinstance(tag_name, six.string_types) and len(tag_name.strip()) == 0: + if isinstance(tag_name, str) and len(tag_name.strip()) == 0: raise click.UsageError('Parameter --tag-name cannot be whitespace or empty string') kwargs = {} @@ -4044,7 +4043,7 @@ def get_tag(ctx, from_json, tag_namespace_id, tag_name): @cli_util.wrap_exceptions def get_tag_default(ctx, from_json, tag_default_id): - if isinstance(tag_default_id, six.string_types) and len(tag_default_id.strip()) == 0: + if isinstance(tag_default_id, str) and len(tag_default_id.strip()) == 0: raise click.UsageError('Parameter --tag-default-id cannot be whitespace or empty string') kwargs = {} @@ -4065,7 +4064,7 @@ def get_tag_default(ctx, from_json, tag_default_id): @cli_util.wrap_exceptions def get_tag_namespace(ctx, from_json, tag_namespace_id): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -4086,7 +4085,7 @@ def get_tag_namespace(ctx, from_json, tag_namespace_id): @cli_util.wrap_exceptions def get_tagging_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4107,7 +4106,7 @@ def get_tagging_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def get_tenancy(ctx, from_json, tenancy_id): - if isinstance(tenancy_id, six.string_types) and len(tenancy_id.strip()) == 0: + if isinstance(tenancy_id, str) and len(tenancy_id.strip()) == 0: raise click.UsageError('Parameter --tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -4128,7 +4127,7 @@ def get_tenancy(ctx, from_json, tenancy_id): @cli_util.wrap_exceptions def get_user(ctx, from_json, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -4149,7 +4148,7 @@ def get_user(ctx, from_json, user_id): @cli_util.wrap_exceptions def get_user_group_membership(ctx, from_json, user_group_membership_id): - if isinstance(user_group_membership_id, six.string_types) and len(user_group_membership_id.strip()) == 0: + if isinstance(user_group_membership_id, str) and len(user_group_membership_id.strip()) == 0: raise click.UsageError('Parameter --user-group-membership-id cannot be whitespace or empty string') kwargs = {} @@ -4170,7 +4169,7 @@ def get_user_group_membership(ctx, from_json, user_group_membership_id): @cli_util.wrap_exceptions def get_user_ui_password_information(ctx, from_json, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -4191,7 +4190,7 @@ def get_user_ui_password_information(ctx, from_json, user_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4293,7 +4292,7 @@ def list_allowed_domain_license_types(ctx, from_json, all_pages, current_license @cli_util.wrap_exceptions def list_api_keys(ctx, from_json, all_pages, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -4315,7 +4314,7 @@ def list_api_keys(ctx, from_json, all_pages, user_id): @cli_util.wrap_exceptions def list_auth_tokens(ctx, from_json, all_pages, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -4570,7 +4569,7 @@ def list_cost_tracking_tags(ctx, from_json, all_pages, page_size, compartment_id @cli_util.wrap_exceptions def list_customer_secret_keys(ctx, from_json, all_pages, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -4604,7 +4603,7 @@ def list_db_credentials(ctx, from_json, all_pages, page_size, user_id, page, lim if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -4887,7 +4886,7 @@ def list_iam_work_request_errors(ctx, from_json, all_pages, page_size, iam_work_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(iam_work_request_id, six.string_types) and len(iam_work_request_id.strip()) == 0: + if isinstance(iam_work_request_id, str) and len(iam_work_request_id.strip()) == 0: raise click.UsageError('Parameter --iam-work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4941,7 +4940,7 @@ def list_iam_work_request_logs(ctx, from_json, all_pages, page_size, iam_work_re if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(iam_work_request_id, six.string_types) and len(iam_work_request_id.strip()) == 0: + if isinstance(iam_work_request_id, str) and len(iam_work_request_id.strip()) == 0: raise click.UsageError('Parameter --iam-work-request-id cannot be whitespace or empty string') kwargs = {} @@ -5049,7 +5048,7 @@ def list_identity_provider_groups(ctx, from_json, all_pages, page_size, identity if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -5172,7 +5171,7 @@ def list_idp_group_mappings(ctx, from_json, all_pages, page_size, identity_provi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -5226,7 +5225,7 @@ def list_mfa_totp_devices(ctx, from_json, all_pages, page_size, user_id, page, l if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -5342,7 +5341,7 @@ def list_o_auth_client_credentials(ctx, from_json, all_pages, page_size, user_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -5451,7 +5450,7 @@ def list_policies(ctx, from_json, all_pages, page_size, compartment_id, page, li @cli_util.wrap_exceptions def list_region_subscriptions(ctx, from_json, all_pages, tenancy_id): - if isinstance(tenancy_id, six.string_types) and len(tenancy_id.strip()) == 0: + if isinstance(tenancy_id, str) and len(tenancy_id.strip()) == 0: raise click.UsageError('Parameter --tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -5490,7 +5489,7 @@ def list_regions(ctx, from_json, all_pages, ): @cli_util.wrap_exceptions def list_smtp_credentials(ctx, from_json, all_pages, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -5561,7 +5560,7 @@ def list_standard_tag_namespaces(ctx, from_json, all_pages, page_size, compartme @cli_util.wrap_exceptions def list_swift_passwords(ctx, from_json, all_pages, user_id): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -5697,7 +5696,7 @@ def list_tagging_work_request_errors(ctx, from_json, all_pages, page_size, work_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -5747,7 +5746,7 @@ def list_tagging_work_request_logs(ctx, from_json, all_pages, page_size, work_re if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -5848,7 +5847,7 @@ def list_tags(ctx, from_json, all_pages, page_size, tag_namespace_id, page, limi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -6072,7 +6071,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def move_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, target_compartment_id, if_match): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') kwargs = {} @@ -6132,7 +6131,7 @@ def move_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def recover_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, if_match): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') kwargs = {} @@ -6184,7 +6183,7 @@ def recover_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def remove_tag_default_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_default_id, type, if_match): - if isinstance(tag_default_id, six.string_types) and len(tag_default_id.strip()) == 0: + if isinstance(tag_default_id, str) and len(tag_default_id.strip()) == 0: raise click.UsageError('Parameter --tag-default-id cannot be whitespace or empty string') kwargs = {} @@ -6241,7 +6240,7 @@ def remove_tag_default_lock(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def remove_tag_namespace_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, type, if_match): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -6295,7 +6294,7 @@ def remove_tag_namespace_lock(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def remove_user_from_group(ctx, from_json, user_group_membership_id, if_match): - if isinstance(user_group_membership_id, six.string_types) and len(user_group_membership_id.strip()) == 0: + if isinstance(user_group_membership_id, str) and len(user_group_membership_id.strip()) == 0: raise click.UsageError('Parameter --user-group-membership-id cannot be whitespace or empty string') kwargs = {} @@ -6318,7 +6317,7 @@ def remove_user_from_group(ctx, from_json, user_group_membership_id, if_match): @cli_util.wrap_exceptions def reset_idp_scim_client(ctx, from_json, identity_provider_id): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -6344,10 +6343,10 @@ def reset_idp_scim_client(ctx, from_json, identity_provider_id): @cli_util.wrap_exceptions def update_auth_token(ctx, from_json, user_id, auth_token_id, description, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(auth_token_id, six.string_types) and len(auth_token_id.strip()) == 0: + if isinstance(auth_token_id, str) and len(auth_token_id.strip()) == 0: raise click.UsageError('Parameter --auth-token-id cannot be whitespace or empty string') kwargs = {} @@ -6382,7 +6381,7 @@ def update_auth_token(ctx, from_json, user_id, auth_token_id, description, if_ma @cli_util.wrap_exceptions def update_authentication_policy(ctx, from_json, force, compartment_id, password_policy, network_policy, if_match): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') if not force: if password_policy or network_policy: @@ -6428,7 +6427,7 @@ def update_authentication_policy(ctx, from_json, force, compartment_id, password @cli_util.wrap_exceptions def update_compartment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, description, name, freeform_tags, defined_tags, if_match): - if isinstance(compartment_id, six.string_types) and len(compartment_id.strip()) == 0: + if isinstance(compartment_id, str) and len(compartment_id.strip()) == 0: raise click.UsageError('Parameter --compartment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6499,10 +6498,10 @@ def update_compartment(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_customer_secret_key(ctx, from_json, user_id, customer_secret_key_id, display_name, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(customer_secret_key_id, six.string_types) and len(customer_secret_key_id.strip()) == 0: + if isinstance(customer_secret_key_id, str) and len(customer_secret_key_id.strip()) == 0: raise click.UsageError('Parameter --customer-secret-key-id cannot be whitespace or empty string') kwargs = {} @@ -6545,7 +6544,7 @@ def update_customer_secret_key(ctx, from_json, user_id, customer_secret_key_id, @cli_util.wrap_exceptions def update_domain(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, description, display_name, is_hidden_on_login, freeform_tags, defined_tags, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6630,7 +6629,7 @@ def update_domain(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_dynamic_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, dynamic_group_id, description, matching_rule, freeform_tags, defined_tags, if_match): - if isinstance(dynamic_group_id, six.string_types) and len(dynamic_group_id.strip()) == 0: + if isinstance(dynamic_group_id, str) and len(dynamic_group_id.strip()) == 0: raise click.UsageError('Parameter --dynamic-group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6706,7 +6705,7 @@ def update_dynamic_group(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, group_id, description, freeform_tags, defined_tags, if_match): - if isinstance(group_id, six.string_types) and len(group_id.strip()) == 0: + if isinstance(group_id, str) and len(group_id.strip()) == 0: raise click.UsageError('Parameter --group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6782,7 +6781,7 @@ def update_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_identity_provider(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, identity_provider_id, protocol, description, freeform_tags, defined_tags, if_match): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6859,7 +6858,7 @@ def update_identity_provider(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_identity_provider_update_saml2_identity_provider_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, identity_provider_id, description, freeform_tags, defined_tags, metadata_url, metadata, freeform_attributes, if_match): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or freeform_attributes: @@ -6942,10 +6941,10 @@ def update_identity_provider_update_saml2_identity_provider_details(ctx, from_js @cli_util.wrap_exceptions def update_idp_group_mapping(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, identity_provider_id, mapping_id, idp_group_name, group_id, if_match): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') - if isinstance(mapping_id, six.string_types) and len(mapping_id.strip()) == 0: + if isinstance(mapping_id, str) and len(mapping_id.strip()) == 0: raise click.UsageError('Parameter --mapping-id cannot be whitespace or empty string') kwargs = {} @@ -7012,7 +7011,7 @@ def update_idp_group_mapping(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_network_source(ctx, from_json, force, network_source_id, description, public_source_list, virtual_source_list, services, freeform_tags, defined_tags, if_match): - if isinstance(network_source_id, six.string_types) and len(network_source_id.strip()) == 0: + if isinstance(network_source_id, str) and len(network_source_id.strip()) == 0: raise click.UsageError('Parameter --network-source-id cannot be whitespace or empty string') if not force: if public_source_list or virtual_source_list or services or freeform_tags or defined_tags: @@ -7067,10 +7066,10 @@ def update_network_source(ctx, from_json, force, network_source_id, description, @cli_util.wrap_exceptions def update_o_auth_client_credential(ctx, from_json, force, user_id, oauth2_client_credential_id, description, scopes, is_reset_password, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(oauth2_client_credential_id, six.string_types) and len(oauth2_client_credential_id.strip()) == 0: + if isinstance(oauth2_client_credential_id, str) and len(oauth2_client_credential_id.strip()) == 0: raise click.UsageError('Parameter --oauth2-client-credential-id cannot be whitespace or empty string') if not force: if scopes: @@ -7119,7 +7118,7 @@ def update_o_auth_client_credential(ctx, from_json, force, user_id, oauth2_clien @cli_util.wrap_exceptions def update_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, policy_id, description, statements, version_date, freeform_tags, defined_tags, if_match): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') if not force: if statements or freeform_tags or defined_tags: @@ -7193,10 +7192,10 @@ def update_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_smtp_credential(ctx, from_json, user_id, smtp_credential_id, description, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(smtp_credential_id, six.string_types) and len(smtp_credential_id.strip()) == 0: + if isinstance(smtp_credential_id, str) and len(smtp_credential_id.strip()) == 0: raise click.UsageError('Parameter --smtp-credential-id cannot be whitespace or empty string') kwargs = {} @@ -7234,10 +7233,10 @@ def update_smtp_credential(ctx, from_json, user_id, smtp_credential_id, descript @cli_util.wrap_exceptions def update_swift_password(ctx, from_json, user_id, swift_password_id, description, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') - if isinstance(swift_password_id, six.string_types) and len(swift_password_id.strip()) == 0: + if isinstance(swift_password_id, str) and len(swift_password_id.strip()) == 0: raise click.UsageError('Parameter --swift-password-id cannot be whitespace or empty string') kwargs = {} @@ -7289,10 +7288,10 @@ def update_swift_password(ctx, from_json, user_id, swift_password_id, descriptio @cli_util.wrap_exceptions def update_tag(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, tag_name, description, is_retired, freeform_tags, defined_tags, is_cost_tracking, validator, if_match, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') - if isinstance(tag_name, six.string_types) and len(tag_name.strip()) == 0: + if isinstance(tag_name, str) and len(tag_name.strip()) == 0: raise click.UsageError('Parameter --tag-name cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or validator: @@ -7387,10 +7386,10 @@ def update_tag(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_tag_default_tag_definition_validator(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, tag_name, description, is_retired, freeform_tags, defined_tags, is_cost_tracking, if_match, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') - if isinstance(tag_name, six.string_types) and len(tag_name.strip()) == 0: + if isinstance(tag_name, str) and len(tag_name.strip()) == 0: raise click.UsageError('Parameter --tag-name cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -7486,10 +7485,10 @@ def update_tag_default_tag_definition_validator(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_tag_enum_tag_definition_validator(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, tag_name, description, is_retired, freeform_tags, defined_tags, is_cost_tracking, if_match, is_lock_override, validator_values): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') - if isinstance(tag_name, six.string_types) and len(tag_name.strip()) == 0: + if isinstance(tag_name, str) and len(tag_name.strip()) == 0: raise click.UsageError('Parameter --tag-name cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -7580,7 +7579,7 @@ def update_tag_enum_tag_definition_validator(ctx, from_json, force, wait_for_sta @cli_util.wrap_exceptions def update_tag_default(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_default_id, value, is_required, is_lock_override, if_match): - if isinstance(tag_default_id, six.string_types) and len(tag_default_id.strip()) == 0: + if isinstance(tag_default_id, str) and len(tag_default_id.strip()) == 0: raise click.UsageError('Parameter --tag-default-id cannot be whitespace or empty string') kwargs = {} @@ -7650,7 +7649,7 @@ def update_tag_default(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_tag_namespace(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, tag_namespace_id, description, is_retired, freeform_tags, defined_tags, is_lock_override): - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -7730,7 +7729,7 @@ def update_tag_namespace(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_user(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, user_id, description, email, db_user_name, freeform_tags, defined_tags, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -7810,7 +7809,7 @@ def update_user(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_user_capabilities(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_id, can_use_console_password, can_use_api_keys, can_use_auth_tokens, can_use_smtp_credentials, can_use_db_credentials, can_use_customer_secret_keys, can_use_o_auth2_client_credentials, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -7886,7 +7885,7 @@ def update_user_capabilities(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_user_state(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, user_id, blocked, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -7946,7 +7945,7 @@ def update_user_state(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def upload_api_key(ctx, from_json, user_id, key): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/identity/src/oci_cli_identity/identity_cli_extended.py b/services/identity/src/oci_cli_identity/identity_cli_extended.py index dfbf94363..e630f0a3e 100644 --- a/services/identity/src/oci_cli_identity/identity_cli_extended.py +++ b/services/identity/src/oci_cli_identity/identity_cli_extended.py @@ -4,7 +4,6 @@ from __future__ import print_function import click -import six import sys from services.identity.src.oci_cli_identity.generated import identity_cli from oci_cli import cli_exceptions @@ -57,9 +56,9 @@ def set_iam_default_tenancy_help(): if not cli_root.cli.commands.get('iam', None): return iam_command = cli_root.cli.commands.get('iam') - for _, entitycommand in six.iteritems(iam_command.commands): + for _, entitycommand in iam_command.commands.items(): if entitycommand.name in iam_tenancy_defaults.keys(): - for _, subcommand in six.iteritems(entitycommand.commands): + for _, subcommand in entitycommand.commands.items(): for param in subcommand.params: if subcommand.name in iam_tenancy_defaults[entitycommand.name]: if param.name == 'compartment_id' or param.name == 'tenancy_id': @@ -374,10 +373,10 @@ def retire_tag(ctx, **kwargs): tag_namespace_id = kwargs['tag_namespace_id'] tag_name = kwargs['tag_name'] - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') - if isinstance(tag_name, six.string_types) and len(tag_name.strip()) == 0: + if isinstance(tag_name, str) and len(tag_name.strip()) == 0: raise click.UsageError('Parameter --tag-name cannot be whitespace or empty string') service_kwargs = {} @@ -405,10 +404,10 @@ def reactivate_tag(ctx, **kwargs): tag_namespace_id = kwargs['tag_namespace_id'] tag_name = kwargs['tag_name'] - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') - if isinstance(tag_name, six.string_types) and len(tag_name.strip()) == 0: + if isinstance(tag_name, str) and len(tag_name.strip()) == 0: raise click.UsageError('Parameter --tag-name cannot be whitespace or empty string') service_kwargs = {} @@ -435,7 +434,7 @@ def update_tag_namespace_description(ctx, **kwargs): freeform_tags = kwargs.get('freeform_tags') defined_tags = kwargs.get('defined_tags') - if isinstance(tag_namespace_id, six.string_types) and len(tag_namespace_id.strip()) == 0: + if isinstance(tag_namespace_id, str) and len(tag_namespace_id.strip()) == 0: raise click.UsageError('Parameter --tag-namespace-id cannot be whitespace or empty string') if not kwargs.get('force'): diff --git a/services/identity_data_plane/src/oci_cli_dataplane/generated/dataplane_cli.py b/services/identity_data_plane/src/oci_cli_dataplane/generated/dataplane_cli.py index a2385b21c..e1d83d942 100644 --- a/services/identity_data_plane/src/oci_cli_dataplane/generated/dataplane_cli.py +++ b/services/identity_data_plane/src/oci_cli_dataplane/generated/dataplane_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 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 092302004..ecf4b9f90 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 @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -9029,7 +9028,7 @@ def create_user_db_credential(ctx, from_json, schemas, db_password, authorizatio @cli_util.wrap_exceptions def delete_api_key(ctx, from_json, api_key_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(api_key_id, six.string_types) and len(api_key_id.strip()) == 0: + if isinstance(api_key_id, str) and len(api_key_id.strip()) == 0: raise click.UsageError('Parameter --api-key-id cannot be whitespace or empty string') kwargs = {} @@ -9065,7 +9064,7 @@ def delete_api_key(ctx, from_json, api_key_id, authorization, resource_type_sche @cli_util.wrap_exceptions def delete_app(ctx, from_json, app_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(app_id, six.string_types) and len(app_id.strip()) == 0: + if isinstance(app_id, str) and len(app_id.strip()) == 0: raise click.UsageError('Parameter --app-id cannot be whitespace or empty string') kwargs = {} @@ -9101,7 +9100,7 @@ def delete_app(ctx, from_json, app_id, authorization, resource_type_schema_versi @cli_util.wrap_exceptions def delete_app_role(ctx, from_json, app_role_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(app_role_id, six.string_types) and len(app_role_id.strip()) == 0: + if isinstance(app_role_id, str) and len(app_role_id.strip()) == 0: raise click.UsageError('Parameter --app-role-id cannot be whitespace or empty string') kwargs = {} @@ -9137,7 +9136,7 @@ def delete_app_role(ctx, from_json, app_role_id, authorization, resource_type_sc @cli_util.wrap_exceptions def delete_approval_workflow(ctx, from_json, approval_workflow_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(approval_workflow_id, six.string_types) and len(approval_workflow_id.strip()) == 0: + if isinstance(approval_workflow_id, str) and len(approval_workflow_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-id cannot be whitespace or empty string') kwargs = {} @@ -9173,7 +9172,7 @@ def delete_approval_workflow(ctx, from_json, approval_workflow_id, authorization @cli_util.wrap_exceptions def delete_approval_workflow_assignment(ctx, from_json, approval_workflow_assignment_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(approval_workflow_assignment_id, six.string_types) and len(approval_workflow_assignment_id.strip()) == 0: + if isinstance(approval_workflow_assignment_id, str) and len(approval_workflow_assignment_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -9209,7 +9208,7 @@ def delete_approval_workflow_assignment(ctx, from_json, approval_workflow_assign @cli_util.wrap_exceptions def delete_approval_workflow_step(ctx, from_json, approval_workflow_step_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(approval_workflow_step_id, six.string_types) and len(approval_workflow_step_id.strip()) == 0: + if isinstance(approval_workflow_step_id, str) and len(approval_workflow_step_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-step-id cannot be whitespace or empty string') kwargs = {} @@ -9245,7 +9244,7 @@ def delete_approval_workflow_step(ctx, from_json, approval_workflow_step_id, aut @cli_util.wrap_exceptions def delete_auth_token(ctx, from_json, auth_token_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(auth_token_id, six.string_types) and len(auth_token_id.strip()) == 0: + if isinstance(auth_token_id, str) and len(auth_token_id.strip()) == 0: raise click.UsageError('Parameter --auth-token-id cannot be whitespace or empty string') kwargs = {} @@ -9281,7 +9280,7 @@ def delete_auth_token(ctx, from_json, auth_token_id, authorization, resource_typ @cli_util.wrap_exceptions def delete_cloud_gate(ctx, from_json, cloud_gate_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(cloud_gate_id, six.string_types) and len(cloud_gate_id.strip()) == 0: + if isinstance(cloud_gate_id, str) and len(cloud_gate_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-id cannot be whitespace or empty string') kwargs = {} @@ -9317,7 +9316,7 @@ def delete_cloud_gate(ctx, from_json, cloud_gate_id, authorization, resource_typ @cli_util.wrap_exceptions def delete_cloud_gate_mapping(ctx, from_json, cloud_gate_mapping_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(cloud_gate_mapping_id, six.string_types) and len(cloud_gate_mapping_id.strip()) == 0: + if isinstance(cloud_gate_mapping_id, str) and len(cloud_gate_mapping_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-mapping-id cannot be whitespace or empty string') kwargs = {} @@ -9353,7 +9352,7 @@ def delete_cloud_gate_mapping(ctx, from_json, cloud_gate_mapping_id, authorizati @cli_util.wrap_exceptions def delete_cloud_gate_server(ctx, from_json, cloud_gate_server_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(cloud_gate_server_id, six.string_types) and len(cloud_gate_server_id.strip()) == 0: + if isinstance(cloud_gate_server_id, str) and len(cloud_gate_server_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-server-id cannot be whitespace or empty string') kwargs = {} @@ -9389,7 +9388,7 @@ def delete_cloud_gate_server(ctx, from_json, cloud_gate_server_id, authorization @cli_util.wrap_exceptions def delete_condition(ctx, from_json, condition_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(condition_id, six.string_types) and len(condition_id.strip()) == 0: + if isinstance(condition_id, str) and len(condition_id.strip()) == 0: raise click.UsageError('Parameter --condition-id cannot be whitespace or empty string') kwargs = {} @@ -9425,7 +9424,7 @@ def delete_condition(ctx, from_json, condition_id, authorization, resource_type_ @cli_util.wrap_exceptions def delete_customer_secret_key(ctx, from_json, customer_secret_key_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(customer_secret_key_id, six.string_types) and len(customer_secret_key_id.strip()) == 0: + if isinstance(customer_secret_key_id, str) and len(customer_secret_key_id.strip()) == 0: raise click.UsageError('Parameter --customer-secret-key-id cannot be whitespace or empty string') kwargs = {} @@ -9461,7 +9460,7 @@ def delete_customer_secret_key(ctx, from_json, customer_secret_key_id, authoriza @cli_util.wrap_exceptions def delete_dynamic_resource_group(ctx, from_json, dynamic_resource_group_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(dynamic_resource_group_id, six.string_types) and len(dynamic_resource_group_id.strip()) == 0: + if isinstance(dynamic_resource_group_id, str) and len(dynamic_resource_group_id.strip()) == 0: raise click.UsageError('Parameter --dynamic-resource-group-id cannot be whitespace or empty string') kwargs = {} @@ -9497,7 +9496,7 @@ def delete_dynamic_resource_group(ctx, from_json, dynamic_resource_group_id, aut @cli_util.wrap_exceptions def delete_grant(ctx, from_json, grant_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(grant_id, six.string_types) and len(grant_id.strip()) == 0: + if isinstance(grant_id, str) and len(grant_id.strip()) == 0: raise click.UsageError('Parameter --grant-id cannot be whitespace or empty string') kwargs = {} @@ -9533,7 +9532,7 @@ def delete_grant(ctx, from_json, grant_id, authorization, resource_type_schema_v @cli_util.wrap_exceptions def delete_group(ctx, from_json, group_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(group_id, six.string_types) and len(group_id.strip()) == 0: + if isinstance(group_id, str) and len(group_id.strip()) == 0: raise click.UsageError('Parameter --group-id cannot be whitespace or empty string') kwargs = {} @@ -9569,7 +9568,7 @@ def delete_group(ctx, from_json, group_id, authorization, resource_type_schema_v @cli_util.wrap_exceptions def delete_identity_propagation_trust(ctx, from_json, identity_propagation_trust_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(identity_propagation_trust_id, six.string_types) and len(identity_propagation_trust_id.strip()) == 0: + if isinstance(identity_propagation_trust_id, str) and len(identity_propagation_trust_id.strip()) == 0: raise click.UsageError('Parameter --identity-propagation-trust-id cannot be whitespace or empty string') kwargs = {} @@ -9605,7 +9604,7 @@ def delete_identity_propagation_trust(ctx, from_json, identity_propagation_trust @cli_util.wrap_exceptions def delete_identity_provider(ctx, from_json, identity_provider_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -9641,7 +9640,7 @@ def delete_identity_provider(ctx, from_json, identity_provider_id, authorization @cli_util.wrap_exceptions def delete_my_api_key(ctx, from_json, my_api_key_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_api_key_id, six.string_types) and len(my_api_key_id.strip()) == 0: + if isinstance(my_api_key_id, str) and len(my_api_key_id.strip()) == 0: raise click.UsageError('Parameter --my-api-key-id cannot be whitespace or empty string') kwargs = {} @@ -9677,7 +9676,7 @@ def delete_my_api_key(ctx, from_json, my_api_key_id, authorization, resource_typ @cli_util.wrap_exceptions def delete_my_auth_token(ctx, from_json, my_auth_token_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_auth_token_id, six.string_types) and len(my_auth_token_id.strip()) == 0: + if isinstance(my_auth_token_id, str) and len(my_auth_token_id.strip()) == 0: raise click.UsageError('Parameter --my-auth-token-id cannot be whitespace or empty string') kwargs = {} @@ -9713,7 +9712,7 @@ def delete_my_auth_token(ctx, from_json, my_auth_token_id, authorization, resour @cli_util.wrap_exceptions def delete_my_customer_secret_key(ctx, from_json, my_customer_secret_key_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_customer_secret_key_id, six.string_types) and len(my_customer_secret_key_id.strip()) == 0: + if isinstance(my_customer_secret_key_id, str) and len(my_customer_secret_key_id.strip()) == 0: raise click.UsageError('Parameter --my-customer-secret-key-id cannot be whitespace or empty string') kwargs = {} @@ -9749,7 +9748,7 @@ def delete_my_customer_secret_key(ctx, from_json, my_customer_secret_key_id, aut @cli_util.wrap_exceptions def delete_my_device(ctx, from_json, my_device_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_device_id, six.string_types) and len(my_device_id.strip()) == 0: + if isinstance(my_device_id, str) and len(my_device_id.strip()) == 0: raise click.UsageError('Parameter --my-device-id cannot be whitespace or empty string') kwargs = {} @@ -9785,7 +9784,7 @@ def delete_my_device(ctx, from_json, my_device_id, authorization, resource_type_ @cli_util.wrap_exceptions def delete_my_o_auth2_client_credential(ctx, from_json, my_o_auth2_client_credential_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_o_auth2_client_credential_id, six.string_types) and len(my_o_auth2_client_credential_id.strip()) == 0: + if isinstance(my_o_auth2_client_credential_id, str) and len(my_o_auth2_client_credential_id.strip()) == 0: raise click.UsageError('Parameter --my-o-auth2-client-credential-id cannot be whitespace or empty string') kwargs = {} @@ -9821,7 +9820,7 @@ def delete_my_o_auth2_client_credential(ctx, from_json, my_o_auth2_client_creden @cli_util.wrap_exceptions def delete_my_smtp_credential(ctx, from_json, my_smtp_credential_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_smtp_credential_id, six.string_types) and len(my_smtp_credential_id.strip()) == 0: + if isinstance(my_smtp_credential_id, str) and len(my_smtp_credential_id.strip()) == 0: raise click.UsageError('Parameter --my-smtp-credential-id cannot be whitespace or empty string') kwargs = {} @@ -9857,7 +9856,7 @@ def delete_my_smtp_credential(ctx, from_json, my_smtp_credential_id, authorizati @cli_util.wrap_exceptions def delete_my_support_account(ctx, from_json, my_support_account_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_support_account_id, six.string_types) and len(my_support_account_id.strip()) == 0: + if isinstance(my_support_account_id, str) and len(my_support_account_id.strip()) == 0: raise click.UsageError('Parameter --my-support-account-id cannot be whitespace or empty string') kwargs = {} @@ -9893,7 +9892,7 @@ def delete_my_support_account(ctx, from_json, my_support_account_id, authorizati @cli_util.wrap_exceptions def delete_my_trusted_user_agent(ctx, from_json, my_trusted_user_agent_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_trusted_user_agent_id, six.string_types) and len(my_trusted_user_agent_id.strip()) == 0: + if isinstance(my_trusted_user_agent_id, str) and len(my_trusted_user_agent_id.strip()) == 0: raise click.UsageError('Parameter --my-trusted-user-agent-id cannot be whitespace or empty string') kwargs = {} @@ -9929,7 +9928,7 @@ def delete_my_trusted_user_agent(ctx, from_json, my_trusted_user_agent_id, autho @cli_util.wrap_exceptions def delete_my_user_db_credential(ctx, from_json, my_user_db_credential_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(my_user_db_credential_id, six.string_types) and len(my_user_db_credential_id.strip()) == 0: + if isinstance(my_user_db_credential_id, str) and len(my_user_db_credential_id.strip()) == 0: raise click.UsageError('Parameter --my-user-db-credential-id cannot be whitespace or empty string') kwargs = {} @@ -9965,7 +9964,7 @@ def delete_my_user_db_credential(ctx, from_json, my_user_db_credential_id, autho @cli_util.wrap_exceptions def delete_network_perimeter(ctx, from_json, network_perimeter_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(network_perimeter_id, six.string_types) and len(network_perimeter_id.strip()) == 0: + if isinstance(network_perimeter_id, str) and len(network_perimeter_id.strip()) == 0: raise click.UsageError('Parameter --network-perimeter-id cannot be whitespace or empty string') kwargs = {} @@ -10001,7 +10000,7 @@ def delete_network_perimeter(ctx, from_json, network_perimeter_id, authorization @cli_util.wrap_exceptions def delete_o_auth2_client_credential(ctx, from_json, o_auth2_client_credential_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(o_auth2_client_credential_id, six.string_types) and len(o_auth2_client_credential_id.strip()) == 0: + if isinstance(o_auth2_client_credential_id, str) and len(o_auth2_client_credential_id.strip()) == 0: raise click.UsageError('Parameter --o-auth2-client-credential-id cannot be whitespace or empty string') kwargs = {} @@ -10037,7 +10036,7 @@ def delete_o_auth2_client_credential(ctx, from_json, o_auth2_client_credential_i @cli_util.wrap_exceptions def delete_o_auth_client_certificate(ctx, from_json, o_auth_client_certificate_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(o_auth_client_certificate_id, six.string_types) and len(o_auth_client_certificate_id.strip()) == 0: + if isinstance(o_auth_client_certificate_id, str) and len(o_auth_client_certificate_id.strip()) == 0: raise click.UsageError('Parameter --o-auth-client-certificate-id cannot be whitespace or empty string') kwargs = {} @@ -10073,7 +10072,7 @@ def delete_o_auth_client_certificate(ctx, from_json, o_auth_client_certificate_i @cli_util.wrap_exceptions def delete_o_auth_partner_certificate(ctx, from_json, o_auth_partner_certificate_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(o_auth_partner_certificate_id, six.string_types) and len(o_auth_partner_certificate_id.strip()) == 0: + if isinstance(o_auth_partner_certificate_id, str) and len(o_auth_partner_certificate_id.strip()) == 0: raise click.UsageError('Parameter --o-auth-partner-certificate-id cannot be whitespace or empty string') kwargs = {} @@ -10109,7 +10108,7 @@ def delete_o_auth_partner_certificate(ctx, from_json, o_auth_partner_certificate @cli_util.wrap_exceptions def delete_password_policy(ctx, from_json, password_policy_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(password_policy_id, six.string_types) and len(password_policy_id.strip()) == 0: + if isinstance(password_policy_id, str) and len(password_policy_id.strip()) == 0: raise click.UsageError('Parameter --password-policy-id cannot be whitespace or empty string') kwargs = {} @@ -10145,7 +10144,7 @@ def delete_password_policy(ctx, from_json, password_policy_id, authorization, re @cli_util.wrap_exceptions def delete_policy(ctx, from_json, policy_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') kwargs = {} @@ -10181,7 +10180,7 @@ def delete_policy(ctx, from_json, policy_id, authorization, resource_type_schema @cli_util.wrap_exceptions def delete_rule(ctx, from_json, rule_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: + if isinstance(rule_id, str) and len(rule_id.strip()) == 0: raise click.UsageError('Parameter --rule-id cannot be whitespace or empty string') kwargs = {} @@ -10217,7 +10216,7 @@ def delete_rule(ctx, from_json, rule_id, authorization, resource_type_schema_ver @cli_util.wrap_exceptions def delete_security_question(ctx, from_json, security_question_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(security_question_id, six.string_types) and len(security_question_id.strip()) == 0: + if isinstance(security_question_id, str) and len(security_question_id.strip()) == 0: raise click.UsageError('Parameter --security-question-id cannot be whitespace or empty string') kwargs = {} @@ -10253,7 +10252,7 @@ def delete_security_question(ctx, from_json, security_question_id, authorization @cli_util.wrap_exceptions def delete_self_registration_profile(ctx, from_json, self_registration_profile_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(self_registration_profile_id, six.string_types) and len(self_registration_profile_id.strip()) == 0: + if isinstance(self_registration_profile_id, str) and len(self_registration_profile_id.strip()) == 0: raise click.UsageError('Parameter --self-registration-profile-id cannot be whitespace or empty string') kwargs = {} @@ -10289,7 +10288,7 @@ def delete_self_registration_profile(ctx, from_json, self_registration_profile_i @cli_util.wrap_exceptions def delete_smtp_credential(ctx, from_json, smtp_credential_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(smtp_credential_id, six.string_types) and len(smtp_credential_id.strip()) == 0: + if isinstance(smtp_credential_id, str) and len(smtp_credential_id.strip()) == 0: raise click.UsageError('Parameter --smtp-credential-id cannot be whitespace or empty string') kwargs = {} @@ -10325,7 +10324,7 @@ def delete_smtp_credential(ctx, from_json, smtp_credential_id, authorization, re @cli_util.wrap_exceptions def delete_social_identity_provider(ctx, from_json, social_identity_provider_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(social_identity_provider_id, six.string_types) and len(social_identity_provider_id.strip()) == 0: + if isinstance(social_identity_provider_id, str) and len(social_identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --social-identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -10361,7 +10360,7 @@ def delete_social_identity_provider(ctx, from_json, social_identity_provider_id, @cli_util.wrap_exceptions def delete_user(ctx, from_json, user_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -10397,7 +10396,7 @@ def delete_user(ctx, from_json, user_id, authorization, resource_type_schema_ver @cli_util.wrap_exceptions def delete_user_db_credential(ctx, from_json, user_db_credential_id, authorization, resource_type_schema_version, force_delete, if_match): - if isinstance(user_db_credential_id, six.string_types) and len(user_db_credential_id.strip()) == 0: + if isinstance(user_db_credential_id, str) and len(user_db_credential_id.strip()) == 0: raise click.UsageError('Parameter --user-db-credential-id cannot be whitespace or empty string') kwargs = {} @@ -10432,7 +10431,7 @@ def delete_user_db_credential(ctx, from_json, user_db_credential_id, authorizati @cli_util.wrap_exceptions def get_account_mgmt_info(ctx, from_json, account_mgmt_info_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(account_mgmt_info_id, six.string_types) and len(account_mgmt_info_id.strip()) == 0: + if isinstance(account_mgmt_info_id, str) and len(account_mgmt_info_id.strip()) == 0: raise click.UsageError('Parameter --account-mgmt-info-id cannot be whitespace or empty string') kwargs = {} @@ -10467,7 +10466,7 @@ def get_account_mgmt_info(ctx, from_json, account_mgmt_info_id, authorization, r @cli_util.wrap_exceptions def get_account_recovery_setting(ctx, from_json, account_recovery_setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(account_recovery_setting_id, six.string_types) and len(account_recovery_setting_id.strip()) == 0: + if isinstance(account_recovery_setting_id, str) and len(account_recovery_setting_id.strip()) == 0: raise click.UsageError('Parameter --account-recovery-setting-id cannot be whitespace or empty string') kwargs = {} @@ -10502,7 +10501,7 @@ def get_account_recovery_setting(ctx, from_json, account_recovery_setting_id, au @cli_util.wrap_exceptions def get_api_key(ctx, from_json, api_key_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(api_key_id, six.string_types) and len(api_key_id.strip()) == 0: + if isinstance(api_key_id, str) and len(api_key_id.strip()) == 0: raise click.UsageError('Parameter --api-key-id cannot be whitespace or empty string') kwargs = {} @@ -10537,7 +10536,7 @@ def get_api_key(ctx, from_json, api_key_id, authorization, resource_type_schema_ @cli_util.wrap_exceptions def get_app(ctx, from_json, app_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(app_id, six.string_types) and len(app_id.strip()) == 0: + if isinstance(app_id, str) and len(app_id.strip()) == 0: raise click.UsageError('Parameter --app-id cannot be whitespace or empty string') kwargs = {} @@ -10572,7 +10571,7 @@ def get_app(ctx, from_json, app_id, authorization, resource_type_schema_version, @cli_util.wrap_exceptions def get_app_role(ctx, from_json, app_role_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(app_role_id, six.string_types) and len(app_role_id.strip()) == 0: + if isinstance(app_role_id, str) and len(app_role_id.strip()) == 0: raise click.UsageError('Parameter --app-role-id cannot be whitespace or empty string') kwargs = {} @@ -10607,7 +10606,7 @@ def get_app_role(ctx, from_json, app_role_id, authorization, resource_type_schem @cli_util.wrap_exceptions def get_approval_workflow(ctx, from_json, approval_workflow_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(approval_workflow_id, six.string_types) and len(approval_workflow_id.strip()) == 0: + if isinstance(approval_workflow_id, str) and len(approval_workflow_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-id cannot be whitespace or empty string') kwargs = {} @@ -10642,7 +10641,7 @@ def get_approval_workflow(ctx, from_json, approval_workflow_id, authorization, r @cli_util.wrap_exceptions def get_approval_workflow_assignment(ctx, from_json, approval_workflow_assignment_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(approval_workflow_assignment_id, six.string_types) and len(approval_workflow_assignment_id.strip()) == 0: + if isinstance(approval_workflow_assignment_id, str) and len(approval_workflow_assignment_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -10677,7 +10676,7 @@ def get_approval_workflow_assignment(ctx, from_json, approval_workflow_assignmen @cli_util.wrap_exceptions def get_approval_workflow_step(ctx, from_json, approval_workflow_step_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(approval_workflow_step_id, six.string_types) and len(approval_workflow_step_id.strip()) == 0: + if isinstance(approval_workflow_step_id, str) and len(approval_workflow_step_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-step-id cannot be whitespace or empty string') kwargs = {} @@ -10712,7 +10711,7 @@ def get_approval_workflow_step(ctx, from_json, approval_workflow_step_id, author @cli_util.wrap_exceptions def get_auth_token(ctx, from_json, auth_token_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(auth_token_id, six.string_types) and len(auth_token_id.strip()) == 0: + if isinstance(auth_token_id, str) and len(auth_token_id.strip()) == 0: raise click.UsageError('Parameter --auth-token-id cannot be whitespace or empty string') kwargs = {} @@ -10747,7 +10746,7 @@ def get_auth_token(ctx, from_json, auth_token_id, authorization, resource_type_s @cli_util.wrap_exceptions def get_authentication_factor_setting(ctx, from_json, authentication_factor_setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(authentication_factor_setting_id, six.string_types) and len(authentication_factor_setting_id.strip()) == 0: + if isinstance(authentication_factor_setting_id, str) and len(authentication_factor_setting_id.strip()) == 0: raise click.UsageError('Parameter --authentication-factor-setting-id cannot be whitespace or empty string') kwargs = {} @@ -10782,7 +10781,7 @@ def get_authentication_factor_setting(ctx, from_json, authentication_factor_sett @cli_util.wrap_exceptions def get_branding_setting(ctx, from_json, branding_setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(branding_setting_id, six.string_types) and len(branding_setting_id.strip()) == 0: + if isinstance(branding_setting_id, str) and len(branding_setting_id.strip()) == 0: raise click.UsageError('Parameter --branding-setting-id cannot be whitespace or empty string') kwargs = {} @@ -10817,7 +10816,7 @@ def get_branding_setting(ctx, from_json, branding_setting_id, authorization, res @cli_util.wrap_exceptions def get_cloud_gate(ctx, from_json, cloud_gate_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(cloud_gate_id, six.string_types) and len(cloud_gate_id.strip()) == 0: + if isinstance(cloud_gate_id, str) and len(cloud_gate_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-id cannot be whitespace or empty string') kwargs = {} @@ -10852,7 +10851,7 @@ def get_cloud_gate(ctx, from_json, cloud_gate_id, authorization, resource_type_s @cli_util.wrap_exceptions def get_cloud_gate_mapping(ctx, from_json, cloud_gate_mapping_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(cloud_gate_mapping_id, six.string_types) and len(cloud_gate_mapping_id.strip()) == 0: + if isinstance(cloud_gate_mapping_id, str) and len(cloud_gate_mapping_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-mapping-id cannot be whitespace or empty string') kwargs = {} @@ -10887,7 +10886,7 @@ def get_cloud_gate_mapping(ctx, from_json, cloud_gate_mapping_id, authorization, @cli_util.wrap_exceptions def get_cloud_gate_server(ctx, from_json, cloud_gate_server_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(cloud_gate_server_id, six.string_types) and len(cloud_gate_server_id.strip()) == 0: + if isinstance(cloud_gate_server_id, str) and len(cloud_gate_server_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-server-id cannot be whitespace or empty string') kwargs = {} @@ -10922,7 +10921,7 @@ def get_cloud_gate_server(ctx, from_json, cloud_gate_server_id, authorization, r @cli_util.wrap_exceptions def get_condition(ctx, from_json, condition_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(condition_id, six.string_types) and len(condition_id.strip()) == 0: + if isinstance(condition_id, str) and len(condition_id.strip()) == 0: raise click.UsageError('Parameter --condition-id cannot be whitespace or empty string') kwargs = {} @@ -10957,7 +10956,7 @@ def get_condition(ctx, from_json, condition_id, authorization, resource_type_sch @cli_util.wrap_exceptions def get_customer_secret_key(ctx, from_json, customer_secret_key_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(customer_secret_key_id, six.string_types) and len(customer_secret_key_id.strip()) == 0: + if isinstance(customer_secret_key_id, str) and len(customer_secret_key_id.strip()) == 0: raise click.UsageError('Parameter --customer-secret-key-id cannot be whitespace or empty string') kwargs = {} @@ -10992,7 +10991,7 @@ def get_customer_secret_key(ctx, from_json, customer_secret_key_id, authorizatio @cli_util.wrap_exceptions def get_dynamic_resource_group(ctx, from_json, dynamic_resource_group_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(dynamic_resource_group_id, six.string_types) and len(dynamic_resource_group_id.strip()) == 0: + if isinstance(dynamic_resource_group_id, str) and len(dynamic_resource_group_id.strip()) == 0: raise click.UsageError('Parameter --dynamic-resource-group-id cannot be whitespace or empty string') kwargs = {} @@ -11027,7 +11026,7 @@ def get_dynamic_resource_group(ctx, from_json, dynamic_resource_group_id, author @cli_util.wrap_exceptions def get_grant(ctx, from_json, grant_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(grant_id, six.string_types) and len(grant_id.strip()) == 0: + if isinstance(grant_id, str) and len(grant_id.strip()) == 0: raise click.UsageError('Parameter --grant-id cannot be whitespace or empty string') kwargs = {} @@ -11062,7 +11061,7 @@ def get_grant(ctx, from_json, grant_id, authorization, resource_type_schema_vers @cli_util.wrap_exceptions def get_group(ctx, from_json, group_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(group_id, six.string_types) and len(group_id.strip()) == 0: + if isinstance(group_id, str) and len(group_id.strip()) == 0: raise click.UsageError('Parameter --group-id cannot be whitespace or empty string') kwargs = {} @@ -11097,7 +11096,7 @@ def get_group(ctx, from_json, group_id, authorization, resource_type_schema_vers @cli_util.wrap_exceptions def get_identity_propagation_trust(ctx, from_json, identity_propagation_trust_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(identity_propagation_trust_id, six.string_types) and len(identity_propagation_trust_id.strip()) == 0: + if isinstance(identity_propagation_trust_id, str) and len(identity_propagation_trust_id.strip()) == 0: raise click.UsageError('Parameter --identity-propagation-trust-id cannot be whitespace or empty string') kwargs = {} @@ -11132,7 +11131,7 @@ def get_identity_propagation_trust(ctx, from_json, identity_propagation_trust_id @cli_util.wrap_exceptions def get_identity_provider(ctx, from_json, identity_provider_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -11167,7 +11166,7 @@ def get_identity_provider(ctx, from_json, identity_provider_id, authorization, r @cli_util.wrap_exceptions def get_identity_setting(ctx, from_json, identity_setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(identity_setting_id, six.string_types) and len(identity_setting_id.strip()) == 0: + if isinstance(identity_setting_id, str) and len(identity_setting_id.strip()) == 0: raise click.UsageError('Parameter --identity-setting-id cannot be whitespace or empty string') kwargs = {} @@ -11202,7 +11201,7 @@ def get_identity_setting(ctx, from_json, identity_setting_id, authorization, res @cli_util.wrap_exceptions def get_kmsi_setting(ctx, from_json, kmsi_setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(kmsi_setting_id, six.string_types) and len(kmsi_setting_id.strip()) == 0: + if isinstance(kmsi_setting_id, str) and len(kmsi_setting_id.strip()) == 0: raise click.UsageError('Parameter --kmsi-setting-id cannot be whitespace or empty string') kwargs = {} @@ -11265,7 +11264,7 @@ def get_me(ctx, from_json, authorization, resource_type_schema_version, attribut @cli_util.wrap_exceptions def get_my_api_key(ctx, from_json, my_api_key_id, authorization, resource_type_schema_version): - if isinstance(my_api_key_id, six.string_types) and len(my_api_key_id.strip()) == 0: + if isinstance(my_api_key_id, str) and len(my_api_key_id.strip()) == 0: raise click.UsageError('Parameter --my-api-key-id cannot be whitespace or empty string') kwargs = {} @@ -11294,7 +11293,7 @@ def get_my_api_key(ctx, from_json, my_api_key_id, authorization, resource_type_s @cli_util.wrap_exceptions def get_my_auth_token(ctx, from_json, my_auth_token_id, authorization, resource_type_schema_version): - if isinstance(my_auth_token_id, six.string_types) and len(my_auth_token_id.strip()) == 0: + if isinstance(my_auth_token_id, str) and len(my_auth_token_id.strip()) == 0: raise click.UsageError('Parameter --my-auth-token-id cannot be whitespace or empty string') kwargs = {} @@ -11323,7 +11322,7 @@ def get_my_auth_token(ctx, from_json, my_auth_token_id, authorization, resource_ @cli_util.wrap_exceptions def get_my_completed_approval(ctx, from_json, my_completed_approval_id, authorization, resource_type_schema_version): - if isinstance(my_completed_approval_id, six.string_types) and len(my_completed_approval_id.strip()) == 0: + if isinstance(my_completed_approval_id, str) and len(my_completed_approval_id.strip()) == 0: raise click.UsageError('Parameter --my-completed-approval-id cannot be whitespace or empty string') kwargs = {} @@ -11352,7 +11351,7 @@ def get_my_completed_approval(ctx, from_json, my_completed_approval_id, authoriz @cli_util.wrap_exceptions def get_my_customer_secret_key(ctx, from_json, my_customer_secret_key_id, authorization, resource_type_schema_version): - if isinstance(my_customer_secret_key_id, six.string_types) and len(my_customer_secret_key_id.strip()) == 0: + if isinstance(my_customer_secret_key_id, str) and len(my_customer_secret_key_id.strip()) == 0: raise click.UsageError('Parameter --my-customer-secret-key-id cannot be whitespace or empty string') kwargs = {} @@ -11383,7 +11382,7 @@ def get_my_customer_secret_key(ctx, from_json, my_customer_secret_key_id, author @cli_util.wrap_exceptions def get_my_device(ctx, from_json, my_device_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(my_device_id, six.string_types) and len(my_device_id.strip()) == 0: + if isinstance(my_device_id, str) and len(my_device_id.strip()) == 0: raise click.UsageError('Parameter --my-device-id cannot be whitespace or empty string') kwargs = {} @@ -11416,7 +11415,7 @@ def get_my_device(ctx, from_json, my_device_id, authorization, resource_type_sch @cli_util.wrap_exceptions def get_my_o_auth2_client_credential(ctx, from_json, my_o_auth2_client_credential_id, authorization, resource_type_schema_version): - if isinstance(my_o_auth2_client_credential_id, six.string_types) and len(my_o_auth2_client_credential_id.strip()) == 0: + if isinstance(my_o_auth2_client_credential_id, str) and len(my_o_auth2_client_credential_id.strip()) == 0: raise click.UsageError('Parameter --my-o-auth2-client-credential-id cannot be whitespace or empty string') kwargs = {} @@ -11445,7 +11444,7 @@ def get_my_o_auth2_client_credential(ctx, from_json, my_o_auth2_client_credentia @cli_util.wrap_exceptions def get_my_pending_approval(ctx, from_json, my_pending_approval_id, authorization, resource_type_schema_version): - if isinstance(my_pending_approval_id, six.string_types) and len(my_pending_approval_id.strip()) == 0: + if isinstance(my_pending_approval_id, str) and len(my_pending_approval_id.strip()) == 0: raise click.UsageError('Parameter --my-pending-approval-id cannot be whitespace or empty string') kwargs = {} @@ -11476,7 +11475,7 @@ def get_my_pending_approval(ctx, from_json, my_pending_approval_id, authorizatio @cli_util.wrap_exceptions def get_my_request(ctx, from_json, my_request_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(my_request_id, six.string_types) and len(my_request_id.strip()) == 0: + if isinstance(my_request_id, str) and len(my_request_id.strip()) == 0: raise click.UsageError('Parameter --my-request-id cannot be whitespace or empty string') kwargs = {} @@ -11509,7 +11508,7 @@ def get_my_request(ctx, from_json, my_request_id, authorization, resource_type_s @cli_util.wrap_exceptions def get_my_smtp_credential(ctx, from_json, my_smtp_credential_id, authorization, resource_type_schema_version): - if isinstance(my_smtp_credential_id, six.string_types) and len(my_smtp_credential_id.strip()) == 0: + if isinstance(my_smtp_credential_id, str) and len(my_smtp_credential_id.strip()) == 0: raise click.UsageError('Parameter --my-smtp-credential-id cannot be whitespace or empty string') kwargs = {} @@ -11538,7 +11537,7 @@ def get_my_smtp_credential(ctx, from_json, my_smtp_credential_id, authorization, @cli_util.wrap_exceptions def get_my_support_account(ctx, from_json, my_support_account_id, authorization, resource_type_schema_version): - if isinstance(my_support_account_id, six.string_types) and len(my_support_account_id.strip()) == 0: + if isinstance(my_support_account_id, str) and len(my_support_account_id.strip()) == 0: raise click.UsageError('Parameter --my-support-account-id cannot be whitespace or empty string') kwargs = {} @@ -11569,7 +11568,7 @@ def get_my_support_account(ctx, from_json, my_support_account_id, authorization, @cli_util.wrap_exceptions def get_my_trusted_user_agent(ctx, from_json, my_trusted_user_agent_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(my_trusted_user_agent_id, six.string_types) and len(my_trusted_user_agent_id.strip()) == 0: + if isinstance(my_trusted_user_agent_id, str) and len(my_trusted_user_agent_id.strip()) == 0: raise click.UsageError('Parameter --my-trusted-user-agent-id cannot be whitespace or empty string') kwargs = {} @@ -11602,7 +11601,7 @@ def get_my_trusted_user_agent(ctx, from_json, my_trusted_user_agent_id, authoriz @cli_util.wrap_exceptions def get_my_user_db_credential(ctx, from_json, my_user_db_credential_id, authorization, resource_type_schema_version): - if isinstance(my_user_db_credential_id, six.string_types) and len(my_user_db_credential_id.strip()) == 0: + if isinstance(my_user_db_credential_id, str) and len(my_user_db_credential_id.strip()) == 0: raise click.UsageError('Parameter --my-user-db-credential-id cannot be whitespace or empty string') kwargs = {} @@ -11633,7 +11632,7 @@ def get_my_user_db_credential(ctx, from_json, my_user_db_credential_id, authoriz @cli_util.wrap_exceptions def get_network_perimeter(ctx, from_json, network_perimeter_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(network_perimeter_id, six.string_types) and len(network_perimeter_id.strip()) == 0: + if isinstance(network_perimeter_id, str) and len(network_perimeter_id.strip()) == 0: raise click.UsageError('Parameter --network-perimeter-id cannot be whitespace or empty string') kwargs = {} @@ -11668,7 +11667,7 @@ def get_network_perimeter(ctx, from_json, network_perimeter_id, authorization, r @cli_util.wrap_exceptions def get_notification_setting(ctx, from_json, notification_setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(notification_setting_id, six.string_types) and len(notification_setting_id.strip()) == 0: + if isinstance(notification_setting_id, str) and len(notification_setting_id.strip()) == 0: raise click.UsageError('Parameter --notification-setting-id cannot be whitespace or empty string') kwargs = {} @@ -11703,7 +11702,7 @@ def get_notification_setting(ctx, from_json, notification_setting_id, authorizat @cli_util.wrap_exceptions def get_o_auth2_client_credential(ctx, from_json, o_auth2_client_credential_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(o_auth2_client_credential_id, six.string_types) and len(o_auth2_client_credential_id.strip()) == 0: + if isinstance(o_auth2_client_credential_id, str) and len(o_auth2_client_credential_id.strip()) == 0: raise click.UsageError('Parameter --o-auth2-client-credential-id cannot be whitespace or empty string') kwargs = {} @@ -11736,7 +11735,7 @@ def get_o_auth2_client_credential(ctx, from_json, o_auth2_client_credential_id, @cli_util.wrap_exceptions def get_o_auth_client_certificate(ctx, from_json, o_auth_client_certificate_id, authorization, resource_type_schema_version): - if isinstance(o_auth_client_certificate_id, six.string_types) and len(o_auth_client_certificate_id.strip()) == 0: + if isinstance(o_auth_client_certificate_id, str) and len(o_auth_client_certificate_id.strip()) == 0: raise click.UsageError('Parameter --o-auth-client-certificate-id cannot be whitespace or empty string') kwargs = {} @@ -11765,7 +11764,7 @@ def get_o_auth_client_certificate(ctx, from_json, o_auth_client_certificate_id, @cli_util.wrap_exceptions def get_o_auth_partner_certificate(ctx, from_json, o_auth_partner_certificate_id, authorization, resource_type_schema_version): - if isinstance(o_auth_partner_certificate_id, six.string_types) and len(o_auth_partner_certificate_id.strip()) == 0: + if isinstance(o_auth_partner_certificate_id, str) and len(o_auth_partner_certificate_id.strip()) == 0: raise click.UsageError('Parameter --o-auth-partner-certificate-id cannot be whitespace or empty string') kwargs = {} @@ -11796,7 +11795,7 @@ def get_o_auth_partner_certificate(ctx, from_json, o_auth_partner_certificate_id @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: + if isinstance(oci_console_sign_on_policy_consent_id, str) 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 = {} @@ -11831,7 +11830,7 @@ def get_oci_console_sign_on_policy_consent(ctx, from_json, oci_console_sign_on_p @cli_util.wrap_exceptions def get_password_policy(ctx, from_json, password_policy_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(password_policy_id, six.string_types) and len(password_policy_id.strip()) == 0: + if isinstance(password_policy_id, str) and len(password_policy_id.strip()) == 0: raise click.UsageError('Parameter --password-policy-id cannot be whitespace or empty string') kwargs = {} @@ -11866,7 +11865,7 @@ def get_password_policy(ctx, from_json, password_policy_id, authorization, resou @cli_util.wrap_exceptions def get_policy(ctx, from_json, policy_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') kwargs = {} @@ -11901,7 +11900,7 @@ def get_policy(ctx, from_json, policy_id, authorization, resource_type_schema_ve @cli_util.wrap_exceptions def get_rule(ctx, from_json, rule_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: + if isinstance(rule_id, str) and len(rule_id.strip()) == 0: raise click.UsageError('Parameter --rule-id cannot be whitespace or empty string') kwargs = {} @@ -11934,7 +11933,7 @@ def get_rule(ctx, from_json, rule_id, authorization, resource_type_schema_versio @cli_util.wrap_exceptions def get_schema(ctx, from_json, schema_id, authorization, resource_type_schema_version): - if isinstance(schema_id, six.string_types) and len(schema_id.strip()) == 0: + if isinstance(schema_id, str) and len(schema_id.strip()) == 0: raise click.UsageError('Parameter --schema-id cannot be whitespace or empty string') kwargs = {} @@ -11965,7 +11964,7 @@ def get_schema(ctx, from_json, schema_id, authorization, resource_type_schema_ve @cli_util.wrap_exceptions def get_security_question(ctx, from_json, security_question_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(security_question_id, six.string_types) and len(security_question_id.strip()) == 0: + if isinstance(security_question_id, str) and len(security_question_id.strip()) == 0: raise click.UsageError('Parameter --security-question-id cannot be whitespace or empty string') kwargs = {} @@ -12000,7 +11999,7 @@ def get_security_question(ctx, from_json, security_question_id, authorization, r @cli_util.wrap_exceptions def get_security_question_setting(ctx, from_json, security_question_setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(security_question_setting_id, six.string_types) and len(security_question_setting_id.strip()) == 0: + if isinstance(security_question_setting_id, str) and len(security_question_setting_id.strip()) == 0: raise click.UsageError('Parameter --security-question-setting-id cannot be whitespace or empty string') kwargs = {} @@ -12035,7 +12034,7 @@ def get_security_question_setting(ctx, from_json, security_question_setting_id, @cli_util.wrap_exceptions def get_self_registration_profile(ctx, from_json, self_registration_profile_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(self_registration_profile_id, six.string_types) and len(self_registration_profile_id.strip()) == 0: + if isinstance(self_registration_profile_id, str) and len(self_registration_profile_id.strip()) == 0: raise click.UsageError('Parameter --self-registration-profile-id cannot be whitespace or empty string') kwargs = {} @@ -12070,7 +12069,7 @@ def get_self_registration_profile(ctx, from_json, self_registration_profile_id, @cli_util.wrap_exceptions def get_setting(ctx, from_json, setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(setting_id, six.string_types) and len(setting_id.strip()) == 0: + if isinstance(setting_id, str) and len(setting_id.strip()) == 0: raise click.UsageError('Parameter --setting-id cannot be whitespace or empty string') kwargs = {} @@ -12105,7 +12104,7 @@ def get_setting(ctx, from_json, setting_id, authorization, resource_type_schema_ @cli_util.wrap_exceptions def get_smtp_credential(ctx, from_json, smtp_credential_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(smtp_credential_id, six.string_types) and len(smtp_credential_id.strip()) == 0: + if isinstance(smtp_credential_id, str) and len(smtp_credential_id.strip()) == 0: raise click.UsageError('Parameter --smtp-credential-id cannot be whitespace or empty string') kwargs = {} @@ -12138,7 +12137,7 @@ def get_smtp_credential(ctx, from_json, smtp_credential_id, authorization, resou @cli_util.wrap_exceptions def get_social_identity_provider(ctx, from_json, social_identity_provider_id, authorization, resource_type_schema_version): - if isinstance(social_identity_provider_id, six.string_types) and len(social_identity_provider_id.strip()) == 0: + if isinstance(social_identity_provider_id, str) and len(social_identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --social-identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -12169,7 +12168,7 @@ def get_social_identity_provider(ctx, from_json, social_identity_provider_id, au @cli_util.wrap_exceptions def get_user(ctx, from_json, user_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -12204,7 +12203,7 @@ def get_user(ctx, from_json, user_id, authorization, resource_type_schema_versio @cli_util.wrap_exceptions def get_user_attributes_setting(ctx, from_json, user_attributes_setting_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(user_attributes_setting_id, six.string_types) and len(user_attributes_setting_id.strip()) == 0: + if isinstance(user_attributes_setting_id, str) and len(user_attributes_setting_id.strip()) == 0: raise click.UsageError('Parameter --user-attributes-setting-id cannot be whitespace or empty string') kwargs = {} @@ -12239,7 +12238,7 @@ def get_user_attributes_setting(ctx, from_json, user_attributes_setting_id, auth @cli_util.wrap_exceptions def get_user_db_credential(ctx, from_json, user_db_credential_id, authorization, resource_type_schema_version, attributes, attribute_sets): - if isinstance(user_db_credential_id, six.string_types) and len(user_db_credential_id.strip()) == 0: + if isinstance(user_db_credential_id, str) and len(user_db_credential_id.strip()) == 0: raise click.UsageError('Parameter --user-db-credential-id cannot be whitespace or empty string') kwargs = {} @@ -16225,7 +16224,7 @@ def list_users(ctx, from_json, all_pages, page_size, filter, sort_by, sort_order @cli_util.wrap_exceptions def patch_account_recovery_setting(ctx, from_json, account_recovery_setting_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(account_recovery_setting_id, six.string_types) and len(account_recovery_setting_id.strip()) == 0: + if isinstance(account_recovery_setting_id, str) and len(account_recovery_setting_id.strip()) == 0: raise click.UsageError('Parameter --account-recovery-setting-id cannot be whitespace or empty string') kwargs = {} @@ -16271,7 +16270,7 @@ def patch_account_recovery_setting(ctx, from_json, account_recovery_setting_id, @cli_util.wrap_exceptions def patch_api_key(ctx, from_json, api_key_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(api_key_id, six.string_types) and len(api_key_id.strip()) == 0: + if isinstance(api_key_id, str) and len(api_key_id.strip()) == 0: raise click.UsageError('Parameter --api-key-id cannot be whitespace or empty string') kwargs = {} @@ -16317,7 +16316,7 @@ def patch_api_key(ctx, from_json, api_key_id, schemas, operations, authorization @cli_util.wrap_exceptions def patch_app(ctx, from_json, app_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(app_id, six.string_types) and len(app_id.strip()) == 0: + if isinstance(app_id, str) and len(app_id.strip()) == 0: raise click.UsageError('Parameter --app-id cannot be whitespace or empty string') kwargs = {} @@ -16363,7 +16362,7 @@ def patch_app(ctx, from_json, app_id, schemas, operations, authorization, resour @cli_util.wrap_exceptions def patch_app_role(ctx, from_json, app_role_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(app_role_id, six.string_types) and len(app_role_id.strip()) == 0: + if isinstance(app_role_id, str) and len(app_role_id.strip()) == 0: raise click.UsageError('Parameter --app-role-id cannot be whitespace or empty string') kwargs = {} @@ -16409,7 +16408,7 @@ def patch_app_role(ctx, from_json, app_role_id, schemas, operations, authorizati @cli_util.wrap_exceptions def patch_approval_workflow(ctx, from_json, approval_workflow_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(approval_workflow_id, six.string_types) and len(approval_workflow_id.strip()) == 0: + if isinstance(approval_workflow_id, str) and len(approval_workflow_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-id cannot be whitespace or empty string') kwargs = {} @@ -16455,7 +16454,7 @@ def patch_approval_workflow(ctx, from_json, approval_workflow_id, schemas, opera @cli_util.wrap_exceptions def patch_approval_workflow_step(ctx, from_json, approval_workflow_step_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(approval_workflow_step_id, six.string_types) and len(approval_workflow_step_id.strip()) == 0: + if isinstance(approval_workflow_step_id, str) and len(approval_workflow_step_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-step-id cannot be whitespace or empty string') kwargs = {} @@ -16501,7 +16500,7 @@ def patch_approval_workflow_step(ctx, from_json, approval_workflow_step_id, sche @cli_util.wrap_exceptions def patch_auth_token(ctx, from_json, auth_token_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(auth_token_id, six.string_types) and len(auth_token_id.strip()) == 0: + if isinstance(auth_token_id, str) and len(auth_token_id.strip()) == 0: raise click.UsageError('Parameter --auth-token-id cannot be whitespace or empty string') kwargs = {} @@ -16547,7 +16546,7 @@ def patch_auth_token(ctx, from_json, auth_token_id, schemas, operations, authori @cli_util.wrap_exceptions def patch_cloud_gate(ctx, from_json, cloud_gate_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(cloud_gate_id, six.string_types) and len(cloud_gate_id.strip()) == 0: + if isinstance(cloud_gate_id, str) and len(cloud_gate_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-id cannot be whitespace or empty string') kwargs = {} @@ -16593,7 +16592,7 @@ def patch_cloud_gate(ctx, from_json, cloud_gate_id, schemas, operations, authori @cli_util.wrap_exceptions def patch_cloud_gate_mapping(ctx, from_json, cloud_gate_mapping_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(cloud_gate_mapping_id, six.string_types) and len(cloud_gate_mapping_id.strip()) == 0: + if isinstance(cloud_gate_mapping_id, str) and len(cloud_gate_mapping_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-mapping-id cannot be whitespace or empty string') kwargs = {} @@ -16639,7 +16638,7 @@ def patch_cloud_gate_mapping(ctx, from_json, cloud_gate_mapping_id, schemas, ope @cli_util.wrap_exceptions def patch_cloud_gate_server(ctx, from_json, cloud_gate_server_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(cloud_gate_server_id, six.string_types) and len(cloud_gate_server_id.strip()) == 0: + if isinstance(cloud_gate_server_id, str) and len(cloud_gate_server_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-server-id cannot be whitespace or empty string') kwargs = {} @@ -16685,7 +16684,7 @@ def patch_cloud_gate_server(ctx, from_json, cloud_gate_server_id, schemas, opera @cli_util.wrap_exceptions def patch_condition(ctx, from_json, condition_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(condition_id, six.string_types) and len(condition_id.strip()) == 0: + if isinstance(condition_id, str) and len(condition_id.strip()) == 0: raise click.UsageError('Parameter --condition-id cannot be whitespace or empty string') kwargs = {} @@ -16731,7 +16730,7 @@ def patch_condition(ctx, from_json, condition_id, schemas, operations, authoriza @cli_util.wrap_exceptions def patch_customer_secret_key(ctx, from_json, customer_secret_key_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(customer_secret_key_id, six.string_types) and len(customer_secret_key_id.strip()) == 0: + if isinstance(customer_secret_key_id, str) and len(customer_secret_key_id.strip()) == 0: raise click.UsageError('Parameter --customer-secret-key-id cannot be whitespace or empty string') kwargs = {} @@ -16777,7 +16776,7 @@ def patch_customer_secret_key(ctx, from_json, customer_secret_key_id, schemas, o @cli_util.wrap_exceptions def patch_dynamic_resource_group(ctx, from_json, dynamic_resource_group_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(dynamic_resource_group_id, six.string_types) and len(dynamic_resource_group_id.strip()) == 0: + if isinstance(dynamic_resource_group_id, str) and len(dynamic_resource_group_id.strip()) == 0: raise click.UsageError('Parameter --dynamic-resource-group-id cannot be whitespace or empty string') kwargs = {} @@ -16823,7 +16822,7 @@ def patch_dynamic_resource_group(ctx, from_json, dynamic_resource_group_id, sche @cli_util.wrap_exceptions def patch_grant(ctx, from_json, grant_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(grant_id, six.string_types) and len(grant_id.strip()) == 0: + if isinstance(grant_id, str) and len(grant_id.strip()) == 0: raise click.UsageError('Parameter --grant-id cannot be whitespace or empty string') kwargs = {} @@ -16869,7 +16868,7 @@ def patch_grant(ctx, from_json, grant_id, schemas, operations, authorization, re @cli_util.wrap_exceptions def patch_group(ctx, from_json, group_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(group_id, six.string_types) and len(group_id.strip()) == 0: + if isinstance(group_id, str) and len(group_id.strip()) == 0: raise click.UsageError('Parameter --group-id cannot be whitespace or empty string') kwargs = {} @@ -16915,7 +16914,7 @@ def patch_group(ctx, from_json, group_id, schemas, operations, authorization, re @cli_util.wrap_exceptions def patch_identity_propagation_trust(ctx, from_json, identity_propagation_trust_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(identity_propagation_trust_id, six.string_types) and len(identity_propagation_trust_id.strip()) == 0: + if isinstance(identity_propagation_trust_id, str) and len(identity_propagation_trust_id.strip()) == 0: raise click.UsageError('Parameter --identity-propagation-trust-id cannot be whitespace or empty string') kwargs = {} @@ -16961,7 +16960,7 @@ def patch_identity_propagation_trust(ctx, from_json, identity_propagation_trust_ @cli_util.wrap_exceptions def patch_identity_provider(ctx, from_json, identity_provider_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -17007,7 +17006,7 @@ def patch_identity_provider(ctx, from_json, identity_provider_id, schemas, opera @cli_util.wrap_exceptions def patch_identity_setting(ctx, from_json, identity_setting_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(identity_setting_id, six.string_types) and len(identity_setting_id.strip()) == 0: + if isinstance(identity_setting_id, str) and len(identity_setting_id.strip()) == 0: raise click.UsageError('Parameter --identity-setting-id cannot be whitespace or empty string') kwargs = {} @@ -17053,7 +17052,7 @@ def patch_identity_setting(ctx, from_json, identity_setting_id, schemas, operati @cli_util.wrap_exceptions def patch_kmsi_setting(ctx, from_json, kmsi_setting_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(kmsi_setting_id, six.string_types) and len(kmsi_setting_id.strip()) == 0: + if isinstance(kmsi_setting_id, str) and len(kmsi_setting_id.strip()) == 0: raise click.UsageError('Parameter --kmsi-setting-id cannot be whitespace or empty string') kwargs = {} @@ -17138,7 +17137,7 @@ def patch_me(ctx, from_json, schemas, operations, authorization, resource_type_s @cli_util.wrap_exceptions def patch_my_api_key(ctx, from_json, my_api_key_id, schemas, operations, authorization, resource_type_schema_version, if_match): - if isinstance(my_api_key_id, six.string_types) and len(my_api_key_id.strip()) == 0: + if isinstance(my_api_key_id, str) and len(my_api_key_id.strip()) == 0: raise click.UsageError('Parameter --my-api-key-id cannot be whitespace or empty string') kwargs = {} @@ -17178,7 +17177,7 @@ def patch_my_api_key(ctx, from_json, my_api_key_id, schemas, operations, authori @cli_util.wrap_exceptions def patch_my_auth_token(ctx, from_json, my_auth_token_id, schemas, operations, authorization, resource_type_schema_version, if_match): - if isinstance(my_auth_token_id, six.string_types) and len(my_auth_token_id.strip()) == 0: + if isinstance(my_auth_token_id, str) and len(my_auth_token_id.strip()) == 0: raise click.UsageError('Parameter --my-auth-token-id cannot be whitespace or empty string') kwargs = {} @@ -17218,7 +17217,7 @@ def patch_my_auth_token(ctx, from_json, my_auth_token_id, schemas, operations, a @cli_util.wrap_exceptions def patch_my_customer_secret_key(ctx, from_json, my_customer_secret_key_id, schemas, operations, authorization, resource_type_schema_version, if_match): - if isinstance(my_customer_secret_key_id, six.string_types) and len(my_customer_secret_key_id.strip()) == 0: + if isinstance(my_customer_secret_key_id, str) and len(my_customer_secret_key_id.strip()) == 0: raise click.UsageError('Parameter --my-customer-secret-key-id cannot be whitespace or empty string') kwargs = {} @@ -17260,7 +17259,7 @@ def patch_my_customer_secret_key(ctx, from_json, my_customer_secret_key_id, sche @cli_util.wrap_exceptions def patch_my_device(ctx, from_json, my_device_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(my_device_id, six.string_types) and len(my_device_id.strip()) == 0: + if isinstance(my_device_id, str) and len(my_device_id.strip()) == 0: raise click.UsageError('Parameter --my-device-id cannot be whitespace or empty string') kwargs = {} @@ -17304,7 +17303,7 @@ def patch_my_device(ctx, from_json, my_device_id, schemas, operations, authoriza @cli_util.wrap_exceptions def patch_my_o_auth2_client_credential(ctx, from_json, my_o_auth2_client_credential_id, schemas, operations, authorization, resource_type_schema_version, if_match): - if isinstance(my_o_auth2_client_credential_id, six.string_types) and len(my_o_auth2_client_credential_id.strip()) == 0: + if isinstance(my_o_auth2_client_credential_id, str) and len(my_o_auth2_client_credential_id.strip()) == 0: raise click.UsageError('Parameter --my-o-auth2-client-credential-id cannot be whitespace or empty string') kwargs = {} @@ -17344,7 +17343,7 @@ def patch_my_o_auth2_client_credential(ctx, from_json, my_o_auth2_client_credent @cli_util.wrap_exceptions def patch_my_pending_approval(ctx, from_json, my_pending_approval_id, schemas, operations, authorization, resource_type_schema_version, if_match): - if isinstance(my_pending_approval_id, six.string_types) and len(my_pending_approval_id.strip()) == 0: + if isinstance(my_pending_approval_id, str) and len(my_pending_approval_id.strip()) == 0: raise click.UsageError('Parameter --my-pending-approval-id cannot be whitespace or empty string') kwargs = {} @@ -17386,7 +17385,7 @@ def patch_my_pending_approval(ctx, from_json, my_pending_approval_id, schemas, o @cli_util.wrap_exceptions def patch_my_request(ctx, from_json, my_request_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(my_request_id, six.string_types) and len(my_request_id.strip()) == 0: + if isinstance(my_request_id, str) and len(my_request_id.strip()) == 0: raise click.UsageError('Parameter --my-request-id cannot be whitespace or empty string') kwargs = {} @@ -17430,7 +17429,7 @@ def patch_my_request(ctx, from_json, my_request_id, schemas, operations, authori @cli_util.wrap_exceptions def patch_my_smtp_credential(ctx, from_json, my_smtp_credential_id, schemas, operations, authorization, resource_type_schema_version, if_match): - if isinstance(my_smtp_credential_id, six.string_types) and len(my_smtp_credential_id.strip()) == 0: + if isinstance(my_smtp_credential_id, str) and len(my_smtp_credential_id.strip()) == 0: raise click.UsageError('Parameter --my-smtp-credential-id cannot be whitespace or empty string') kwargs = {} @@ -17472,7 +17471,7 @@ def patch_my_smtp_credential(ctx, from_json, my_smtp_credential_id, schemas, ope @cli_util.wrap_exceptions def patch_network_perimeter(ctx, from_json, network_perimeter_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(network_perimeter_id, six.string_types) and len(network_perimeter_id.strip()) == 0: + if isinstance(network_perimeter_id, str) and len(network_perimeter_id.strip()) == 0: raise click.UsageError('Parameter --network-perimeter-id cannot be whitespace or empty string') kwargs = {} @@ -17518,7 +17517,7 @@ def patch_network_perimeter(ctx, from_json, network_perimeter_id, schemas, opera @cli_util.wrap_exceptions def patch_o_auth2_client_credential(ctx, from_json, o_auth2_client_credential_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(o_auth2_client_credential_id, six.string_types) and len(o_auth2_client_credential_id.strip()) == 0: + if isinstance(o_auth2_client_credential_id, str) and len(o_auth2_client_credential_id.strip()) == 0: raise click.UsageError('Parameter --o-auth2-client-credential-id cannot be whitespace or empty string') kwargs = {} @@ -17564,7 +17563,7 @@ def patch_o_auth2_client_credential(ctx, from_json, o_auth2_client_credential_id @cli_util.wrap_exceptions def patch_password_policy(ctx, from_json, password_policy_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(password_policy_id, six.string_types) and len(password_policy_id.strip()) == 0: + if isinstance(password_policy_id, str) and len(password_policy_id.strip()) == 0: raise click.UsageError('Parameter --password-policy-id cannot be whitespace or empty string') kwargs = {} @@ -17610,7 +17609,7 @@ def patch_password_policy(ctx, from_json, password_policy_id, schemas, operation @cli_util.wrap_exceptions def patch_policy(ctx, from_json, policy_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') kwargs = {} @@ -17656,7 +17655,7 @@ def patch_policy(ctx, from_json, policy_id, schemas, operations, authorization, @cli_util.wrap_exceptions def patch_rule(ctx, from_json, rule_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: + if isinstance(rule_id, str) and len(rule_id.strip()) == 0: raise click.UsageError('Parameter --rule-id cannot be whitespace or empty string') kwargs = {} @@ -17700,7 +17699,7 @@ def patch_rule(ctx, from_json, rule_id, schemas, operations, authorization, reso @cli_util.wrap_exceptions def patch_schema(ctx, from_json, schema_id, schemas, operations, authorization, resource_type_schema_version, if_match): - if isinstance(schema_id, six.string_types) and len(schema_id.strip()) == 0: + if isinstance(schema_id, str) and len(schema_id.strip()) == 0: raise click.UsageError('Parameter --schema-id cannot be whitespace or empty string') kwargs = {} @@ -17742,7 +17741,7 @@ def patch_schema(ctx, from_json, schema_id, schemas, operations, authorization, @cli_util.wrap_exceptions def patch_security_question(ctx, from_json, security_question_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(security_question_id, six.string_types) and len(security_question_id.strip()) == 0: + if isinstance(security_question_id, str) and len(security_question_id.strip()) == 0: raise click.UsageError('Parameter --security-question-id cannot be whitespace or empty string') kwargs = {} @@ -17788,7 +17787,7 @@ def patch_security_question(ctx, from_json, security_question_id, schemas, opera @cli_util.wrap_exceptions def patch_security_question_setting(ctx, from_json, security_question_setting_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(security_question_setting_id, six.string_types) and len(security_question_setting_id.strip()) == 0: + if isinstance(security_question_setting_id, str) and len(security_question_setting_id.strip()) == 0: raise click.UsageError('Parameter --security-question-setting-id cannot be whitespace or empty string') kwargs = {} @@ -17834,7 +17833,7 @@ def patch_security_question_setting(ctx, from_json, security_question_setting_id @cli_util.wrap_exceptions def patch_self_registration_profile(ctx, from_json, self_registration_profile_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(self_registration_profile_id, six.string_types) and len(self_registration_profile_id.strip()) == 0: + if isinstance(self_registration_profile_id, str) and len(self_registration_profile_id.strip()) == 0: raise click.UsageError('Parameter --self-registration-profile-id cannot be whitespace or empty string') kwargs = {} @@ -17880,7 +17879,7 @@ def patch_self_registration_profile(ctx, from_json, self_registration_profile_id @cli_util.wrap_exceptions def patch_setting(ctx, from_json, setting_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(setting_id, six.string_types) and len(setting_id.strip()) == 0: + if isinstance(setting_id, str) and len(setting_id.strip()) == 0: raise click.UsageError('Parameter --setting-id cannot be whitespace or empty string') kwargs = {} @@ -17926,7 +17925,7 @@ def patch_setting(ctx, from_json, setting_id, schemas, operations, authorization @cli_util.wrap_exceptions def patch_smtp_credential(ctx, from_json, smtp_credential_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(smtp_credential_id, six.string_types) and len(smtp_credential_id.strip()) == 0: + if isinstance(smtp_credential_id, str) and len(smtp_credential_id.strip()) == 0: raise click.UsageError('Parameter --smtp-credential-id cannot be whitespace or empty string') kwargs = {} @@ -17970,7 +17969,7 @@ def patch_smtp_credential(ctx, from_json, smtp_credential_id, schemas, operation @cli_util.wrap_exceptions def patch_social_identity_provider(ctx, from_json, social_identity_provider_id, schemas, operations, authorization, resource_type_schema_version, if_match): - if isinstance(social_identity_provider_id, six.string_types) and len(social_identity_provider_id.strip()) == 0: + if isinstance(social_identity_provider_id, str) and len(social_identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --social-identity-provider-id cannot be whitespace or empty string') kwargs = {} @@ -18012,7 +18011,7 @@ def patch_social_identity_provider(ctx, from_json, social_identity_provider_id, @cli_util.wrap_exceptions def patch_user(ctx, from_json, user_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-id cannot be whitespace or empty string') kwargs = {} @@ -18058,7 +18057,7 @@ def patch_user(ctx, from_json, user_id, schemas, operations, authorization, reso @cli_util.wrap_exceptions def patch_user_attributes_setting(ctx, from_json, user_attributes_setting_id, schemas, operations, authorization, resource_type_schema_version, attributes, attribute_sets, if_match): - if isinstance(user_attributes_setting_id, six.string_types) and len(user_attributes_setting_id.strip()) == 0: + if isinstance(user_attributes_setting_id, str) and len(user_attributes_setting_id.strip()) == 0: raise click.UsageError('Parameter --user-attributes-setting-id cannot be whitespace or empty string') kwargs = {} @@ -18150,7 +18149,7 @@ def patch_user_attributes_setting(ctx, from_json, user_attributes_setting_id, sc @cli_util.wrap_exceptions def put_account_recovery_setting(ctx, from_json, force, account_recovery_setting_id, schemas, factors, max_incorrect_attempts, lockout_duration, 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, if_match): - if isinstance(account_recovery_setting_id, six.string_types) and len(account_recovery_setting_id.strip()) == 0: + if isinstance(account_recovery_setting_id, str) and len(account_recovery_setting_id.strip()) == 0: raise click.UsageError('Parameter --account-recovery-setting-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 factors: @@ -18635,7 +18634,7 @@ def put_account_recovery_setting(ctx, from_json, force, account_recovery_setting @cli_util.wrap_exceptions def put_app(ctx, from_json, force, app_id, schemas, display_name, based_on_template, 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, meter_as_opc_service, name, client_secret, hashed_client_secret, description, id_token_enc_algo, delegated_service_names, active, app_icon, app_thumbnail, migrated, infrastructure, is_login_target, show_in_my_apps, login_mechanism, landing_page_url, product_logo_url, privacy_policy_url, terms_of_service_url, contact_email_address, product_name, home_page_url, is_form_fill, is_o_auth_client, is_radius_app, client_type, redirect_uris, all_url_schemes_allowed, logout_uri, post_logout_redirect_uris, allowed_grants, allowed_operations, client_ip_checking, is_opc_service, is_unmanaged_app, allow_access_control, is_o_auth_resource, access_token_expiry, refresh_token_expiry, allow_offline, callback_service_url, audience, is_mobile_target, login_page_url, linking_callback_url, logout_page_url, error_page_url, is_saml_service_provider, is_web_tier_policy, is_kerberos_realm, icon, is_alias_app, is_managed_app, service_type_urn, service_type_version, is_obligation_capable, ready_to_upgrade, trust_scope, is_database_service, secondary_audiences, is_enterprise_app, bypass_consent, disable_kmsi_token_authentication, is_multicloud_service_app, radius_policy, apps_network_perimeters, cloud_control_properties, editable_attributes, terms_of_use, protectable_secondary_audiences, idp_policy, allowed_tags, app_signon_policy, trust_policies, signon_policy, identity_providers, accounts, grants, service_params, attr_rendering_metadata, granted_app_roles, saml_service_provider, allowed_scopes, certificates, alias_apps, as_opc_service, admin_roles, user_roles, scopes, urnietfparamsscimschemasoracleidcsextensionradius_app_app, urnietfparamsscimschemasoracleidcsextensionsaml_service_provider_app, urnietfparamsscimschemasoracleidcsextensionweb_tier_policy_app, urnietfparamsscimschemasoracleidcsextensionmanagedapp_app, urnietfparamsscimschemasoracleidcsextensionform_fill_app_template_app_template, urnietfparamsscimschemasoracleidcsextensionopc_service_app, urnietfparamsscimschemasoracleidcsextensionkerberos_realm_app, urnietfparamsscimschemasoracleidcsextensionrequestable_app, urnietfparamsscimschemasoracleidcsextensionform_fill_app_app, urnietfparamsscimschemasoracleidcsextensiondbcs_app, urnietfparamsscimschemasoracleidcsextensionenterprise_app_app, urnietfparamsscimschemasoracleidcsextension_oci_tags, urnietfparamsscimschemasoracleidcsextensionmulticloud_service_app_app, if_match): - if isinstance(app_id, six.string_types) and len(app_id.strip()) == 0: + if isinstance(app_id, str) and len(app_id.strip()) == 0: raise click.UsageError('Parameter --app-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 delegated_service_names or redirect_uris or post_logout_redirect_uris or allowed_grants or allowed_operations or secondary_audiences or radius_policy or apps_network_perimeters or cloud_control_properties or editable_attributes or terms_of_use or protectable_secondary_audiences or idp_policy or allowed_tags or app_signon_policy or trust_policies or signon_policy or identity_providers or accounts or grants or service_params or attr_rendering_metadata or based_on_template or granted_app_roles or saml_service_provider or allowed_scopes or certificates or alias_apps or as_opc_service or admin_roles or user_roles or scopes or urnietfparamsscimschemasoracleidcsextensionradius_app_app or urnietfparamsscimschemasoracleidcsextensionsaml_service_provider_app or urnietfparamsscimschemasoracleidcsextensionweb_tier_policy_app or urnietfparamsscimschemasoracleidcsextensionmanagedapp_app or urnietfparamsscimschemasoracleidcsextensionform_fill_app_template_app_template or urnietfparamsscimschemasoracleidcsextensionopc_service_app or urnietfparamsscimschemasoracleidcsextensionkerberos_realm_app or urnietfparamsscimschemasoracleidcsextensionrequestable_app or urnietfparamsscimschemasoracleidcsextensionform_fill_app_app or urnietfparamsscimschemasoracleidcsextensiondbcs_app or urnietfparamsscimschemasoracleidcsextensionenterprise_app_app or urnietfparamsscimschemasoracleidcsextension_oci_tags or urnietfparamsscimschemasoracleidcsextensionmulticloud_service_app_app: @@ -19065,7 +19064,7 @@ def put_app(ctx, from_json, force, app_id, schemas, display_name, based_on_templ @cli_util.wrap_exceptions def put_app_status_changer(ctx, from_json, force, app_status_changer_id, schemas, active, 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, if_match): - if isinstance(app_status_changer_id, six.string_types) and len(app_status_changer_id.strip()) == 0: + if isinstance(app_status_changer_id, str) and len(app_status_changer_id.strip()) == 0: raise click.UsageError('Parameter --app-status-changer-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: @@ -19197,7 +19196,7 @@ def put_app_status_changer(ctx, from_json, force, app_status_changer_id, schemas @cli_util.wrap_exceptions def put_approval_workflow(ctx, from_json, force, approval_workflow_id, schemas, name, max_duration, 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, description, approval_workflow_steps, if_match): - if isinstance(approval_workflow_id, six.string_types) and len(approval_workflow_id.strip()) == 0: + if isinstance(approval_workflow_id, str) and len(approval_workflow_id.strip()) == 0: raise click.UsageError('Parameter --approval-workflow-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 max_duration or approval_workflow_steps: @@ -19397,7 +19396,7 @@ def put_approval_workflow(ctx, from_json, force, approval_workflow_id, schemas, @cli_util.wrap_exceptions def put_authentication_factor_setting(ctx, from_json, force, authentication_factor_setting_id, schemas, sms_enabled, totp_enabled, push_enabled, bypass_code_enabled, security_questions_enabled, mfa_enrollment_type, notification_settings, bypass_code_settings, client_app_settings, endpoint_restrictions, compliance_policy, totp_settings, 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, email_enabled, phone_call_enabled, fido_authenticator_enabled, yubico_otp_enabled, mfa_enabled_category, hide_backup_factor_enabled, auto_enroll_email_factor_disabled, user_enrollment_disabled_factors, email_settings, third_party_factor, identity_store_settings, urnietfparamsscimschemasoracleidcsextensionthird_party_authentication_factor_settings, urnietfparamsscimschemasoracleidcsextensionfido_authentication_factor_settings, if_match): - if isinstance(authentication_factor_setting_id, six.string_types) and len(authentication_factor_setting_id.strip()) == 0: + if isinstance(authentication_factor_setting_id, str) and len(authentication_factor_setting_id.strip()) == 0: raise click.UsageError('Parameter --authentication-factor-setting-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 user_enrollment_disabled_factors or email_settings or third_party_factor or notification_settings or identity_store_settings or bypass_code_settings or client_app_settings or endpoint_restrictions or compliance_policy or totp_settings or urnietfparamsscimschemasoracleidcsextensionthird_party_authentication_factor_settings or urnietfparamsscimschemasoracleidcsextensionfido_authentication_factor_settings: @@ -19620,7 +19619,7 @@ def put_authentication_factor_setting(ctx, from_json, force, authentication_fact @cli_util.wrap_exceptions def put_cloud_gate(ctx, from_json, force, cloud_gate_id, schemas, display_name, 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, is_opc_service, last_modified_time, description, active, type, upstream_server_groups, upstream_servers, oauth_client, servers, mappings, if_match): - if isinstance(cloud_gate_id, six.string_types) and len(cloud_gate_id.strip()) == 0: + if isinstance(cloud_gate_id, str) and len(cloud_gate_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-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 upstream_server_groups or upstream_servers or oauth_client or servers or mappings: @@ -19794,7 +19793,7 @@ def put_cloud_gate(ctx, from_json, force, cloud_gate_id, schemas, display_name, @cli_util.wrap_exceptions def put_cloud_gate_mapping(ctx, from_json, force, cloud_gate_mapping_id, schemas, resource_prefix, policy_name, server, gateway_app, cloud_gate, 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, is_opc_service, description, proxy_pass, nginx_settings, upstream_server_group, if_match): - if isinstance(cloud_gate_mapping_id, six.string_types) and len(cloud_gate_mapping_id.strip()) == 0: + if isinstance(cloud_gate_mapping_id, str) and len(cloud_gate_mapping_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-mapping-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 upstream_server_group or server or gateway_app or cloud_gate: @@ -19957,7 +19956,7 @@ def put_cloud_gate_mapping(ctx, from_json, force, cloud_gate_mapping_id, schemas @cli_util.wrap_exceptions def put_cloud_gate_server(ctx, from_json, force, cloud_gate_server_id, schemas, display_name, host_name, port, ssl, cloud_gate, 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, is_opc_service, description, nginx_settings, if_match): - if isinstance(cloud_gate_server_id, six.string_types) and len(cloud_gate_server_id.strip()) == 0: + if isinstance(cloud_gate_server_id, str) and len(cloud_gate_server_id.strip()) == 0: raise click.UsageError('Parameter --cloud-gate-server-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 cloud_gate: @@ -20112,7 +20111,7 @@ def put_cloud_gate_server(ctx, from_json, force, cloud_gate_server_id, schemas, @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, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy, if_match): - if isinstance(condition_id, six.string_types) and len(condition_id.strip()) == 0: + if isinstance(condition_id, str) 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 or urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy: @@ -20267,7 +20266,7 @@ def put_condition(ctx, from_json, force, condition_id, schemas, name, attribute_ @cli_util.wrap_exceptions def put_dynamic_resource_group(ctx, from_json, force, dynamic_resource_group_id, schemas, matching_rule, display_name, 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, description, grants, dynamic_group_app_roles, urnietfparamsscimschemasoracleidcsextension_oci_tags, if_match): - if isinstance(dynamic_resource_group_id, six.string_types) and len(dynamic_resource_group_id.strip()) == 0: + if isinstance(dynamic_resource_group_id, str) and len(dynamic_resource_group_id.strip()) == 0: raise click.UsageError('Parameter --dynamic-resource-group-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 grants or dynamic_group_app_roles or urnietfparamsscimschemasoracleidcsextension_oci_tags: @@ -20422,7 +20421,7 @@ def put_dynamic_resource_group(ctx, from_json, force, dynamic_resource_group_id, @cli_util.wrap_exceptions def put_group(ctx, from_json, force, group_id, schemas, display_name, 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, non_unique_display_name, members, urnietfparamsscimschemasoracleidcsextensiongroup_group, urnietfparamsscimschemasoracleidcsextensionposix_group, urnietfparamsscimschemasoracleidcsextensionrequestable_group, urnietfparamsscimschemasoracleidcsextensiondbcs_group, urnietfparamsscimschemasoracleidcsextensiondynamic_group, urnietfparamsscimschemasoracleidcsextension_oci_tags, if_match): - if isinstance(group_id, six.string_types) and len(group_id.strip()) == 0: + if isinstance(group_id, str) and len(group_id.strip()) == 0: raise click.UsageError('Parameter --group-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 members or urnietfparamsscimschemasoracleidcsextensiongroup_group or urnietfparamsscimschemasoracleidcsextensionposix_group or urnietfparamsscimschemasoracleidcsextensionrequestable_group or urnietfparamsscimschemasoracleidcsextensiondbcs_group or urnietfparamsscimschemasoracleidcsextensiondynamic_group or urnietfparamsscimschemasoracleidcsextension_oci_tags: @@ -20625,7 +20624,7 @@ def put_group(ctx, from_json, force, group_id, schemas, display_name, authorizat @cli_util.wrap_exceptions def put_identity_propagation_trust(ctx, from_json, force, identity_propagation_trust_id, schemas, name, type, issuer, 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, description, account_id, subject_claim_name, subject_mapping_attribute, subject_type, client_claim_name, client_claim_values, active, public_key_endpoint, public_certificate, oauth_clients, allow_impersonation, clock_skew_seconds, impersonation_service_users, keytab, if_match): - if isinstance(identity_propagation_trust_id, six.string_types) and len(identity_propagation_trust_id.strip()) == 0: + if isinstance(identity_propagation_trust_id, str) and len(identity_propagation_trust_id.strip()) == 0: raise click.UsageError('Parameter --identity-propagation-trust-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 client_claim_values or oauth_clients or impersonation_service_users or keytab: @@ -20970,7 +20969,7 @@ def put_identity_propagation_trust(ctx, from_json, force, identity_propagation_t @cli_util.wrap_exceptions def put_identity_provider(ctx, from_json, force, identity_provider_id, schemas, partner_name, enabled, 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, metadata, partner_provider_id, tenant_provider_id, succinct_id, idp_sso_url, logout_request_url, logout_response_url, signing_certificate, encryption_certificate, name_id_format, include_signing_cert_in_signature, authn_request_binding, logout_binding, logout_enabled, signature_hash_algorithm, icon_url, shown_on_login_page, jit_user_prov_enabled, jit_user_prov_group_assertion_attribute_enabled, jit_user_prov_group_static_list_enabled, jit_user_prov_create_user_enabled, jit_user_prov_attribute_update_enabled, jit_user_prov_group_assignment_method, jit_user_prov_group_mapping_mode, jit_user_prov_group_saml_attribute_name, service_instance_identifier, user_mapping_method, user_mapping_store_attribute, assertion_attribute, type, require_force_authn, requires_encrypted_assertion, saml_ho_k_required, requested_authentication_context, jit_user_prov_ignore_error_on_absent_groups, last_notification_sent_time, jit_user_prov_group_mappings, jit_user_prov_attributes, jit_user_prov_assigned_groups, correlation_policy, urnietfparamsscimschemasoracleidcsextensionsocial_identity_provider, urnietfparamsscimschemasoracleidcsextensionx509_identity_provider, if_match): - if isinstance(identity_provider_id, six.string_types) and len(identity_provider_id.strip()) == 0: + if isinstance(identity_provider_id, str) and len(identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --identity-provider-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 requested_authentication_context or jit_user_prov_group_mappings or jit_user_prov_attributes or jit_user_prov_assigned_groups or correlation_policy or urnietfparamsscimschemasoracleidcsextensionsocial_identity_provider or urnietfparamsscimschemasoracleidcsextensionx509_identity_provider: @@ -21255,7 +21254,7 @@ def put_identity_provider(ctx, from_json, force, identity_provider_id, schemas, @cli_util.wrap_exceptions def put_identity_setting(ctx, from_json, force, identity_setting_id, schemas, 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, user_allowed_to_set_recovery_email, emit_locked_message_when_user_is_locked, primary_email_required, remove_invalid_emails, return_inactive_over_locked_message, my_profile, posix_uid, posix_gid, tokens, if_match): - if isinstance(identity_setting_id, six.string_types) and len(identity_setting_id.strip()) == 0: + if isinstance(identity_setting_id, str) and len(identity_setting_id.strip()) == 0: raise click.UsageError('Parameter --identity-setting-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 my_profile or posix_uid or posix_gid or tokens: @@ -21430,7 +21429,7 @@ def put_identity_setting(ctx, from_json, force, identity_setting_id, schemas, au @cli_util.wrap_exceptions def put_kmsi_setting(ctx, from_json, force, kmsi_setting_id, schemas, 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, token_validity_in_days, last_used_validity_in_days, max_allowed_sessions, kmsi_feature_enabled, kmsi_prompt_enabled, tou_prompt_disabled, last_enabled_on, if_match): - if isinstance(kmsi_setting_id, six.string_types) and len(kmsi_setting_id.strip()) == 0: + if isinstance(kmsi_setting_id, str) and len(kmsi_setting_id.strip()) == 0: raise click.UsageError('Parameter --kmsi-setting-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: @@ -22031,7 +22030,7 @@ def put_me_password_changer(ctx, from_json, force, schemas, password, old_passwo @cli_util.wrap_exceptions def put_network_perimeter(ctx, from_json, force, network_perimeter_id, schemas, name, ip_addresses, 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, if_match): - if isinstance(network_perimeter_id, six.string_types) and len(network_perimeter_id.strip()) == 0: + if isinstance(network_perimeter_id, str) and len(network_perimeter_id.strip()) == 0: raise click.UsageError('Parameter --network-perimeter-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 ip_addresses: @@ -22184,7 +22183,7 @@ def put_network_perimeter(ctx, from_json, force, network_perimeter_id, schemas, @cli_util.wrap_exceptions def put_notification_setting(ctx, from_json, force, notification_setting_id, schemas, notification_enabled, from_email_address, event_settings, 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, test_mode_enabled, test_recipients, send_notifications_to_secondary_email, send_notification_to_old_and_new_primary_emails_when_admin_changes_primary_email, if_match): - if isinstance(notification_setting_id, six.string_types) and len(notification_setting_id.strip()) == 0: + if isinstance(notification_setting_id, str) and len(notification_setting_id.strip()) == 0: raise click.UsageError('Parameter --notification-setting-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 test_recipients or from_email_address or event_settings: @@ -22447,7 +22446,7 @@ def put_notification_setting(ctx, from_json, force, notification_setting_id, sch @cli_util.wrap_exceptions def put_password_policy(ctx, from_json, force, password_policy_id, schemas, name, 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, max_length, min_length, min_alphas, min_numerals, min_alpha_numerals, min_special_chars, max_special_chars, min_lower_case, min_upper_case, min_unique_chars, max_repeated_chars, starts_with_alphabet, first_name_disallowed, last_name_disallowed, user_name_disallowed, disallowed_user_attribute_values, min_password_age, password_expires_after, password_expire_warning, required_chars, disallowed_chars, allowed_chars, disallowed_substrings, dictionary_word_disallowed, dictionary_location, dictionary_delimiter, max_incorrect_attempts, lockout_duration, num_passwords_in_history, password_strength, force_password_reset, distinct_characters, priority, groups, configured_password_policy_rules, if_match): - if isinstance(password_policy_id, six.string_types) and len(password_policy_id.strip()) == 0: + if isinstance(password_policy_id, str) and len(password_policy_id.strip()) == 0: raise click.UsageError('Parameter --password-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 disallowed_user_attribute_values or disallowed_substrings or groups or configured_password_policy_rules: @@ -22700,7 +22699,7 @@ def put_password_policy(ctx, from_json, force, password_policy_id, schemas, name @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, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy, if_match): - if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: + if isinstance(policy_id, str) 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 or urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy: @@ -22868,7 +22867,7 @@ def put_policy(ctx, from_json, force, policy_id, schemas, name, policy_type, aut @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, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy, if_match): - if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: + if isinstance(rule_id, str) 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 or urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy: @@ -23013,7 +23012,7 @@ def put_rule(ctx, from_json, force, rule_id, schemas, name, condition, policy_ty @cli_util.wrap_exceptions def put_schema(ctx, from_json, force, schema_id, schemas, idcs_mappable, authorization, resource_type_schema_version, idcs_maps_to_same_target_attribute_name_as, external_id, name, idcs_resource_types, description, idcs_attribute_cacheable, idcs_override_common_attribute, attributes, if_match): - if isinstance(schema_id, six.string_types) and len(schema_id.strip()) == 0: + if isinstance(schema_id, str) and len(schema_id.strip()) == 0: raise click.UsageError('Parameter --schema-id cannot be whitespace or empty string') if not force: if schemas or idcs_resource_types or attributes: @@ -23132,7 +23131,7 @@ def put_schema(ctx, from_json, force, schema_id, schemas, idcs_mappable, authori @cli_util.wrap_exceptions def put_security_question_setting(ctx, from_json, force, security_question_setting_id, schemas, num_questions_to_setup, min_answer_length, max_field_length, num_questions_to_ans, 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, if_match): - if isinstance(security_question_setting_id, six.string_types) and len(security_question_setting_id.strip()) == 0: + if isinstance(security_question_setting_id, str) and len(security_question_setting_id.strip()) == 0: raise click.UsageError('Parameter --security-question-setting-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: @@ -23324,7 +23323,7 @@ def put_security_question_setting(ctx, from_json, force, security_question_setti @cli_util.wrap_exceptions def put_self_registration_profile(ctx, from_json, force, self_registration_profile_id, schemas, name, activation_email_required, number_of_days_redirect_url_is_valid, show_on_login_page, redirect_url, consent_text_present, display_name, email_template, 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, active, allowed_email_domains, disallowed_email_domains, header_logo, footer_logo, after_submit_text, user_attributes, default_groups, header_text, footer_text, consent_text, if_match): - if isinstance(self_registration_profile_id, six.string_types) and len(self_registration_profile_id.strip()) == 0: + if isinstance(self_registration_profile_id, str) and len(self_registration_profile_id.strip()) == 0: raise click.UsageError('Parameter --self-registration-profile-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 allowed_email_domains or disallowed_email_domains or display_name or after_submit_text or user_attributes or email_template or default_groups or header_text or footer_text or consent_text: @@ -23705,7 +23704,7 @@ def put_self_registration_profile(ctx, from_json, force, self_registration_profi @cli_util.wrap_exceptions def put_setting(ctx, from_json, force, setting_id, schemas, csr_access, 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, contact_emails, custom_branding, preferred_language, timezone, diagnostic_record_for_search_identifies_returned_resources, re_auth_when_changing_my_authentication_factors, re_auth_factor, locale, signing_cert_public_access, sub_mapping_attr, account_always_trust_scope, default_trust_scope, issuer, prev_issuer, diagnostic_level, diagnostic_tracing_upto, allowed_domains, enable_terms_of_use, terms_of_use_url, privacy_policy_url, migration_status, on_premises_provisioning, allowed_forgot_password_flow_return_urls, allowed_notification_redirect_urls, audit_event_retention_period, is_hosted_page, custom_html_location, custom_css_location, custom_translation, cloud_account_name, cloud_migration_url_enabled, cloud_migration_custom_url, service_admin_cannot_list_other_users, max_no_of_app_role_members_to_return, max_no_of_app_cmva_to_return, iam_upst_session_expiry, cloud_gate_cors_settings, certificate_validation, tenant_custom_claims, purge_configs, default_company_names, default_login_texts, default_images, company_names, login_texts, images, if_match): - if isinstance(setting_id, six.string_types) and len(setting_id.strip()) == 0: + if isinstance(setting_id, str) and len(setting_id.strip()) == 0: raise click.UsageError('Parameter --setting-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 contact_emails or re_auth_factor or allowed_domains or allowed_forgot_password_flow_return_urls or allowed_notification_redirect_urls or cloud_gate_cors_settings or certificate_validation or tenant_custom_claims or purge_configs or default_company_names or default_login_texts or default_images or company_names or login_texts or images: @@ -24069,7 +24068,7 @@ def put_setting(ctx, from_json, force, setting_id, schemas, csr_access, authoriz @cli_util.wrap_exceptions def put_social_identity_provider(ctx, from_json, force, social_identity_provider_id, schemas, name, enabled, account_linking_enabled, registration_enabled, show_on_login, consumer_key, consumer_secret, service_provider_name, 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, description, social_jit_provisioning_enabled, jit_prov_group_static_list_enabled, jit_prov_assigned_groups, auto_redirect_enabled, status, id_attribute, authz_url, access_token_url, profile_url, scope, admin_scope, clock_skew_in_seconds, redirect_url, icon_url, discovery_url, client_credential_in_payload, refresh_token_url, relay_idp_param_mappings, if_match): - if isinstance(social_identity_provider_id, six.string_types) and len(social_identity_provider_id.strip()) == 0: + if isinstance(social_identity_provider_id, str) and len(social_identity_provider_id.strip()) == 0: raise click.UsageError('Parameter --social-identity-provider-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 jit_prov_assigned_groups or scope or admin_scope or relay_idp_param_mappings: @@ -24356,7 +24355,7 @@ def put_social_identity_provider(ctx, from_json, force, social_identity_provider @cli_util.wrap_exceptions def put_user(ctx, from_json, force, user_id, schemas, user_name, 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, display_name, nick_name, profile_url, title, user_type, locale, preferred_language, timezone, active, password, name, emails, phone_numbers, ims, photos, addresses, groups, entitlements, roles, x509_certificates, urnietfparamsscimschemasextensionenterprise2_0_user, urnietfparamsscimschemasoracleidcsextensionuser_user, urnietfparamsscimschemasoracleidcsextensionpassword_state_user, urnietfparamsscimschemasoracleidcsextensionuser_state_user, urnietfparamsscimschemasoracleidcsextensionposix_user, urnietfparamsscimschemasoracleidcsextensionkerberos_user_user, urnietfparamsscimschemasoracleidcsextensionmfa_user, urnietfparamsscimschemasoracleidcsextensionadaptive_user, urnietfparamsscimschemasoracleidcsextensionsff_user, urnietfparamsscimschemasoracleidcsextensionsecurity_questions_user, urnietfparamsscimschemasoracleidcsextensionself_registration_user, urnietfparamsscimschemasoracleidcsextensionsocial_account_user, urnietfparamsscimschemasoracleidcsextensiondb_user_user, urnietfparamsscimschemasoracleidcsextensionterms_of_use_user, urnietfparamsscimschemasoracleidcsextensionpasswordless_user, urnietfparamsscimschemasoracleidcsextension_oci_tags, urnietfparamsscimschemasoracleidcsextensionuser_credentials_user, urnietfparamsscimschemasoracleidcsextensioncapabilities_user, urnietfparamsscimschemasoracleidcsextensiondb_credentials_user, urnietfparamsscimschemasoracleidcsextensionself_change_user, if_match): - if isinstance(user_id, six.string_types) and len(user_id.strip()) == 0: + if isinstance(user_id, str) and len(user_id.strip()) == 0: raise click.UsageError('Parameter --user-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 name or emails or phone_numbers or ims or photos or addresses or groups or entitlements or roles or x509_certificates or urnietfparamsscimschemasextensionenterprise2_0_user or urnietfparamsscimschemasoracleidcsextensionuser_user or urnietfparamsscimschemasoracleidcsextensionpassword_state_user or urnietfparamsscimschemasoracleidcsextensionuser_state_user or urnietfparamsscimschemasoracleidcsextensionposix_user or urnietfparamsscimschemasoracleidcsextensionkerberos_user_user or urnietfparamsscimschemasoracleidcsextensionmfa_user or urnietfparamsscimschemasoracleidcsextensionadaptive_user or urnietfparamsscimschemasoracleidcsextensionsff_user or urnietfparamsscimschemasoracleidcsextensionsecurity_questions_user or urnietfparamsscimschemasoracleidcsextensionself_registration_user or urnietfparamsscimschemasoracleidcsextensionsocial_account_user or urnietfparamsscimschemasoracleidcsextensiondb_user_user or urnietfparamsscimschemasoracleidcsextensionterms_of_use_user or urnietfparamsscimschemasoracleidcsextensionpasswordless_user or urnietfparamsscimschemasoracleidcsextension_oci_tags or urnietfparamsscimschemasoracleidcsextensionuser_credentials_user or urnietfparamsscimschemasoracleidcsextensioncapabilities_user or urnietfparamsscimschemasoracleidcsextensiondb_credentials_user or urnietfparamsscimschemasoracleidcsextensionself_change_user: @@ -24625,7 +24624,7 @@ def put_user(ctx, from_json, force, user_id, schemas, user_name, authorization, @cli_util.wrap_exceptions def put_user_capabilities_changer(ctx, from_json, force, user_capabilities_changer_id, schemas, 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, can_use_api_keys, can_use_auth_tokens, can_use_console_password, can_use_customer_secret_keys, can_use_o_auth2_client_credentials, can_use_smtp_credentials, can_use_db_credentials, can_use_console, urnietfparamsscimschemasoracleidcsextensionself_change_user, if_match): - if isinstance(user_capabilities_changer_id, six.string_types) and len(user_capabilities_changer_id.strip()) == 0: + if isinstance(user_capabilities_changer_id, str) and len(user_capabilities_changer_id.strip()) == 0: raise click.UsageError('Parameter --user-capabilities-changer-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 urnietfparamsscimschemasoracleidcsextensionself_change_user: @@ -24778,7 +24777,7 @@ def put_user_capabilities_changer(ctx, from_json, force, user_capabilities_chang @cli_util.wrap_exceptions def put_user_password_changer(ctx, from_json, force, user_password_changer_id, schemas, password, 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, external_id, bypass_notification, notification_email_template_id, urnietfparamsscimschemasoracleidcsextensionself_change_user, if_match): - if isinstance(user_password_changer_id, six.string_types) and len(user_password_changer_id.strip()) == 0: + if isinstance(user_password_changer_id, str) and len(user_password_changer_id.strip()) == 0: raise click.UsageError('Parameter --user-password-changer-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 urnietfparamsscimschemasoracleidcsextensionself_change_user: @@ -24921,7 +24920,7 @@ def put_user_password_changer(ctx, from_json, force, user_password_changer_id, s @cli_util.wrap_exceptions def put_user_password_resetter(ctx, from_json, force, user_password_resetter_id, schemas, 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, external_id, bypass_notification, user_flow_controlled_by_external_client, user_token, notification_email_template_id, one_time_password, urnietfparamsscimschemasoracleidcsextensionself_change_user, if_match): - if isinstance(user_password_resetter_id, six.string_types) and len(user_password_resetter_id.strip()) == 0: + if isinstance(user_password_resetter_id, str) and len(user_password_resetter_id.strip()) == 0: raise click.UsageError('Parameter --user-password-resetter-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 user_token or urnietfparamsscimschemasoracleidcsextensionself_change_user: @@ -25064,7 +25063,7 @@ def put_user_password_resetter(ctx, from_json, force, user_password_resetter_id, @cli_util.wrap_exceptions def put_user_status_changer(ctx, from_json, force, user_status_changer_id, schemas, 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, active, urnietfparamsscimschemasoracleidcsextensionself_change_user, if_match): - if isinstance(user_status_changer_id, six.string_types) and len(user_status_changer_id.strip()) == 0: + if isinstance(user_status_changer_id, str) and len(user_status_changer_id.strip()) == 0: raise click.UsageError('Parameter --user-status-changer-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 urnietfparamsscimschemasoracleidcsextensionself_change_user: diff --git a/services/integration/src/oci_cli_integration_instance/generated/integrationinstance_cli.py b/services/integration/src/oci_cli_integration_instance/generated/integrationinstance_cli.py index 7f4a4354e..651afd983 100644 --- a/services/integration/src/oci_cli_integration_instance/generated/integrationinstance_cli.py +++ b/services/integration/src/oci_cli_integration_instance/generated/integrationinstance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -68,7 +67,7 @@ def work_request_group(): @cli_util.wrap_exceptions def add_oracle_managed_custom_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, hostname, integration_instance_id, dns_type, dns_zone_name, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -135,7 +134,7 @@ def add_oracle_managed_custom_endpoint(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def change_integration_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, compartment_id, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -198,7 +197,7 @@ def change_integration_instance_compartment(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def change_integration_instance_network_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, network_endpoint_details, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -265,7 +264,7 @@ def change_integration_instance_network_endpoint(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_integration_instance_network_endpoint_public_endpoint_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, if_match, network_endpoint_details_allowlisted_http_ips, network_endpoint_details_allowlisted_http_vcns, network_endpoint_details_is_integration_vcn_allowlisted): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -337,7 +336,7 @@ def change_integration_instance_network_endpoint_public_endpoint_details(ctx, fr @cli_util.wrap_exceptions def change_private_endpoint_outbound_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, private_endpoint_outbound_connection, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -401,7 +400,7 @@ def change_private_endpoint_outbound_connection(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_private_endpoint_outbound_connection_private_endpoint_outbound_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, private_endpoint_outbound_connection_subnet_id, if_match, private_endpoint_outbound_connection_nsg_ids): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -467,7 +466,7 @@ def change_private_endpoint_outbound_connection_private_endpoint_outbound_connec @cli_util.wrap_exceptions def change_private_endpoint_outbound_connection_none_outbound_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -765,7 +764,7 @@ def create_integration_instance_public_endpoint_details(ctx, from_json, wait_for @cli_util.wrap_exceptions def delete_integration_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -820,7 +819,7 @@ def delete_integration_instance(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def disaster_recovery_failover(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -875,7 +874,7 @@ def disaster_recovery_failover(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def enable_process_automation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -931,7 +930,7 @@ def enable_process_automation(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def extend_data_retention(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, data_retention_period, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -987,7 +986,7 @@ def extend_data_retention(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def get_integration_instance(ctx, from_json, integration_instance_id): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1009,7 +1008,7 @@ def get_integration_instance(ctx, from_json, integration_instance_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1101,7 +1100,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, compartment_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1156,7 +1155,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, compartment_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1258,7 +1257,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def remove_oracle_managed_custom_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1313,7 +1312,7 @@ def remove_oracle_managed_custom_endpoint(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def start_integration_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1368,7 +1367,7 @@ def start_integration_instance(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def stop_integration_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1436,7 +1435,7 @@ def stop_integration_instance(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_integration_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, integration_instance_id, display_name, integration_instance_type, freeform_tags, defined_tags, is_byol, message_packs, is_file_server_enabled, is_visual_builder_enabled, custom_endpoint, alternate_custom_endpoints, if_match): - if isinstance(integration_instance_id, six.string_types) and len(integration_instance_id.strip()) == 0: + if isinstance(integration_instance_id, str) and len(integration_instance_id.strip()) == 0: raise click.UsageError('Parameter --integration-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or custom_endpoint or alternate_custom_endpoints: diff --git a/services/jms/src/oci_cli_java_management_service/generated/javamanagementservice_cli.py b/services/jms/src/oci_cli_java_management_service/generated/javamanagementservice_cli.py index 8f3e77042..d473d4cb2 100644 --- a/services/jms/src/oci_cli_java_management_service/generated/javamanagementservice_cli.py +++ b/services/jms/src/oci_cli_java_management_service/generated/javamanagementservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -293,7 +292,7 @@ def fleet_error_summary_group(): @cli_util.wrap_exceptions def add_fleet_installation_sites(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, installation_sites, post_installation_actions, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -354,7 +353,7 @@ def add_fleet_installation_sites(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -383,7 +382,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_fleet_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, compartment_id, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -442,7 +441,7 @@ def change_fleet_compartment(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_blocklist(ctx, from_json, fleet_id, target, operation, reason): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -480,7 +479,7 @@ def create_blocklist(ctx, from_json, fleet_id, target, operation, reason): @cli_util.wrap_exceptions def create_drs_file(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, bucket_name, namespace, drs_file_name, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -683,10 +682,10 @@ def create_jms_plugin(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_blocklist(ctx, from_json, fleet_id, blocklist_key, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(blocklist_key, six.string_types) and len(blocklist_key.strip()) == 0: + if isinstance(blocklist_key, str) and len(blocklist_key.strip()) == 0: raise click.UsageError('Parameter --blocklist-key cannot be whitespace or empty string') kwargs = {} @@ -717,10 +716,10 @@ def delete_blocklist(ctx, from_json, fleet_id, blocklist_key, if_match): @cli_util.wrap_exceptions def delete_crypto_analysis_result(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, crypto_analysis_result_id, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(crypto_analysis_result_id, six.string_types) and len(crypto_analysis_result_id.strip()) == 0: + if isinstance(crypto_analysis_result_id, str) and len(crypto_analysis_result_id.strip()) == 0: raise click.UsageError('Parameter --crypto-analysis-result-id cannot be whitespace or empty string') kwargs = {} @@ -778,10 +777,10 @@ def delete_crypto_analysis_result(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_drs_file(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, drs_file_key, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(drs_file_key, six.string_types) and len(drs_file_key.strip()) == 0: + if isinstance(drs_file_key, str) and len(drs_file_key.strip()) == 0: raise click.UsageError('Parameter --drs-file-key cannot be whitespace or empty string') kwargs = {} @@ -838,7 +837,7 @@ def delete_drs_file(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_fleet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -895,10 +894,10 @@ def delete_fleet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_java_migration_analysis_result(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, java_migration_analysis_result_id, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(java_migration_analysis_result_id, six.string_types) and len(java_migration_analysis_result_id.strip()) == 0: + if isinstance(java_migration_analysis_result_id, str) and len(java_migration_analysis_result_id.strip()) == 0: raise click.UsageError('Parameter --java-migration-analysis-result-id cannot be whitespace or empty string') kwargs = {} @@ -955,7 +954,7 @@ def delete_java_migration_analysis_result(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def delete_jms_plugin(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, jms_plugin_id, if_match): - if isinstance(jms_plugin_id, six.string_types) and len(jms_plugin_id.strip()) == 0: + if isinstance(jms_plugin_id, str) and len(jms_plugin_id.strip()) == 0: raise click.UsageError('Parameter --jms-plugin-id cannot be whitespace or empty string') kwargs = {} @@ -1020,10 +1019,10 @@ def delete_jms_plugin(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_performance_tuning_analysis_result(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, performance_tuning_analysis_result_id, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(performance_tuning_analysis_result_id, six.string_types) and len(performance_tuning_analysis_result_id.strip()) == 0: + if isinstance(performance_tuning_analysis_result_id, str) and len(performance_tuning_analysis_result_id.strip()) == 0: raise click.UsageError('Parameter --performance-tuning-analysis-result-id cannot be whitespace or empty string') kwargs = {} @@ -1080,7 +1079,7 @@ def delete_performance_tuning_analysis_result(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def disable_drs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, manage_drs_details, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1143,7 +1142,7 @@ def disable_drs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def enable_drs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, manage_drs_details, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1205,7 +1204,7 @@ def enable_drs(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def generate_agent_deploy_script(ctx, from_json, file, fleet_id, install_key_id, os_family, is_user_name_enabled): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1309,7 +1308,7 @@ def generate_agent_installer_configuration(ctx, from_json, file, install_key_id, @cli_util.wrap_exceptions def generate_load_pipeline_script(ctx, from_json, file, fleet_id, target_bucket_name, target_bucket_namespace, target_bucket_region, interval_minutes): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1364,10 +1363,10 @@ def generate_load_pipeline_script(ctx, from_json, file, fleet_id, target_bucket_ @cli_util.wrap_exceptions def get_crypto_analysis_result(ctx, from_json, fleet_id, crypto_analysis_result_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(crypto_analysis_result_id, six.string_types) and len(crypto_analysis_result_id.strip()) == 0: + if isinstance(crypto_analysis_result_id, str) and len(crypto_analysis_result_id.strip()) == 0: raise click.UsageError('Parameter --crypto-analysis-result-id cannot be whitespace or empty string') kwargs = {} @@ -1392,10 +1391,10 @@ def get_crypto_analysis_result(ctx, from_json, fleet_id, crypto_analysis_result_ @cli_util.wrap_exceptions def get_drs_file(ctx, from_json, fleet_id, drs_file_key, page): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(drs_file_key, six.string_types) and len(drs_file_key.strip()) == 0: + if isinstance(drs_file_key, str) and len(drs_file_key.strip()) == 0: raise click.UsageError('Parameter --drs-file-key cannot be whitespace or empty string') kwargs = {} @@ -1420,7 +1419,7 @@ def get_drs_file(ctx, from_json, fleet_id, drs_file_key, page): @cli_util.wrap_exceptions def get_export_setting(ctx, from_json, fleet_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1442,7 +1441,7 @@ def get_export_setting(ctx, from_json, fleet_id): @cli_util.wrap_exceptions def get_export_status(ctx, from_json, fleet_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1464,7 +1463,7 @@ def get_export_status(ctx, from_json, fleet_id): @cli_util.wrap_exceptions def get_fleet(ctx, from_json, fleet_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1487,7 +1486,7 @@ def get_fleet(ctx, from_json, fleet_id): @cli_util.wrap_exceptions def get_fleet_advanced_feature_configuration(ctx, from_json, fleet_id, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1511,7 +1510,7 @@ def get_fleet_advanced_feature_configuration(ctx, from_json, fleet_id, if_match) @cli_util.wrap_exceptions def get_fleet_agent_configuration(ctx, from_json, fleet_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1533,7 +1532,7 @@ def get_fleet_agent_configuration(ctx, from_json, fleet_id): @cli_util.wrap_exceptions def get_java_family(ctx, from_json, family_version): - if isinstance(family_version, six.string_types) and len(family_version.strip()) == 0: + if isinstance(family_version, str) and len(family_version.strip()) == 0: raise click.UsageError('Parameter --family-version cannot be whitespace or empty string') kwargs = {} @@ -1556,10 +1555,10 @@ def get_java_family(ctx, from_json, family_version): @cli_util.wrap_exceptions def get_java_migration_analysis_result(ctx, from_json, fleet_id, java_migration_analysis_result_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(java_migration_analysis_result_id, six.string_types) and len(java_migration_analysis_result_id.strip()) == 0: + if isinstance(java_migration_analysis_result_id, str) and len(java_migration_analysis_result_id.strip()) == 0: raise click.UsageError('Parameter --java-migration-analysis-result-id cannot be whitespace or empty string') kwargs = {} @@ -1582,7 +1581,7 @@ def get_java_migration_analysis_result(ctx, from_json, fleet_id, java_migration_ @cli_util.wrap_exceptions def get_java_release(ctx, from_json, release_version): - if isinstance(release_version, six.string_types) and len(release_version.strip()) == 0: + if isinstance(release_version, str) and len(release_version.strip()) == 0: raise click.UsageError('Parameter --release-version cannot be whitespace or empty string') kwargs = {} @@ -1604,7 +1603,7 @@ def get_java_release(ctx, from_json, release_version): @cli_util.wrap_exceptions def get_jms_plugin(ctx, from_json, jms_plugin_id): - if isinstance(jms_plugin_id, six.string_types) and len(jms_plugin_id.strip()) == 0: + if isinstance(jms_plugin_id, str) and len(jms_plugin_id.strip()) == 0: raise click.UsageError('Parameter --jms-plugin-id cannot be whitespace or empty string') kwargs = {} @@ -1627,10 +1626,10 @@ def get_jms_plugin(ctx, from_json, jms_plugin_id): @cli_util.wrap_exceptions def get_performance_tuning_analysis_result(ctx, from_json, fleet_id, performance_tuning_analysis_result_id): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(performance_tuning_analysis_result_id, six.string_types) and len(performance_tuning_analysis_result_id.strip()) == 0: + if isinstance(performance_tuning_analysis_result_id, str) and len(performance_tuning_analysis_result_id.strip()) == 0: raise click.UsageError('Parameter --performance-tuning-analysis-result-id cannot be whitespace or empty string') kwargs = {} @@ -1653,7 +1652,7 @@ def get_performance_tuning_analysis_result(ctx, from_json, fleet_id, performance @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1807,7 +1806,7 @@ def list_blocklists(ctx, from_json, all_pages, page_size, fleet_id, operation, m if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1877,7 +1876,7 @@ def list_crypto_analysis_results(ctx, from_json, all_pages, page_size, fleet_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -1952,7 +1951,7 @@ def list_drs_files(ctx, from_json, all_pages, page_size, fleet_id, limit, page, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2007,7 +2006,7 @@ def list_fleet_diagnoses(ctx, from_json, all_pages, page_size, fleet_id, limit, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2207,7 +2206,7 @@ def list_installation_sites(ctx, from_json, all_pages, page_size, fleet_id, jre_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2350,7 +2349,7 @@ def list_java_migration_analysis_results(ctx, from_json, all_pages, page_size, f if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2639,7 +2638,7 @@ def list_performance_tuning_analysis_results(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -2777,7 +2776,7 @@ def list_work_items(ctx, from_json, all_pages, page_size, work_request_id, page, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2828,7 +2827,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2879,7 +2878,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2990,7 +2989,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, id, @cli_util.wrap_exceptions def remove_fleet_installation_sites(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, installation_sites, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3054,7 +3053,7 @@ def remove_fleet_installation_sites(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def request_crypto_analyses(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, targets, recording_duration_in_minutes, waiting_period_in_minutes): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3120,7 +3119,7 @@ def request_crypto_analyses(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def request_deployed_application_migration_analyses(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, targets): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3178,7 +3177,7 @@ def request_deployed_application_migration_analyses(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def request_java_migration_analyses(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, targets): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3244,7 +3243,7 @@ def request_java_migration_analyses(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def request_jfr_recordings(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, jfc_profile_name, targets, jfc_v1, jfc_v2, recording_duration_in_minutes, recording_size_in_mb, waiting_period_in_minutes): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3324,7 +3323,7 @@ def request_jfr_recordings(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def request_performance_tuning_analyses(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, recording_duration_in_minutes, targets, waiting_period_in_minutes): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3389,7 +3388,7 @@ def request_performance_tuning_analyses(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def scan_java_server_usage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, managed_instance_ids, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3452,7 +3451,7 @@ def scan_java_server_usage(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def scan_library_usage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, managed_instance_ids, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3529,7 +3528,7 @@ def scan_library_usage(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def summarize_application_installation_usage(ctx, from_json, fleet_id, application_installation_key, application_id, display_name, display_name_contains, application_type, app_installation_path_contains, jre_vendor, jre_distribution, jre_version, installation_path, library_key, managed_instance_id, os_family, time_start, time_end, limit, page, sort_order, sort_by): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3607,7 +3606,7 @@ def summarize_application_installation_usage(ctx, from_json, fleet_id, applicati @cli_util.wrap_exceptions def summarize_application_usage(ctx, from_json, fleet_id, application_id, display_name, application_type, jre_vendor, jre_distribution, jre_version, installation_path, managed_instance_id, fields, time_start, time_end, limit, page, sort_order, sort_by, os_family, display_name_contains, library_key): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3680,7 +3679,7 @@ def summarize_application_usage(ctx, from_json, fleet_id, application_id, displa @cli_util.wrap_exceptions def summarize_deployed_application_installation_usage(ctx, from_json, fleet_id, server_key, server_instance_key, managed_instance_id, application_installation_key, application_key, application_name_contains, application_name, application_source_path_contains, library_key, time_start, time_end, limit, page, sort_order, sort_by): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3745,7 +3744,7 @@ def summarize_deployed_application_installation_usage(ctx, from_json, fleet_id, @cli_util.wrap_exceptions def summarize_deployed_application_usage(ctx, from_json, fleet_id, server_key, server_instance_key, managed_instance_id, library_key, application_key, application_name_contains, application_name, time_start, time_end, limit, page, sort_order, sort_by): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3837,7 +3836,7 @@ def summarize_fleet_errors(ctx, from_json, compartment_id, compartment_id_in_sub @cli_util.wrap_exceptions def summarize_installation_usage(ctx, from_json, fleet_id, jre_vendor, jre_distribution, jre_version, installation_path, application_id, managed_instance_id, fields, time_start, time_end, limit, page, sort_order, sort_by, os_family, path_contains): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3902,7 +3901,7 @@ def summarize_installation_usage(ctx, from_json, fleet_id, jre_vendor, jre_distr @cli_util.wrap_exceptions def summarize_java_server_instance_usage(ctx, from_json, fleet_id, server_key, server_instance_key, managed_instance_id, application_key, library_key, server_instance_name_contains, server_instance_name, time_start, time_end, limit, page, sort_order, sort_by): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -3960,7 +3959,7 @@ def summarize_java_server_instance_usage(ctx, from_json, fleet_id, server_key, s @cli_util.wrap_exceptions def summarize_java_server_usage(ctx, from_json, fleet_id, server_key, server_name_contains, server_name, server_version, time_start, time_end, limit, page, sort_order, sort_by): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -4017,7 +4016,7 @@ def summarize_java_server_usage(ctx, from_json, fleet_id, server_key, server_nam @cli_util.wrap_exceptions def summarize_jre_usage(ctx, from_json, fleet_id, jre_id, jre_vendor, jre_distribution, jre_version, application_id, managed_instance_id, fields, time_start, time_end, limit, page, sort_order, sort_by, os_family, jre_security_status): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -4083,7 +4082,7 @@ def summarize_jre_usage(ctx, from_json, fleet_id, jre_id, jre_vendor, jre_distri @cli_util.wrap_exceptions def summarize_library_usage(ctx, from_json, fleet_id, server_instance_key, managed_instance_id, application_key, library_key, library_name_contains, library_name, cvss_score_greater_than, cvss_score_less_than, time_start, time_end, limit, page, sort_order, sort_by): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -4150,7 +4149,7 @@ def summarize_library_usage(ctx, from_json, fleet_id, server_instance_key, manag @cli_util.wrap_exceptions def summarize_managed_instance_usage(ctx, from_json, fleet_id, managed_instance_id, managed_instance_type, jre_vendor, jre_distribution, jre_version, installation_path, application_id, fields, time_start, time_end, limit, page, sort_order, sort_by, os_family, hostname_contains, library_key): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -4272,10 +4271,10 @@ def summarize_resource_inventory(ctx, from_json, compartment_id, compartment_id_ @cli_util.wrap_exceptions def update_drs_file(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, bucket_name, namespace, drs_file_name, drs_file_key, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') - if isinstance(drs_file_key, six.string_types) and len(drs_file_key.strip()) == 0: + if isinstance(drs_file_key, str) and len(drs_file_key.strip()) == 0: raise click.UsageError('Parameter --drs-file-key cannot be whitespace or empty string') kwargs = {} @@ -4343,7 +4342,7 @@ def update_drs_file(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def update_export_setting(ctx, from_json, fleet_id, is_enabled, export_duration, export_resources, is_cross_region_acknowledged, target_bucket_name, target_bucket_namespace, target_bucket_region, export_frequency, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') kwargs = {} @@ -4405,7 +4404,7 @@ def update_export_setting(ctx, from_json, fleet_id, is_enabled, export_duration, @cli_util.wrap_exceptions def update_fleet(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, display_name, description, inventory_log, operation_log, is_advanced_features_enabled, defined_tags, freeform_tags, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') if not force: if inventory_log or operation_log or defined_tags or freeform_tags: @@ -4495,7 +4494,7 @@ def update_fleet(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_fleet_advanced_feature_configuration(ctx, from_json, force, fleet_id, analytic_namespace, analytic_bucket_name, lcm, crypto_event_analysis, advanced_usage_tracking, jfr_recording, performance_tuning_analysis, java_migration_analysis, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') if not force: if lcm or crypto_event_analysis or advanced_usage_tracking or jfr_recording or performance_tuning_analysis or java_migration_analysis: @@ -4565,7 +4564,7 @@ def update_fleet_advanced_feature_configuration(ctx, from_json, force, fleet_id, @cli_util.wrap_exceptions def update_fleet_agent_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, fleet_id, jre_scan_frequency_in_minutes, java_usage_tracker_processing_frequency_in_minutes, work_request_validity_period_in_days, agent_polling_interval_in_minutes, is_collecting_managed_instance_metrics_enabled, is_collecting_usernames_enabled, linux_configuration, windows_configuration, mac_os_configuration, if_match): - if isinstance(fleet_id, six.string_types) and len(fleet_id.strip()) == 0: + if isinstance(fleet_id, str) and len(fleet_id.strip()) == 0: raise click.UsageError('Parameter --fleet-id cannot be whitespace or empty string') if not force: if linux_configuration or windows_configuration or mac_os_configuration: @@ -4659,7 +4658,7 @@ def update_fleet_agent_configuration(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_jms_plugin(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, jms_plugin_id, fleet_id, defined_tags, freeform_tags, if_match): - if isinstance(jms_plugin_id, six.string_types) and len(jms_plugin_id.strip()) == 0: + if isinstance(jms_plugin_id, str) and len(jms_plugin_id.strip()) == 0: raise click.UsageError('Parameter --jms-plugin-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: diff --git a/services/jms_java_downloads/src/oci_cli_java_download/generated/javadownload_cli.py b/services/jms_java_downloads/src/oci_cli_java_download/generated/javadownload_cli.py index cc12b0f76..352088eaf 100644 --- a/services/jms_java_downloads/src/oci_cli_java_download/generated/javadownload_cli.py +++ b/services/jms_java_downloads/src/oci_cli_java_download/generated/javadownload_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -105,7 +104,7 @@ def java_download_count_aggregation_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -349,7 +348,7 @@ def create_java_license_acceptance_record(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def delete_java_download_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, java_download_report_id, if_match): - if isinstance(java_download_report_id, six.string_types) and len(java_download_report_id.strip()) == 0: + if isinstance(java_download_report_id, str) and len(java_download_report_id.strip()) == 0: raise click.UsageError('Parameter --java-download-report-id cannot be whitespace or empty string') kwargs = {} @@ -405,7 +404,7 @@ def delete_java_download_report(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_java_download_token(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, java_download_token_id, if_match): - if isinstance(java_download_token_id, six.string_types) and len(java_download_token_id.strip()) == 0: + if isinstance(java_download_token_id, str) and len(java_download_token_id.strip()) == 0: raise click.UsageError('Parameter --java-download-token-id cannot be whitespace or empty string') kwargs = {} @@ -461,7 +460,7 @@ def delete_java_download_token(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_java_license_acceptance_record(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, java_license_acceptance_record_id, if_match): - if isinstance(java_license_acceptance_record_id, six.string_types) and len(java_license_acceptance_record_id.strip()) == 0: + if isinstance(java_license_acceptance_record_id, str) and len(java_license_acceptance_record_id.strip()) == 0: raise click.UsageError('Parameter --java-license-acceptance-record-id cannot be whitespace or empty string') kwargs = {} @@ -549,7 +548,7 @@ def generate_artifact_download_url(ctx, from_json, artifact_id, compartment_id): @cli_util.wrap_exceptions def get_java_download_report(ctx, from_json, java_download_report_id): - if isinstance(java_download_report_id, six.string_types) and len(java_download_report_id.strip()) == 0: + if isinstance(java_download_report_id, str) and len(java_download_report_id.strip()) == 0: raise click.UsageError('Parameter --java-download-report-id cannot be whitespace or empty string') kwargs = {} @@ -572,7 +571,7 @@ def get_java_download_report(ctx, from_json, java_download_report_id): @cli_util.wrap_exceptions def get_java_download_report_content(ctx, from_json, file, java_download_report_id): - if isinstance(java_download_report_id, six.string_types) and len(java_download_report_id.strip()) == 0: + if isinstance(java_download_report_id, str) and len(java_download_report_id.strip()) == 0: raise click.UsageError('Parameter --java-download-report-id cannot be whitespace or empty string') kwargs = {} @@ -616,7 +615,7 @@ def get_java_download_report_content(ctx, from_json, file, java_download_report_ @cli_util.wrap_exceptions def get_java_download_token(ctx, from_json, java_download_token_id): - if isinstance(java_download_token_id, six.string_types) and len(java_download_token_id.strip()) == 0: + if isinstance(java_download_token_id, str) and len(java_download_token_id.strip()) == 0: raise click.UsageError('Parameter --java-download-token-id cannot be whitespace or empty string') kwargs = {} @@ -638,7 +637,7 @@ def get_java_download_token(ctx, from_json, java_download_token_id): @cli_util.wrap_exceptions def get_java_license(ctx, from_json, license_type): - if isinstance(license_type, six.string_types) and len(license_type.strip()) == 0: + if isinstance(license_type, str) and len(license_type.strip()) == 0: raise click.UsageError('Parameter --license-type cannot be whitespace or empty string') kwargs = {} @@ -660,7 +659,7 @@ def get_java_license(ctx, from_json, license_type): @cli_util.wrap_exceptions def get_java_license_acceptance_record(ctx, from_json, java_license_acceptance_record_id): - if isinstance(java_license_acceptance_record_id, six.string_types) and len(java_license_acceptance_record_id.strip()) == 0: + if isinstance(java_license_acceptance_record_id, str) and len(java_license_acceptance_record_id.strip()) == 0: raise click.UsageError('Parameter --java-license-acceptance-record-id cannot be whitespace or empty string') kwargs = {} @@ -682,7 +681,7 @@ def get_java_license_acceptance_record(ctx, from_json, java_license_acceptance_r @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1045,7 +1044,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1102,7 +1101,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1284,7 +1283,7 @@ def request_summarized_java_download_counts(ctx, from_json, compartment_id, grou @cli_util.wrap_exceptions def update_java_download_token(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, java_download_token_id, display_name, description, is_default, time_expires, license_type, freeform_tags, defined_tags, if_match): - if isinstance(java_download_token_id, six.string_types) and len(java_download_token_id.strip()) == 0: + if isinstance(java_download_token_id, str) and len(java_download_token_id.strip()) == 0: raise click.UsageError('Parameter --java-download-token-id cannot be whitespace or empty string') if not force: if license_type or freeform_tags or defined_tags: @@ -1372,7 +1371,7 @@ def update_java_download_token(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_java_license_acceptance_record(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, java_license_acceptance_record_id, license_acceptance_status, freeform_tags, defined_tags, if_match): - if isinstance(java_license_acceptance_record_id, six.string_types) and len(java_license_acceptance_record_id.strip()) == 0: + if isinstance(java_license_acceptance_record_id, str) and len(java_license_acceptance_record_id.strip()) == 0: raise click.UsageError('Parameter --java-license-acceptance-record-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/key_management/src/oci_cli_ekm/generated/ekm_cli.py b/services/key_management/src/oci_cli_ekm/generated/ekm_cli.py index 48e9af756..0d9865cba 100644 --- a/services/key_management/src/oci_cli_ekm/generated/ekm_cli.py +++ b/services/key_management/src/oci_cli_ekm/generated/ekm_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -115,7 +114,7 @@ def create_ekms_private_endpoint(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_ekms_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ekms_private_endpoint_id, if_match): - if isinstance(ekms_private_endpoint_id, six.string_types) and len(ekms_private_endpoint_id.strip()) == 0: + if isinstance(ekms_private_endpoint_id, str) and len(ekms_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --ekms-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -174,7 +173,7 @@ def delete_ekms_private_endpoint(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def get_ekms_private_endpoint(ctx, from_json, ekms_private_endpoint_id): - if isinstance(ekms_private_endpoint_id, six.string_types) and len(ekms_private_endpoint_id.strip()) == 0: + if isinstance(ekms_private_endpoint_id, str) and len(ekms_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --ekms-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -258,7 +257,7 @@ def list_ekms_private_endpoints(ctx, from_json, all_pages, page_size, compartmen @cli_util.wrap_exceptions def update_ekms_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ekms_private_endpoint_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(ekms_private_endpoint_id, six.string_types) and len(ekms_private_endpoint_id.strip()) == 0: + if isinstance(ekms_private_endpoint_id, str) and len(ekms_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --ekms-private-endpoint-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/key_management/src/oci_cli_kms_crypto/generated/kmscrypto_cli.py b/services/key_management/src/oci_cli_kms_crypto/generated/kmscrypto_cli.py index 94f31efee..42d9c9ddc 100644 --- a/services/key_management/src/oci_cli_kms_crypto/generated/kmscrypto_cli.py +++ b/services/key_management/src/oci_cli_kms_crypto/generated/kmscrypto_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/key_management/src/oci_cli_kms_hsm_cluster/generated/kmshsmcluster_cli.py b/services/key_management/src/oci_cli_kms_hsm_cluster/generated/kmshsmcluster_cli.py index 45e81f6c5..d6f0872a9 100644 --- a/services/key_management/src/oci_cli_kms_hsm_cluster/generated/kmshsmcluster_cli.py +++ b/services/key_management/src/oci_cli_kms_hsm_cluster/generated/kmshsmcluster_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -52,7 +51,7 @@ def hsm_partition_group(): @cli_util.wrap_exceptions def cancel_hsm_cluster_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, hsm_cluster_id, if_match): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -101,7 +100,7 @@ def cancel_hsm_cluster_deletion(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def change_hsm_cluster_compartment(ctx, from_json, hsm_cluster_id, compartment_id, if_match): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -190,7 +189,7 @@ def create_hsm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def download_certificate_signing_request(ctx, from_json, hsm_cluster_id, if_match): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -216,7 +215,7 @@ def download_certificate_signing_request(ctx, from_json, hsm_cluster_id, if_matc @cli_util.wrap_exceptions def get_hsm_cluster(ctx, from_json, hsm_cluster_id): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -239,10 +238,10 @@ def get_hsm_cluster(ctx, from_json, hsm_cluster_id): @cli_util.wrap_exceptions def get_hsm_partition(ctx, from_json, hsm_cluster_id, hsm_partition_id): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') - if isinstance(hsm_partition_id, six.string_types) and len(hsm_partition_id.strip()) == 0: + if isinstance(hsm_partition_id, str) and len(hsm_partition_id.strip()) == 0: raise click.UsageError('Parameter --hsm-partition-id cannot be whitespace or empty string') kwargs = {} @@ -265,7 +264,7 @@ def get_hsm_partition(ctx, from_json, hsm_cluster_id, hsm_partition_id): @cli_util.wrap_exceptions def get_pre_co_user_credentials(ctx, from_json, hsm_cluster_id): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -353,7 +352,7 @@ def list_hsm_partitions(ctx, from_json, all_pages, page_size, hsm_cluster_id, li if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -408,7 +407,7 @@ def list_hsm_partitions(ctx, from_json, all_pages, page_size, hsm_cluster_id, li @cli_util.wrap_exceptions def schedule_hsm_cluster_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, hsm_cluster_id, time_of_deletion, if_match): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -472,7 +471,7 @@ def schedule_hsm_cluster_deletion(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_hsm_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, hsm_cluster_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -539,7 +538,7 @@ def update_hsm_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def upload_partition_certificates(ctx, from_json, hsm_cluster_id, partition_certificate, partition_owner_certificate, if_match): - if isinstance(hsm_cluster_id, six.string_types) and len(hsm_cluster_id.strip()) == 0: + if isinstance(hsm_cluster_id, str) and len(hsm_cluster_id.strip()) == 0: raise click.UsageError('Parameter --hsm-cluster-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/key_management/src/oci_cli_kms_management/generated/kmsmanagement_cli.py b/services/key_management/src/oci_cli_kms_management/generated/kmsmanagement_cli.py index 7ea2257a2..70051d80e 100644 --- a/services/key_management/src/oci_cli_kms_management/generated/kmsmanagement_cli.py +++ b/services/key_management/src/oci_cli_kms_management/generated/kmsmanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -69,7 +68,7 @@ def replication_status_details_group(): @cli_util.wrap_exceptions def backup_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, if_match, backup_location): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -132,7 +131,7 @@ def backup_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def backup_key_backup_location_bucket(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, backup_location_namespace, backup_location_bucket_name, backup_location_object_name, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -196,7 +195,7 @@ def backup_key_backup_location_bucket(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def backup_key_backup_location_uri(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, backup_location_uri, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -259,7 +258,7 @@ def backup_key_backup_location_uri(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def cancel_key_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -315,10 +314,10 @@ def cancel_key_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def cancel_key_version_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, key_version_id, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') - if isinstance(key_version_id, six.string_types) and len(key_version_id.strip()) == 0: + if isinstance(key_version_id, str) and len(key_version_id.strip()) == 0: raise click.UsageError('Parameter --key-version-id cannot be whitespace or empty string') kwargs = {} @@ -374,7 +373,7 @@ def cancel_key_version_deletion(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def change_key_compartment(ctx, from_json, key_id, compartment_id, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -492,7 +491,7 @@ def create_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def create_key_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, external_key_version_id): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -552,7 +551,7 @@ def create_key_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def disable_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -607,7 +606,7 @@ def disable_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def enable_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -658,7 +657,7 @@ def enable_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def get_key(ctx, from_json, key_id): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -685,10 +684,10 @@ def get_key(ctx, from_json, key_id): @cli_util.wrap_exceptions def get_key_version(ctx, from_json, key_id, key_version_id): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') - if isinstance(key_version_id, six.string_types) and len(key_version_id.strip()) == 0: + if isinstance(key_version_id, str) and len(key_version_id.strip()) == 0: raise click.UsageError('Parameter --key-version-id cannot be whitespace or empty string') kwargs = {} @@ -713,7 +712,7 @@ def get_key_version(ctx, from_json, key_id, key_version_id): @cli_util.wrap_exceptions def get_replication_status(ctx, from_json, replication_id): - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') kwargs = {} @@ -810,7 +809,7 @@ def import_key(ctx, from_json, compartment_id, display_name, key_shape, wrapped_ @cli_util.wrap_exceptions def import_key_version(ctx, from_json, key_id, wrapped_import_key, defined_tags, freeform_tags): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -856,7 +855,7 @@ def list_key_versions(ctx, from_json, all_pages, page_size, key_id, limit, page, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -1113,7 +1112,7 @@ def restore_key_from_object_store_backup_location_uri(ctx, from_json, backup_loc @cli_util.wrap_exceptions def schedule_key_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, time_of_deletion, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -1177,10 +1176,10 @@ def schedule_key_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def schedule_key_version_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, key_version_id, time_of_deletion, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') - if isinstance(key_version_id, six.string_types) and len(key_version_id.strip()) == 0: + if isinstance(key_version_id, str) and len(key_version_id.strip()) == 0: raise click.UsageError('Parameter --key-version-id cannot be whitespace or empty string') kwargs = {} @@ -1249,7 +1248,7 @@ def schedule_key_version_deletion(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_key(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, is_auto_rotation_enabled, auto_key_rotation_details, defined_tags, display_name, freeform_tags, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') if not force: if auto_key_rotation_details or defined_tags or freeform_tags: diff --git a/services/key_management/src/oci_cli_kms_management/kms_management_cli_extended.py b/services/key_management/src/oci_cli_kms_management/kms_management_cli_extended.py index f322c63ec..93d8edc04 100644 --- a/services/key_management/src/oci_cli_kms_management/kms_management_cli_extended.py +++ b/services/key_management/src/oci_cli_kms_management/kms_management_cli_extended.py @@ -4,7 +4,6 @@ import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from services.key_management.src.oci_cli_kms_management.generated import kmsmanagement_cli from oci_cli import cli_util @@ -150,7 +149,7 @@ def restore_from_file(ctx, **kwargs): @cli_util.wrap_exceptions def create_key_version_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, external_key_version_id): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') kwargs = {} @@ -205,10 +204,10 @@ def create_key_version_extended(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def schedule_key_version_deletion_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, key_version_id, time_of_deletion, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') - if isinstance(key_version_id, six.string_types) and len(key_version_id.strip()) == 0: + if isinstance(key_version_id, str) and len(key_version_id.strip()) == 0: raise click.UsageError('Parameter --key-version-id cannot be whitespace or empty string') kwargs = {} @@ -265,10 +264,10 @@ def schedule_key_version_deletion_extended(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def cancel_key_version_deletion_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, key_id, key_version_id, if_match): - if isinstance(key_id, six.string_types) and len(key_id.strip()) == 0: + if isinstance(key_id, str) and len(key_id.strip()) == 0: raise click.UsageError('Parameter --key-id cannot be whitespace or empty string') - if isinstance(key_version_id, six.string_types) and len(key_version_id.strip()) == 0: + if isinstance(key_version_id, str) and len(key_version_id.strip()) == 0: raise click.UsageError('Parameter --key-version-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/key_management/src/oci_cli_kms_vault/generated/kmsvault_cli.py b/services/key_management/src/oci_cli_kms_vault/generated/kmsvault_cli.py index b7399a419..7ce277072 100644 --- a/services/key_management/src/oci_cli_kms_vault/generated/kmsvault_cli.py +++ b/services/key_management/src/oci_cli_kms_vault/generated/kmsvault_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -54,7 +53,7 @@ def vault_group(): @cli_util.wrap_exceptions def backup_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vault_id, if_match, backup_location, is_include_keys): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -119,7 +118,7 @@ def backup_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def backup_vault_backup_location_bucket(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vault_id, backup_location_namespace, backup_location_bucket_name, backup_location_object_name, if_match, is_include_keys): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -185,7 +184,7 @@ def backup_vault_backup_location_bucket(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def backup_vault_backup_location_uri(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vault_id, backup_location_uri, if_match, is_include_keys): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -249,7 +248,7 @@ def backup_vault_backup_location_uri(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def cancel_vault_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vault_id, if_match): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -302,7 +301,7 @@ def cancel_vault_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def change_vault_compartment(ctx, from_json, vault_id, compartment_id, if_match): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -405,7 +404,7 @@ def create_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def create_vault_replica(ctx, from_json, vault_id, replica_region, replica_vault_metadata, if_match): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -445,7 +444,7 @@ def create_vault_replica(ctx, from_json, vault_id, replica_region, replica_vault @cli_util.wrap_exceptions def create_vault_replica_replica_external_vault_metadata(ctx, from_json, vault_id, replica_region, replica_vault_metadata_private_endpoint_id, replica_vault_metadata_idcs_account_name_url, if_match): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -483,7 +482,7 @@ def create_vault_replica_replica_external_vault_metadata(ctx, from_json, vault_i @cli_util.wrap_exceptions def delete_vault_replica(ctx, from_json, vault_id, replica_region, if_match): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -514,7 +513,7 @@ def delete_vault_replica(ctx, from_json, vault_id, replica_region, if_match): @cli_util.wrap_exceptions def get_vault(ctx, from_json, vault_id): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -536,7 +535,7 @@ def get_vault(ctx, from_json, vault_id): @cli_util.wrap_exceptions def get_vault_usage(ctx, from_json, vault_id): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -570,7 +569,7 @@ def list_vault_replicas(ctx, from_json, all_pages, page_size, vault_id, if_match if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -813,7 +812,7 @@ def restore_vault_from_object_store_backup_location_uri(ctx, from_json, compartm @cli_util.wrap_exceptions def schedule_vault_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vault_id, time_of_deletion, if_match): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') kwargs = {} @@ -877,7 +876,7 @@ def schedule_vault_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_vault(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vault_id, defined_tags, display_name, freeform_tags, if_match): - if isinstance(vault_id, six.string_types) and len(vault_id.strip()) == 0: + if isinstance(vault_id, str) and len(vault_id.strip()) == 0: raise click.UsageError('Parameter --vault-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: diff --git a/services/license_manager/src/oci_cli_license_manager/generated/licensemanager_cli.py b/services/license_manager/src/oci_cli_license_manager/generated/licensemanager_cli.py index 1dc40357b..33fe2baa8 100644 --- a/services/license_manager/src/oci_cli_license_manager/generated/licensemanager_cli.py +++ b/services/license_manager/src/oci_cli_license_manager/generated/licensemanager_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -294,7 +293,7 @@ def create_product_license(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_license_record(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, license_record_id, if_match): - if isinstance(license_record_id, six.string_types) and len(license_record_id.strip()) == 0: + if isinstance(license_record_id, str) and len(license_record_id.strip()) == 0: raise click.UsageError('Parameter --license-record-id cannot be whitespace or empty string') kwargs = {} @@ -358,7 +357,7 @@ def delete_license_record(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_product_license(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, product_license_id, if_match): - if isinstance(product_license_id, six.string_types) and len(product_license_id.strip()) == 0: + if isinstance(product_license_id, str) and len(product_license_id.strip()) == 0: raise click.UsageError('Parameter --product-license-id cannot be whitespace or empty string') kwargs = {} @@ -475,7 +474,7 @@ def get_license_metric(ctx, from_json, compartment_id, is_compartment_id_in_subt @cli_util.wrap_exceptions def get_license_record(ctx, from_json, license_record_id): - if isinstance(license_record_id, six.string_types) and len(license_record_id.strip()) == 0: + if isinstance(license_record_id, str) and len(license_record_id.strip()) == 0: raise click.UsageError('Parameter --license-record-id cannot be whitespace or empty string') kwargs = {} @@ -497,7 +496,7 @@ def get_license_record(ctx, from_json, license_record_id): @cli_util.wrap_exceptions def get_product_license(ctx, from_json, product_license_id): - if isinstance(product_license_id, six.string_types) and len(product_license_id.strip()) == 0: + if isinstance(product_license_id, str) and len(product_license_id.strip()) == 0: raise click.UsageError('Parameter --product-license-id cannot be whitespace or empty string') kwargs = {} @@ -875,7 +874,7 @@ def update_configuration(ctx, from_json, force, compartment_id, email_ids, if_ma @cli_util.wrap_exceptions def update_license_record(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, license_record_id, display_name, is_perpetual, is_unlimited, expiration_date, support_end_date, license_count, product_id, freeform_tags, defined_tags, if_match): - if isinstance(license_record_id, six.string_types) and len(license_record_id.strip()) == 0: + if isinstance(license_record_id, str) and len(license_record_id.strip()) == 0: raise click.UsageError('Parameter --license-record-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -959,7 +958,7 @@ def update_license_record(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_product_license(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, product_license_id, images, freeform_tags, defined_tags, if_match): - if isinstance(product_license_id, six.string_types) and len(product_license_id.strip()) == 0: + if isinstance(product_license_id, str) and len(product_license_id.strip()) == 0: raise click.UsageError('Parameter --product-license-id cannot be whitespace or empty string') if not force: if images or freeform_tags or defined_tags: diff --git a/services/limits/src/oci_cli_limits/generated/limits_cli.py b/services/limits/src/oci_cli_limits/generated/limits_cli.py index 95c4f8e3e..a7ed0434d 100644 --- a/services/limits/src/oci_cli_limits/generated/limits_cli.py +++ b/services/limits/src/oci_cli_limits/generated/limits_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -72,10 +71,10 @@ def resource_availability_group(): @cli_util.wrap_exceptions def get_resource_availability(ctx, from_json, service_name, limit_name, compartment_id, availability_domain, subscription_id): - if isinstance(service_name, six.string_types) and len(service_name.strip()) == 0: + if isinstance(service_name, str) and len(service_name.strip()) == 0: raise click.UsageError('Parameter --service-name cannot be whitespace or empty string') - if isinstance(limit_name, six.string_types) and len(limit_name.strip()) == 0: + if isinstance(limit_name, str) and len(limit_name.strip()) == 0: raise click.UsageError('Parameter --limit-name cannot be whitespace or empty string') kwargs = {} diff --git a/services/limits/src/oci_cli_quotas/generated/quotas_cli.py b/services/limits/src/oci_cli_quotas/generated/quotas_cli.py index 5cc033d03..64b491fc7 100644 --- a/services/limits/src/oci_cli_quotas/generated/quotas_cli.py +++ b/services/limits/src/oci_cli_quotas/generated/quotas_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -48,7 +47,7 @@ def quota_group(): @cli_util.wrap_exceptions def add_quota_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, quota_id, type, related_resource_id, message, if_match): - if isinstance(quota_id, six.string_types) and len(quota_id.strip()) == 0: + if isinstance(quota_id, str) and len(quota_id.strip()) == 0: raise click.UsageError('Parameter --quota-id cannot be whitespace or empty string') kwargs = {} @@ -181,7 +180,7 @@ def create_quota(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_quota(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, quota_id, if_match, is_lock_override): - if isinstance(quota_id, six.string_types) and len(quota_id.strip()) == 0: + if isinstance(quota_id, str) and len(quota_id.strip()) == 0: raise click.UsageError('Parameter --quota-id cannot be whitespace or empty string') kwargs = {} @@ -242,7 +241,7 @@ def delete_quota(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def get_quota(ctx, from_json, quota_id): - if isinstance(quota_id, six.string_types) and len(quota_id.strip()) == 0: + if isinstance(quota_id, str) and len(quota_id.strip()) == 0: raise click.UsageError('Parameter --quota-id cannot be whitespace or empty string') kwargs = {} @@ -329,7 +328,7 @@ def list_quotas(ctx, from_json, all_pages, page_size, compartment_id, page, limi @cli_util.wrap_exceptions def remove_quota_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, quota_id, type, if_match): - if isinstance(quota_id, six.string_types) and len(quota_id.strip()) == 0: + if isinstance(quota_id, str) and len(quota_id.strip()) == 0: raise click.UsageError('Parameter --quota-id cannot be whitespace or empty string') kwargs = {} @@ -391,7 +390,7 @@ def remove_quota_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_quota(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, quota_id, description, statements, freeform_tags, defined_tags, if_match, is_lock_override): - if isinstance(quota_id, six.string_types) and len(quota_id.strip()) == 0: + if isinstance(quota_id, str) and len(quota_id.strip()) == 0: raise click.UsageError('Parameter --quota-id cannot be whitespace or empty string') if not force: if statements or freeform_tags or defined_tags: diff --git a/services/load_balancer/src/oci_cli_load_balancer/generated/loadbalancer_cli.py b/services/load_balancer/src/oci_cli_load_balancer/generated/loadbalancer_cli.py index f15a900d3..5dd56bcca 100644 --- a/services/load_balancer/src/oci_cli_load_balancer/generated/loadbalancer_cli.py +++ b/services/load_balancer/src/oci_cli_load_balancer/generated/loadbalancer_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -251,7 +250,7 @@ def network_security_groups_group(): @cli_util.wrap_exceptions def change_load_balancer_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, compartment_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -345,10 +344,10 @@ def change_load_balancer_compartment(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def create_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, ip_address, port, load_balancer_id, backend_set_name, weight, max_connections, backup, drain, offline, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -451,7 +450,7 @@ def create_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def create_backend_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, name, policy, health_checker, load_balancer_id, backends, backend_max_connections, ssl_configuration, session_persistence_configuration, lb_cookie_session_persistence_configuration, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -553,7 +552,7 @@ def create_backend_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def create_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_name, load_balancer_id, passphrase, private_key, public_certificate, ca_certificate, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -637,7 +636,7 @@ def create_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def create_hostname(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, name, hostname, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -730,7 +729,7 @@ def create_hostname(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def create_listener(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, default_backend_set_name, port, protocol, name, load_balancer_id, hostname_names, path_route_set_name, ssl_configuration, connection_configuration, routing_policy_name, rule_set_names, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1046,7 +1045,7 @@ def create_load_balancer(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def create_path_route_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, name, path_routes, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1118,7 +1117,7 @@ def create_path_route_set(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def create_routing_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, name, condition_language_version, rules, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1190,7 +1189,7 @@ def create_routing_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def create_rule_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, name, items, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1281,7 +1280,7 @@ def create_rule_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def create_ssl_cipher_suite(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, name, ciphers, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1355,13 +1354,13 @@ def create_ssl_cipher_suite(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, backend_set_name, backend_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -1430,10 +1429,10 @@ def delete_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_backend_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, backend_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -1499,10 +1498,10 @@ def delete_backend_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, certificate_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(certificate_name, six.string_types) and len(certificate_name.strip()) == 0: + if isinstance(certificate_name, str) and len(certificate_name.strip()) == 0: raise click.UsageError('Parameter --certificate-name cannot be whitespace or empty string') kwargs = {} @@ -1568,10 +1567,10 @@ def delete_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_hostname(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') kwargs = {} @@ -1637,10 +1636,10 @@ def delete_hostname(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_listener(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, listener_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(listener_name, six.string_types) and len(listener_name.strip()) == 0: + if isinstance(listener_name, str) and len(listener_name.strip()) == 0: raise click.UsageError('Parameter --listener-name cannot be whitespace or empty string') kwargs = {} @@ -1703,7 +1702,7 @@ def delete_listener(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_load_balancer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1770,10 +1769,10 @@ def delete_load_balancer(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_path_route_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, path_route_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(path_route_set_name, six.string_types) and len(path_route_set_name.strip()) == 0: + if isinstance(path_route_set_name, str) and len(path_route_set_name.strip()) == 0: raise click.UsageError('Parameter --path-route-set-name cannot be whitespace or empty string') kwargs = {} @@ -1841,10 +1840,10 @@ def delete_path_route_set(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_routing_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, routing_policy_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(routing_policy_name, six.string_types) and len(routing_policy_name.strip()) == 0: + if isinstance(routing_policy_name, str) and len(routing_policy_name.strip()) == 0: raise click.UsageError('Parameter --routing-policy-name cannot be whitespace or empty string') kwargs = {} @@ -1912,10 +1911,10 @@ def delete_routing_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_rule_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, rule_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(rule_set_name, six.string_types) and len(rule_set_name.strip()) == 0: + if isinstance(rule_set_name, str) and len(rule_set_name.strip()) == 0: raise click.UsageError('Parameter --rule-set-name cannot be whitespace or empty string') kwargs = {} @@ -1981,10 +1980,10 @@ def delete_rule_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_ssl_cipher_suite(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') kwargs = {} @@ -2049,13 +2048,13 @@ def delete_ssl_cipher_suite(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def get_backend(ctx, from_json, load_balancer_id, backend_set_name, backend_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -2094,13 +2093,13 @@ def get_backend(ctx, from_json, load_balancer_id, backend_set_name, backend_name @cli_util.wrap_exceptions def get_backend_health(ctx, from_json, load_balancer_id, backend_set_name, backend_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -2136,10 +2135,10 @@ def get_backend_health(ctx, from_json, load_balancer_id, backend_set_name, backe @cli_util.wrap_exceptions def get_backend_set(ctx, from_json, load_balancer_id, backend_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -2174,10 +2173,10 @@ def get_backend_set(ctx, from_json, load_balancer_id, backend_set_name, if_match @cli_util.wrap_exceptions def get_backend_set_health(ctx, from_json, load_balancer_id, backend_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -2212,10 +2211,10 @@ def get_backend_set_health(ctx, from_json, load_balancer_id, backend_set_name, i @cli_util.wrap_exceptions def get_health_checker(ctx, from_json, load_balancer_id, backend_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -2250,10 +2249,10 @@ def get_health_checker(ctx, from_json, load_balancer_id, backend_set_name, if_ma @cli_util.wrap_exceptions def get_hostname(ctx, from_json, load_balancer_id, name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') kwargs = {} @@ -2285,7 +2284,7 @@ def get_hostname(ctx, from_json, load_balancer_id, name, if_match): @cli_util.wrap_exceptions def get_load_balancer(ctx, from_json, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -2316,7 +2315,7 @@ def get_load_balancer(ctx, from_json, load_balancer_id, if_match): @cli_util.wrap_exceptions def get_load_balancer_health(ctx, from_json, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -2350,10 +2349,10 @@ def get_load_balancer_health(ctx, from_json, load_balancer_id, if_match): @cli_util.wrap_exceptions def get_path_route_set(ctx, from_json, load_balancer_id, path_route_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(path_route_set_name, six.string_types) and len(path_route_set_name.strip()) == 0: + if isinstance(path_route_set_name, str) and len(path_route_set_name.strip()) == 0: raise click.UsageError('Parameter --path-route-set-name cannot be whitespace or empty string') kwargs = {} @@ -2388,10 +2387,10 @@ def get_path_route_set(ctx, from_json, load_balancer_id, path_route_set_name, if @cli_util.wrap_exceptions def get_routing_policy(ctx, from_json, load_balancer_id, routing_policy_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(routing_policy_name, six.string_types) and len(routing_policy_name.strip()) == 0: + if isinstance(routing_policy_name, str) and len(routing_policy_name.strip()) == 0: raise click.UsageError('Parameter --routing-policy-name cannot be whitespace or empty string') kwargs = {} @@ -2426,10 +2425,10 @@ def get_routing_policy(ctx, from_json, load_balancer_id, routing_policy_name, if @cli_util.wrap_exceptions def get_rule_set(ctx, from_json, load_balancer_id, rule_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(rule_set_name, six.string_types) and len(rule_set_name.strip()) == 0: + if isinstance(rule_set_name, str) and len(rule_set_name.strip()) == 0: raise click.UsageError('Parameter --rule-set-name cannot be whitespace or empty string') kwargs = {} @@ -2464,10 +2463,10 @@ def get_rule_set(ctx, from_json, load_balancer_id, rule_set_name, if_match): @cli_util.wrap_exceptions def get_ssl_cipher_suite(ctx, from_json, load_balancer_id, name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') kwargs = {} @@ -2492,7 +2491,7 @@ def get_ssl_cipher_suite(ctx, from_json, load_balancer_id, name, if_match): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2522,7 +2521,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def list_backend_sets(ctx, from_json, all_pages, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -2557,10 +2556,10 @@ def list_backend_sets(ctx, from_json, all_pages, load_balancer_id, if_match): @cli_util.wrap_exceptions def list_backends(ctx, from_json, all_pages, load_balancer_id, backend_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -2593,7 +2592,7 @@ def list_backends(ctx, from_json, all_pages, load_balancer_id, backend_set_name, @cli_util.wrap_exceptions def list_certificates(ctx, from_json, all_pages, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -2625,7 +2624,7 @@ def list_certificates(ctx, from_json, all_pages, load_balancer_id, if_match): @cli_util.wrap_exceptions def list_hostnames(ctx, from_json, all_pages, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -2660,10 +2659,10 @@ def list_hostnames(ctx, from_json, all_pages, load_balancer_id, if_match): @cli_util.wrap_exceptions def list_listener_rules(ctx, from_json, all_pages, load_balancer_id, listener_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(listener_name, six.string_types) and len(listener_name.strip()) == 0: + if isinstance(listener_name, str) and len(listener_name.strip()) == 0: raise click.UsageError('Parameter --listener-name cannot be whitespace or empty string') kwargs = {} @@ -2821,7 +2820,7 @@ def list_load_balancers(ctx, from_json, all_pages, page_size, compartment_id, li @cli_util.wrap_exceptions def list_path_route_sets(ctx, from_json, all_pages, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -2967,7 +2966,7 @@ def list_routing_policies(ctx, from_json, all_pages, page_size, load_balancer_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -3021,7 +3020,7 @@ def list_routing_policies(ctx, from_json, all_pages, page_size, load_balancer_id @cli_util.wrap_exceptions def list_rule_sets(ctx, from_json, all_pages, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -3105,7 +3104,7 @@ def list_shapes(ctx, from_json, all_pages, page_size, compartment_id, limit, pag @cli_util.wrap_exceptions def list_ssl_cipher_suites(ctx, from_json, all_pages, load_balancer_id, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -3140,7 +3139,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, load_balancer_id, l if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -3219,13 +3218,13 @@ def list_work_requests(ctx, from_json, all_pages, page_size, load_balancer_id, l @cli_util.wrap_exceptions def update_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, weight, backup, drain, offline, load_balancer_id, backend_set_name, backend_name, max_connections, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -3316,10 +3315,10 @@ def update_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def update_backend_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, policy, backends, health_checker, load_balancer_id, backend_set_name, backend_max_connections, ssl_configuration, session_persistence_configuration, lb_cookie_session_persistence_configuration, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') if not force: if backends or health_checker or ssl_configuration or session_persistence_configuration or lb_cookie_session_persistence_configuration: @@ -3438,10 +3437,10 @@ def update_backend_set(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_health_checker(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, protocol, port, return_code, retries, timeout_in_millis, interval_in_millis, response_body_regex, load_balancer_id, backend_set_name, url_path, is_force_plain_text, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -3526,10 +3525,10 @@ def update_health_checker(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_hostname(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, name, hostname, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') kwargs = {} @@ -3625,10 +3624,10 @@ def update_hostname(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def update_listener(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, default_backend_set_name, port, protocol, load_balancer_id, listener_name, hostname_names, path_route_set_name, routing_policy_name, ssl_configuration, connection_configuration, rule_set_names, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(listener_name, six.string_types) and len(listener_name.strip()) == 0: + if isinstance(listener_name, str) and len(listener_name.strip()) == 0: raise click.UsageError('Parameter --listener-name cannot be whitespace or empty string') if not force: if hostname_names or ssl_configuration or connection_configuration or rule_set_names: @@ -3764,7 +3763,7 @@ def update_listener(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_load_balancer(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, display_name, ip_mode, is_delete_protection_enabled, is_request_id_enabled, request_id_header, freeform_tags, defined_tags, security_attributes, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or security_attributes: @@ -3868,7 +3867,7 @@ def update_load_balancer(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_load_balancer_shape(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, shape_name, shape_details, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') if not force: if shape_details: @@ -3951,7 +3950,7 @@ def update_load_balancer_shape(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_network_security_groups(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, network_security_group_ids, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') if not force: if network_security_group_ids: @@ -4030,10 +4029,10 @@ def update_network_security_groups(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_path_route_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, path_routes, load_balancer_id, path_route_set_name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(path_route_set_name, six.string_types) and len(path_route_set_name.strip()) == 0: + if isinstance(path_route_set_name, str) and len(path_route_set_name.strip()) == 0: raise click.UsageError('Parameter --path-route-set-name cannot be whitespace or empty string') if not force: if path_routes: @@ -4112,10 +4111,10 @@ def update_path_route_set(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_routing_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, rules, load_balancer_id, routing_policy_name, condition_language_version, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(routing_policy_name, six.string_types) and len(routing_policy_name.strip()) == 0: + if isinstance(routing_policy_name, str) and len(routing_policy_name.strip()) == 0: raise click.UsageError('Parameter --routing-policy-name cannot be whitespace or empty string') if not force: if rules: @@ -4196,10 +4195,10 @@ def update_routing_policy(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_rule_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, load_balancer_id, rule_set_name, items, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(rule_set_name, six.string_types) and len(rule_set_name.strip()) == 0: + if isinstance(rule_set_name, str) and len(rule_set_name.strip()) == 0: raise click.UsageError('Parameter --rule-set-name cannot be whitespace or empty string') if not force: if items: @@ -4291,10 +4290,10 @@ def update_rule_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_ssl_cipher_suite(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, ciphers, load_balancer_id, name, if_match): - if isinstance(load_balancer_id, six.string_types) and len(load_balancer_id.strip()) == 0: + if isinstance(load_balancer_id, str) and len(load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --load-balancer-id cannot be whitespace or empty string') - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') if not force: if ciphers: diff --git a/services/load_balancer/src/oci_cli_load_balancer/lb_cli_extended.py b/services/load_balancer/src/oci_cli_load_balancer/lb_cli_extended.py index 421085e3d..80b0b9307 100644 --- a/services/load_balancer/src/oci_cli_load_balancer/lb_cli_extended.py +++ b/services/load_balancer/src/oci_cli_load_balancer/lb_cli_extended.py @@ -5,7 +5,6 @@ from __future__ import print_function import click import json -import six # noqa: F401 from oci_cli import cli_util from oci_cli import json_skeleton_utils from oci_cli import custom_types # noqa: F401 diff --git a/services/lockbox/src/oci_cli_lockbox/generated/lockbox_cli.py b/services/lockbox/src/oci_cli_lockbox/generated/lockbox_cli.py index fce6fa06c..b1a318368 100644 --- a/services/lockbox/src/oci_cli_lockbox/generated/lockbox_cli.py +++ b/services/lockbox/src/oci_cli_lockbox/generated/lockbox_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -114,7 +113,7 @@ def lockbox_collection_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -140,7 +139,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_approval_template_compartment(ctx, from_json, approval_template_id, compartment_id, if_match): - if isinstance(approval_template_id, six.string_types) and len(approval_template_id.strip()) == 0: + if isinstance(approval_template_id, str) and len(approval_template_id.strip()) == 0: raise click.UsageError('Parameter --approval-template-id cannot be whitespace or empty string') kwargs = {} @@ -171,7 +170,7 @@ def change_approval_template_compartment(ctx, from_json, approval_template_id, c @cli_util.wrap_exceptions def change_lockbox_compartment(ctx, from_json, lockbox_id, compartment_id, if_match): - if isinstance(lockbox_id, six.string_types) and len(lockbox_id.strip()) == 0: + if isinstance(lockbox_id, str) and len(lockbox_id.strip()) == 0: raise click.UsageError('Parameter --lockbox-id cannot be whitespace or empty string') kwargs = {} @@ -428,7 +427,7 @@ def create_lockbox(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_approval_template(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, approval_template_id, if_match): - if isinstance(approval_template_id, six.string_types) and len(approval_template_id.strip()) == 0: + if isinstance(approval_template_id, str) and len(approval_template_id.strip()) == 0: raise click.UsageError('Parameter --approval-template-id cannot be whitespace or empty string') kwargs = {} @@ -492,7 +491,7 @@ def delete_approval_template(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_lockbox(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, lockbox_id, if_match): - if isinstance(lockbox_id, six.string_types) and len(lockbox_id.strip()) == 0: + if isinstance(lockbox_id, str) and len(lockbox_id.strip()) == 0: raise click.UsageError('Parameter --lockbox-id cannot be whitespace or empty string') kwargs = {} @@ -631,7 +630,7 @@ def export_access_requests(ctx, from_json, file, lockbox_id, time_created_after, @cli_util.wrap_exceptions def get_access_materials(ctx, from_json, access_request_id): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -653,7 +652,7 @@ def get_access_materials(ctx, from_json, access_request_id): @cli_util.wrap_exceptions def get_access_request(ctx, from_json, access_request_id): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -675,7 +674,7 @@ def get_access_request(ctx, from_json, access_request_id): @cli_util.wrap_exceptions def get_access_request_internal(ctx, from_json, access_request_id): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -697,7 +696,7 @@ def get_access_request_internal(ctx, from_json, access_request_id): @cli_util.wrap_exceptions def get_approval_template(ctx, from_json, approval_template_id): - if isinstance(approval_template_id, six.string_types) and len(approval_template_id.strip()) == 0: + if isinstance(approval_template_id, str) and len(approval_template_id.strip()) == 0: raise click.UsageError('Parameter --approval-template-id cannot be whitespace or empty string') kwargs = {} @@ -719,7 +718,7 @@ def get_approval_template(ctx, from_json, approval_template_id): @cli_util.wrap_exceptions def get_lockbox(ctx, from_json, lockbox_id): - if isinstance(lockbox_id, six.string_types) and len(lockbox_id.strip()) == 0: + if isinstance(lockbox_id, str) and len(lockbox_id.strip()) == 0: raise click.UsageError('Parameter --lockbox-id cannot be whitespace or empty string') kwargs = {} @@ -741,7 +740,7 @@ def get_lockbox(ctx, from_json, lockbox_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -769,7 +768,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def handle_access_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, access_request_id, action, message, if_match): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -1047,7 +1046,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1104,7 +1103,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1224,7 +1223,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_approval_template(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, approval_template_id, approver_levels, display_name, auto_approval_state, freeform_tags, defined_tags, if_match): - if isinstance(approval_template_id, six.string_types) and len(approval_template_id.strip()) == 0: + if isinstance(approval_template_id, str) and len(approval_template_id.strip()) == 0: raise click.UsageError('Parameter --approval-template-id cannot be whitespace or empty string') if not force: if approver_levels or freeform_tags or defined_tags: @@ -1304,7 +1303,7 @@ def update_approval_template(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_lockbox(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, lockbox_id, display_name, approval_template_id, max_access_duration, freeform_tags, defined_tags, if_match): - if isinstance(lockbox_id, six.string_types) and len(lockbox_id.strip()) == 0: + if isinstance(lockbox_id, str) and len(lockbox_id.strip()) == 0: raise click.UsageError('Parameter --lockbox-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/log_analytics/src/oci_cli_log_analytics/generated/loganalytics_cli.py b/services/log_analytics/src/oci_cli_log_analytics/generated/loganalytics_cli.py index 5155c6fba..39e30035b 100644 --- a/services/log_analytics/src/oci_cli_log_analytics/generated/loganalytics_cli.py +++ b/services/log_analytics/src/oci_cli_log_analytics/generated/loganalytics_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -267,10 +266,10 @@ def binary_group(): @cli_util.wrap_exceptions def add_entity_association(ctx, from_json, namespace_name, log_analytics_entity_id, association_entities, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_entity_id, six.string_types) and len(log_analytics_entity_id.strip()) == 0: + if isinstance(log_analytics_entity_id, str) and len(log_analytics_entity_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-entity-id cannot be whitespace or empty string') kwargs = {} @@ -304,10 +303,10 @@ def add_entity_association(ctx, from_json, namespace_name, log_analytics_entity_ @cli_util.wrap_exceptions def add_source_event_types(ctx, from_json, namespace_name, source_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -346,10 +345,10 @@ def add_source_event_types(ctx, from_json, namespace_name, source_name, items): @cli_util.wrap_exceptions def append_lookup_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, lookup_name, append_lookup_file_body, is_force, char_encoding, if_match, expect): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(lookup_name, six.string_types) and len(lookup_name.strip()) == 0: + if isinstance(lookup_name, str) and len(lookup_name.strip()) == 0: raise click.UsageError('Parameter --lookup-name cannot be whitespace or empty string') kwargs = {} @@ -418,7 +417,7 @@ def append_lookup_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def assign_encryption_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, key_id, key_type, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -481,7 +480,7 @@ def assign_encryption_key(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def batch_get_basic_info(ctx, from_json, namespace_name, is_include_deleted, label_names, limit, page, sort_order, basic_label_sort_by): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -522,10 +521,10 @@ def batch_get_basic_info(ctx, from_json, namespace_name, is_include_deleted, lab @cli_util.wrap_exceptions def cancel_query_work_request(ctx, from_json, namespace_name, work_request_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -553,10 +552,10 @@ def cancel_query_work_request(ctx, from_json, namespace_name, work_request_id, i @cli_util.wrap_exceptions def change_ingest_time_rule_compartment(ctx, from_json, namespace_name, ingest_time_rule_id, compartment_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(ingest_time_rule_id, six.string_types) and len(ingest_time_rule_id.strip()) == 0: + if isinstance(ingest_time_rule_id, str) and len(ingest_time_rule_id.strip()) == 0: raise click.UsageError('Parameter --ingest-time-rule-id cannot be whitespace or empty string') kwargs = {} @@ -589,10 +588,10 @@ def change_ingest_time_rule_compartment(ctx, from_json, namespace_name, ingest_t @cli_util.wrap_exceptions def change_log_analytics_em_bridge_compartment(ctx, from_json, namespace_name, log_analytics_em_bridge_id, compartment_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_em_bridge_id, six.string_types) and len(log_analytics_em_bridge_id.strip()) == 0: + if isinstance(log_analytics_em_bridge_id, str) and len(log_analytics_em_bridge_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-em-bridge-id cannot be whitespace or empty string') kwargs = {} @@ -625,10 +624,10 @@ def change_log_analytics_em_bridge_compartment(ctx, from_json, namespace_name, l @cli_util.wrap_exceptions def change_log_analytics_entity_compartment(ctx, from_json, namespace_name, log_analytics_entity_id, compartment_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_entity_id, six.string_types) and len(log_analytics_entity_id.strip()) == 0: + if isinstance(log_analytics_entity_id, str) and len(log_analytics_entity_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-entity-id cannot be whitespace or empty string') kwargs = {} @@ -661,10 +660,10 @@ def change_log_analytics_entity_compartment(ctx, from_json, namespace_name, log_ @cli_util.wrap_exceptions def change_log_analytics_log_group_compartment(ctx, from_json, namespace_name, log_analytics_log_group_id, compartment_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_log_group_id, six.string_types) and len(log_analytics_log_group_id.strip()) == 0: + if isinstance(log_analytics_log_group_id, str) and len(log_analytics_log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-log-group-id cannot be whitespace or empty string') kwargs = {} @@ -697,10 +696,10 @@ def change_log_analytics_log_group_compartment(ctx, from_json, namespace_name, l @cli_util.wrap_exceptions def change_log_analytics_object_collection_rule_compartment(ctx, from_json, namespace_name, log_analytics_object_collection_rule_id, compartment_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_object_collection_rule_id, six.string_types) and len(log_analytics_object_collection_rule_id.strip()) == 0: + if isinstance(log_analytics_object_collection_rule_id, str) and len(log_analytics_object_collection_rule_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-object-collection-rule-id cannot be whitespace or empty string') kwargs = {} @@ -733,10 +732,10 @@ def change_log_analytics_object_collection_rule_compartment(ctx, from_json, name @cli_util.wrap_exceptions def change_lookup_compartment(ctx, from_json, namespace_name, lookup_name, compartment_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(lookup_name, six.string_types) and len(lookup_name.strip()) == 0: + if isinstance(lookup_name, str) and len(lookup_name.strip()) == 0: raise click.UsageError('Parameter --lookup-name cannot be whitespace or empty string') kwargs = {} @@ -769,10 +768,10 @@ def change_lookup_compartment(ctx, from_json, namespace_name, lookup_name, compa @cli_util.wrap_exceptions def change_scheduled_task_compartment(ctx, from_json, namespace_name, scheduled_task_id, compartment_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') kwargs = {} @@ -805,10 +804,10 @@ def change_scheduled_task_compartment(ctx, from_json, namespace_name, scheduled_ @cli_util.wrap_exceptions def clean(ctx, from_json, namespace_name, scheduled_task_id, time_start, time_end): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') kwargs = {} @@ -837,7 +836,7 @@ def clean(ctx, from_json, namespace_name, scheduled_task_id, time_start, time_en @cli_util.wrap_exceptions def compare_content(ctx, from_json, namespace_name, content1, content2): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -879,7 +878,7 @@ def compare_content(ctx, from_json, namespace_name, content1, content2): @cli_util.wrap_exceptions def create_ingest_time_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, display_name, conditions, actions, description, freeform_tags, defined_tags): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -956,7 +955,7 @@ def create_ingest_time_rule(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def create_ingest_time_rule_ingest_time_rule_field_condition(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, display_name, actions, conditions_field_name, conditions_field_operator, conditions_field_value, description, freeform_tags, defined_tags, conditions_additional_conditions): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1036,7 +1035,7 @@ def create_ingest_time_rule_ingest_time_rule_field_condition(ctx, from_json, wai @cli_util.wrap_exceptions def create_log_analytics_em_bridge(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, display_name, compartment_id, em_entities_compartment_id, bucket_name, description, freeform_tags, defined_tags): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1114,7 +1113,7 @@ def create_log_analytics_em_bridge(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def create_log_analytics_entity(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, name, compartment_id, entity_type_name, management_agent_id, cloud_resource_id, timezone_region, hostname, source_id, properties, freeform_tags, defined_tags, time_last_discovered, metadata): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1201,7 +1200,7 @@ def create_log_analytics_entity(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def create_log_analytics_entity_type(ctx, from_json, namespace_name, name, category, properties): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1239,7 +1238,7 @@ def create_log_analytics_entity_type(ctx, from_json, namespace_name, name, categ @cli_util.wrap_exceptions def create_log_analytics_log_group(ctx, from_json, namespace_name, display_name, compartment_id, description, freeform_tags, defined_tags): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1305,7 +1304,7 @@ def create_log_analytics_log_group(ctx, from_json, namespace_name, display_name, @cli_util.wrap_exceptions def create_log_analytics_object_collection_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, name, compartment_id, os_namespace, os_bucket_name, log_group_id, description, collection_type, poll_since, poll_till, log_source_name, entity_id, char_encoding, is_enabled, timezone, log_set, log_set_key, log_set_ext_regex, overrides, object_name_filters, log_type, is_force_historic_collection, stream_id, stream_cursor_type, stream_cursor_time, defined_tags, freeform_tags): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1430,7 +1429,7 @@ def create_log_analytics_object_collection_rule(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def create_scheduled_task(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, kind, compartment_id, display_name, freeform_tags, defined_tags): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1502,7 +1501,7 @@ def create_scheduled_task(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def create_scheduled_task_create_standard_task_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, task_type, action, display_name, freeform_tags, defined_tags, schedules): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1576,7 +1575,7 @@ def create_scheduled_task_create_standard_task_details(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def create_scheduled_task_create_acceleration_task_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, saved_search_id, display_name, freeform_tags, defined_tags): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1645,7 +1644,7 @@ def create_scheduled_task_create_acceleration_task_details(ctx, from_json, wait_ @cli_util.wrap_exceptions def delete_associations(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1707,10 +1706,10 @@ def delete_associations(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_field(ctx, from_json, namespace_name, field_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(field_name, six.string_types) and len(field_name.strip()) == 0: + if isinstance(field_name, str) and len(field_name.strip()) == 0: raise click.UsageError('Parameter --field-name cannot be whitespace or empty string') kwargs = {} @@ -1738,10 +1737,10 @@ def delete_field(ctx, from_json, namespace_name, field_name, if_match): @cli_util.wrap_exceptions def delete_ingest_time_rule(ctx, from_json, namespace_name, ingest_time_rule_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(ingest_time_rule_id, six.string_types) and len(ingest_time_rule_id.strip()) == 0: + if isinstance(ingest_time_rule_id, str) and len(ingest_time_rule_id.strip()) == 0: raise click.UsageError('Parameter --ingest-time-rule-id cannot be whitespace or empty string') kwargs = {} @@ -1769,10 +1768,10 @@ def delete_ingest_time_rule(ctx, from_json, namespace_name, ingest_time_rule_id, @cli_util.wrap_exceptions def delete_label(ctx, from_json, namespace_name, label_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(label_name, six.string_types) and len(label_name.strip()) == 0: + if isinstance(label_name, str) and len(label_name.strip()) == 0: raise click.UsageError('Parameter --label-name cannot be whitespace or empty string') kwargs = {} @@ -1801,10 +1800,10 @@ def delete_label(ctx, from_json, namespace_name, label_name, if_match): @cli_util.wrap_exceptions def delete_log_analytics_em_bridge(ctx, from_json, namespace_name, log_analytics_em_bridge_id, if_match, is_delete_entities): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_em_bridge_id, six.string_types) and len(log_analytics_em_bridge_id.strip()) == 0: + if isinstance(log_analytics_em_bridge_id, str) and len(log_analytics_em_bridge_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-em-bridge-id cannot be whitespace or empty string') kwargs = {} @@ -1835,10 +1834,10 @@ def delete_log_analytics_em_bridge(ctx, from_json, namespace_name, log_analytics @cli_util.wrap_exceptions def delete_log_analytics_entity(ctx, from_json, namespace_name, log_analytics_entity_id, if_match, is_force_delete): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_entity_id, six.string_types) and len(log_analytics_entity_id.strip()) == 0: + if isinstance(log_analytics_entity_id, str) and len(log_analytics_entity_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-entity-id cannot be whitespace or empty string') kwargs = {} @@ -1868,10 +1867,10 @@ def delete_log_analytics_entity(ctx, from_json, namespace_name, log_analytics_en @cli_util.wrap_exceptions def delete_log_analytics_entity_type(ctx, from_json, namespace_name, entity_type_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(entity_type_name, six.string_types) and len(entity_type_name.strip()) == 0: + if isinstance(entity_type_name, str) and len(entity_type_name.strip()) == 0: raise click.UsageError('Parameter --entity-type-name cannot be whitespace or empty string') kwargs = {} @@ -1899,10 +1898,10 @@ def delete_log_analytics_entity_type(ctx, from_json, namespace_name, entity_type @cli_util.wrap_exceptions def delete_log_analytics_log_group(ctx, from_json, namespace_name, log_analytics_log_group_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_log_group_id, six.string_types) and len(log_analytics_log_group_id.strip()) == 0: + if isinstance(log_analytics_log_group_id, str) and len(log_analytics_log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-log-group-id cannot be whitespace or empty string') kwargs = {} @@ -1930,10 +1929,10 @@ def delete_log_analytics_log_group(ctx, from_json, namespace_name, log_analytics @cli_util.wrap_exceptions def delete_log_analytics_object_collection_rule(ctx, from_json, namespace_name, log_analytics_object_collection_rule_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_object_collection_rule_id, six.string_types) and len(log_analytics_object_collection_rule_id.strip()) == 0: + if isinstance(log_analytics_object_collection_rule_id, str) and len(log_analytics_object_collection_rule_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-object-collection-rule-id cannot be whitespace or empty string') kwargs = {} @@ -1965,10 +1964,10 @@ def delete_log_analytics_object_collection_rule(ctx, from_json, namespace_name, @cli_util.wrap_exceptions def delete_lookup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, lookup_name, is_force, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(lookup_name, six.string_types) and len(lookup_name.strip()) == 0: + if isinstance(lookup_name, str) and len(lookup_name.strip()) == 0: raise click.UsageError('Parameter --lookup-name cannot be whitespace or empty string') kwargs = {} @@ -2025,10 +2024,10 @@ def delete_lookup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_parser(ctx, from_json, namespace_name, parser_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(parser_name, six.string_types) and len(parser_name.strip()) == 0: + if isinstance(parser_name, str) and len(parser_name.strip()) == 0: raise click.UsageError('Parameter --parser-name cannot be whitespace or empty string') kwargs = {} @@ -2056,10 +2055,10 @@ def delete_parser(ctx, from_json, namespace_name, parser_name, if_match): @cli_util.wrap_exceptions def delete_scheduled_task(ctx, from_json, namespace_name, scheduled_task_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') kwargs = {} @@ -2087,10 +2086,10 @@ def delete_scheduled_task(ctx, from_json, namespace_name, scheduled_task_id, if_ @cli_util.wrap_exceptions def delete_source(ctx, from_json, namespace_name, source_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -2118,10 +2117,10 @@ def delete_source(ctx, from_json, namespace_name, source_name, if_match): @cli_util.wrap_exceptions def delete_upload(ctx, from_json, namespace_name, upload_reference, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(upload_reference, six.string_types) and len(upload_reference.strip()) == 0: + if isinstance(upload_reference, str) and len(upload_reference.strip()) == 0: raise click.UsageError('Parameter --upload-reference cannot be whitespace or empty string') kwargs = {} @@ -2149,13 +2148,13 @@ def delete_upload(ctx, from_json, namespace_name, upload_reference, if_match): @cli_util.wrap_exceptions def delete_upload_file(ctx, from_json, namespace_name, upload_reference, file_reference): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(upload_reference, six.string_types) and len(upload_reference.strip()) == 0: + if isinstance(upload_reference, str) and len(upload_reference.strip()) == 0: raise click.UsageError('Parameter --upload-reference cannot be whitespace or empty string') - if isinstance(file_reference, six.string_types) and len(file_reference.strip()) == 0: + if isinstance(file_reference, str) and len(file_reference.strip()) == 0: raise click.UsageError('Parameter --file-reference cannot be whitespace or empty string') kwargs = {} @@ -2182,13 +2181,13 @@ def delete_upload_file(ctx, from_json, namespace_name, upload_reference, file_re @cli_util.wrap_exceptions def delete_upload_warning(ctx, from_json, namespace_name, upload_reference, warning_reference): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(upload_reference, six.string_types) and len(upload_reference.strip()) == 0: + if isinstance(upload_reference, str) and len(upload_reference.strip()) == 0: raise click.UsageError('Parameter --upload-reference cannot be whitespace or empty string') - if isinstance(warning_reference, six.string_types) and len(warning_reference.strip()) == 0: + if isinstance(warning_reference, str) and len(warning_reference.strip()) == 0: raise click.UsageError('Parameter --warning-reference cannot be whitespace or empty string') kwargs = {} @@ -2213,7 +2212,7 @@ def delete_upload_warning(ctx, from_json, namespace_name, upload_reference, warn @cli_util.wrap_exceptions def disable_archiving(ctx, from_json, namespace_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -2244,10 +2243,10 @@ def disable_archiving(ctx, from_json, namespace_name, if_match): @cli_util.wrap_exceptions def disable_auto_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, source_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -2309,10 +2308,10 @@ def disable_auto_association(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def disable_ingest_time_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, ingest_time_rule_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(ingest_time_rule_id, six.string_types) and len(ingest_time_rule_id.strip()) == 0: + if isinstance(ingest_time_rule_id, str) and len(ingest_time_rule_id.strip()) == 0: raise click.UsageError('Parameter --ingest-time-rule-id cannot be whitespace or empty string') kwargs = {} @@ -2368,10 +2367,10 @@ def disable_ingest_time_rule(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def disable_source_event_types(ctx, from_json, namespace_name, source_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -2402,7 +2401,7 @@ def disable_source_event_types(ctx, from_json, namespace_name, source_name, item @cli_util.wrap_exceptions def enable_archiving(ctx, from_json, namespace_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -2433,10 +2432,10 @@ def enable_archiving(ctx, from_json, namespace_name, if_match): @cli_util.wrap_exceptions def enable_auto_association(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, source_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -2498,10 +2497,10 @@ def enable_auto_association(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def enable_ingest_time_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, ingest_time_rule_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(ingest_time_rule_id, six.string_types) and len(ingest_time_rule_id.strip()) == 0: + if isinstance(ingest_time_rule_id, str) and len(ingest_time_rule_id.strip()) == 0: raise click.UsageError('Parameter --ingest-time-rule-id cannot be whitespace or empty string') kwargs = {} @@ -2557,10 +2556,10 @@ def enable_ingest_time_rule(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def enable_source_event_types(ctx, from_json, namespace_name, source_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -2596,7 +2595,7 @@ def enable_source_event_types(ctx, from_json, namespace_name, source_name, items @cli_util.wrap_exceptions def estimate_purge_data_size(ctx, from_json, namespace_name, compartment_id, time_data_ended, compartment_id_in_subtree, purge_query_string, data_type, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -2639,7 +2638,7 @@ def estimate_purge_data_size(ctx, from_json, namespace_name, compartment_id, tim @cli_util.wrap_exceptions def estimate_recall_data_size(ctx, from_json, namespace_name, time_data_started, time_data_ended, log_sets, is_recall_new_data_only): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -2675,7 +2674,7 @@ def estimate_recall_data_size(ctx, from_json, namespace_name, time_data_started, @cli_util.wrap_exceptions def estimate_release_data_size(ctx, from_json, namespace_name, time_data_started, time_data_ended): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -2707,7 +2706,7 @@ def estimate_release_data_size(ctx, from_json, namespace_name, time_data_started @cli_util.wrap_exceptions def export_custom_content(ctx, from_json, file, namespace_name, field_names, parser_names, source_names): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -2781,7 +2780,7 @@ def export_custom_content(ctx, from_json, file, namespace_name, field_names, par @cli_util.wrap_exceptions def export_query_result(ctx, from_json, file, namespace_name, compartment_id, query_string, sub_system, compartment_id_in_subtree, scope_filters, max_total_count, time_filter, query_timeout_in_seconds, should_include_columns, output_format, should_localize, should_use_acceleration): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -2910,7 +2909,7 @@ def export_query_result(ctx, from_json, file, namespace_name, compartment_id, qu @cli_util.wrap_exceptions def extract_structured_log_field_paths(ctx, from_json, namespace_name, content, description, display_name, edit_version, encoding, example_content, field_maps, footer_content, header_content, name, is_default, is_single_line_content, is_system, language, time_updated, log_type_test_request_version, mapped_parsers, parser_ignoreline_characters, is_hidden, parser_sequence, parser_timezone, parser_filter, is_parser_written_once, parser_functions, sources_count, sources, should_tokenize_original_text, field_delimiter, field_qualifier, type, is_user_deleted, is_namespace_aware, categories, is_position_aware, dependent_sources, dependent_parsers, parser_type): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3097,7 +3096,7 @@ def extract_structured_log_field_paths(ctx, from_json, namespace_name, content, @cli_util.wrap_exceptions def extract_structured_log_header_paths(ctx, from_json, namespace_name, content, description, display_name, edit_version, encoding, example_content, field_maps, footer_content, header_content, name, is_default, is_single_line_content, is_system, language, time_updated, log_type_test_request_version, mapped_parsers, parser_ignoreline_characters, is_hidden, parser_sequence, parser_timezone, parser_filter, is_parser_written_once, parser_functions, sources_count, sources, should_tokenize_original_text, field_delimiter, field_qualifier, type, is_user_deleted, is_namespace_aware, categories, is_position_aware, dependent_sources, dependent_parsers, parser_type): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3238,7 +3237,7 @@ def extract_structured_log_header_paths(ctx, from_json, namespace_name, content, @cli_util.wrap_exceptions def filter(ctx, from_json, namespace_name, query_string, sub_system, filters): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3270,7 +3269,7 @@ def filter(ctx, from_json, namespace_name, query_string, sub_system, filters): @cli_util.wrap_exceptions def get_association_summary(ctx, from_json, namespace_name, compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3294,10 +3293,10 @@ def get_association_summary(ctx, from_json, namespace_name, compartment_id): @cli_util.wrap_exceptions def get_category(ctx, from_json, namespace_name, category_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(category_name, six.string_types) and len(category_name.strip()) == 0: + if isinstance(category_name, str) and len(category_name.strip()) == 0: raise click.UsageError('Parameter --category-name cannot be whitespace or empty string') kwargs = {} @@ -3321,7 +3320,7 @@ def get_category(ctx, from_json, namespace_name, category_name): @cli_util.wrap_exceptions def get_column_names(ctx, from_json, namespace_name, sql_query): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3345,10 +3344,10 @@ def get_column_names(ctx, from_json, namespace_name, sql_query): @cli_util.wrap_exceptions def get_config_work_request(ctx, from_json, namespace_name, work_request_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3372,10 +3371,10 @@ def get_config_work_request(ctx, from_json, namespace_name, work_request_id): @cli_util.wrap_exceptions def get_field(ctx, from_json, namespace_name, field_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(field_name, six.string_types) and len(field_name.strip()) == 0: + if isinstance(field_name, str) and len(field_name.strip()) == 0: raise click.UsageError('Parameter --field-name cannot be whitespace or empty string') kwargs = {} @@ -3399,10 +3398,10 @@ def get_field(ctx, from_json, namespace_name, field_name): @cli_util.wrap_exceptions def get_field_usages(ctx, from_json, namespace_name, field_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(field_name, six.string_types) and len(field_name.strip()) == 0: + if isinstance(field_name, str) and len(field_name.strip()) == 0: raise click.UsageError('Parameter --field-name cannot be whitespace or empty string') kwargs = {} @@ -3426,7 +3425,7 @@ def get_field_usages(ctx, from_json, namespace_name, field_name): @cli_util.wrap_exceptions def get_fields_summary(ctx, from_json, namespace_name, is_show_detail): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3451,10 +3450,10 @@ def get_fields_summary(ctx, from_json, namespace_name, is_show_detail): @cli_util.wrap_exceptions def get_ingest_time_rule(ctx, from_json, namespace_name, ingest_time_rule_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(ingest_time_rule_id, six.string_types) and len(ingest_time_rule_id.strip()) == 0: + if isinstance(ingest_time_rule_id, str) and len(ingest_time_rule_id.strip()) == 0: raise click.UsageError('Parameter --ingest-time-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3478,10 +3477,10 @@ def get_ingest_time_rule(ctx, from_json, namespace_name, ingest_time_rule_id): @cli_util.wrap_exceptions def get_label(ctx, from_json, namespace_name, label_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(label_name, six.string_types) and len(label_name.strip()) == 0: + if isinstance(label_name, str) and len(label_name.strip()) == 0: raise click.UsageError('Parameter --label-name cannot be whitespace or empty string') kwargs = {} @@ -3504,7 +3503,7 @@ def get_label(ctx, from_json, namespace_name, label_name): @cli_util.wrap_exceptions def get_label_summary(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3527,10 +3526,10 @@ def get_label_summary(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_log_analytics_em_bridge(ctx, from_json, namespace_name, log_analytics_em_bridge_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_em_bridge_id, six.string_types) and len(log_analytics_em_bridge_id.strip()) == 0: + if isinstance(log_analytics_em_bridge_id, str) and len(log_analytics_em_bridge_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-em-bridge-id cannot be whitespace or empty string') kwargs = {} @@ -3554,7 +3553,7 @@ def get_log_analytics_em_bridge(ctx, from_json, namespace_name, log_analytics_em @cli_util.wrap_exceptions def get_log_analytics_em_bridge_summary(ctx, from_json, namespace_name, compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3578,7 +3577,7 @@ def get_log_analytics_em_bridge_summary(ctx, from_json, namespace_name, compartm @cli_util.wrap_exceptions def get_log_analytics_entities_summary(ctx, from_json, namespace_name, compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3603,10 +3602,10 @@ def get_log_analytics_entities_summary(ctx, from_json, namespace_name, compartme @cli_util.wrap_exceptions def get_log_analytics_entity(ctx, from_json, namespace_name, log_analytics_entity_id, is_show_associated_sources_count): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_entity_id, six.string_types) and len(log_analytics_entity_id.strip()) == 0: + if isinstance(log_analytics_entity_id, str) and len(log_analytics_entity_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-entity-id cannot be whitespace or empty string') kwargs = {} @@ -3632,10 +3631,10 @@ def get_log_analytics_entity(ctx, from_json, namespace_name, log_analytics_entit @cli_util.wrap_exceptions def get_log_analytics_entity_type(ctx, from_json, namespace_name, entity_type_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(entity_type_name, six.string_types) and len(entity_type_name.strip()) == 0: + if isinstance(entity_type_name, str) and len(entity_type_name.strip()) == 0: raise click.UsageError('Parameter --entity-type-name cannot be whitespace or empty string') kwargs = {} @@ -3659,10 +3658,10 @@ def get_log_analytics_entity_type(ctx, from_json, namespace_name, entity_type_na @cli_util.wrap_exceptions def get_log_analytics_log_group(ctx, from_json, namespace_name, log_analytics_log_group_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_log_group_id, six.string_types) and len(log_analytics_log_group_id.strip()) == 0: + if isinstance(log_analytics_log_group_id, str) and len(log_analytics_log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-log-group-id cannot be whitespace or empty string') kwargs = {} @@ -3686,7 +3685,7 @@ def get_log_analytics_log_group(ctx, from_json, namespace_name, log_analytics_lo @cli_util.wrap_exceptions def get_log_analytics_log_groups_summary(ctx, from_json, namespace_name, compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3710,10 +3709,10 @@ def get_log_analytics_log_groups_summary(ctx, from_json, namespace_name, compart @cli_util.wrap_exceptions def get_log_analytics_object_collection_rule(ctx, from_json, namespace_name, log_analytics_object_collection_rule_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_object_collection_rule_id, six.string_types) and len(log_analytics_object_collection_rule_id.strip()) == 0: + if isinstance(log_analytics_object_collection_rule_id, str) and len(log_analytics_object_collection_rule_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-object-collection-rule-id cannot be whitespace or empty string') kwargs = {} @@ -3736,7 +3735,7 @@ def get_log_analytics_object_collection_rule(ctx, from_json, namespace_name, log @cli_util.wrap_exceptions def get_log_sets_count(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3759,10 +3758,10 @@ def get_log_sets_count(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_lookup(ctx, from_json, namespace_name, lookup_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(lookup_name, six.string_types) and len(lookup_name.strip()) == 0: + if isinstance(lookup_name, str) and len(lookup_name.strip()) == 0: raise click.UsageError('Parameter --lookup-name cannot be whitespace or empty string') kwargs = {} @@ -3786,7 +3785,7 @@ def get_lookup(ctx, from_json, namespace_name, lookup_name): @cli_util.wrap_exceptions def get_lookup_summary(ctx, from_json, namespace_name, compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3810,7 +3809,7 @@ def get_lookup_summary(ctx, from_json, namespace_name, compartment_id): @cli_util.wrap_exceptions def get_namespace(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3833,10 +3832,10 @@ def get_namespace(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_parser(ctx, from_json, namespace_name, parser_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(parser_name, six.string_types) and len(parser_name.strip()) == 0: + if isinstance(parser_name, str) and len(parser_name.strip()) == 0: raise click.UsageError('Parameter --parser-name cannot be whitespace or empty string') kwargs = {} @@ -3859,7 +3858,7 @@ def get_parser(ctx, from_json, namespace_name, parser_name): @cli_util.wrap_exceptions def get_parser_summary(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3885,7 +3884,7 @@ def get_parser_summary(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_preferences(ctx, from_json, namespace_name, sort_order, sort_by, limit, page): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3921,7 +3920,7 @@ def get_preferences(ctx, from_json, namespace_name, sort_order, sort_by, limit, @cli_util.wrap_exceptions def get_query_result(ctx, from_json, namespace_name, work_request_id, page, limit, should_include_columns, should_include_fields, output_mode): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -3955,10 +3954,10 @@ def get_query_result(ctx, from_json, namespace_name, work_request_id, page, limi @cli_util.wrap_exceptions def get_query_work_request(ctx, from_json, namespace_name, work_request_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3981,7 +3980,7 @@ def get_query_work_request(ctx, from_json, namespace_name, work_request_id): @cli_util.wrap_exceptions def get_recall_count(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4005,7 +4004,7 @@ def get_recall_count(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_recalled_data_size(ctx, from_json, namespace_name, time_data_started, time_data_ended): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4032,7 +4031,7 @@ def get_recalled_data_size(ctx, from_json, namespace_name, time_data_started, ti @cli_util.wrap_exceptions def get_rules_summary(ctx, from_json, namespace_name, compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4056,10 +4055,10 @@ def get_rules_summary(ctx, from_json, namespace_name, compartment_id): @cli_util.wrap_exceptions def get_scheduled_task(ctx, from_json, namespace_name, scheduled_task_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') kwargs = {} @@ -4084,10 +4083,10 @@ def get_scheduled_task(ctx, from_json, namespace_name, scheduled_task_id): @cli_util.wrap_exceptions def get_source(ctx, from_json, namespace_name, source_name, compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -4111,7 +4110,7 @@ def get_source(ctx, from_json, namespace_name, source_name, compartment_id): @cli_util.wrap_exceptions def get_source_summary(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4133,7 +4132,7 @@ def get_source_summary(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_storage(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4155,7 +4154,7 @@ def get_storage(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_storage_usage(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4178,10 +4177,10 @@ def get_storage_usage(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_storage_work_request(ctx, from_json, work_request_id, namespace_name): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4205,10 +4204,10 @@ def get_storage_work_request(ctx, from_json, work_request_id, namespace_name): @cli_util.wrap_exceptions def get_template(ctx, from_json, namespace_name, template_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') kwargs = {} @@ -4231,7 +4230,7 @@ def get_template(ctx, from_json, namespace_name, template_id): @cli_util.wrap_exceptions def get_unprocessed_data_bucket(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4254,10 +4253,10 @@ def get_unprocessed_data_bucket(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_upload(ctx, from_json, namespace_name, upload_reference): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(upload_reference, six.string_types) and len(upload_reference.strip()) == 0: + if isinstance(upload_reference, str) and len(upload_reference.strip()) == 0: raise click.UsageError('Parameter --upload-reference cannot be whitespace or empty string') kwargs = {} @@ -4281,10 +4280,10 @@ def get_upload(ctx, from_json, namespace_name, upload_reference): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, namespace_name, work_request_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4310,7 +4309,7 @@ def get_work_request(ctx, from_json, namespace_name, work_request_id): @cli_util.wrap_exceptions def import_custom_content(ctx, from_json, namespace_name, import_custom_content_file_body, is_overwrite, expect): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4354,10 +4353,10 @@ def list_associable_entities(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -4428,7 +4427,7 @@ def list_associated_entities(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4495,10 +4494,10 @@ def list_auto_associations(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -4561,7 +4560,7 @@ def list_categories(ctx, from_json, all_pages, page_size, namespace_name, catego if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4625,7 +4624,7 @@ def list_config_work_requests(ctx, from_json, all_pages, page_size, namespace_na if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4691,7 +4690,7 @@ def list_effective_properties(ctx, from_json, all_pages, page_size, namespace_na if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4754,7 +4753,7 @@ def list_effective_properties(ctx, from_json, all_pages, page_size, namespace_na @cli_util.wrap_exceptions def list_encryption_key_info(ctx, from_json, all_pages, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4787,10 +4786,10 @@ def list_entity_associations(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_entity_id, six.string_types) and len(log_analytics_entity_id.strip()) == 0: + if isinstance(log_analytics_entity_id, str) and len(log_analytics_entity_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-entity-id cannot be whitespace or empty string') kwargs = {} @@ -4858,7 +4857,7 @@ def list_entity_source_associations(ctx, from_json, all_pages, page_size, namesp if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -4936,7 +4935,7 @@ def list_fields(ctx, from_json, all_pages, page_size, namespace_name, is_match_a if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5015,7 +5014,7 @@ def list_ingest_time_rules(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5083,7 +5082,7 @@ def list_label_priorities(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5137,7 +5136,7 @@ def list_label_source_details(ctx, from_json, all_pages, page_size, namespace_na if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5202,7 +5201,7 @@ def list_labels(ctx, from_json, all_pages, page_size, namespace_name, label_name if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5276,7 +5275,7 @@ def list_log_analytics_em_bridges(ctx, from_json, all_pages, page_size, namespac if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5363,7 +5362,7 @@ def list_log_analytics_entities(ctx, from_json, all_pages, page_size, namespace_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5463,10 +5462,10 @@ def list_log_analytics_entity_topology(ctx, from_json, all_pages, page_size, nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_entity_id, six.string_types) and len(log_analytics_entity_id.strip()) == 0: + if isinstance(log_analytics_entity_id, str) and len(log_analytics_entity_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-entity-id cannot be whitespace or empty string') kwargs = {} @@ -5536,7 +5535,7 @@ def list_log_analytics_entity_types(ctx, from_json, all_pages, page_size, namesp if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5603,7 +5602,7 @@ def list_log_analytics_log_groups(ctx, from_json, all_pages, page_size, namespac if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5668,7 +5667,7 @@ def list_log_analytics_object_collection_rules(ctx, from_json, all_pages, page_s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5732,7 +5731,7 @@ def list_log_sets(ctx, from_json, all_pages, page_size, namespace_name, limit, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5796,7 +5795,7 @@ def list_lookups(ctx, from_json, all_pages, page_size, namespace_name, type, loo if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5868,7 +5867,7 @@ def list_meta_source_types(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -5947,7 +5946,7 @@ def list_overlapping_recalls(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6010,7 +6009,7 @@ def list_parser_actions(ctx, from_json, all_pages, page_size, namespace_name, na if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6072,7 +6071,7 @@ def list_parser_functions(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6131,7 +6130,7 @@ def list_parser_meta_plugins(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6195,7 +6194,7 @@ def list_parsers(ctx, from_json, all_pages, page_size, namespace_name, is_match_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6270,7 +6269,7 @@ def list_properties_metadata(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6337,7 +6336,7 @@ def list_query_work_requests(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6401,7 +6400,7 @@ def list_recalled_data(ctx, from_json, all_pages, page_size, namespace_name, lim if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6465,7 +6464,7 @@ def list_recalled_info(ctx, from_json, all_pages, page_size, namespace_name, lim if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6532,7 +6531,7 @@ def list_resource_categories(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6602,7 +6601,7 @@ def list_rules(ctx, from_json, all_pages, page_size, namespace_name, compartment if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6677,7 +6676,7 @@ def list_scheduled_tasks(ctx, from_json, all_pages, page_size, namespace_name, t if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6755,7 +6754,7 @@ def list_source_associations(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -6828,10 +6827,10 @@ def list_source_event_types(ctx, from_json, all_pages, page_size, namespace_name if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -6898,10 +6897,10 @@ def list_source_extended_field_definitions(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -6961,7 +6960,7 @@ def list_source_label_operators(ctx, from_json, all_pages, page_size, namespace_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7018,7 +7017,7 @@ def list_source_meta_functions(ctx, from_json, all_pages, page_size, namespace_n if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7077,10 +7076,10 @@ def list_source_patterns(ctx, from_json, all_pages, page_size, namespace_name, s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -7152,7 +7151,7 @@ def list_sources(ctx, from_json, all_pages, page_size, namespace_name, compartme if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7232,10 +7231,10 @@ def list_storage_work_request_errors(ctx, from_json, all_pages, page_size, compa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7305,7 +7304,7 @@ def list_storage_work_requests(ctx, from_json, all_pages, page_size, compartment if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7375,7 +7374,7 @@ def list_supported_char_encodings(ctx, from_json, all_pages, page_size, namespac if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7426,7 +7425,7 @@ def list_supported_timezones(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7485,7 +7484,7 @@ def list_templates(ctx, from_json, all_pages, page_size, namespace_name, compart if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7558,10 +7557,10 @@ def list_upload_files(ctx, from_json, all_pages, page_size, namespace_name, uplo if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(upload_reference, six.string_types) and len(upload_reference.strip()) == 0: + if isinstance(upload_reference, str) and len(upload_reference.strip()) == 0: raise click.UsageError('Parameter --upload-reference cannot be whitespace or empty string') kwargs = {} @@ -7624,10 +7623,10 @@ def list_upload_warnings(ctx, from_json, all_pages, page_size, namespace_name, u if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(upload_reference, six.string_types) and len(upload_reference.strip()) == 0: + if isinstance(upload_reference, str) and len(upload_reference.strip()) == 0: raise click.UsageError('Parameter --upload-reference cannot be whitespace or empty string') kwargs = {} @@ -7686,7 +7685,7 @@ def list_uploads(ctx, from_json, all_pages, page_size, namespace_name, name, nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7760,7 +7759,7 @@ def list_warnings(ctx, from_json, all_pages, page_size, namespace_name, compartm if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -7839,10 +7838,10 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -7897,10 +7896,10 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -7955,7 +7954,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, namespace_name, com if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8005,7 +8004,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, namespace_name, com @cli_util.wrap_exceptions def offboard_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8057,7 +8056,7 @@ def offboard_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def onboard_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8108,7 +8107,7 @@ def onboard_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def parse_query(ctx, from_json, namespace_name, query_string, sub_system): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8141,10 +8140,10 @@ def parse_query(ctx, from_json, namespace_name, query_string, sub_system): @cli_util.wrap_exceptions def pause_scheduled_task(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, scheduled_task_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') kwargs = {} @@ -8201,7 +8200,7 @@ def pause_scheduled_task(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def purge_storage_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, time_data_ended, compartment_id_in_subtree, purge_query_string, data_type, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8269,10 +8268,10 @@ def purge_storage_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def put_query_work_request_background(ctx, from_json, namespace_name, work_request_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -8319,7 +8318,7 @@ def put_query_work_request_background(ctx, from_json, namespace_name, work_reque @cli_util.wrap_exceptions def query(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, query_string, sub_system, compartment_id_in_subtree, saved_search_id, max_total_count, time_filter, scope_filters, query_timeout_in_seconds, should_run_async, async_mode, should_include_total_count, should_include_columns, should_include_fields, should_use_acceleration, page, limit): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8429,7 +8428,7 @@ def query(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_second @cli_util.wrap_exceptions def recall_archived_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, time_data_ended, time_data_started, data_type, log_sets, query_parameterconflict, purpose, is_recall_new_data_only, is_use_recommended_data_set, collection_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8516,7 +8515,7 @@ def recall_archived_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def register_lookup(ctx, from_json, namespace_name, type, register_lookup_content_file_body, name, description, char_encoding, is_hidden, expect, compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8565,7 +8564,7 @@ def register_lookup(ctx, from_json, namespace_name, type, register_lookup_conten @cli_util.wrap_exceptions def release_recalled_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, time_data_ended, time_data_started, data_type, collection_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8632,10 +8631,10 @@ def release_recalled_data(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def remove_entity_associations(ctx, from_json, namespace_name, log_analytics_entity_id, association_entities, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_entity_id, six.string_types) and len(log_analytics_entity_id.strip()) == 0: + if isinstance(log_analytics_entity_id, str) and len(log_analytics_entity_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-entity-id cannot be whitespace or empty string') kwargs = {} @@ -8668,7 +8667,7 @@ def remove_entity_associations(ctx, from_json, namespace_name, log_analytics_ent @cli_util.wrap_exceptions def remove_preferences(ctx, from_json, namespace_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8700,7 +8699,7 @@ def remove_preferences(ctx, from_json, namespace_name, items): @cli_util.wrap_exceptions def remove_resource_categories(ctx, from_json, namespace_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8733,10 +8732,10 @@ def remove_resource_categories(ctx, from_json, namespace_name, items): @cli_util.wrap_exceptions def remove_source_event_types(ctx, from_json, namespace_name, source_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(source_name, six.string_types) and len(source_name.strip()) == 0: + if isinstance(source_name, str) and len(source_name.strip()) == 0: raise click.UsageError('Parameter --source-name cannot be whitespace or empty string') kwargs = {} @@ -8771,10 +8770,10 @@ def remove_source_event_types(ctx, from_json, namespace_name, source_name, items @cli_util.wrap_exceptions def resume_scheduled_task(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, scheduled_task_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') kwargs = {} @@ -8825,10 +8824,10 @@ def resume_scheduled_task(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def run(ctx, from_json, namespace_name, scheduled_task_id, time_start, time_end): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') kwargs = {} @@ -8857,7 +8856,7 @@ def run(ctx, from_json, namespace_name, scheduled_task_id, time_start, time_end) @cli_util.wrap_exceptions def set_unprocessed_data_bucket(ctx, from_json, namespace_name, bucket_name, is_enabled): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8886,7 +8885,7 @@ def set_unprocessed_data_bucket(ctx, from_json, namespace_name, bucket_name, is_ @cli_util.wrap_exceptions def suggest(ctx, from_json, namespace_name, compartment_id, query_string, sub_system, compartment_id_in_subtree): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8920,7 +8919,7 @@ def suggest(ctx, from_json, namespace_name, compartment_id, query_string, sub_sy @cli_util.wrap_exceptions def suppress_warning(ctx, from_json, namespace_name, compartment_id, warning_references): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -8984,7 +8983,7 @@ def suppress_warning(ctx, from_json, namespace_name, compartment_id, warning_ref @cli_util.wrap_exceptions def test_parser(ctx, from_json, namespace_name, content, description, display_name, encoding, example_content, field_maps, footer_content, header_content, name, is_default, is_single_line_content, is_system, language, time_updated, log_type_test_request_version, metadata, parser_ignoreline_characters, is_hidden, parser_sequence, parser_timezone, is_parser_written_once, parser_functions, should_tokenize_original_text, field_delimiter, field_qualifier, type, is_namespace_aware, is_position_aware, scope, req_origin_module): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -9100,7 +9099,7 @@ def test_parser(ctx, from_json, namespace_name, content, description, display_na @cli_util.wrap_exceptions def unsuppress_warning(ctx, from_json, namespace_name, compartment_id, warning_references): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -9150,10 +9149,10 @@ def unsuppress_warning(ctx, from_json, namespace_name, compartment_id, warning_r @cli_util.wrap_exceptions def update_ingest_time_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, ingest_time_rule_id, id, compartment_id, display_name, description, freeform_tags, defined_tags, time_created, time_updated, lifecycle_state, is_enabled, conditions, actions, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(ingest_time_rule_id, six.string_types) and len(ingest_time_rule_id.strip()) == 0: + if isinstance(ingest_time_rule_id, str) and len(ingest_time_rule_id.strip()) == 0: raise click.UsageError('Parameter --ingest-time-rule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or conditions or actions: @@ -9264,10 +9263,10 @@ def update_ingest_time_rule(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_ingest_time_rule_ingest_time_rule_field_condition(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, ingest_time_rule_id, id, compartment_id, display_name, conditions_field_name, conditions_field_operator, conditions_field_value, description, freeform_tags, defined_tags, time_created, time_updated, lifecycle_state, is_enabled, actions, if_match, conditions_additional_conditions): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(ingest_time_rule_id, six.string_types) and len(ingest_time_rule_id.strip()) == 0: + if isinstance(ingest_time_rule_id, str) and len(ingest_time_rule_id.strip()) == 0: raise click.UsageError('Parameter --ingest-time-rule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or actions: @@ -9370,10 +9369,10 @@ def update_ingest_time_rule_ingest_time_rule_field_condition(ctx, from_json, for @cli_util.wrap_exceptions def update_log_analytics_em_bridge(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, log_analytics_em_bridge_id, display_name, description, bucket_name, freeform_tags, defined_tags, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_em_bridge_id, six.string_types) and len(log_analytics_em_bridge_id.strip()) == 0: + if isinstance(log_analytics_em_bridge_id, str) and len(log_analytics_em_bridge_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-em-bridge-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -9459,10 +9458,10 @@ def update_log_analytics_em_bridge(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_log_analytics_entity(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, log_analytics_entity_id, name, management_agent_id, timezone_region, hostname, properties, freeform_tags, defined_tags, time_last_discovered, metadata, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_entity_id, six.string_types) and len(log_analytics_entity_id.strip()) == 0: + if isinstance(log_analytics_entity_id, str) and len(log_analytics_entity_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-entity-id cannot be whitespace or empty string') if not force: if properties or freeform_tags or defined_tags or metadata: @@ -9552,10 +9551,10 @@ def update_log_analytics_entity(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_log_analytics_entity_type(ctx, from_json, force, namespace_name, entity_type_name, category, properties, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(entity_type_name, six.string_types) and len(entity_type_name.strip()) == 0: + if isinstance(entity_type_name, str) and len(entity_type_name.strip()) == 0: raise click.UsageError('Parameter --entity-type-name cannot be whitespace or empty string') if not force: if properties: @@ -9601,10 +9600,10 @@ def update_log_analytics_entity_type(ctx, from_json, force, namespace_name, enti @cli_util.wrap_exceptions def update_log_analytics_log_group(ctx, from_json, force, namespace_name, log_analytics_log_group_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_log_group_id, six.string_types) and len(log_analytics_log_group_id.strip()) == 0: + if isinstance(log_analytics_log_group_id, str) and len(log_analytics_log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-log-group-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -9672,10 +9671,10 @@ def update_log_analytics_log_group(ctx, from_json, force, namespace_name, log_an @cli_util.wrap_exceptions def update_log_analytics_object_collection_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, log_analytics_object_collection_rule_id, description, log_group_id, log_source_name, entity_id, char_encoding, is_enabled, timezone, log_set, log_set_key, log_set_ext_regex, overrides, object_name_filters, stream_id, stream_cursor_type, stream_cursor_time, defined_tags, freeform_tags, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(log_analytics_object_collection_rule_id, six.string_types) and len(log_analytics_object_collection_rule_id.strip()) == 0: + if isinstance(log_analytics_object_collection_rule_id, str) and len(log_analytics_object_collection_rule_id.strip()) == 0: raise click.UsageError('Parameter --log-analytics-object-collection-rule-id cannot be whitespace or empty string') if not force: if overrides or object_name_filters or defined_tags or freeform_tags: @@ -9796,10 +9795,10 @@ def update_log_analytics_object_collection_rule(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_lookup(ctx, from_json, force, namespace_name, lookup_name, default_match_value, description, fields, max_matches, categories, freeform_tags, defined_tags, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(lookup_name, six.string_types) and len(lookup_name.strip()) == 0: + if isinstance(lookup_name, str) and len(lookup_name.strip()) == 0: raise click.UsageError('Parameter --lookup-name cannot be whitespace or empty string') if not force: if fields or categories or freeform_tags or defined_tags: @@ -9862,10 +9861,10 @@ def update_lookup(ctx, from_json, force, namespace_name, lookup_name, default_ma @cli_util.wrap_exceptions def update_lookup_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, lookup_name, update_lookup_file_body, is_force, char_encoding, if_match, expect): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(lookup_name, six.string_types) and len(lookup_name.strip()) == 0: + if isinstance(lookup_name, str) and len(lookup_name.strip()) == 0: raise click.UsageError('Parameter --lookup-name cannot be whitespace or empty string') kwargs = {} @@ -9931,7 +9930,7 @@ def update_lookup_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_preferences(ctx, from_json, namespace_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -9963,7 +9962,7 @@ def update_preferences(ctx, from_json, namespace_name, items): @cli_util.wrap_exceptions def update_resource_categories(ctx, from_json, namespace_name, items): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10005,10 +10004,10 @@ def update_resource_categories(ctx, from_json, namespace_name, items): @cli_util.wrap_exceptions def update_scheduled_task(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, scheduled_task_id, kind, display_name, freeform_tags, defined_tags, schedules, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or schedules: @@ -10090,10 +10089,10 @@ def update_scheduled_task(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_scheduled_task_update_standard_task_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, scheduled_task_id, display_name, freeform_tags, defined_tags, schedules, action, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or schedules or action: @@ -10169,7 +10168,7 @@ def update_scheduled_task_update_standard_task_details(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_storage(ctx, from_json, force, namespace_name, archiving_configuration, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') if not force: if archiving_configuration: @@ -10209,7 +10208,7 @@ def update_storage(ctx, from_json, force, namespace_name, archiving_configuratio @cli_util.wrap_exceptions def upload_discovery_data(ctx, from_json, namespace_name, upload_discovery_data_details, opc_meta_properties, discovery_data_type, log_group_id, payload_type, content_type, expect): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10255,7 +10254,7 @@ def upload_discovery_data(ctx, from_json, namespace_name, upload_discovery_data_ @cli_util.wrap_exceptions def upload_log_events_file(ctx, from_json, namespace_name, log_group_id, upload_log_events_file_details, log_set, payload_type, content_type, opc_meta_properties, expect): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10310,7 +10309,7 @@ def upload_log_events_file(ctx, from_json, namespace_name, log_group_id, upload_ @cli_util.wrap_exceptions def upload_log_file(ctx, from_json, namespace_name, log_source_name, filename, opc_meta_loggrpid, upload_log_file_body, upload_name, entity_id, timezone, char_encoding, date_format, date_year, invalidate_cache, content_md5, content_type, log_set, expect): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10368,7 +10367,7 @@ def upload_log_file(ctx, from_json, namespace_name, log_source_name, filename, o @cli_util.wrap_exceptions def upload_otlp_logs(ctx, from_json, namespace_name, opc_meta_loggrpid, upload_otlp_logs_details, log_set, content_type, opc_meta_properties, expect): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10412,7 +10411,7 @@ def upload_otlp_logs(ctx, from_json, namespace_name, opc_meta_loggrpid, upload_o @cli_util.wrap_exceptions def upsert_associations(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, compartment_id, items, is_from_republish): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10480,7 +10479,7 @@ def upsert_associations(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def upsert_field(ctx, from_json, namespace_name, data_type, is_multi_valued, description, display_name, name, is_keep_duplicates, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10540,7 +10539,7 @@ def upsert_field(ctx, from_json, namespace_name, data_type, is_multi_valued, des @cli_util.wrap_exceptions def upsert_label(ctx, from_json, namespace_name, aliases, suggest_type, description, display_name, edit_version, impact, is_system, name, priority, recommendation, type, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10635,7 +10634,7 @@ def upsert_label(ctx, from_json, namespace_name, aliases, suggest_type, descript @cli_util.wrap_exceptions def upsert_parser(ctx, from_json, namespace_name, content, description, display_name, edit_version, encoding, example_content, field_maps, footer_content, header_content, name, is_default, is_single_line_content, is_system, language, log_type_test_request_version, parser_ignoreline_characters, parser_sequence, parser_timezone, is_parser_written_once, parser_functions, should_tokenize_original_text, field_delimiter, field_qualifier, type, is_namespace_aware, categories, is_position_aware, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10815,7 +10814,7 @@ def upsert_parser(ctx, from_json, namespace_name, content, description, display_ @cli_util.wrap_exceptions def upsert_source(ctx, from_json, namespace_name, label_conditions, data_filter_definitions, database_credential, extended_field_definitions, is_for_cloud, labels, metric_definitions, metrics, oob_parsers, parameters, patterns, description, display_name, edit_version, functions, source_id, name, is_secure_content, is_system, parsers, rule_id, type_name, warning_config, metadata_fields, label_definitions, entity_types, is_timezone_override, user_parsers, categories, endpoints, source_properties, create_like_source_id, is_incremental, is_ignore_warning, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10950,7 +10949,7 @@ def upsert_source(ctx, from_json, namespace_name, label_conditions, data_filter_ @cli_util.wrap_exceptions def validate_association_parameters(ctx, from_json, namespace_name, compartment_id, items, limit, page, sort_order, sort_by): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -10991,7 +10990,7 @@ def validate_association_parameters(ctx, from_json, namespace_name, compartment_ @cli_util.wrap_exceptions def validate_endpoint(ctx, from_json, namespace_name, endpoint_type): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -11020,7 +11019,7 @@ def validate_endpoint(ctx, from_json, namespace_name, endpoint_type): @cli_util.wrap_exceptions def validate_endpoint_log_list_type_endpoint(ctx, from_json, namespace_name, list_endpoint, log_endpoints): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -11051,7 +11050,7 @@ def validate_endpoint_log_list_type_endpoint(ctx, from_json, namespace_name, lis @cli_util.wrap_exceptions def validate_endpoint_log_type_endpoint(ctx, from_json, namespace_name, log_endpoint): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -11082,7 +11081,7 @@ def validate_endpoint_log_type_endpoint(ctx, from_json, namespace_name, log_endp @cli_util.wrap_exceptions def validate_file(ctx, from_json, namespace_name, object_location, filename): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -11111,7 +11110,7 @@ def validate_file(ctx, from_json, namespace_name, object_location, filename): @cli_util.wrap_exceptions def validate_label_condition(ctx, from_json, namespace_name, condition_string, condition_block, field_values): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -11216,7 +11215,7 @@ def validate_label_condition(ctx, from_json, namespace_name, condition_string, c @cli_util.wrap_exceptions def validate_source(ctx, from_json, namespace_name, label_conditions, data_filter_definitions, database_credential, extended_field_definitions, is_for_cloud, labels, metric_definitions, metrics, oob_parsers, parameters, patterns, description, display_name, edit_version, functions, source_id, name, is_secure_content, is_system, parsers, rule_id, type_name, warning_config, metadata_fields, label_definitions, entity_types, is_timezone_override, user_parsers, categories, endpoints, source_properties, create_like_source_id, is_incremental, is_ignore_warning): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -11420,7 +11419,7 @@ def validate_source(ctx, from_json, namespace_name, label_conditions, data_filte @cli_util.wrap_exceptions def validate_source_extended_field_details(ctx, from_json, namespace_name, label_conditions, association_count, association_entity, data_filter_definitions, database_credential, extended_field_definitions, is_for_cloud, labels, metric_definitions, metrics, oob_parsers, parameters, pattern_count, patterns, description, display_name, edit_version, functions, source_id, name, is_secure_content, is_system, parsers, is_auto_association_enabled, is_auto_association_override, rule_id, type_name, type_display_name, warning_config, metadata_fields, label_definitions, entity_types, is_timezone_override, user_parsers, time_updated, event_types, categories, endpoints, source_properties): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -11566,7 +11565,7 @@ def validate_source_extended_field_details(ctx, from_json, namespace_name, label @cli_util.wrap_exceptions def validate_source_mapping(ctx, from_json, namespace_name, object_location, filename, log_source_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -11593,10 +11592,10 @@ def validate_source_mapping(ctx, from_json, namespace_name, object_location, fil @cli_util.wrap_exceptions def verify(ctx, from_json, namespace_name, scheduled_task_id, should_include_results): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(scheduled_task_id, six.string_types) and len(scheduled_task_id.strip()) == 0: + if isinstance(scheduled_task_id, str) and len(scheduled_task_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-task-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/logging/src/oci_cli_logging_management/generated/loggingmanagement_cli.py b/services/logging/src/oci_cli_logging_management/generated/loggingmanagement_cli.py index 416ebffe3..9d811408f 100644 --- a/services/logging/src/oci_cli_logging_management/generated/loggingmanagement_cli.py +++ b/services/logging/src/oci_cli_logging_management/generated/loggingmanagement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -97,7 +96,7 @@ def log_saved_search_group(): @cli_util.wrap_exceptions def change_log_group_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, log_group_id, compartment_id, if_match): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') kwargs = {} @@ -161,10 +160,10 @@ def change_log_group_compartment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def change_log_log_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, log_group_id, log_id, target_log_group_id, if_match): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') - if isinstance(log_id, six.string_types) and len(log_id.strip()) == 0: + if isinstance(log_id, str) and len(log_id.strip()) == 0: raise click.UsageError('Parameter --log-id cannot be whitespace or empty string') kwargs = {} @@ -225,7 +224,7 @@ def change_log_log_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def change_log_saved_search_compartment(ctx, from_json, log_saved_search_id, compartment_id, if_match): - if isinstance(log_saved_search_id, six.string_types) and len(log_saved_search_id.strip()) == 0: + if isinstance(log_saved_search_id, str) and len(log_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --log-saved-search-id cannot be whitespace or empty string') kwargs = {} @@ -259,7 +258,7 @@ def change_log_saved_search_compartment(ctx, from_json, log_saved_search_id, com @cli_util.wrap_exceptions def change_unified_agent_configuration_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_agent_configuration_id, compartment_id, if_match): - if isinstance(unified_agent_configuration_id, six.string_types) and len(unified_agent_configuration_id.strip()) == 0: + if isinstance(unified_agent_configuration_id, str) and len(unified_agent_configuration_id.strip()) == 0: raise click.UsageError('Parameter --unified-agent-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -329,7 +328,7 @@ def change_unified_agent_configuration_compartment(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def create_log(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, log_group_id, display_name, log_type, is_enabled, defined_tags, freeform_tags, configuration, retention_duration): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') kwargs = {} @@ -780,10 +779,10 @@ def create_unified_agent_configuration_unified_agent_monitoring_configuration_de @cli_util.wrap_exceptions def delete_log(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, log_group_id, log_id, if_match): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') - if isinstance(log_id, six.string_types) and len(log_id.strip()) == 0: + if isinstance(log_id, str) and len(log_id.strip()) == 0: raise click.UsageError('Parameter --log-id cannot be whitespace or empty string') kwargs = {} @@ -840,7 +839,7 @@ def delete_log(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def delete_log_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, log_group_id, if_match): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') kwargs = {} @@ -896,7 +895,7 @@ def delete_log_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_log_saved_search(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, log_saved_search_id, if_match): - if isinstance(log_saved_search_id, six.string_types) and len(log_saved_search_id.strip()) == 0: + if isinstance(log_saved_search_id, str) and len(log_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --log-saved-search-id cannot be whitespace or empty string') kwargs = {} @@ -960,7 +959,7 @@ def delete_log_saved_search(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_unified_agent_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_agent_configuration_id, if_match): - if isinstance(unified_agent_configuration_id, six.string_types) and len(unified_agent_configuration_id.strip()) == 0: + if isinstance(unified_agent_configuration_id, str) and len(unified_agent_configuration_id.strip()) == 0: raise click.UsageError('Parameter --unified-agent-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -1016,7 +1015,7 @@ def delete_unified_agent_configuration(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_work_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1068,10 +1067,10 @@ def delete_work_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_log(ctx, from_json, log_group_id, log_id): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') - if isinstance(log_id, six.string_types) and len(log_id.strip()) == 0: + if isinstance(log_id, str) and len(log_id.strip()) == 0: raise click.UsageError('Parameter --log-id cannot be whitespace or empty string') kwargs = {} @@ -1094,7 +1093,7 @@ def get_log(ctx, from_json, log_group_id, log_id): @cli_util.wrap_exceptions def get_log_group(ctx, from_json, log_group_id): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') kwargs = {} @@ -1116,7 +1115,7 @@ def get_log_group(ctx, from_json, log_group_id): @cli_util.wrap_exceptions def get_log_saved_search(ctx, from_json, log_saved_search_id): - if isinstance(log_saved_search_id, six.string_types) and len(log_saved_search_id.strip()) == 0: + if isinstance(log_saved_search_id, str) and len(log_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --log-saved-search-id cannot be whitespace or empty string') kwargs = {} @@ -1138,7 +1137,7 @@ def get_log_saved_search(ctx, from_json, log_saved_search_id): @cli_util.wrap_exceptions def get_unified_agent_configuration(ctx, from_json, unified_agent_configuration_id): - if isinstance(unified_agent_configuration_id, six.string_types) and len(unified_agent_configuration_id.strip()) == 0: + if isinstance(unified_agent_configuration_id, str) and len(unified_agent_configuration_id.strip()) == 0: raise click.UsageError('Parameter --unified-agent-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -1160,7 +1159,7 @@ def get_unified_agent_configuration(ctx, from_json, unified_agent_configuration_ @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1316,7 +1315,7 @@ def list_logs(ctx, from_json, all_pages, page_size, log_group_id, log_type, sour if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') kwargs = {} @@ -1468,7 +1467,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1519,7 +1518,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1637,10 +1636,10 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, sta @cli_util.wrap_exceptions def update_log(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, log_group_id, log_id, display_name, is_enabled, defined_tags, freeform_tags, retention_duration, configuration, if_match): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') - if isinstance(log_id, six.string_types) and len(log_id.strip()) == 0: + if isinstance(log_id, str) and len(log_id.strip()) == 0: raise click.UsageError('Parameter --log-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or configuration: @@ -1729,7 +1728,7 @@ def update_log(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_log_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, log_group_id, display_name, description, defined_tags, freeform_tags, if_match): - if isinstance(log_group_id, six.string_types) and len(log_group_id.strip()) == 0: + if isinstance(log_group_id, str) and len(log_group_id.strip()) == 0: raise click.UsageError('Parameter --log-group-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -1812,7 +1811,7 @@ def update_log_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_log_saved_search(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, log_saved_search_id, name, description, query_parameterconflict, defined_tags, freeform_tags, if_match): - if isinstance(log_saved_search_id, six.string_types) and len(log_saved_search_id.strip()) == 0: + if isinstance(log_saved_search_id, str) and len(log_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --log-saved-search-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -1896,7 +1895,7 @@ def update_log_saved_search(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_unified_agent_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_agent_configuration_id, display_name, is_enabled, service_configuration, defined_tags, freeform_tags, description, group_association, if_match): - if isinstance(unified_agent_configuration_id, six.string_types) and len(unified_agent_configuration_id.strip()) == 0: + if isinstance(unified_agent_configuration_id, str) and len(unified_agent_configuration_id.strip()) == 0: raise click.UsageError('Parameter --unified-agent-configuration-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or service_configuration or group_association: @@ -1988,7 +1987,7 @@ def update_unified_agent_configuration(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_unified_agent_configuration_unified_agent_logging_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_agent_configuration_id, display_name, is_enabled, service_configuration_sources, service_configuration_destination, defined_tags, freeform_tags, description, group_association, if_match, service_configuration_filter): - if isinstance(unified_agent_configuration_id, six.string_types) and len(unified_agent_configuration_id.strip()) == 0: + if isinstance(unified_agent_configuration_id, str) and len(unified_agent_configuration_id.strip()) == 0: raise click.UsageError('Parameter --unified-agent-configuration-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or group_association: @@ -2083,7 +2082,7 @@ def update_unified_agent_configuration_unified_agent_logging_configuration(ctx, @cli_util.wrap_exceptions def update_unified_agent_configuration_unified_agent_monitoring_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, unified_agent_configuration_id, display_name, is_enabled, service_configuration_application_configurations, defined_tags, freeform_tags, description, group_association, if_match): - if isinstance(unified_agent_configuration_id, six.string_types) and len(unified_agent_configuration_id.strip()) == 0: + if isinstance(unified_agent_configuration_id, str) and len(unified_agent_configuration_id.strip()) == 0: raise click.UsageError('Parameter --unified-agent-configuration-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or group_association: diff --git a/services/loggingingestion/src/oci_cli_logging/generated/logging_cli.py b/services/loggingingestion/src/oci_cli_logging/generated/logging_cli.py index 859a9754d..e127a9ce6 100644 --- a/services/loggingingestion/src/oci_cli_logging/generated/logging_cli.py +++ b/services/loggingingestion/src/oci_cli_logging/generated/logging_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -44,7 +43,7 @@ def log_entry_group(): @cli_util.wrap_exceptions def put_logs(ctx, from_json, log_id, specversion, log_entry_batches, timestamp_opc_agent_processing, opc_agent_version): - if isinstance(log_id, six.string_types) and len(log_id.strip()) == 0: + if isinstance(log_id, str) and len(log_id.strip()) == 0: raise click.UsageError('Parameter --log-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/loggingsearch/src/oci_cli_log_search/generated/logsearch_cli.py b/services/loggingsearch/src/oci_cli_log_search/generated/logsearch_cli.py index 54dc9d90e..ddd8e9fbc 100644 --- a/services/loggingsearch/src/oci_cli_log_search/generated/logsearch_cli.py +++ b/services/loggingsearch/src/oci_cli_log_search/generated/logsearch_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 diff --git a/services/lustre_file_storage/src/oci_cli_lustre_file_storage/generated/lustrefilestorage_cli.py b/services/lustre_file_storage/src/oci_cli_lustre_file_storage/generated/lustrefilestorage_cli.py index 9304b7398..925bcdd3d 100644 --- a/services/lustre_file_storage/src/oci_cli_lustre_file_storage/generated/lustrefilestorage_cli.py +++ b/services/lustre_file_storage/src/oci_cli_lustre_file_storage/generated/lustrefilestorage_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -72,7 +71,7 @@ def work_request_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -101,7 +100,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_lustre_file_system_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, lustre_file_system_id, compartment_id, if_match): - if isinstance(lustre_file_system_id, six.string_types) and len(lustre_file_system_id.strip()) == 0: + if isinstance(lustre_file_system_id, str) and len(lustre_file_system_id.strip()) == 0: raise click.UsageError('Parameter --lustre-file-system-id cannot be whitespace or empty string') kwargs = {} @@ -263,7 +262,7 @@ def create_lustre_file_system(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_lustre_file_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, lustre_file_system_id, if_match): - if isinstance(lustre_file_system_id, six.string_types) and len(lustre_file_system_id.strip()) == 0: + if isinstance(lustre_file_system_id, str) and len(lustre_file_system_id.strip()) == 0: raise click.UsageError('Parameter --lustre-file-system-id cannot be whitespace or empty string') kwargs = {} @@ -314,7 +313,7 @@ def delete_lustre_file_system(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_lustre_file_system(ctx, from_json, lustre_file_system_id): - if isinstance(lustre_file_system_id, six.string_types) and len(lustre_file_system_id.strip()) == 0: + if isinstance(lustre_file_system_id, str) and len(lustre_file_system_id.strip()) == 0: raise click.UsageError('Parameter --lustre-file-system-id cannot be whitespace or empty string') kwargs = {} @@ -336,7 +335,7 @@ def get_lustre_file_system(ctx, from_json, lustre_file_system_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -436,7 +435,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -493,7 +492,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -622,7 +621,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_lustre_file_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, lustre_file_system_id, display_name, file_system_description, freeform_tags, defined_tags, nsg_ids, kms_key_id, capacity_in_gbs, root_squash_configuration, if_match): - if isinstance(lustre_file_system_id, six.string_types) and len(lustre_file_system_id.strip()) == 0: + if isinstance(lustre_file_system_id, str) and len(lustre_file_system_id.strip()) == 0: raise click.UsageError('Parameter --lustre-file-system-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or nsg_ids or root_squash_configuration: diff --git a/services/managed_kafka/src/oci_cli_kafka_cluster/generated/kafkacluster_cli.py b/services/managed_kafka/src/oci_cli_kafka_cluster/generated/kafkacluster_cli.py index f2bf55e58..aadfc0eb9 100644 --- a/services/managed_kafka/src/oci_cli_kafka_cluster/generated/kafkacluster_cli.py +++ b/services/managed_kafka/src/oci_cli_kafka_cluster/generated/kafkacluster_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -88,7 +87,7 @@ def kafka_cluster_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -117,7 +116,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_kafka_cluster_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, kafka_cluster_id, compartment_id, if_match): - if isinstance(kafka_cluster_id, six.string_types) and len(kafka_cluster_id.strip()) == 0: + if isinstance(kafka_cluster_id, str) and len(kafka_cluster_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -175,7 +174,7 @@ def change_kafka_cluster_compartment(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def change_kafka_cluster_config_compartment(ctx, from_json, kafka_cluster_config_id, compartment_id, if_match): - if isinstance(kafka_cluster_config_id, six.string_types) and len(kafka_cluster_config_id.strip()) == 0: + if isinstance(kafka_cluster_config_id, str) and len(kafka_cluster_config_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-config-id cannot be whitespace or empty string') kwargs = {} @@ -363,7 +362,7 @@ def create_kafka_cluster_config(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_kafka_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, kafka_cluster_id, if_match): - if isinstance(kafka_cluster_id, six.string_types) and len(kafka_cluster_id.strip()) == 0: + if isinstance(kafka_cluster_id, str) and len(kafka_cluster_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -419,7 +418,7 @@ def delete_kafka_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_kafka_cluster_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, kafka_cluster_config_id, if_match): - if isinstance(kafka_cluster_config_id, six.string_types) and len(kafka_cluster_config_id.strip()) == 0: + if isinstance(kafka_cluster_config_id, str) and len(kafka_cluster_config_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-config-id cannot be whitespace or empty string') kwargs = {} @@ -481,10 +480,10 @@ def delete_kafka_cluster_config(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_kafka_cluster_config_version(ctx, from_json, kafka_cluster_config_id, version_number, if_match): - if isinstance(kafka_cluster_config_id, six.string_types) and len(kafka_cluster_config_id.strip()) == 0: + if isinstance(kafka_cluster_config_id, str) and len(kafka_cluster_config_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-config-id cannot be whitespace or empty string') - if isinstance(version_number, six.string_types) and len(version_number.strip()) == 0: + if isinstance(version_number, str) and len(version_number.strip()) == 0: raise click.UsageError('Parameter --version-number cannot be whitespace or empty string') kwargs = {} @@ -513,7 +512,7 @@ def delete_kafka_cluster_config_version(ctx, from_json, kafka_cluster_config_id, @cli_util.wrap_exceptions def disable_superuser(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, kafka_cluster_id, if_match): - if isinstance(kafka_cluster_id, six.string_types) and len(kafka_cluster_id.strip()) == 0: + if isinstance(kafka_cluster_id, str) and len(kafka_cluster_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -570,7 +569,7 @@ def disable_superuser(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def enable_superuser(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, kafka_cluster_id, compartment_id, secret_id, if_match): - if isinstance(kafka_cluster_id, six.string_types) and len(kafka_cluster_id.strip()) == 0: + if isinstance(kafka_cluster_id, str) and len(kafka_cluster_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -627,7 +626,7 @@ def enable_superuser(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def get_kafka_cluster(ctx, from_json, kafka_cluster_id): - if isinstance(kafka_cluster_id, six.string_types) and len(kafka_cluster_id.strip()) == 0: + if isinstance(kafka_cluster_id, str) and len(kafka_cluster_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -649,7 +648,7 @@ def get_kafka_cluster(ctx, from_json, kafka_cluster_id): @cli_util.wrap_exceptions def get_kafka_cluster_config(ctx, from_json, kafka_cluster_config_id): - if isinstance(kafka_cluster_config_id, six.string_types) and len(kafka_cluster_config_id.strip()) == 0: + if isinstance(kafka_cluster_config_id, str) and len(kafka_cluster_config_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-config-id cannot be whitespace or empty string') kwargs = {} @@ -672,10 +671,10 @@ def get_kafka_cluster_config(ctx, from_json, kafka_cluster_config_id): @cli_util.wrap_exceptions def get_kafka_cluster_config_version(ctx, from_json, kafka_cluster_config_id, version_number): - if isinstance(kafka_cluster_config_id, six.string_types) and len(kafka_cluster_config_id.strip()) == 0: + if isinstance(kafka_cluster_config_id, str) and len(kafka_cluster_config_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-config-id cannot be whitespace or empty string') - if isinstance(version_number, six.string_types) and len(version_number.strip()) == 0: + if isinstance(version_number, str) and len(version_number.strip()) == 0: raise click.UsageError('Parameter --version-number cannot be whitespace or empty string') kwargs = {} @@ -698,7 +697,7 @@ def get_kafka_cluster_config_version(ctx, from_json, kafka_cluster_config_id, ve @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -729,7 +728,7 @@ def list_kafka_cluster_config_versions(ctx, from_json, all_pages, page_size, kaf if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(kafka_cluster_config_id, six.string_types) and len(kafka_cluster_config_id.strip()) == 0: + if isinstance(kafka_cluster_config_id, str) and len(kafka_cluster_config_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-config-id cannot be whitespace or empty string') kwargs = {} @@ -910,7 +909,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -967,7 +966,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1097,7 +1096,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_kafka_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, kafka_cluster_id, display_name, client_certificate_bundle, broker_shape, cluster_config_id, cluster_config_version, access_subnets, coordination_type, freeform_tags, defined_tags, if_match): - if isinstance(kafka_cluster_id, six.string_types) and len(kafka_cluster_id.strip()) == 0: + if isinstance(kafka_cluster_id, str) and len(kafka_cluster_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-id cannot be whitespace or empty string') if not force: if broker_shape or access_subnets or freeform_tags or defined_tags: @@ -1196,7 +1195,7 @@ def update_kafka_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_kafka_cluster_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, kafka_cluster_config_id, display_name, latest_config, freeform_tags, defined_tags, if_match): - if isinstance(kafka_cluster_config_id, six.string_types) and len(kafka_cluster_config_id.strip()) == 0: + if isinstance(kafka_cluster_config_id, str) and len(kafka_cluster_config_id.strip()) == 0: raise click.UsageError('Parameter --kafka-cluster-config-id cannot be whitespace or empty string') if not force: if latest_config or freeform_tags or defined_tags: diff --git a/services/management_agent/src/oci_cli_management_agent/generated/managementagent_cli.py b/services/management_agent/src/oci_cli_management_agent/generated/managementagent_cli.py index 48b98c4ca..7e5bcc19e 100644 --- a/services/management_agent/src/oci_cli_management_agent/generated/managementagent_cli.py +++ b/services/management_agent/src/oci_cli_management_agent/generated/managementagent_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -97,7 +96,7 @@ def management_agent_image_group(): @cli_util.wrap_exceptions def create_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_id, type, name, compartment_id, if_match): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') kwargs = {} @@ -173,7 +172,7 @@ def create_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def create_data_source_create_prometheus_emitter_data_source_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_id, name, compartment_id, url, namespace, allow_metrics, proxy_url, connection_timeout, read_timeout, read_data_limit_in_kilobytes, schedule_mins, resource_group, metric_dimensions, if_match): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') kwargs = {} @@ -401,10 +400,10 @@ def create_named_credential(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_id, data_source_key, if_match): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') - if isinstance(data_source_key, six.string_types) and len(data_source_key.strip()) == 0: + if isinstance(data_source_key, str) and len(data_source_key.strip()) == 0: raise click.UsageError('Parameter --data-source-key cannot be whitespace or empty string') kwargs = {} @@ -461,7 +460,7 @@ def delete_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_management_agent(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_id, if_match): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') kwargs = {} @@ -525,7 +524,7 @@ def delete_management_agent(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_management_agent_install_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_install_key_id, if_match): - if isinstance(management_agent_install_key_id, six.string_types) and len(management_agent_install_key_id.strip()) == 0: + if isinstance(management_agent_install_key_id, str) and len(management_agent_install_key_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-install-key-id cannot be whitespace or empty string') kwargs = {} @@ -589,7 +588,7 @@ def delete_management_agent_install_key(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def delete_named_credential(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, named_credential_id, if_match): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') kwargs = {} @@ -642,7 +641,7 @@ def delete_named_credential(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -743,10 +742,10 @@ def get_auto_upgradable_config(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_data_source(ctx, from_json, management_agent_id, data_source_key): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') - if isinstance(data_source_key, six.string_types) and len(data_source_key.strip()) == 0: + if isinstance(data_source_key, str) and len(data_source_key.strip()) == 0: raise click.UsageError('Parameter --data-source-key cannot be whitespace or empty string') kwargs = {} @@ -769,7 +768,7 @@ def get_data_source(ctx, from_json, management_agent_id, data_source_key): @cli_util.wrap_exceptions def get_management_agent(ctx, from_json, management_agent_id): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') kwargs = {} @@ -791,7 +790,7 @@ def get_management_agent(ctx, from_json, management_agent_id): @cli_util.wrap_exceptions def get_management_agent_install_key(ctx, from_json, management_agent_install_key_id): - if isinstance(management_agent_install_key_id, six.string_types) and len(management_agent_install_key_id.strip()) == 0: + if isinstance(management_agent_install_key_id, str) and len(management_agent_install_key_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-install-key-id cannot be whitespace or empty string') kwargs = {} @@ -815,7 +814,7 @@ def get_management_agent_install_key(ctx, from_json, management_agent_install_ke @cli_util.wrap_exceptions def get_management_agent_install_key_content(ctx, from_json, file, management_agent_install_key_id, plugin_name): - if isinstance(management_agent_install_key_id, six.string_types) and len(management_agent_install_key_id.strip()) == 0: + if isinstance(management_agent_install_key_id, str) and len(management_agent_install_key_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-install-key-id cannot be whitespace or empty string') kwargs = {} @@ -861,7 +860,7 @@ def get_management_agent_install_key_content(ctx, from_json, file, management_ag @cli_util.wrap_exceptions def get_named_credential(ctx, from_json, named_credential_id): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') kwargs = {} @@ -905,7 +904,7 @@ def get_named_credentials_metadatum(ctx, from_json, compartment_id, management_a @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -938,7 +937,7 @@ def list_availability_histories(ctx, from_json, all_pages, page_size, management if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') kwargs = {} @@ -1000,7 +999,7 @@ def list_data_sources(ctx, from_json, all_pages, page_size, management_agent_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') kwargs = {} @@ -1398,7 +1397,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1455,7 +1454,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1660,10 +1659,10 @@ def summarize_management_agent_plugin_counts(ctx, from_json, compartment_id, gro @cli_util.wrap_exceptions def update_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_id, data_source_key, type, if_match): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') - if isinstance(data_source_key, six.string_types) and len(data_source_key.strip()) == 0: + if isinstance(data_source_key, str) and len(data_source_key.strip()) == 0: raise click.UsageError('Parameter --data-source-key cannot be whitespace or empty string') kwargs = {} @@ -1737,10 +1736,10 @@ def update_data_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_data_source_update_prometheus_emitter_data_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_id, data_source_key, url, allow_metrics, proxy_url, connection_timeout, read_timeout, read_data_limit_in_kilobytes, schedule_mins, resource_group, metric_dimensions, if_match): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') - if isinstance(data_source_key, six.string_types) and len(data_source_key.strip()) == 0: + if isinstance(data_source_key, str) and len(data_source_key.strip()) == 0: raise click.UsageError('Parameter --data-source-key cannot be whitespace or empty string') if not force: if metric_dimensions: @@ -1835,7 +1834,7 @@ def update_data_source_update_prometheus_emitter_data_source_details(ctx, from_j @cli_util.wrap_exceptions def update_management_agent(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(management_agent_id, six.string_types) and len(management_agent_id.strip()) == 0: + if isinstance(management_agent_id, str) and len(management_agent_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1905,7 +1904,7 @@ def update_management_agent(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_management_agent_install_key(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_agent_install_key_id, is_key_active, display_name, if_match): - if isinstance(management_agent_install_key_id, six.string_types) and len(management_agent_install_key_id.strip()) == 0: + if isinstance(management_agent_install_key_id, str) and len(management_agent_install_key_id.strip()) == 0: raise click.UsageError('Parameter --management-agent-install-key-id cannot be whitespace or empty string') kwargs = {} @@ -1971,7 +1970,7 @@ def update_management_agent_install_key(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def update_named_credential(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, named_credential_id, properties, description, freeform_tags, defined_tags, if_match): - if isinstance(named_credential_id, six.string_types) and len(named_credential_id.strip()) == 0: + if isinstance(named_credential_id, str) and len(named_credential_id.strip()) == 0: raise click.UsageError('Parameter --named-credential-id cannot be whitespace or empty string') if not force: if properties or freeform_tags or defined_tags: diff --git a/services/management_dashboard/src/oci_cli_dashx_apis/generated/dashxapis_cli.py b/services/management_dashboard/src/oci_cli_dashx_apis/generated/dashxapis_cli.py index b00d3e1cf..f7495c33c 100644 --- a/services/management_dashboard/src/oci_cli_dashx_apis/generated/dashxapis_cli.py +++ b/services/management_dashboard/src/oci_cli_dashx_apis/generated/dashxapis_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -59,7 +58,7 @@ def management_dashboard_group(): @cli_util.wrap_exceptions def change_management_dashboards_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_dashboard_id, compartment_id, if_match): - if isinstance(management_dashboard_id, six.string_types) and len(management_dashboard_id.strip()) == 0: + if isinstance(management_dashboard_id, str) and len(management_dashboard_id.strip()) == 0: raise click.UsageError('Parameter --management-dashboard-id cannot be whitespace or empty string') kwargs = {} @@ -116,7 +115,7 @@ def change_management_dashboards_compartment(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def change_management_saved_searches_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_saved_search_id, compartment_id, if_match): - if isinstance(management_saved_search_id, six.string_types) and len(management_saved_search_id.strip()) == 0: + if isinstance(management_saved_search_id, str) and len(management_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --management-saved-search-id cannot be whitespace or empty string') kwargs = {} @@ -379,7 +378,7 @@ def create_management_saved_search(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_management_dashboard(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_dashboard_id, if_match): - if isinstance(management_dashboard_id, six.string_types) and len(management_dashboard_id.strip()) == 0: + if isinstance(management_dashboard_id, str) and len(management_dashboard_id.strip()) == 0: raise click.UsageError('Parameter --management-dashboard-id cannot be whitespace or empty string') kwargs = {} @@ -443,7 +442,7 @@ def delete_management_dashboard(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_management_saved_search(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_saved_search_id, if_match): - if isinstance(management_saved_search_id, six.string_types) and len(management_saved_search_id.strip()) == 0: + if isinstance(management_saved_search_id, str) and len(management_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --management-saved-search-id cannot be whitespace or empty string') kwargs = {} @@ -503,7 +502,7 @@ def delete_management_saved_search(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def export_dashboard(ctx, from_json, export_dashboard_id, export_tags): - if isinstance(export_dashboard_id, six.string_types) and len(export_dashboard_id.strip()) == 0: + if isinstance(export_dashboard_id, str) and len(export_dashboard_id.strip()) == 0: raise click.UsageError('Parameter --export-dashboard-id cannot be whitespace or empty string') kwargs = {} @@ -527,7 +526,7 @@ def export_dashboard(ctx, from_json, export_dashboard_id, export_tags): @cli_util.wrap_exceptions def get_management_dashboard(ctx, from_json, management_dashboard_id): - if isinstance(management_dashboard_id, six.string_types) and len(management_dashboard_id.strip()) == 0: + if isinstance(management_dashboard_id, str) and len(management_dashboard_id.strip()) == 0: raise click.UsageError('Parameter --management-dashboard-id cannot be whitespace or empty string') kwargs = {} @@ -549,7 +548,7 @@ def get_management_dashboard(ctx, from_json, management_dashboard_id): @cli_util.wrap_exceptions def get_management_saved_search(ctx, from_json, management_saved_search_id): - if isinstance(management_saved_search_id, six.string_types) and len(management_saved_search_id.strip()) == 0: + if isinstance(management_saved_search_id, str) and len(management_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --management-saved-search-id cannot be whitespace or empty string') kwargs = {} @@ -571,7 +570,7 @@ def get_management_saved_search(ctx, from_json, management_saved_search_id): @cli_util.wrap_exceptions def get_oob_management_dashboard(ctx, from_json, management_dashboard_id): - if isinstance(management_dashboard_id, six.string_types) and len(management_dashboard_id.strip()) == 0: + if isinstance(management_dashboard_id, str) and len(management_dashboard_id.strip()) == 0: raise click.UsageError('Parameter --management-dashboard-id cannot be whitespace or empty string') kwargs = {} @@ -593,7 +592,7 @@ def get_oob_management_dashboard(ctx, from_json, management_dashboard_id): @cli_util.wrap_exceptions def get_oob_management_saved_search(ctx, from_json, management_saved_search_id): - if isinstance(management_saved_search_id, six.string_types) and len(management_saved_search_id.strip()) == 0: + if isinstance(management_saved_search_id, str) and len(management_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --management-saved-search-id cannot be whitespace or empty string') kwargs = {} @@ -915,7 +914,7 @@ def list_oob_management_saved_searches(ctx, from_json, all_pages, page_size, com @cli_util.wrap_exceptions def update_management_dashboard(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, management_dashboard_id, provider_id, provider_name, provider_version, tiles, display_name, description, compartment_id, is_oob_dashboard, is_show_in_home, metadata_version, is_show_description, screen_image, nls, ui_config, data_config, type, is_favorite, parameters_config, features_config, drilldown_config, freeform_tags, defined_tags, if_match): - if isinstance(management_dashboard_id, six.string_types) and len(management_dashboard_id.strip()) == 0: + if isinstance(management_dashboard_id, str) and len(management_dashboard_id.strip()) == 0: raise click.UsageError('Parameter --management-dashboard-id cannot be whitespace or empty string') if not force: if tiles or nls or ui_config or data_config or parameters_config or features_config or drilldown_config or freeform_tags or defined_tags: @@ -1061,7 +1060,7 @@ def update_management_dashboard(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_management_saved_search(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, management_saved_search_id, display_name, provider_id, provider_version, provider_name, compartment_id, is_oob_saved_search, description, nls, type, ui_config, data_config, screen_image, metadata_version, widget_template, widget_vm, parameters_config, features_config, drilldown_config, freeform_tags, defined_tags, if_match): - if isinstance(management_saved_search_id, six.string_types) and len(management_saved_search_id.strip()) == 0: + if isinstance(management_saved_search_id, str) and len(management_saved_search_id.strip()) == 0: raise click.UsageError('Parameter --management-saved-search-id cannot be whitespace or empty string') if not force: if nls or ui_config or data_config or parameters_config or features_config or drilldown_config or freeform_tags or defined_tags: diff --git a/services/management_dashboard/src/oci_cli_dashx_apis/management_dashboard_cli_extended.py b/services/management_dashboard/src/oci_cli_dashx_apis/management_dashboard_cli_extended.py index a45dac1d6..015a5e06c 100644 --- a/services/management_dashboard/src/oci_cli_dashx_apis/management_dashboard_cli_extended.py +++ b/services/management_dashboard/src/oci_cli_dashx_apis/management_dashboard_cli_extended.py @@ -4,7 +4,6 @@ from __future__ import print_function import click -import six from oci_cli import cli_util from oci_cli import json_skeleton_utils from services.management_dashboard.src.oci_cli_dashx_apis.generated import dashxapis_cli @@ -40,7 +39,7 @@ @cli_util.wrap_exceptions def export_dashboard(ctx, from_json, export_dashboard_id): - if isinstance(export_dashboard_id, six.string_types) and len(export_dashboard_id.strip()) == 0: + if isinstance(export_dashboard_id, str) and len(export_dashboard_id.strip()) == 0: raise click.UsageError('Parameter --export-dashboard-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/marketplace/src/oci_cli_account/generated/account_cli.py b/services/marketplace/src/oci_cli_account/generated/account_cli.py index 687da8db2..f48bd2457 100644 --- a/services/marketplace/src/oci_cli_account/generated/account_cli.py +++ b/services/marketplace/src/oci_cli_account/generated/account_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/marketplace/src/oci_cli_marketplace/generated/marketplace_cli.py b/services/marketplace/src/oci_cli_marketplace/generated/marketplace_cli.py index ec840dcdb..c2949c52a 100644 --- a/services/marketplace/src/oci_cli_marketplace/generated/marketplace_cli.py +++ b/services/marketplace/src/oci_cli_marketplace/generated/marketplace_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -158,7 +157,7 @@ def listing_group(): @cli_util.wrap_exceptions def change_publication_compartment(ctx, from_json, publication_id, compartment_id, if_match): - if isinstance(publication_id, six.string_types) and len(publication_id.strip()) == 0: + if isinstance(publication_id, str) and len(publication_id.strip()) == 0: raise click.UsageError('Parameter --publication-id cannot be whitespace or empty string') kwargs = {} @@ -392,7 +391,7 @@ def create_publication_create_image_publication_package(ctx, from_json, wait_for @cli_util.wrap_exceptions def delete_accepted_agreement(ctx, from_json, accepted_agreement_id, signature, if_match): - if isinstance(accepted_agreement_id, six.string_types) and len(accepted_agreement_id.strip()) == 0: + if isinstance(accepted_agreement_id, str) and len(accepted_agreement_id.strip()) == 0: raise click.UsageError('Parameter --accepted-agreement-id cannot be whitespace or empty string') kwargs = {} @@ -423,7 +422,7 @@ def delete_accepted_agreement(ctx, from_json, accepted_agreement_id, signature, @cli_util.wrap_exceptions def delete_publication(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, publication_id, if_match): - if isinstance(publication_id, six.string_types) and len(publication_id.strip()) == 0: + if isinstance(publication_id, str) and len(publication_id.strip()) == 0: raise click.UsageError('Parameter --publication-id cannot be whitespace or empty string') kwargs = {} @@ -488,10 +487,10 @@ def delete_publication(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def export_listing(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_id, package_version, compartment_id, container_repository_path): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') - if isinstance(package_version, six.string_types) and len(package_version.strip()) == 0: + if isinstance(package_version, str) and len(package_version.strip()) == 0: raise click.UsageError('Parameter --package-version cannot be whitespace or empty string') kwargs = {} @@ -547,7 +546,7 @@ def export_listing(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_accepted_agreement(ctx, from_json, accepted_agreement_id): - if isinstance(accepted_agreement_id, six.string_types) and len(accepted_agreement_id.strip()) == 0: + if isinstance(accepted_agreement_id, str) and len(accepted_agreement_id.strip()) == 0: raise click.UsageError('Parameter --accepted-agreement-id cannot be whitespace or empty string') kwargs = {} @@ -572,13 +571,13 @@ def get_accepted_agreement(ctx, from_json, accepted_agreement_id): @cli_util.wrap_exceptions def get_agreement(ctx, from_json, listing_id, package_version, agreement_id, compartment_id): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') - if isinstance(package_version, six.string_types) and len(package_version.strip()) == 0: + if isinstance(package_version, str) and len(package_version.strip()) == 0: raise click.UsageError('Parameter --package-version cannot be whitespace or empty string') - if isinstance(agreement_id, six.string_types) and len(agreement_id.strip()) == 0: + if isinstance(agreement_id, str) and len(agreement_id.strip()) == 0: raise click.UsageError('Parameter --agreement-id cannot be whitespace or empty string') kwargs = {} @@ -611,7 +610,7 @@ def get_agreement(ctx, from_json, listing_id, package_version, agreement_id, com @cli_util.wrap_exceptions def get_listing(ctx, from_json, listing_id, compartment_id): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -643,10 +642,10 @@ def get_listing(ctx, from_json, listing_id, compartment_id): @cli_util.wrap_exceptions def get_package(ctx, from_json, listing_id, package_version, compartment_id): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') - if isinstance(package_version, six.string_types) and len(package_version.strip()) == 0: + if isinstance(package_version, str) and len(package_version.strip()) == 0: raise click.UsageError('Parameter --package-version cannot be whitespace or empty string') kwargs = {} @@ -671,7 +670,7 @@ def get_package(ctx, from_json, listing_id, package_version, compartment_id): @cli_util.wrap_exceptions def get_publication(ctx, from_json, publication_id): - if isinstance(publication_id, six.string_types) and len(publication_id.strip()) == 0: + if isinstance(publication_id, str) and len(publication_id.strip()) == 0: raise click.UsageError('Parameter --publication-id cannot be whitespace or empty string') kwargs = {} @@ -694,10 +693,10 @@ def get_publication(ctx, from_json, publication_id): @cli_util.wrap_exceptions def get_publication_package(ctx, from_json, publication_id, package_version): - if isinstance(publication_id, six.string_types) and len(publication_id.strip()) == 0: + if isinstance(publication_id, str) and len(publication_id.strip()) == 0: raise click.UsageError('Parameter --publication-id cannot be whitespace or empty string') - if isinstance(package_version, six.string_types) and len(package_version.strip()) == 0: + if isinstance(package_version, str) and len(package_version.strip()) == 0: raise click.UsageError('Parameter --package-version cannot be whitespace or empty string') kwargs = {} @@ -720,7 +719,7 @@ def get_publication_package(ctx, from_json, publication_id, package_version): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -817,10 +816,10 @@ def list_agreements(ctx, from_json, all_pages, page_size, listing_id, package_ve if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') - if isinstance(package_version, six.string_types) and len(package_version.strip()) == 0: + if isinstance(package_version, str) and len(package_version.strip()) == 0: raise click.UsageError('Parameter --package-version cannot be whitespace or empty string') kwargs = {} @@ -1023,7 +1022,7 @@ def list_packages(ctx, from_json, all_pages, page_size, listing_id, package_vers if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -1088,7 +1087,7 @@ def list_publication_packages(ctx, from_json, all_pages, page_size, publication_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(publication_id, six.string_types) and len(publication_id.strip()) == 0: + if isinstance(publication_id, str) and len(publication_id.strip()) == 0: raise click.UsageError('Parameter --publication-id cannot be whitespace or empty string') kwargs = {} @@ -1325,7 +1324,7 @@ def list_reports(ctx, from_json, all_pages, report_type, date, compartment_id, p @cli_util.wrap_exceptions def list_taxes(ctx, from_json, all_pages, listing_id, compartment_id): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -1358,7 +1357,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1415,7 +1414,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1631,7 +1630,7 @@ def search_listings_free_text_search_details(ctx, from_json, text, matching_cont @cli_util.wrap_exceptions def update_accepted_agreement(ctx, from_json, force, accepted_agreement_id, display_name, defined_tags, freeform_tags, if_match): - if isinstance(accepted_agreement_id, six.string_types) and len(accepted_agreement_id.strip()) == 0: + if isinstance(accepted_agreement_id, str) and len(accepted_agreement_id.strip()) == 0: raise click.UsageError('Parameter --accepted-agreement-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -1685,7 +1684,7 @@ def update_accepted_agreement(ctx, from_json, force, accepted_agreement_id, disp @cli_util.wrap_exceptions def update_publication(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, publication_id, name, short_description, long_description, support_contacts, defined_tags, freeform_tags, if_match): - if isinstance(publication_id, six.string_types) and len(publication_id.strip()) == 0: + if isinstance(publication_id, str) and len(publication_id.strip()) == 0: raise click.UsageError('Parameter --publication-id cannot be whitespace or empty string') if not force: if support_contacts or defined_tags or freeform_tags: diff --git a/services/marketplace_private_offer/src/oci_cli_attachment/generated/attachment_cli.py b/services/marketplace_private_offer/src/oci_cli_attachment/generated/attachment_cli.py index 4b8311e88..79f3b7045 100644 --- a/services/marketplace_private_offer/src/oci_cli_attachment/generated/attachment_cli.py +++ b/services/marketplace_private_offer/src/oci_cli_attachment/generated/attachment_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -54,7 +53,7 @@ def attachment_collection_group(): @cli_util.wrap_exceptions def create_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, file_base64_encoded, display_name, type, offer_id): - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') kwargs = {} @@ -109,10 +108,10 @@ def create_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_attachment(ctx, from_json, offer_id, attachment_id, if_match): - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') kwargs = {} @@ -138,10 +137,10 @@ def delete_attachment(ctx, from_json, offer_id, attachment_id, if_match): @cli_util.wrap_exceptions def get_attachment(ctx, from_json, offer_id, attachment_id): - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') kwargs = {} @@ -166,10 +165,10 @@ def get_attachment(ctx, from_json, offer_id, attachment_id): @cli_util.wrap_exceptions def get_attachment_content(ctx, from_json, file, offer_id, attachment_id): - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') kwargs = {} @@ -228,7 +227,7 @@ def list_attachments(ctx, from_json, all_pages, page_size, offer_id, buyer_compa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/marketplace_private_offer/src/oci_cli_offer/generated/offer_cli.py b/services/marketplace_private_offer/src/oci_cli_offer/generated/offer_cli.py index f46d96b8c..307f21cf8 100644 --- a/services/marketplace_private_offer/src/oci_cli_offer/generated/offer_cli.py +++ b/services/marketplace_private_offer/src/oci_cli_offer/generated/offer_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -160,7 +159,7 @@ def create_offer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_offer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, offer_id, if_match): - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') kwargs = {} @@ -219,7 +218,7 @@ def delete_offer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def get_offer(ctx, from_json, offer_id): - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') kwargs = {} @@ -241,7 +240,7 @@ def get_offer(ctx, from_json, offer_id): @cli_util.wrap_exceptions def get_offer_internal_detail(ctx, from_json, offer_id): - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') kwargs = {} @@ -351,7 +350,7 @@ def list_offers(ctx, from_json, all_pages, page_size, buyer_compartment_id, sell @cli_util.wrap_exceptions def update_offer(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, offer_id, display_name, buyer_compartment_id, description, internal_notes, time_start_date, duration, time_accept_by, pricing, buyer_information, seller_information, resource_bundles, custom_fields, freeform_tags, defined_tags, if_match): - if isinstance(offer_id, six.string_types) and len(offer_id.strip()) == 0: + if isinstance(offer_id, str) and len(offer_id.strip()) == 0: raise click.UsageError('Parameter --offer-id cannot be whitespace or empty string') if not force: if pricing or buyer_information or seller_information or resource_bundles or custom_fields or freeform_tags or defined_tags: diff --git a/services/marketplace_publisher/src/oci_cli_marketplace_publisher/generated/marketplacepublisher_cli.py b/services/marketplace_publisher/src/oci_cli_marketplace_publisher/generated/marketplacepublisher_cli.py index 170e21995..0b2d2bc6a 100644 --- a/services/marketplace_publisher/src/oci_cli_marketplace_publisher/generated/marketplacepublisher_cli.py +++ b/services/marketplace_publisher/src/oci_cli_marketplace_publisher/generated/marketplacepublisher_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -289,7 +288,7 @@ def listing_revision_package_group(): @cli_util.wrap_exceptions def activate_term_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, term_version_id, if_match): - if isinstance(term_version_id, six.string_types) and len(term_version_id.strip()) == 0: + if isinstance(term_version_id, str) and len(term_version_id.strip()) == 0: raise click.UsageError('Parameter --term-version-id cannot be whitespace or empty string') kwargs = {} @@ -338,7 +337,7 @@ def activate_term_version(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -366,7 +365,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def cascading_delete_listing(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_id, if_match): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -421,7 +420,7 @@ def cascading_delete_listing(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def cascading_delete_listing_revision(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -477,7 +476,7 @@ def cascading_delete_listing_revision(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def change_artifact_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, compartment_id, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') kwargs = {} @@ -538,7 +537,7 @@ def change_artifact_compartment(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def change_listing_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_id, compartment_id, if_match): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -600,7 +599,7 @@ def change_listing_compartment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_listing_revision_to_new_status(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -652,7 +651,7 @@ def change_listing_revision_to_new_status(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_term_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, term_id, compartment_id, if_match): - if isinstance(term_id, six.string_types) and len(term_id.strip()) == 0: + if isinstance(term_id, str) and len(term_id.strip()) == 0: raise click.UsageError('Parameter --term-id cannot be whitespace or empty string') kwargs = {} @@ -714,7 +713,7 @@ def change_term_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def clone_listing_revision(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -2508,7 +2507,7 @@ def create_term_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') kwargs = {} @@ -2564,7 +2563,7 @@ def delete_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_listing(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_id, if_match): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -2628,7 +2627,7 @@ def delete_listing(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_listing_revision(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -2692,7 +2691,7 @@ def delete_listing_revision(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_listing_revision_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -2756,7 +2755,7 @@ def delete_listing_revision_attachment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_listing_revision_note(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_note_id, if_match): - if isinstance(listing_revision_note_id, six.string_types) and len(listing_revision_note_id.strip()) == 0: + if isinstance(listing_revision_note_id, str) and len(listing_revision_note_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-note-id cannot be whitespace or empty string') kwargs = {} @@ -2820,7 +2819,7 @@ def delete_listing_revision_note(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_listing_revision_package(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_package_id, if_match): - if isinstance(listing_revision_package_id, six.string_types) and len(listing_revision_package_id.strip()) == 0: + if isinstance(listing_revision_package_id, str) and len(listing_revision_package_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-package-id cannot be whitespace or empty string') kwargs = {} @@ -2884,7 +2883,7 @@ def delete_listing_revision_package(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def delete_term(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, term_id, if_match): - if isinstance(term_id, six.string_types) and len(term_id.strip()) == 0: + if isinstance(term_id, str) and len(term_id.strip()) == 0: raise click.UsageError('Parameter --term-id cannot be whitespace or empty string') kwargs = {} @@ -2948,7 +2947,7 @@ def delete_term(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_term_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, term_version_id, if_match): - if isinstance(term_version_id, six.string_types) and len(term_version_id.strip()) == 0: + if isinstance(term_version_id, str) and len(term_version_id.strip()) == 0: raise click.UsageError('Parameter --term-version-id cannot be whitespace or empty string') kwargs = {} @@ -3007,7 +3006,7 @@ def delete_term_version(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_artifact(ctx, from_json, artifact_id): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') kwargs = {} @@ -3030,7 +3029,7 @@ def get_artifact(ctx, from_json, artifact_id): @cli_util.wrap_exceptions def get_category(ctx, from_json, category_code, compartment_id): - if isinstance(category_code, six.string_types) and len(category_code.strip()) == 0: + if isinstance(category_code, str) and len(category_code.strip()) == 0: raise click.UsageError('Parameter --category-code cannot be whitespace or empty string') kwargs = {} @@ -3053,7 +3052,7 @@ def get_category(ctx, from_json, category_code, compartment_id): @cli_util.wrap_exceptions def get_lead(ctx, from_json, lead_id): - if isinstance(lead_id, six.string_types) and len(lead_id.strip()) == 0: + if isinstance(lead_id, str) and len(lead_id.strip()) == 0: raise click.UsageError('Parameter --lead-id cannot be whitespace or empty string') kwargs = {} @@ -3075,7 +3074,7 @@ def get_lead(ctx, from_json, lead_id): @cli_util.wrap_exceptions def get_listing(ctx, from_json, listing_id): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') kwargs = {} @@ -3097,7 +3096,7 @@ def get_listing(ctx, from_json, listing_id): @cli_util.wrap_exceptions def get_listing_revision(ctx, from_json, listing_revision_id): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -3119,7 +3118,7 @@ def get_listing_revision(ctx, from_json, listing_revision_id): @cli_util.wrap_exceptions def get_listing_revision_attachment(ctx, from_json, listing_revision_attachment_id): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -3142,7 +3141,7 @@ def get_listing_revision_attachment(ctx, from_json, listing_revision_attachment_ @cli_util.wrap_exceptions def get_listing_revision_attachment_content(ctx, from_json, file, listing_revision_attachment_id): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -3187,7 +3186,7 @@ def get_listing_revision_attachment_content(ctx, from_json, file, listing_revisi @cli_util.wrap_exceptions def get_listing_revision_icon_content(ctx, from_json, file, listing_revision_id): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -3231,7 +3230,7 @@ def get_listing_revision_icon_content(ctx, from_json, file, listing_revision_id) @cli_util.wrap_exceptions def get_listing_revision_note(ctx, from_json, listing_revision_note_id): - if isinstance(listing_revision_note_id, six.string_types) and len(listing_revision_note_id.strip()) == 0: + if isinstance(listing_revision_note_id, str) and len(listing_revision_note_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-note-id cannot be whitespace or empty string') kwargs = {} @@ -3253,7 +3252,7 @@ def get_listing_revision_note(ctx, from_json, listing_revision_note_id): @cli_util.wrap_exceptions def get_listing_revision_package(ctx, from_json, listing_revision_package_id): - if isinstance(listing_revision_package_id, six.string_types) and len(listing_revision_package_id.strip()) == 0: + if isinstance(listing_revision_package_id, str) and len(listing_revision_package_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-package-id cannot be whitespace or empty string') kwargs = {} @@ -3275,7 +3274,7 @@ def get_listing_revision_package(ctx, from_json, listing_revision_package_id): @cli_util.wrap_exceptions def get_market(ctx, from_json, market_code): - if isinstance(market_code, six.string_types) and len(market_code.strip()) == 0: + if isinstance(market_code, str) and len(market_code.strip()) == 0: raise click.UsageError('Parameter --market-code cannot be whitespace or empty string') kwargs = {} @@ -3297,7 +3296,7 @@ def get_market(ctx, from_json, market_code): @cli_util.wrap_exceptions def get_product(ctx, from_json, product_code): - if isinstance(product_code, six.string_types) and len(product_code.strip()) == 0: + if isinstance(product_code, str) and len(product_code.strip()) == 0: raise click.UsageError('Parameter --product-code cannot be whitespace or empty string') kwargs = {} @@ -3319,7 +3318,7 @@ def get_product(ctx, from_json, product_code): @cli_util.wrap_exceptions def get_publisher(ctx, from_json, publisher_id): - if isinstance(publisher_id, six.string_types) and len(publisher_id.strip()) == 0: + if isinstance(publisher_id, str) and len(publisher_id.strip()) == 0: raise click.UsageError('Parameter --publisher-id cannot be whitespace or empty string') kwargs = {} @@ -3341,7 +3340,7 @@ def get_publisher(ctx, from_json, publisher_id): @cli_util.wrap_exceptions def get_support_doc(ctx, from_json, support_doc_code): - if isinstance(support_doc_code, six.string_types) and len(support_doc_code.strip()) == 0: + if isinstance(support_doc_code, str) and len(support_doc_code.strip()) == 0: raise click.UsageError('Parameter --support-doc-code cannot be whitespace or empty string') kwargs = {} @@ -3364,7 +3363,7 @@ def get_support_doc(ctx, from_json, support_doc_code): @cli_util.wrap_exceptions def get_support_doc_content(ctx, from_json, file, support_doc_code): - if isinstance(support_doc_code, six.string_types) and len(support_doc_code.strip()) == 0: + if isinstance(support_doc_code, str) and len(support_doc_code.strip()) == 0: raise click.UsageError('Parameter --support-doc-code cannot be whitespace or empty string') kwargs = {} @@ -3408,7 +3407,7 @@ def get_support_doc_content(ctx, from_json, file, support_doc_code): @cli_util.wrap_exceptions def get_term(ctx, from_json, term_id): - if isinstance(term_id, six.string_types) and len(term_id.strip()) == 0: + if isinstance(term_id, str) and len(term_id.strip()) == 0: raise click.UsageError('Parameter --term-id cannot be whitespace or empty string') kwargs = {} @@ -3430,7 +3429,7 @@ def get_term(ctx, from_json, term_id): @cli_util.wrap_exceptions def get_term_version(ctx, from_json, term_version_id): - if isinstance(term_version_id, six.string_types) and len(term_version_id.strip()) == 0: + if isinstance(term_version_id, str) and len(term_version_id.strip()) == 0: raise click.UsageError('Parameter --term-version-id cannot be whitespace or empty string') kwargs = {} @@ -3453,7 +3452,7 @@ def get_term_version(ctx, from_json, term_version_id): @cli_util.wrap_exceptions def get_term_version_content(ctx, from_json, file, term_version_id): - if isinstance(term_version_id, six.string_types) and len(term_version_id.strip()) == 0: + if isinstance(term_version_id, str) and len(term_version_id.strip()) == 0: raise click.UsageError('Parameter --term-version-id cannot be whitespace or empty string') kwargs = {} @@ -3497,7 +3496,7 @@ def get_term_version_content(ctx, from_json, file, term_version_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4666,7 +4665,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4723,7 +4722,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4838,7 +4837,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def mark_listing_revision_package_as_default(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_package_id, if_match): - if isinstance(listing_revision_package_id, six.string_types) and len(listing_revision_package_id.strip()) == 0: + if isinstance(listing_revision_package_id, str) and len(listing_revision_package_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-package-id cannot be whitespace or empty string') kwargs = {} @@ -4893,7 +4892,7 @@ def mark_listing_revision_package_as_default(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def publish_listing_revision(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -4949,7 +4948,7 @@ def publish_listing_revision(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def publish_listing_revision_as_private(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, allowed_tenancies, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -5011,7 +5010,7 @@ def publish_listing_revision_as_private(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def publish_listing_revision_package(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_package_id, if_match): - if isinstance(listing_revision_package_id, six.string_types) and len(listing_revision_package_id.strip()) == 0: + if isinstance(listing_revision_package_id, str) and len(listing_revision_package_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-package-id cannot be whitespace or empty string') kwargs = {} @@ -5069,7 +5068,7 @@ def publish_listing_revision_package(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def submit_listing_revision_for_review(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, note_details, are_internal_tenancy_launch_allowed, should_auto_publish_on_approval, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -5133,7 +5132,7 @@ def submit_listing_revision_for_review(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def un_publish_listing_revision_package(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_package_id, if_match): - if isinstance(listing_revision_package_id, six.string_types) and len(listing_revision_package_id.strip()) == 0: + if isinstance(listing_revision_package_id, str) and len(listing_revision_package_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-package-id cannot be whitespace or empty string') kwargs = {} @@ -5194,7 +5193,7 @@ def un_publish_listing_revision_package(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def update_artifact(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, compartment_id, display_name, artifact_type, freeform_tags, defined_tags, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5279,7 +5278,7 @@ def update_artifact(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_artifact_update_kubernetes_image_artifact_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, compartment_id, display_name, freeform_tags, defined_tags, helm_chart, container_image_artifact_ids, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or helm_chart or container_image_artifact_ids: @@ -5368,7 +5367,7 @@ def update_artifact_update_kubernetes_image_artifact_details(ctx, from_json, for @cli_util.wrap_exceptions def update_artifact_update_stack_artifact_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, compartment_id, display_name, freeform_tags, defined_tags, stack, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or stack: @@ -5454,7 +5453,7 @@ def update_artifact_update_stack_artifact_details(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_artifact_update_container_image_artifact_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, compartment_id, display_name, freeform_tags, defined_tags, container_image, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or container_image: @@ -5540,7 +5539,7 @@ def update_artifact_update_container_image_artifact_details(ctx, from_json, forc @cli_util.wrap_exceptions def update_artifact_update_machine_image_artifact_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, compartment_id, display_name, freeform_tags, defined_tags, machine_image, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or machine_image: @@ -5623,7 +5622,7 @@ def update_artifact_update_machine_image_artifact_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_listing(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_id, freeform_tags, defined_tags, if_match): - if isinstance(listing_id, six.string_types) and len(listing_id.strip()) == 0: + if isinstance(listing_id, str) and len(listing_id.strip()) == 0: raise click.UsageError('Parameter --listing-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5709,7 +5708,7 @@ def update_listing(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_listing_revision(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, listing_type, display_name, headline, tagline, keywords, short_description, usage_information, long_description, content_language, supportedlanguages, support_contacts, support_links, freeform_tags, defined_tags, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') if not force: if content_language or supportedlanguages or support_contacts or support_links or freeform_tags or defined_tags: @@ -5838,7 +5837,7 @@ def update_listing_revision(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_listing_revision_update_service_listing_revision_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, display_name, headline, tagline, keywords, short_description, usage_information, long_description, content_language, supportedlanguages, support_contacts, support_links, freeform_tags, defined_tags, contact_us, product_codes, industries, trained_professionals, vanity_url, geo_locations, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') if not force: if content_language or supportedlanguages or support_contacts or support_links or freeform_tags or defined_tags or product_codes or industries or trained_professionals or geo_locations: @@ -5989,7 +5988,7 @@ def update_listing_revision_update_service_listing_revision_details(ctx, from_js @cli_util.wrap_exceptions def update_listing_revision_update_oci_listing_revision_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, display_name, headline, tagline, keywords, short_description, usage_information, long_description, content_language, supportedlanguages, support_contacts, support_links, freeform_tags, defined_tags, version_details, system_requirements, pricing_type, products, vanity_url, recommended_service_provider_listing_ids, availability_and_pricing_policy, pricing_plans, is_rover_exportable, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') if not force: if content_language or supportedlanguages or support_contacts or support_links or freeform_tags or defined_tags or version_details or products or recommended_service_provider_listing_ids or pricing_plans: @@ -6148,7 +6147,7 @@ def update_listing_revision_update_oci_listing_revision_details(ctx, from_json, @cli_util.wrap_exceptions def update_listing_revision_update_lead_gen_listing_revision_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, display_name, headline, tagline, keywords, short_description, usage_information, long_description, content_language, supportedlanguages, support_contacts, support_links, freeform_tags, defined_tags, version_details, system_requirements, pricing_type, products, demo_url, self_paced_training_url, recommended_service_provider_listing_ids, vanity_url, download_info, pricing_plans, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') if not force: if content_language or supportedlanguages or support_contacts or support_links or freeform_tags or defined_tags or version_details or products or recommended_service_provider_listing_ids or download_info: @@ -6284,7 +6283,7 @@ def update_listing_revision_update_lead_gen_listing_revision_details(ctx, from_j @cli_util.wrap_exceptions def update_listing_revision_attachment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, display_name, description, attachment_type, freeform_tags, defined_tags, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6363,7 +6362,7 @@ def update_listing_revision_attachment(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_listing_revision_attachment_update_screen_shot_attachment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6444,7 +6443,7 @@ def update_listing_revision_attachment_update_screen_shot_attachment_details(ctx @cli_util.wrap_exceptions def update_listing_revision_attachment_update_customer_success_attachment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, customer_name, display_name, description, freeform_tags, defined_tags, url, product_codes, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or product_codes: @@ -6531,7 +6530,7 @@ def update_listing_revision_attachment_update_customer_success_attachment(ctx, f @cli_util.wrap_exceptions def update_listing_revision_attachment_update_review_support_document_attachment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, document_name, template_code, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6612,7 +6611,7 @@ def update_listing_revision_attachment_update_review_support_document_attachment @cli_util.wrap_exceptions def update_listing_revision_attachment_update_related_document_attachment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, display_name, description, freeform_tags, defined_tags, document_category, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6696,7 +6695,7 @@ def update_listing_revision_attachment_update_related_document_attachment_detail @cli_util.wrap_exceptions def update_listing_revision_attachment_update_supported_service_attachment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, service_name, type, display_name, description, freeform_tags, defined_tags, url, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6779,7 +6778,7 @@ def update_listing_revision_attachment_update_supported_service_attachment(ctx, @cli_util.wrap_exceptions def update_listing_revision_attachment_update_video_attachment_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6853,7 +6852,7 @@ def update_listing_revision_attachment_update_video_attachment_details(ctx, from @cli_util.wrap_exceptions def update_listing_revision_attachment_content(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_attachment_id, update_listing_revision_attachment_content, if_match): - if isinstance(listing_revision_attachment_id, six.string_types) and len(listing_revision_attachment_id.strip()) == 0: + if isinstance(listing_revision_attachment_id, str) and len(listing_revision_attachment_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -6910,7 +6909,7 @@ def update_listing_revision_attachment_content(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def update_listing_revision_icon_content(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, update_listing_revision_icon_content, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} @@ -6969,7 +6968,7 @@ def update_listing_revision_icon_content(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def update_listing_revision_note(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_note_id, freeform_tags, defined_tags, if_match): - if isinstance(listing_revision_note_id, six.string_types) and len(listing_revision_note_id.strip()) == 0: + if isinstance(listing_revision_note_id, str) and len(listing_revision_note_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-note-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -7044,7 +7043,7 @@ def update_listing_revision_note(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_listing_revision_package(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_package_id, package_version, display_name, description, artifact_id, term_id, is_default, are_security_upgrades_provided, freeform_tags, defined_tags, if_match): - if isinstance(listing_revision_package_id, six.string_types) and len(listing_revision_package_id.strip()) == 0: + if isinstance(listing_revision_package_id, str) and len(listing_revision_package_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-package-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -7133,7 +7132,7 @@ def update_listing_revision_package(ctx, from_json, force, wait_for_state, max_w @cli_util.wrap_exceptions def update_term(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, term_id, freeform_tags, defined_tags, if_match): - if isinstance(term_id, six.string_types) and len(term_id.strip()) == 0: + if isinstance(term_id, str) and len(term_id.strip()) == 0: raise click.UsageError('Parameter --term-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -7202,7 +7201,7 @@ def update_term(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def update_term_version(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, term_version_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(term_version_id, six.string_types) and len(term_version_id.strip()) == 0: + if isinstance(term_version_id, str) and len(term_version_id.strip()) == 0: raise click.UsageError('Parameter --term-version-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -7272,7 +7271,7 @@ def update_term_version(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_term_version_content(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, term_version_id, update_term_version_content, if_match, display_name): - if isinstance(term_version_id, six.string_types) and len(term_version_id.strip()) == 0: + if isinstance(term_version_id, str) and len(term_version_id.strip()) == 0: raise click.UsageError('Parameter --term-version-id cannot be whitespace or empty string') kwargs = {} @@ -7330,7 +7329,7 @@ def update_term_version_content(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def validate_and_publish_artifact(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, artifact_id, if_match): - if isinstance(artifact_id, six.string_types) and len(artifact_id.strip()) == 0: + if isinstance(artifact_id, str) and len(artifact_id.strip()) == 0: raise click.UsageError('Parameter --artifact-id cannot be whitespace or empty string') kwargs = {} @@ -7385,7 +7384,7 @@ def validate_and_publish_artifact(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def withdraw_listing_revision(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, listing_revision_id, if_match): - if isinstance(listing_revision_id, six.string_types) and len(listing_revision_id.strip()) == 0: + if isinstance(listing_revision_id, str) and len(listing_revision_id.strip()) == 0: raise click.UsageError('Parameter --listing-revision-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/media_services/src/oci_cli_media_services/generated/mediaservices_cli.py b/services/media_services/src/oci_cli_media_services/generated/mediaservices_cli.py index 456dfdd58..8144eeb5f 100644 --- a/services/media_services/src/oci_cli_media_services/generated/mediaservices_cli.py +++ b/services/media_services/src/oci_cli_media_services/generated/mediaservices_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -135,7 +134,7 @@ def media_workflow_configuration_collection_group(): @cli_util.wrap_exceptions def add_media_asset_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, media_asset_id, related_resource_id, message, time_created, if_match): - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') kwargs = {} @@ -206,7 +205,7 @@ def add_media_asset_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def add_media_workflow_configuration_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, media_workflow_configuration_id, related_resource_id, message, time_created, if_match): - if isinstance(media_workflow_configuration_id, six.string_types) and len(media_workflow_configuration_id.strip()) == 0: + if isinstance(media_workflow_configuration_id, str) and len(media_workflow_configuration_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -277,7 +276,7 @@ def add_media_workflow_configuration_lock(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def add_media_workflow_job_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, media_workflow_job_id, related_resource_id, message, time_created, if_match): - if isinstance(media_workflow_job_id, six.string_types) and len(media_workflow_job_id.strip()) == 0: + if isinstance(media_workflow_job_id, str) and len(media_workflow_job_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-job-id cannot be whitespace or empty string') kwargs = {} @@ -348,7 +347,7 @@ def add_media_workflow_job_lock(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def add_media_workflow_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, media_workflow_id, related_resource_id, message, time_created, if_match): - if isinstance(media_workflow_id, six.string_types) and len(media_workflow_id.strip()) == 0: + if isinstance(media_workflow_id, str) and len(media_workflow_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-id cannot be whitespace or empty string') kwargs = {} @@ -419,7 +418,7 @@ def add_media_workflow_lock(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def add_stream_cdn_config_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, stream_cdn_config_id, related_resource_id, message, time_created, if_match): - if isinstance(stream_cdn_config_id, six.string_types) and len(stream_cdn_config_id.strip()) == 0: + if isinstance(stream_cdn_config_id, str) and len(stream_cdn_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-cdn-config-id cannot be whitespace or empty string') kwargs = {} @@ -490,7 +489,7 @@ def add_stream_cdn_config_lock(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def add_stream_distribution_channel_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, stream_distribution_channel_id, related_resource_id, message, time_created, if_match): - if isinstance(stream_distribution_channel_id, six.string_types) and len(stream_distribution_channel_id.strip()) == 0: + if isinstance(stream_distribution_channel_id, str) and len(stream_distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --stream-distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -561,7 +560,7 @@ def add_stream_distribution_channel_lock(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def add_stream_packaging_config_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, stream_packaging_config_id, related_resource_id, message, time_created, if_match): - if isinstance(stream_packaging_config_id, six.string_types) and len(stream_packaging_config_id.strip()) == 0: + if isinstance(stream_packaging_config_id, str) and len(stream_packaging_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-packaging-config-id cannot be whitespace or empty string') kwargs = {} @@ -626,7 +625,7 @@ def add_stream_packaging_config_lock(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def change_media_asset_compartment(ctx, from_json, media_asset_id, compartment_id, is_lock_override, if_match): - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') kwargs = {} @@ -660,7 +659,7 @@ def change_media_asset_compartment(ctx, from_json, media_asset_id, compartment_i @cli_util.wrap_exceptions def change_media_workflow_compartment(ctx, from_json, media_workflow_id, compartment_id, is_lock_override, if_match): - if isinstance(media_workflow_id, six.string_types) and len(media_workflow_id.strip()) == 0: + if isinstance(media_workflow_id, str) and len(media_workflow_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-id cannot be whitespace or empty string') kwargs = {} @@ -694,7 +693,7 @@ def change_media_workflow_compartment(ctx, from_json, media_workflow_id, compart @cli_util.wrap_exceptions def change_media_workflow_configuration_compartment(ctx, from_json, media_workflow_configuration_id, compartment_id, is_lock_override, if_match): - if isinstance(media_workflow_configuration_id, six.string_types) and len(media_workflow_configuration_id.strip()) == 0: + if isinstance(media_workflow_configuration_id, str) and len(media_workflow_configuration_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -728,7 +727,7 @@ def change_media_workflow_configuration_compartment(ctx, from_json, media_workfl @cli_util.wrap_exceptions def change_media_workflow_job_compartment(ctx, from_json, media_workflow_job_id, compartment_id, is_lock_override, if_match): - if isinstance(media_workflow_job_id, six.string_types) and len(media_workflow_job_id.strip()) == 0: + if isinstance(media_workflow_job_id, str) and len(media_workflow_job_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-job-id cannot be whitespace or empty string') kwargs = {} @@ -762,7 +761,7 @@ def change_media_workflow_job_compartment(ctx, from_json, media_workflow_job_id, @cli_util.wrap_exceptions def change_stream_distribution_channel_compartment(ctx, from_json, stream_distribution_channel_id, compartment_id, is_lock_override, if_match): - if isinstance(stream_distribution_channel_id, six.string_types) and len(stream_distribution_channel_id.strip()) == 0: + if isinstance(stream_distribution_channel_id, str) and len(stream_distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --stream-distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -1855,7 +1854,7 @@ def create_stream_packaging_config_stream_packaging_config_encryption_none(ctx, @cli_util.wrap_exceptions def delete_media_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, media_asset_id, is_lock_override, if_match, delete_mode): - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') kwargs = {} @@ -1923,10 +1922,10 @@ def delete_media_asset(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_media_asset_distribution_channel_attachment(ctx, from_json, media_asset_id, distribution_channel_id, is_lock_override, if_match, version_parameterconflict): - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') - if isinstance(distribution_channel_id, six.string_types) and len(distribution_channel_id.strip()) == 0: + if isinstance(distribution_channel_id, str) and len(distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -1961,7 +1960,7 @@ def delete_media_asset_distribution_channel_attachment(ctx, from_json, media_ass @cli_util.wrap_exceptions def delete_media_workflow(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, media_workflow_id, is_lock_override, if_match): - if isinstance(media_workflow_id, six.string_types) and len(media_workflow_id.strip()) == 0: + if isinstance(media_workflow_id, str) and len(media_workflow_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-id cannot be whitespace or empty string') kwargs = {} @@ -2028,7 +2027,7 @@ def delete_media_workflow(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_media_workflow_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, media_workflow_configuration_id, is_lock_override, if_match): - if isinstance(media_workflow_configuration_id, six.string_types) and len(media_workflow_configuration_id.strip()) == 0: + if isinstance(media_workflow_configuration_id, str) and len(media_workflow_configuration_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2095,7 +2094,7 @@ def delete_media_workflow_configuration(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def delete_media_workflow_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, media_workflow_job_id, is_lock_override, if_match): - if isinstance(media_workflow_job_id, six.string_types) and len(media_workflow_job_id.strip()) == 0: + if isinstance(media_workflow_job_id, str) and len(media_workflow_job_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-job-id cannot be whitespace or empty string') kwargs = {} @@ -2162,7 +2161,7 @@ def delete_media_workflow_job(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_stream_cdn_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_cdn_config_id, is_lock_override, if_match): - if isinstance(stream_cdn_config_id, six.string_types) and len(stream_cdn_config_id.strip()) == 0: + if isinstance(stream_cdn_config_id, str) and len(stream_cdn_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-cdn-config-id cannot be whitespace or empty string') kwargs = {} @@ -2229,7 +2228,7 @@ def delete_stream_cdn_config(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_stream_distribution_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_distribution_channel_id, is_lock_override, if_match): - if isinstance(stream_distribution_channel_id, six.string_types) and len(stream_distribution_channel_id.strip()) == 0: + if isinstance(stream_distribution_channel_id, str) and len(stream_distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --stream-distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -2296,7 +2295,7 @@ def delete_stream_distribution_channel(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_stream_packaging_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_packaging_config_id, is_lock_override, if_match): - if isinstance(stream_packaging_config_id, six.string_types) and len(stream_packaging_config_id.strip()) == 0: + if isinstance(stream_packaging_config_id, str) and len(stream_packaging_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-packaging-config-id cannot be whitespace or empty string') kwargs = {} @@ -2357,7 +2356,7 @@ def delete_stream_packaging_config(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def get_media_asset(ctx, from_json, media_asset_id): - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') kwargs = {} @@ -2381,10 +2380,10 @@ def get_media_asset(ctx, from_json, media_asset_id): @cli_util.wrap_exceptions def get_media_asset_distribution_channel_attachment(ctx, from_json, media_asset_id, distribution_channel_id, version_parameterconflict): - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') - if isinstance(distribution_channel_id, six.string_types) and len(distribution_channel_id.strip()) == 0: + if isinstance(distribution_channel_id, str) and len(distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -2409,7 +2408,7 @@ def get_media_asset_distribution_channel_attachment(ctx, from_json, media_asset_ @cli_util.wrap_exceptions def get_media_workflow(ctx, from_json, media_workflow_id): - if isinstance(media_workflow_id, six.string_types) and len(media_workflow_id.strip()) == 0: + if isinstance(media_workflow_id, str) and len(media_workflow_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-id cannot be whitespace or empty string') kwargs = {} @@ -2431,7 +2430,7 @@ def get_media_workflow(ctx, from_json, media_workflow_id): @cli_util.wrap_exceptions def get_media_workflow_configuration(ctx, from_json, media_workflow_configuration_id): - if isinstance(media_workflow_configuration_id, six.string_types) and len(media_workflow_configuration_id.strip()) == 0: + if isinstance(media_workflow_configuration_id, str) and len(media_workflow_configuration_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2453,7 +2452,7 @@ def get_media_workflow_configuration(ctx, from_json, media_workflow_configuratio @cli_util.wrap_exceptions def get_media_workflow_job(ctx, from_json, media_workflow_job_id): - if isinstance(media_workflow_job_id, six.string_types) and len(media_workflow_job_id.strip()) == 0: + if isinstance(media_workflow_job_id, str) and len(media_workflow_job_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-job-id cannot be whitespace or empty string') kwargs = {} @@ -2475,7 +2474,7 @@ def get_media_workflow_job(ctx, from_json, media_workflow_job_id): @cli_util.wrap_exceptions def get_stream_cdn_config(ctx, from_json, stream_cdn_config_id): - if isinstance(stream_cdn_config_id, six.string_types) and len(stream_cdn_config_id.strip()) == 0: + if isinstance(stream_cdn_config_id, str) and len(stream_cdn_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-cdn-config-id cannot be whitespace or empty string') kwargs = {} @@ -2497,7 +2496,7 @@ def get_stream_cdn_config(ctx, from_json, stream_cdn_config_id): @cli_util.wrap_exceptions def get_stream_distribution_channel(ctx, from_json, stream_distribution_channel_id): - if isinstance(stream_distribution_channel_id, six.string_types) and len(stream_distribution_channel_id.strip()) == 0: + if isinstance(stream_distribution_channel_id, str) and len(stream_distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --stream-distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -2519,7 +2518,7 @@ def get_stream_distribution_channel(ctx, from_json, stream_distribution_channel_ @cli_util.wrap_exceptions def get_stream_packaging_config(ctx, from_json, stream_packaging_config_id): - if isinstance(stream_packaging_config_id, six.string_types) and len(stream_packaging_config_id.strip()) == 0: + if isinstance(stream_packaging_config_id, str) and len(stream_packaging_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-packaging-config-id cannot be whitespace or empty string') kwargs = {} @@ -2542,7 +2541,7 @@ def get_stream_packaging_config(ctx, from_json, stream_packaging_config_id): @cli_util.wrap_exceptions def ingest_stream_distribution_channel(ctx, from_json, stream_distribution_channel_id, ingest_payload_type): - if isinstance(stream_distribution_channel_id, six.string_types) and len(stream_distribution_channel_id.strip()) == 0: + if isinstance(stream_distribution_channel_id, str) and len(stream_distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --stream-distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -2571,7 +2570,7 @@ def ingest_stream_distribution_channel(ctx, from_json, stream_distribution_chann @cli_util.wrap_exceptions def ingest_stream_distribution_channel_asset_metadata_entry_details(ctx, from_json, stream_distribution_channel_id, media_asset_id, compartment_id): - if isinstance(stream_distribution_channel_id, six.string_types) and len(stream_distribution_channel_id.strip()) == 0: + if isinstance(stream_distribution_channel_id, str) and len(stream_distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --stream-distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -2614,7 +2613,7 @@ def list_media_asset_distribution_channel_attachments(ctx, from_json, all_pages, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') kwargs = {} @@ -3253,7 +3252,7 @@ def list_system_media_workflows(ctx, from_json, all_pages, page_size, compartmen @cli_util.wrap_exceptions def remove_media_asset_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, media_asset_id, related_resource_id, message, time_created, if_match): - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') kwargs = {} @@ -3324,7 +3323,7 @@ def remove_media_asset_lock(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def remove_media_workflow_configuration_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, media_workflow_configuration_id, related_resource_id, message, time_created, if_match): - if isinstance(media_workflow_configuration_id, six.string_types) and len(media_workflow_configuration_id.strip()) == 0: + if isinstance(media_workflow_configuration_id, str) and len(media_workflow_configuration_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -3395,7 +3394,7 @@ def remove_media_workflow_configuration_lock(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def remove_media_workflow_job_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, media_workflow_job_id, related_resource_id, message, time_created, if_match): - if isinstance(media_workflow_job_id, six.string_types) and len(media_workflow_job_id.strip()) == 0: + if isinstance(media_workflow_job_id, str) and len(media_workflow_job_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-job-id cannot be whitespace or empty string') kwargs = {} @@ -3466,7 +3465,7 @@ def remove_media_workflow_job_lock(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def remove_media_workflow_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, media_workflow_id, related_resource_id, message, time_created, if_match): - if isinstance(media_workflow_id, six.string_types) and len(media_workflow_id.strip()) == 0: + if isinstance(media_workflow_id, str) and len(media_workflow_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-id cannot be whitespace or empty string') kwargs = {} @@ -3537,7 +3536,7 @@ def remove_media_workflow_lock(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def remove_stream_cdn_config_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, stream_cdn_config_id, related_resource_id, message, time_created, if_match): - if isinstance(stream_cdn_config_id, six.string_types) and len(stream_cdn_config_id.strip()) == 0: + if isinstance(stream_cdn_config_id, str) and len(stream_cdn_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-cdn-config-id cannot be whitespace or empty string') kwargs = {} @@ -3608,7 +3607,7 @@ def remove_stream_cdn_config_lock(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def remove_stream_distribution_channel_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, stream_distribution_channel_id, related_resource_id, message, time_created, if_match): - if isinstance(stream_distribution_channel_id, six.string_types) and len(stream_distribution_channel_id.strip()) == 0: + if isinstance(stream_distribution_channel_id, str) and len(stream_distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --stream-distribution-channel-id cannot be whitespace or empty string') kwargs = {} @@ -3679,7 +3678,7 @@ def remove_stream_distribution_channel_lock(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def remove_stream_packaging_config_lock(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, type, compartment_id, stream_packaging_config_id, related_resource_id, message, time_created, if_match): - if isinstance(stream_packaging_config_id, six.string_types) and len(stream_packaging_config_id.strip()) == 0: + if isinstance(stream_packaging_config_id, str) and len(stream_packaging_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-packaging-config-id cannot be whitespace or empty string') kwargs = {} @@ -3759,7 +3758,7 @@ def remove_stream_packaging_config_lock(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def update_media_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, media_asset_id, display_name, type, parent_media_asset_id, master_media_asset_id, metadata, media_asset_tags, freeform_tags, defined_tags, is_lock_override, if_match): - if isinstance(media_asset_id, six.string_types) and len(media_asset_id.strip()) == 0: + if isinstance(media_asset_id, str) and len(media_asset_id.strip()) == 0: raise click.UsageError('Parameter --media-asset-id cannot be whitespace or empty string') if not force: if metadata or media_asset_tags or freeform_tags or defined_tags: @@ -3854,7 +3853,7 @@ def update_media_asset(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_media_workflow(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, media_workflow_id, display_name, tasks, media_workflow_configuration_ids, parameters, freeform_tags, defined_tags, is_lock_override, if_match): - if isinstance(media_workflow_id, six.string_types) and len(media_workflow_id.strip()) == 0: + if isinstance(media_workflow_id, str) and len(media_workflow_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-id cannot be whitespace or empty string') if not force: if tasks or media_workflow_configuration_ids or parameters or freeform_tags or defined_tags: @@ -3939,7 +3938,7 @@ def update_media_workflow(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_media_workflow_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, media_workflow_configuration_id, display_name, parameters, freeform_tags, defined_tags, is_lock_override, if_match): - if isinstance(media_workflow_configuration_id, six.string_types) and len(media_workflow_configuration_id.strip()) == 0: + if isinstance(media_workflow_configuration_id, str) and len(media_workflow_configuration_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-configuration-id cannot be whitespace or empty string') if not force: if parameters or freeform_tags or defined_tags: @@ -4017,7 +4016,7 @@ def update_media_workflow_configuration(ctx, from_json, force, wait_for_state, m @cli_util.wrap_exceptions def update_media_workflow_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, media_workflow_job_id, display_name, freeform_tags, defined_tags, is_lock_override, if_match): - if isinstance(media_workflow_job_id, six.string_types) and len(media_workflow_job_id.strip()) == 0: + if isinstance(media_workflow_job_id, str) and len(media_workflow_job_id.strip()) == 0: raise click.UsageError('Parameter --media-workflow-job-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4094,7 +4093,7 @@ def update_media_workflow_job(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_stream_cdn_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_cdn_config_id, display_name, is_enabled, config, freeform_tags, defined_tags, is_lock_override, if_match): - if isinstance(stream_cdn_config_id, six.string_types) and len(stream_cdn_config_id.strip()) == 0: + if isinstance(stream_cdn_config_id, str) and len(stream_cdn_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-cdn-config-id cannot be whitespace or empty string') if not force: if config or freeform_tags or defined_tags: @@ -4187,7 +4186,7 @@ def update_stream_cdn_config(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_stream_cdn_config_akamai_manual_stream_cdn_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_cdn_config_id, display_name, is_enabled, freeform_tags, defined_tags, is_lock_override, if_match, config_origin_auth_sign_type, config_origin_auth_sign_encryption, config_origin_auth_secret_key_a, config_origin_auth_secret_key_nonce_a, config_origin_auth_secret_key_b, config_origin_auth_secret_key_nonce_b, config_edge_hostname, config_edge_path_prefix, config_is_edge_token_auth, config_edge_token_key, config_edge_token_salt): - if isinstance(stream_cdn_config_id, six.string_types) and len(stream_cdn_config_id.strip()) == 0: + if isinstance(stream_cdn_config_id, str) and len(stream_cdn_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-cdn-config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4302,7 +4301,7 @@ def update_stream_cdn_config_akamai_manual_stream_cdn_config(ctx, from_json, for @cli_util.wrap_exceptions def update_stream_cdn_config_edge_stream_cdn_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_cdn_config_id, display_name, is_enabled, freeform_tags, defined_tags, is_lock_override, if_match): - if isinstance(stream_cdn_config_id, six.string_types) and len(stream_cdn_config_id.strip()) == 0: + if isinstance(stream_cdn_config_id, str) and len(stream_cdn_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-cdn-config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4383,7 +4382,7 @@ def update_stream_cdn_config_edge_stream_cdn_config(ctx, from_json, force, wait_ @cli_util.wrap_exceptions def update_stream_distribution_channel(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_distribution_channel_id, display_name, freeform_tags, defined_tags, is_lock_override, if_match): - if isinstance(stream_distribution_channel_id, six.string_types) and len(stream_distribution_channel_id.strip()) == 0: + if isinstance(stream_distribution_channel_id, str) and len(stream_distribution_channel_id.strip()) == 0: raise click.UsageError('Parameter --stream-distribution-channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4458,7 +4457,7 @@ def update_stream_distribution_channel(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_stream_packaging_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_packaging_config_id, display_name, freeform_tags, defined_tags, is_lock_override, if_match): - if isinstance(stream_packaging_config_id, six.string_types) and len(stream_packaging_config_id.strip()) == 0: + if isinstance(stream_packaging_config_id, str) and len(stream_packaging_config_id.strip()) == 0: raise click.UsageError('Parameter --stream-packaging-config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/media_services/src/oci_cli_media_stream/generated/mediastream_cli.py b/services/media_services/src/oci_cli_media_stream/generated/mediastream_cli.py index cb1bdcb61..e722f0c67 100644 --- a/services/media_services/src/oci_cli_media_stream/generated/mediastream_cli.py +++ b/services/media_services/src/oci_cli_media_stream/generated/mediastream_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/mngdmac/src/oci_cli_mac_device/generated/macdevice_cli.py b/services/mngdmac/src/oci_cli_mac_device/generated/macdevice_cli.py index 30df84faf..308a33afe 100644 --- a/services/mngdmac/src/oci_cli_mac_device/generated/macdevice_cli.py +++ b/services/mngdmac/src/oci_cli_mac_device/generated/macdevice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -49,10 +48,10 @@ def mac_device_collection_group(): @cli_util.wrap_exceptions def get_mac_device(ctx, from_json, mac_device_id, mac_order_id): - if isinstance(mac_device_id, six.string_types) and len(mac_device_id.strip()) == 0: + if isinstance(mac_device_id, str) and len(mac_device_id.strip()) == 0: raise click.UsageError('Parameter --mac-device-id cannot be whitespace or empty string') - if isinstance(mac_order_id, six.string_types) and len(mac_order_id.strip()) == 0: + if isinstance(mac_order_id, str) and len(mac_order_id.strip()) == 0: raise click.UsageError('Parameter --mac-order-id cannot be whitespace or empty string') kwargs = {} @@ -88,7 +87,7 @@ def list_mac_devices(ctx, from_json, all_pages, page_size, mac_order_id, compart if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(mac_order_id, six.string_types) and len(mac_order_id.strip()) == 0: + if isinstance(mac_order_id, str) and len(mac_order_id.strip()) == 0: raise click.UsageError('Parameter --mac-order-id cannot be whitespace or empty string') kwargs = {} @@ -149,10 +148,10 @@ def list_mac_devices(ctx, from_json, all_pages, page_size, mac_order_id, compart @cli_util.wrap_exceptions def terminate_mac_device(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mac_device_id, mac_order_id, if_match): - if isinstance(mac_device_id, six.string_types) and len(mac_device_id.strip()) == 0: + if isinstance(mac_device_id, str) and len(mac_device_id.strip()) == 0: raise click.UsageError('Parameter --mac-device-id cannot be whitespace or empty string') - if isinstance(mac_order_id, six.string_types) and len(mac_order_id.strip()) == 0: + if isinstance(mac_order_id, str) and len(mac_order_id.strip()) == 0: raise click.UsageError('Parameter --mac-order-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/mngdmac/src/oci_cli_mac_order/generated/macorder_cli.py b/services/mngdmac/src/oci_cli_mac_order/generated/macorder_cli.py index 9f3614e4f..d3cb1baa2 100644 --- a/services/mngdmac/src/oci_cli_mac_order/generated/macorder_cli.py +++ b/services/mngdmac/src/oci_cli_mac_order/generated/macorder_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -74,7 +73,7 @@ def mac_order_collection_group(): @cli_util.wrap_exceptions def cancel_mac_order(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mac_order_id, cancel_reason, if_match): - if isinstance(mac_order_id, six.string_types) and len(mac_order_id.strip()) == 0: + if isinstance(mac_order_id, str) and len(mac_order_id.strip()) == 0: raise click.UsageError('Parameter --mac-order-id cannot be whitespace or empty string') kwargs = {} @@ -134,7 +133,7 @@ def cancel_mac_order(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -163,7 +162,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_mac_order_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mac_order_id, compartment_id, if_match): - if isinstance(mac_order_id, six.string_types) and len(mac_order_id.strip()) == 0: + if isinstance(mac_order_id, str) and len(mac_order_id.strip()) == 0: raise click.UsageError('Parameter --mac-order-id cannot be whitespace or empty string') kwargs = {} @@ -290,7 +289,7 @@ def create_mac_order(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def get_mac_order(ctx, from_json, mac_order_id): - if isinstance(mac_order_id, six.string_types) and len(mac_order_id.strip()) == 0: + if isinstance(mac_order_id, str) and len(mac_order_id.strip()) == 0: raise click.UsageError('Parameter --mac-order-id cannot be whitespace or empty string') kwargs = {} @@ -312,7 +311,7 @@ def get_mac_order(ctx, from_json, mac_order_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -405,7 +404,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -462,7 +461,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -583,7 +582,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_mac_order(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, mac_order_id, display_name, order_description, order_size, shape, ip_range, if_match): - if isinstance(mac_order_id, six.string_types) and len(mac_order_id.strip()) == 0: + if isinstance(mac_order_id, str) and len(mac_order_id.strip()) == 0: raise click.UsageError('Parameter --mac-order-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/model_deployment/src/oci_cli_model_deployment/generated/modeldeployment_cli.py b/services/model_deployment/src/oci_cli_model_deployment/generated/modeldeployment_cli.py index c0405b8f2..77b06c2a8 100644 --- a/services/model_deployment/src/oci_cli_model_deployment/generated/modeldeployment_cli.py +++ b/services/model_deployment/src/oci_cli_model_deployment/generated/modeldeployment_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -43,7 +42,7 @@ def inference_result_group(): @cli_util.wrap_exceptions def predict(ctx, from_json, model_deployment_id, request_body): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') kwargs = {} @@ -68,7 +67,7 @@ def predict(ctx, from_json, model_deployment_id, request_body): @cli_util.wrap_exceptions def predict_with_response_stream(ctx, from_json, file, model_deployment_id, request_body): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/model_deployment/src/oci_cli_model_deployment/modeldeployment_cli_extended.py b/services/model_deployment/src/oci_cli_model_deployment/modeldeployment_cli_extended.py index 87832b841..5b28fa544 100644 --- a/services/model_deployment/src/oci_cli_model_deployment/modeldeployment_cli_extended.py +++ b/services/model_deployment/src/oci_cli_model_deployment/modeldeployment_cli_extended.py @@ -2,7 +2,6 @@ # Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. import click -import six from oci_cli import cli_util, json_skeleton_utils, cli_constants from services.model_deployment.src.oci_cli_model_deployment.generated import modeldeployment_cli @@ -19,7 +18,7 @@ @cli_util.wrap_exceptions def predict_extended(ctx, from_json, model_deployment_id, request_body): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') parsed_request_body = '' @@ -49,7 +48,7 @@ def predict_extended(ctx, from_json, model_deployment_id, request_body): @cli_util.wrap_exceptions def predict_with_response_stream_extended(ctx, from_json, file, model_deployment_id, request_body): - if isinstance(model_deployment_id, six.string_types) and len(model_deployment_id.strip()) == 0: + if isinstance(model_deployment_id, str) and len(model_deployment_id.strip()) == 0: raise click.UsageError('Parameter --model-deployment-id cannot be whitespace or empty string') parsed_request_body = '' diff --git a/services/monitoring/src/oci_cli_monitoring/generated/monitoring_cli.py b/services/monitoring/src/oci_cli_monitoring/generated/monitoring_cli.py index 63e8eef41..f922b37f3 100644 --- a/services/monitoring/src/oci_cli_monitoring/generated/monitoring_cli.py +++ b/services/monitoring/src/oci_cli_monitoring/generated/monitoring_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -117,7 +116,7 @@ def alarm_suppression_group(): @cli_util.wrap_exceptions def change_alarm_compartment(ctx, from_json, alarm_id, compartment_id, if_match): - if isinstance(alarm_id, six.string_types) and len(alarm_id.strip()) == 0: + if isinstance(alarm_id, str) and len(alarm_id.strip()) == 0: raise click.UsageError('Parameter --alarm-id cannot be whitespace or empty string') kwargs = {} @@ -641,7 +640,7 @@ def create_alarm_suppression_alarm_suppression_compartment_target(ctx, from_json @cli_util.wrap_exceptions def delete_alarm(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, alarm_id, if_match): - if isinstance(alarm_id, six.string_types) and len(alarm_id.strip()) == 0: + if isinstance(alarm_id, str) and len(alarm_id.strip()) == 0: raise click.UsageError('Parameter --alarm-id cannot be whitespace or empty string') kwargs = {} @@ -709,7 +708,7 @@ def delete_alarm(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_alarm_suppression(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, alarm_suppression_id, if_match): - if isinstance(alarm_suppression_id, six.string_types) and len(alarm_suppression_id.strip()) == 0: + if isinstance(alarm_suppression_id, str) and len(alarm_suppression_id.strip()) == 0: raise click.UsageError('Parameter --alarm-suppression-id cannot be whitespace or empty string') kwargs = {} @@ -770,7 +769,7 @@ def delete_alarm_suppression(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def get_alarm(ctx, from_json, alarm_id): - if isinstance(alarm_id, six.string_types) and len(alarm_id.strip()) == 0: + if isinstance(alarm_id, str) and len(alarm_id.strip()) == 0: raise click.UsageError('Parameter --alarm-id cannot be whitespace or empty string') kwargs = {} @@ -809,7 +808,7 @@ def get_alarm(ctx, from_json, alarm_id): @cli_util.wrap_exceptions def get_alarm_history(ctx, from_json, alarm_id, alarm_historytype, page, limit, timestamp_greater_than_or_equal_to, timestamp_less_than): - if isinstance(alarm_id, six.string_types) and len(alarm_id.strip()) == 0: + if isinstance(alarm_id, str) and len(alarm_id.strip()) == 0: raise click.UsageError('Parameter --alarm-id cannot be whitespace or empty string') kwargs = {} @@ -845,7 +844,7 @@ def get_alarm_history(ctx, from_json, alarm_id, alarm_historytype, page, limit, @cli_util.wrap_exceptions def get_alarm_suppression(ctx, from_json, alarm_suppression_id): - if isinstance(alarm_suppression_id, six.string_types) and len(alarm_suppression_id.strip()) == 0: + if isinstance(alarm_suppression_id, str) and len(alarm_suppression_id.strip()) == 0: raise click.UsageError('Parameter --alarm-suppression-id cannot be whitespace or empty string') kwargs = {} @@ -1284,7 +1283,7 @@ def post_metric_data(ctx, from_json, metric_data, batch_atomicity, content_encod @cli_util.wrap_exceptions def remove_alarm_suppression(ctx, from_json, alarm_id, if_match): - if isinstance(alarm_id, six.string_types) and len(alarm_id.strip()) == 0: + if isinstance(alarm_id, str) and len(alarm_id.strip()) == 0: raise click.UsageError('Parameter --alarm-id cannot be whitespace or empty string') kwargs = {} @@ -1322,7 +1321,7 @@ def remove_alarm_suppression(ctx, from_json, alarm_id, if_match): @cli_util.wrap_exceptions def retrieve_dimension_states(ctx, from_json, alarm_id, page, limit, dimension_filters, status): - if isinstance(alarm_id, six.string_types) and len(alarm_id.strip()) == 0: + if isinstance(alarm_id, str) and len(alarm_id.strip()) == 0: raise click.UsageError('Parameter --alarm-id cannot be whitespace or empty string') kwargs = {} @@ -1381,7 +1380,7 @@ def retrieve_dimension_states(ctx, from_json, alarm_id, page, limit, dimension_f @cli_util.wrap_exceptions def summarize_alarm_suppression_history(ctx, from_json, alarm_id, page, limit, dimensions, time_suppress_from_greater_than_or_equal_to, time_suppress_from_less_than): - if isinstance(alarm_id, six.string_types) and len(alarm_id.strip()) == 0: + if isinstance(alarm_id, str) and len(alarm_id.strip()) == 0: raise click.UsageError('Parameter --alarm-id cannot be whitespace or empty string') kwargs = {} @@ -1574,7 +1573,7 @@ def summarize_metrics_data(ctx, from_json, compartment_id, namespace, query_para @cli_util.wrap_exceptions def update_alarm(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, alarm_id, display_name, compartment_id, metric_compartment_id, metric_compartment_id_in_subtree, namespace, resource_group, query_parameterconflict, resolution, pending_duration, severity, body, is_notifications_per_metric_dimension_enabled, message_format, destinations, repeat_notification_duration, suppression, is_enabled, freeform_tags, defined_tags, overrides, rule_name, notification_version, notification_title, evaluation_slack_duration, alarm_summary, if_match): - if isinstance(alarm_id, six.string_types) and len(alarm_id.strip()) == 0: + if isinstance(alarm_id, str) and len(alarm_id.strip()) == 0: raise click.UsageError('Parameter --alarm-id cannot be whitespace or empty string') if not force: if destinations or suppression or freeform_tags or defined_tags or overrides: diff --git a/services/multicloud/src/oci_cli_metadata/generated/metadata_cli.py b/services/multicloud/src/oci_cli_metadata/generated/metadata_cli.py index 680727ab7..89ec8cea9 100644 --- a/services/multicloud/src/oci_cli_metadata/generated/metadata_cli.py +++ b/services/multicloud/src/oci_cli_metadata/generated/metadata_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/multicloud/src/oci_cli_multi_clouds_metadata/generated/multicloudsmetadata_cli.py b/services/multicloud/src/oci_cli_multi_clouds_metadata/generated/multicloudsmetadata_cli.py index 97c74ae2c..4d1473bc0 100644 --- a/services/multicloud/src/oci_cli_multi_clouds_metadata/generated/multicloudsmetadata_cli.py +++ b/services/multicloud/src/oci_cli_multi_clouds_metadata/generated/multicloudsmetadata_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -49,7 +48,7 @@ def multi_cloud_metadata_group(): @cli_util.wrap_exceptions def get_multi_cloud_metadata(ctx, from_json, compartment_id, subscription_id): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/multicloud/src/oci_cli_omhub_network_anchor/generated/omhubnetworkanchor_cli.py b/services/multicloud/src/oci_cli_omhub_network_anchor/generated/omhubnetworkanchor_cli.py index a71e63183..e732f3447 100644 --- a/services/multicloud/src/oci_cli_omhub_network_anchor/generated/omhubnetworkanchor_cli.py +++ b/services/multicloud/src/oci_cli_omhub_network_anchor/generated/omhubnetworkanchor_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -53,7 +52,7 @@ def network_anchor_collection_group(): @cli_util.wrap_exceptions def get_network_anchor(ctx, from_json, network_anchor_id, subscription_service_name, subscription_id, external_location): - if isinstance(network_anchor_id, six.string_types) and len(network_anchor_id.strip()) == 0: + if isinstance(network_anchor_id, str) and len(network_anchor_id.strip()) == 0: raise click.UsageError('Parameter --network-anchor-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/multicloud/src/oci_cli_omhub_resource_anchor/generated/omhubresourceanchor_cli.py b/services/multicloud/src/oci_cli_omhub_resource_anchor/generated/omhubresourceanchor_cli.py index ac8d547d1..498519c3c 100644 --- a/services/multicloud/src/oci_cli_omhub_resource_anchor/generated/omhubresourceanchor_cli.py +++ b/services/multicloud/src/oci_cli_omhub_resource_anchor/generated/omhubresourceanchor_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -52,7 +51,7 @@ def resource_anchor_group(): @cli_util.wrap_exceptions def get_resource_anchor(ctx, from_json, resource_anchor_id, subscription_service_name, subscription_id): - if isinstance(resource_anchor_id, six.string_types) and len(resource_anchor_id.strip()) == 0: + if isinstance(resource_anchor_id, str) and len(resource_anchor_id.strip()) == 0: raise click.UsageError('Parameter --resource-anchor-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/mysql/src/oci_cli_channels/generated/channels_cli.py b/services/mysql/src/oci_cli_channels/generated/channels_cli.py index 9cc9736f2..63522a700 100644 --- a/services/mysql/src/oci_cli_channels/generated/channels_cli.py +++ b/services/mysql/src/oci_cli_channels/generated/channels_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -335,7 +334,7 @@ def create_channel_create_channel_target_from_db_system_details(ctx, from_json, @cli_util.wrap_exceptions def delete_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, channel_id, if_match): - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -389,7 +388,7 @@ def delete_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_channel(ctx, from_json, channel_id, if_none_match): - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -486,7 +485,7 @@ def list_channels(ctx, from_json, all_pages, page_size, compartment_id, db_syste @cli_util.wrap_exceptions def reset_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, channel_id, if_match): - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -543,7 +542,7 @@ def reset_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def resume_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, channel_id, if_match): - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -608,7 +607,7 @@ def resume_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def update_channel(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, channel_id, source, target, display_name, is_enabled, description, freeform_tags, defined_tags, if_match): - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if source or target or freeform_tags or defined_tags: @@ -708,7 +707,7 @@ def update_channel(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_channel_update_channel_source_from_mysql_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, channel_id, target, display_name, is_enabled, description, freeform_tags, defined_tags, if_match, source_hostname, source_port, source_username, source_password, source_ssl_mode, source_ssl_ca_certificate, source_anonymous_transactions_handling): - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if target or freeform_tags or defined_tags: @@ -829,7 +828,7 @@ def update_channel_update_channel_source_from_mysql_details(ctx, from_json, forc @cli_util.wrap_exceptions def update_channel_update_channel_target_from_db_system_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, channel_id, source, display_name, is_enabled, description, freeform_tags, defined_tags, if_match, target_channel_name, target_applier_username, target_filters, target_tables_without_primary_key_handling, target_delay_in_seconds): - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if source or freeform_tags or defined_tags: diff --git a/services/mysql/src/oci_cli_db_backups/generated/dbbackups_cli.py b/services/mysql/src/oci_cli_db_backups/generated/dbbackups_cli.py index 2e1832853..9a03e4113 100644 --- a/services/mysql/src/oci_cli_db_backups/generated/dbbackups_cli.py +++ b/services/mysql/src/oci_cli_db_backups/generated/dbbackups_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -47,7 +46,7 @@ def backup_group(): @cli_util.wrap_exceptions def cancel_backup_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -105,7 +104,7 @@ def cancel_backup_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def change_backup_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, compartment_id, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -333,7 +332,7 @@ def create_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -387,7 +386,7 @@ def delete_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def get_backup(ctx, from_json, backup_id, if_none_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -500,7 +499,7 @@ def list_backups(ctx, from_json, all_pages, page_size, compartment_id, backup_id @cli_util.wrap_exceptions def update_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, display_name, description, soft_delete, retention_in_days, freeform_tags, defined_tags, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -578,7 +577,7 @@ def update_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def validate_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, is_prepared_backup_required, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/mysql/src/oci_cli_db_system/db_system_cli_extended.py b/services/mysql/src/oci_cli_db_system/db_system_cli_extended.py index c78037acb..cf9632263 100755 --- a/services/mysql/src/oci_cli_db_system/db_system_cli_extended.py +++ b/services/mysql/src/oci_cli_db_system/db_system_cli_extended.py @@ -10,7 +10,6 @@ from oci_cli import json_skeleton_utils from oci_cli import custom_types import click -import six import oci.waiter import sys import json @@ -63,7 +62,7 @@ def list_db_systems_extended(ctx, **kwargs): @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}) @cli_util.wrap_exceptions def start_db_system_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match, **kwargs): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -115,7 +114,7 @@ def start_db_system_extended(ctx, from_json, wait_for_state, max_wait_seconds, w @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}) @cli_util.wrap_exceptions def stop_db_system_extended(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, shutdown_type, if_match, **kwargs): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/mysql/src/oci_cli_db_system/generated/dbsystem_cli.py b/services/mysql/src/oci_cli_db_system/generated/dbsystem_cli.py index 8840e97fc..46d9b73bb 100644 --- a/services/mysql/src/oci_cli_db_system/generated/dbsystem_cli.py +++ b/services/mysql/src/oci_cli_db_system/generated/dbsystem_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -62,7 +61,7 @@ def db_system_group(): @cli_util.wrap_exceptions def add_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, shape_name, cluster_size, is_lakehouse_enabled, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1130,7 +1129,7 @@ def create_db_system_create_db_system_source_from_pitr_details(ctx, from_json, w @cli_util.wrap_exceptions def delete_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1188,7 +1187,7 @@ def delete_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1244,7 +1243,7 @@ def delete_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def generate_heat_wave_cluster_memory_estimate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1296,7 +1295,7 @@ def generate_heat_wave_cluster_memory_estimate(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def get_db_system(ctx, from_json, db_system_id, if_none_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1321,7 +1320,7 @@ def get_db_system(ctx, from_json, db_system_id, if_none_match): @cli_util.wrap_exceptions def get_heat_wave_cluster(ctx, from_json, db_system_id, if_none_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1345,7 +1344,7 @@ def get_heat_wave_cluster(ctx, from_json, db_system_id, if_none_match): @cli_util.wrap_exceptions def get_heat_wave_cluster_memory_estimate(ctx, from_json, db_system_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1447,7 +1446,7 @@ def list_db_systems(ctx, from_json, all_pages, page_size, compartment_id, is_hea @cli_util.wrap_exceptions def restart_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, shutdown_type, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1509,7 +1508,7 @@ def restart_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def restart_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1566,7 +1565,7 @@ def restart_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def start_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1623,7 +1622,7 @@ def start_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def start_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1683,7 +1682,7 @@ def start_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def stop_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, shutdown_type, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1745,7 +1744,7 @@ def stop_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def stop_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1855,7 +1854,7 @@ def stop_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_db_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, display_name, description, subnet_id, nsg_ids, database_mode, access_mode, rest, is_highly_available, availability_domain, fault_domain, shape_name, mysql_version, configuration_id, admin_username, admin_password, data_storage_size_in_gbs, data_storage, hostname_label, ip_address, port, port_x, backup_policy, maintenance, freeform_tags, defined_tags, deletion_policy, crash_recovery, database_management, secure_connections, encrypt_data, customer_contacts, read_endpoint, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') if not force: if nsg_ids or rest or data_storage or backup_policy or maintenance or freeform_tags or defined_tags or deletion_policy or secure_connections or encrypt_data or customer_contacts or read_endpoint: @@ -2019,7 +2018,7 @@ def update_db_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_heat_wave_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, shape_name, cluster_size, is_lakehouse_enabled, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/mysql/src/oci_cli_mysqlaas/generated/mysqlaas_cli.py b/services/mysql/src/oci_cli_mysqlaas/generated/mysqlaas_cli.py index 81e8444b8..790a55373 100644 --- a/services/mysql/src/oci_cli_mysqlaas/generated/mysqlaas_cli.py +++ b/services/mysql/src/oci_cli_mysqlaas/generated/mysqlaas_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -145,7 +144,7 @@ def create_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_id, if_match): - if isinstance(configuration_id, six.string_types) and len(configuration_id.strip()) == 0: + if isinstance(configuration_id, str) and len(configuration_id.strip()) == 0: raise click.UsageError('Parameter --configuration-id cannot be whitespace or empty string') kwargs = {} @@ -205,7 +204,7 @@ def delete_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def get_configuration(ctx, from_json, configuration_id, if_none_match): - if isinstance(configuration_id, six.string_types) and len(configuration_id.strip()) == 0: + if isinstance(configuration_id, str) and len(configuration_id.strip()) == 0: raise click.UsageError('Parameter --configuration-id cannot be whitespace or empty string') kwargs = {} @@ -362,7 +361,7 @@ def list_versions(ctx, from_json, all_pages, compartment_id): @cli_util.wrap_exceptions def update_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_id, description, display_name, freeform_tags, defined_tags, if_match): - if isinstance(configuration_id, six.string_types) and len(configuration_id.strip()) == 0: + if isinstance(configuration_id, str) and len(configuration_id.strip()) == 0: raise click.UsageError('Parameter --configuration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/mysql/src/oci_cli_replicas/generated/replicas_cli.py b/services/mysql/src/oci_cli_replicas/generated/replicas_cli.py index 47b13a175..81f1960fb 100644 --- a/services/mysql/src/oci_cli_replicas/generated/replicas_cli.py +++ b/services/mysql/src/oci_cli_replicas/generated/replicas_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -125,7 +124,7 @@ def create_replica(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_replica(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, replica_id, if_match): - if isinstance(replica_id, six.string_types) and len(replica_id.strip()) == 0: + if isinstance(replica_id, str) and len(replica_id.strip()) == 0: raise click.UsageError('Parameter --replica-id cannot be whitespace or empty string') kwargs = {} @@ -179,7 +178,7 @@ def delete_replica(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_replica(ctx, from_json, replica_id, if_none_match): - if isinstance(replica_id, six.string_types) and len(replica_id.strip()) == 0: + if isinstance(replica_id, str) and len(replica_id.strip()) == 0: raise click.UsageError('Parameter --replica-id cannot be whitespace or empty string') kwargs = {} @@ -286,7 +285,7 @@ def list_replicas(ctx, from_json, all_pages, page_size, compartment_id, limit, p @cli_util.wrap_exceptions def update_replica(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, replica_id, display_name, description, freeform_tags, defined_tags, is_delete_protected, replica_overrides, if_match): - if isinstance(replica_id, six.string_types) and len(replica_id.strip()) == 0: + if isinstance(replica_id, str) and len(replica_id.strip()) == 0: raise click.UsageError('Parameter --replica-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or replica_overrides: diff --git a/services/mysql/src/oci_cli_work_requests/generated/workrequests_cli.py b/services/mysql/src/oci_cli_work_requests/generated/workrequests_cli.py index 8fdb505cc..25c7fe345 100644 --- a/services/mysql/src/oci_cli_work_requests/generated/workrequests_cli.py +++ b/services/mysql/src/oci_cli_work_requests/generated/workrequests_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -56,7 +55,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id, if_none_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -87,7 +86,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -138,7 +137,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/network_firewall/src/oci_cli_network_firewall/generated/networkfirewall_cli.py b/services/network_firewall/src/oci_cli_network_firewall/generated/networkfirewall_cli.py index c755cdce8..f8b973840 100644 --- a/services/network_firewall/src/oci_cli_network_firewall/generated/networkfirewall_cli.py +++ b/services/network_firewall/src/oci_cli_network_firewall/generated/networkfirewall_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -157,7 +156,7 @@ def security_rule_group(): @cli_util.wrap_exceptions def apply_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, firewalls, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -220,7 +219,7 @@ def apply_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def bulk_upload_address_lists(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_address_lists_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -281,7 +280,7 @@ def bulk_upload_address_lists(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def bulk_upload_application_groups(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_application_groups_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -342,7 +341,7 @@ def bulk_upload_application_groups(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def bulk_upload_applications(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_applications_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -403,7 +402,7 @@ def bulk_upload_applications(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def bulk_upload_decryption_profiles(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_decryption_profiles_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -464,7 +463,7 @@ def bulk_upload_decryption_profiles(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def bulk_upload_decryption_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_decryption_rules_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -525,7 +524,7 @@ def bulk_upload_decryption_rules(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def bulk_upload_mapped_secrets(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_mapped_secrets_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -586,7 +585,7 @@ def bulk_upload_mapped_secrets(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def bulk_upload_nat_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_nat_rules_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -647,7 +646,7 @@ def bulk_upload_nat_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def bulk_upload_security_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_security_rules_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -708,7 +707,7 @@ def bulk_upload_security_rules(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def bulk_upload_service_lists(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_service_lists_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -769,7 +768,7 @@ def bulk_upload_service_lists(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def bulk_upload_services(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_services_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -830,7 +829,7 @@ def bulk_upload_services(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def bulk_upload_tunnel_inspection_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_tunnel_inspection_rules_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -891,7 +890,7 @@ def bulk_upload_tunnel_inspection_rules(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def bulk_upload_url_lists(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, bulk_upload_url_lists_details, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -949,7 +948,7 @@ def bulk_upload_url_lists(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -978,7 +977,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_network_firewall_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_id, compartment_id, if_match): - if isinstance(network_firewall_id, six.string_types) and len(network_firewall_id.strip()) == 0: + if isinstance(network_firewall_id, str) and len(network_firewall_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-id cannot be whitespace or empty string') kwargs = {} @@ -1036,7 +1035,7 @@ def change_network_firewall_compartment(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def change_network_firewall_policy_compartment(ctx, from_json, network_firewall_policy_id, compartment_id, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1073,7 +1072,7 @@ def change_network_firewall_policy_compartment(ctx, from_json, network_firewall_ @cli_util.wrap_exceptions def clone_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, display_name, compartment_id, freeform_tags, defined_tags, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1143,7 +1142,7 @@ def clone_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def create_address_list(ctx, from_json, network_firewall_policy_id, name, type, addresses): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1174,7 +1173,7 @@ def create_address_list(ctx, from_json, network_firewall_policy_id, name, type, @cli_util.wrap_exceptions def create_application(ctx, from_json, network_firewall_policy_id, name, type): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1207,7 +1206,7 @@ def create_application(ctx, from_json, network_firewall_policy_id, name, type): @cli_util.wrap_exceptions def create_application_create_icmp_application_details(ctx, from_json, network_firewall_policy_id, name, icmp_type, icmp_code): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1243,7 +1242,7 @@ def create_application_create_icmp_application_details(ctx, from_json, network_f @cli_util.wrap_exceptions def create_application_create_icmp6_application_details(ctx, from_json, network_firewall_policy_id, name, icmp_type, icmp_code): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1278,7 +1277,7 @@ def create_application_create_icmp6_application_details(ctx, from_json, network_ @cli_util.wrap_exceptions def create_application_group(ctx, from_json, network_firewall_policy_id, name, apps): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1308,7 +1307,7 @@ def create_application_group(ctx, from_json, network_firewall_policy_id, name, a @cli_util.wrap_exceptions def create_decryption_profile(ctx, from_json, network_firewall_policy_id, type, name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1340,7 +1339,7 @@ def create_decryption_profile(ctx, from_json, network_firewall_policy_id, type, @cli_util.wrap_exceptions def create_decryption_profile_create_ssl_inbound_inspection_profile_details(ctx, from_json, network_firewall_policy_id, name, is_unsupported_version_blocked, is_unsupported_cipher_blocked, is_out_of_capacity_blocked): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1388,7 +1387,7 @@ def create_decryption_profile_create_ssl_inbound_inspection_profile_details(ctx, @cli_util.wrap_exceptions def create_decryption_profile_create_ssl_forward_proxy_profile_details(ctx, from_json, network_firewall_policy_id, name, is_expired_certificate_blocked, is_untrusted_issuer_blocked, is_revocation_status_timeout_blocked, is_unsupported_version_blocked, is_unsupported_cipher_blocked, is_unknown_revocation_status_blocked, are_certificate_extensions_restricted, is_auto_include_alt_name, is_out_of_capacity_blocked): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1452,7 +1451,7 @@ def create_decryption_profile_create_ssl_forward_proxy_profile_details(ctx, from @cli_util.wrap_exceptions def create_decryption_rule(ctx, from_json, network_firewall_policy_id, name, condition, action, decryption_profile, secret, position): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1495,7 +1494,7 @@ def create_decryption_rule(ctx, from_json, network_firewall_policy_id, name, con @cli_util.wrap_exceptions def create_mapped_secret(ctx, from_json, network_firewall_policy_id, name, source, type): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1530,7 +1529,7 @@ def create_mapped_secret(ctx, from_json, network_firewall_policy_id, name, sourc @cli_util.wrap_exceptions def create_mapped_secret_create_vault_mapped_secret_details(ctx, from_json, network_firewall_policy_id, name, type, vault_secret_id, version_number): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1568,7 +1567,7 @@ def create_mapped_secret_create_vault_mapped_secret_details(ctx, from_json, netw @cli_util.wrap_exceptions def create_nat_rule(ctx, from_json, network_firewall_policy_id, name, type, description, position): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1609,7 +1608,7 @@ def create_nat_rule(ctx, from_json, network_firewall_policy_id, name, type, desc @cli_util.wrap_exceptions def create_nat_rule_create_nat_v4_rule_details(ctx, from_json, network_firewall_policy_id, name, condition, action, description, position): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1809,7 +1808,7 @@ def create_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def create_security_rule(ctx, from_json, network_firewall_policy_id, name, condition, action, inspection, position): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1846,7 +1845,7 @@ def create_security_rule(ctx, from_json, network_firewall_policy_id, name, condi @cli_util.wrap_exceptions def create_service(ctx, from_json, network_firewall_policy_id, name, type): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1878,7 +1877,7 @@ def create_service(ctx, from_json, network_firewall_policy_id, name, type): @cli_util.wrap_exceptions def create_service_create_udp_service_details(ctx, from_json, network_firewall_policy_id, name, port_ranges): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1910,7 +1909,7 @@ def create_service_create_udp_service_details(ctx, from_json, network_firewall_p @cli_util.wrap_exceptions def create_service_create_tcp_service_details(ctx, from_json, network_firewall_policy_id, name, port_ranges): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1942,7 +1941,7 @@ def create_service_create_tcp_service_details(ctx, from_json, network_firewall_p @cli_util.wrap_exceptions def create_service_list(ctx, from_json, network_firewall_policy_id, name, services): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1978,7 +1977,7 @@ def create_service_list(ctx, from_json, network_firewall_policy_id, name, servic @cli_util.wrap_exceptions def create_tunnel_inspection_rule(ctx, from_json, network_firewall_policy_id, name, protocol, action, position): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2019,7 +2018,7 @@ def create_tunnel_inspection_rule(ctx, from_json, network_firewall_policy_id, na @cli_util.wrap_exceptions def create_tunnel_inspection_rule_create_vxlan_inspection_rule_details(ctx, from_json, network_firewall_policy_id, name, condition, action, position, profile_parameterconflict): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2060,7 +2059,7 @@ def create_tunnel_inspection_rule_create_vxlan_inspection_rule_details(ctx, from @cli_util.wrap_exceptions def create_url_list(ctx, from_json, network_firewall_policy_id, name, urls): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2091,10 +2090,10 @@ def create_url_list(ctx, from_json, network_firewall_policy_id, name, urls): @cli_util.wrap_exceptions def delete_address_list(ctx, from_json, network_firewall_policy_id, address_list_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(address_list_name, six.string_types) and len(address_list_name.strip()) == 0: + if isinstance(address_list_name, str) and len(address_list_name.strip()) == 0: raise click.UsageError('Parameter --address-list-name cannot be whitespace or empty string') kwargs = {} @@ -2122,10 +2121,10 @@ def delete_address_list(ctx, from_json, network_firewall_policy_id, address_list @cli_util.wrap_exceptions def delete_application(ctx, from_json, network_firewall_policy_id, application_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(application_name, six.string_types) and len(application_name.strip()) == 0: + if isinstance(application_name, str) and len(application_name.strip()) == 0: raise click.UsageError('Parameter --application-name cannot be whitespace or empty string') kwargs = {} @@ -2153,10 +2152,10 @@ def delete_application(ctx, from_json, network_firewall_policy_id, application_n @cli_util.wrap_exceptions def delete_application_group(ctx, from_json, network_firewall_policy_id, application_group_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(application_group_name, six.string_types) and len(application_group_name.strip()) == 0: + if isinstance(application_group_name, str) and len(application_group_name.strip()) == 0: raise click.UsageError('Parameter --application-group-name cannot be whitespace or empty string') kwargs = {} @@ -2184,10 +2183,10 @@ def delete_application_group(ctx, from_json, network_firewall_policy_id, applica @cli_util.wrap_exceptions def delete_decryption_profile(ctx, from_json, network_firewall_policy_id, decryption_profile_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(decryption_profile_name, six.string_types) and len(decryption_profile_name.strip()) == 0: + if isinstance(decryption_profile_name, str) and len(decryption_profile_name.strip()) == 0: raise click.UsageError('Parameter --decryption-profile-name cannot be whitespace or empty string') kwargs = {} @@ -2215,10 +2214,10 @@ def delete_decryption_profile(ctx, from_json, network_firewall_policy_id, decryp @cli_util.wrap_exceptions def delete_decryption_rule(ctx, from_json, network_firewall_policy_id, decryption_rule_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(decryption_rule_name, six.string_types) and len(decryption_rule_name.strip()) == 0: + if isinstance(decryption_rule_name, str) and len(decryption_rule_name.strip()) == 0: raise click.UsageError('Parameter --decryption-rule-name cannot be whitespace or empty string') kwargs = {} @@ -2246,10 +2245,10 @@ def delete_decryption_rule(ctx, from_json, network_firewall_policy_id, decryptio @cli_util.wrap_exceptions def delete_mapped_secret(ctx, from_json, network_firewall_policy_id, mapped_secret_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(mapped_secret_name, six.string_types) and len(mapped_secret_name.strip()) == 0: + if isinstance(mapped_secret_name, str) and len(mapped_secret_name.strip()) == 0: raise click.UsageError('Parameter --mapped-secret-name cannot be whitespace or empty string') kwargs = {} @@ -2277,10 +2276,10 @@ def delete_mapped_secret(ctx, from_json, network_firewall_policy_id, mapped_secr @cli_util.wrap_exceptions def delete_nat_rule(ctx, from_json, network_firewall_policy_id, nat_rule_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(nat_rule_name, six.string_types) and len(nat_rule_name.strip()) == 0: + if isinstance(nat_rule_name, str) and len(nat_rule_name.strip()) == 0: raise click.UsageError('Parameter --nat-rule-name cannot be whitespace or empty string') kwargs = {} @@ -2310,7 +2309,7 @@ def delete_nat_rule(ctx, from_json, network_firewall_policy_id, nat_rule_name, i @cli_util.wrap_exceptions def delete_network_firewall(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_id, if_match): - if isinstance(network_firewall_id, six.string_types) and len(network_firewall_id.strip()) == 0: + if isinstance(network_firewall_id, str) and len(network_firewall_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-id cannot be whitespace or empty string') kwargs = {} @@ -2366,7 +2365,7 @@ def delete_network_firewall(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2420,10 +2419,10 @@ def delete_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_security_rule(ctx, from_json, network_firewall_policy_id, security_rule_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(security_rule_name, six.string_types) and len(security_rule_name.strip()) == 0: + if isinstance(security_rule_name, str) and len(security_rule_name.strip()) == 0: raise click.UsageError('Parameter --security-rule-name cannot be whitespace or empty string') kwargs = {} @@ -2451,10 +2450,10 @@ def delete_security_rule(ctx, from_json, network_firewall_policy_id, security_ru @cli_util.wrap_exceptions def delete_service(ctx, from_json, network_firewall_policy_id, service_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(service_name, six.string_types) and len(service_name.strip()) == 0: + if isinstance(service_name, str) and len(service_name.strip()) == 0: raise click.UsageError('Parameter --service-name cannot be whitespace or empty string') kwargs = {} @@ -2482,10 +2481,10 @@ def delete_service(ctx, from_json, network_firewall_policy_id, service_name, if_ @cli_util.wrap_exceptions def delete_service_list(ctx, from_json, network_firewall_policy_id, service_list_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(service_list_name, six.string_types) and len(service_list_name.strip()) == 0: + if isinstance(service_list_name, str) and len(service_list_name.strip()) == 0: raise click.UsageError('Parameter --service-list-name cannot be whitespace or empty string') kwargs = {} @@ -2513,10 +2512,10 @@ def delete_service_list(ctx, from_json, network_firewall_policy_id, service_list @cli_util.wrap_exceptions def delete_tunnel_inspection_rule(ctx, from_json, network_firewall_policy_id, tunnel_inspection_rule_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(tunnel_inspection_rule_name, six.string_types) and len(tunnel_inspection_rule_name.strip()) == 0: + if isinstance(tunnel_inspection_rule_name, str) and len(tunnel_inspection_rule_name.strip()) == 0: raise click.UsageError('Parameter --tunnel-inspection-rule-name cannot be whitespace or empty string') kwargs = {} @@ -2544,10 +2543,10 @@ def delete_tunnel_inspection_rule(ctx, from_json, network_firewall_policy_id, tu @cli_util.wrap_exceptions def delete_url_list(ctx, from_json, network_firewall_policy_id, url_list_name, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(url_list_name, six.string_types) and len(url_list_name.strip()) == 0: + if isinstance(url_list_name, str) and len(url_list_name.strip()) == 0: raise click.UsageError('Parameter --url-list-name cannot be whitespace or empty string') kwargs = {} @@ -2573,10 +2572,10 @@ def delete_url_list(ctx, from_json, network_firewall_policy_id, url_list_name, i @cli_util.wrap_exceptions def get_address_list(ctx, from_json, network_firewall_policy_id, address_list_name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(address_list_name, six.string_types) and len(address_list_name.strip()) == 0: + if isinstance(address_list_name, str) and len(address_list_name.strip()) == 0: raise click.UsageError('Parameter --address-list-name cannot be whitespace or empty string') kwargs = {} @@ -2602,10 +2601,10 @@ def get_address_list(ctx, from_json, network_firewall_policy_id, address_list_na @cli_util.wrap_exceptions def get_application(ctx, from_json, network_firewall_policy_id, application_name, limit, page): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(application_name, six.string_types) and len(application_name.strip()) == 0: + if isinstance(application_name, str) and len(application_name.strip()) == 0: raise click.UsageError('Parameter --application-name cannot be whitespace or empty string') kwargs = {} @@ -2633,10 +2632,10 @@ def get_application(ctx, from_json, network_firewall_policy_id, application_name @cli_util.wrap_exceptions def get_application_group(ctx, from_json, network_firewall_policy_id, application_group_name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(application_group_name, six.string_types) and len(application_group_name.strip()) == 0: + if isinstance(application_group_name, str) and len(application_group_name.strip()) == 0: raise click.UsageError('Parameter --application-group-name cannot be whitespace or empty string') kwargs = {} @@ -2660,10 +2659,10 @@ def get_application_group(ctx, from_json, network_firewall_policy_id, applicatio @cli_util.wrap_exceptions def get_decryption_profile(ctx, from_json, network_firewall_policy_id, decryption_profile_name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(decryption_profile_name, six.string_types) and len(decryption_profile_name.strip()) == 0: + if isinstance(decryption_profile_name, str) and len(decryption_profile_name.strip()) == 0: raise click.UsageError('Parameter --decryption-profile-name cannot be whitespace or empty string') kwargs = {} @@ -2689,10 +2688,10 @@ def get_decryption_profile(ctx, from_json, network_firewall_policy_id, decryptio @cli_util.wrap_exceptions def get_decryption_rule(ctx, from_json, network_firewall_policy_id, decryption_rule_name, limit, page): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(decryption_rule_name, six.string_types) and len(decryption_rule_name.strip()) == 0: + if isinstance(decryption_rule_name, str) and len(decryption_rule_name.strip()) == 0: raise click.UsageError('Parameter --decryption-rule-name cannot be whitespace or empty string') kwargs = {} @@ -2722,10 +2721,10 @@ def get_decryption_rule(ctx, from_json, network_firewall_policy_id, decryption_r @cli_util.wrap_exceptions def get_mapped_secret(ctx, from_json, network_firewall_policy_id, mapped_secret_name, limit, page): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(mapped_secret_name, six.string_types) and len(mapped_secret_name.strip()) == 0: + if isinstance(mapped_secret_name, str) and len(mapped_secret_name.strip()) == 0: raise click.UsageError('Parameter --mapped-secret-name cannot be whitespace or empty string') kwargs = {} @@ -2753,10 +2752,10 @@ def get_mapped_secret(ctx, from_json, network_firewall_policy_id, mapped_secret_ @cli_util.wrap_exceptions def get_nat_rule(ctx, from_json, network_firewall_policy_id, nat_rule_name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(nat_rule_name, six.string_types) and len(nat_rule_name.strip()) == 0: + if isinstance(nat_rule_name, str) and len(nat_rule_name.strip()) == 0: raise click.UsageError('Parameter --nat-rule-name cannot be whitespace or empty string') kwargs = {} @@ -2779,7 +2778,7 @@ def get_nat_rule(ctx, from_json, network_firewall_policy_id, nat_rule_name): @cli_util.wrap_exceptions def get_network_firewall(ctx, from_json, network_firewall_id): - if isinstance(network_firewall_id, six.string_types) and len(network_firewall_id.strip()) == 0: + if isinstance(network_firewall_id, str) and len(network_firewall_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-id cannot be whitespace or empty string') kwargs = {} @@ -2801,7 +2800,7 @@ def get_network_firewall(ctx, from_json, network_firewall_id): @cli_util.wrap_exceptions def get_network_firewall_policy(ctx, from_json, network_firewall_policy_id): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2824,10 +2823,10 @@ def get_network_firewall_policy(ctx, from_json, network_firewall_policy_id): @cli_util.wrap_exceptions def get_security_rule(ctx, from_json, network_firewall_policy_id, security_rule_name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(security_rule_name, six.string_types) and len(security_rule_name.strip()) == 0: + if isinstance(security_rule_name, str) and len(security_rule_name.strip()) == 0: raise click.UsageError('Parameter --security-rule-name cannot be whitespace or empty string') kwargs = {} @@ -2853,10 +2852,10 @@ def get_security_rule(ctx, from_json, network_firewall_policy_id, security_rule_ @cli_util.wrap_exceptions def get_service(ctx, from_json, network_firewall_policy_id, service_name, limit, page): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(service_name, six.string_types) and len(service_name.strip()) == 0: + if isinstance(service_name, str) and len(service_name.strip()) == 0: raise click.UsageError('Parameter --service-name cannot be whitespace or empty string') kwargs = {} @@ -2884,10 +2883,10 @@ def get_service(ctx, from_json, network_firewall_policy_id, service_name, limit, @cli_util.wrap_exceptions def get_service_list(ctx, from_json, network_firewall_policy_id, service_list_name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(service_list_name, six.string_types) and len(service_list_name.strip()) == 0: + if isinstance(service_list_name, str) and len(service_list_name.strip()) == 0: raise click.UsageError('Parameter --service-list-name cannot be whitespace or empty string') kwargs = {} @@ -2911,10 +2910,10 @@ def get_service_list(ctx, from_json, network_firewall_policy_id, service_list_na @cli_util.wrap_exceptions def get_tunnel_inspection_rule(ctx, from_json, network_firewall_policy_id, tunnel_inspection_rule_name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(tunnel_inspection_rule_name, six.string_types) and len(tunnel_inspection_rule_name.strip()) == 0: + if isinstance(tunnel_inspection_rule_name, str) and len(tunnel_inspection_rule_name.strip()) == 0: raise click.UsageError('Parameter --tunnel-inspection-rule-name cannot be whitespace or empty string') kwargs = {} @@ -2938,10 +2937,10 @@ def get_tunnel_inspection_rule(ctx, from_json, network_firewall_policy_id, tunne @cli_util.wrap_exceptions def get_url_list(ctx, from_json, network_firewall_policy_id, url_list_name): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(url_list_name, six.string_types) and len(url_list_name.strip()) == 0: + if isinstance(url_list_name, str) and len(url_list_name.strip()) == 0: raise click.UsageError('Parameter --url-list-name cannot be whitespace or empty string') kwargs = {} @@ -2964,7 +2963,7 @@ def get_url_list(ctx, from_json, network_firewall_policy_id, url_list_name): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2996,7 +2995,7 @@ def list_address_lists(ctx, from_json, all_pages, page_size, network_firewall_po if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3056,7 +3055,7 @@ def list_application_groups(ctx, from_json, all_pages, page_size, network_firewa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3116,7 +3115,7 @@ def list_applications(ctx, from_json, all_pages, page_size, network_firewall_pol if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3176,7 +3175,7 @@ def list_decryption_profiles(ctx, from_json, all_pages, page_size, network_firew if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3237,7 +3236,7 @@ def list_decryption_rules(ctx, from_json, all_pages, page_size, network_firewall if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3299,7 +3298,7 @@ def list_mapped_secrets(ctx, from_json, all_pages, page_size, network_firewall_p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3360,7 +3359,7 @@ def list_nat_rules(ctx, from_json, all_pages, page_size, network_firewall_policy if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3557,7 +3556,7 @@ def list_security_rules(ctx, from_json, all_pages, page_size, network_firewall_p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3619,7 +3618,7 @@ def list_service_lists(ctx, from_json, all_pages, page_size, network_firewall_po if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3679,7 +3678,7 @@ def list_services(ctx, from_json, all_pages, page_size, network_firewall_policy_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3740,7 +3739,7 @@ def list_tunnel_inspection_rules(ctx, from_json, all_pages, page_size, network_f if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3802,7 +3801,7 @@ def list_url_lists(ctx, from_json, all_pages, page_size, network_firewall_policy if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3861,7 +3860,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3918,7 +3917,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4033,7 +4032,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def migrate_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -4087,10 +4086,10 @@ def migrate_network_firewall_policy(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_address_list(ctx, from_json, network_firewall_policy_id, address_list_name, type, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(address_list_name, six.string_types) and len(address_list_name.strip()) == 0: + if isinstance(address_list_name, str) and len(address_list_name.strip()) == 0: raise click.UsageError('Parameter --address-list-name cannot be whitespace or empty string') kwargs = {} @@ -4124,10 +4123,10 @@ def update_address_list(ctx, from_json, network_firewall_policy_id, address_list @cli_util.wrap_exceptions def update_address_list_update_fqdn_address_list_details(ctx, from_json, force, network_firewall_policy_id, address_list_name, addresses, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(address_list_name, six.string_types) and len(address_list_name.strip()) == 0: + if isinstance(address_list_name, str) and len(address_list_name.strip()) == 0: raise click.UsageError('Parameter --address-list-name cannot be whitespace or empty string') if not force: if addresses: @@ -4167,10 +4166,10 @@ def update_address_list_update_fqdn_address_list_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_address_list_update_ip_address_list_details(ctx, from_json, force, network_firewall_policy_id, address_list_name, addresses, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(address_list_name, six.string_types) and len(address_list_name.strip()) == 0: + if isinstance(address_list_name, str) and len(address_list_name.strip()) == 0: raise click.UsageError('Parameter --address-list-name cannot be whitespace or empty string') if not force: if addresses: @@ -4209,10 +4208,10 @@ def update_address_list_update_ip_address_list_details(ctx, from_json, force, ne @cli_util.wrap_exceptions def update_application(ctx, from_json, network_firewall_policy_id, application_name, type, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(application_name, six.string_types) and len(application_name.strip()) == 0: + if isinstance(application_name, str) and len(application_name.strip()) == 0: raise click.UsageError('Parameter --application-name cannot be whitespace or empty string') kwargs = {} @@ -4246,10 +4245,10 @@ def update_application(ctx, from_json, network_firewall_policy_id, application_n @cli_util.wrap_exceptions def update_application_update_icmp6_application_details(ctx, from_json, network_firewall_policy_id, application_name, icmp_type, icmp_code, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(application_name, six.string_types) and len(application_name.strip()) == 0: + if isinstance(application_name, str) and len(application_name.strip()) == 0: raise click.UsageError('Parameter --application-name cannot be whitespace or empty string') kwargs = {} @@ -4288,10 +4287,10 @@ def update_application_update_icmp6_application_details(ctx, from_json, network_ @cli_util.wrap_exceptions def update_application_update_icmp_application_details(ctx, from_json, network_firewall_policy_id, application_name, icmp_type, icmp_code, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(application_name, six.string_types) and len(application_name.strip()) == 0: + if isinstance(application_name, str) and len(application_name.strip()) == 0: raise click.UsageError('Parameter --application-name cannot be whitespace or empty string') kwargs = {} @@ -4330,10 +4329,10 @@ def update_application_update_icmp_application_details(ctx, from_json, network_f @cli_util.wrap_exceptions def update_application_group(ctx, from_json, force, network_firewall_policy_id, application_group_name, apps, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(application_group_name, six.string_types) and len(application_group_name.strip()) == 0: + if isinstance(application_group_name, str) and len(application_group_name.strip()) == 0: raise click.UsageError('Parameter --application-group-name cannot be whitespace or empty string') if not force: if apps: @@ -4370,10 +4369,10 @@ def update_application_group(ctx, from_json, force, network_firewall_policy_id, @cli_util.wrap_exceptions def update_decryption_profile(ctx, from_json, network_firewall_policy_id, decryption_profile_name, type, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(decryption_profile_name, six.string_types) and len(decryption_profile_name.strip()) == 0: + if isinstance(decryption_profile_name, str) and len(decryption_profile_name.strip()) == 0: raise click.UsageError('Parameter --decryption-profile-name cannot be whitespace or empty string') kwargs = {} @@ -4408,10 +4407,10 @@ def update_decryption_profile(ctx, from_json, network_firewall_policy_id, decryp @cli_util.wrap_exceptions def update_decryption_profile_update_ssl_inbound_inspection_profile_details(ctx, from_json, network_firewall_policy_id, decryption_profile_name, is_unsupported_version_blocked, is_unsupported_cipher_blocked, is_out_of_capacity_blocked, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(decryption_profile_name, six.string_types) and len(decryption_profile_name.strip()) == 0: + if isinstance(decryption_profile_name, str) and len(decryption_profile_name.strip()) == 0: raise click.UsageError('Parameter --decryption-profile-name cannot be whitespace or empty string') kwargs = {} @@ -4462,10 +4461,10 @@ def update_decryption_profile_update_ssl_inbound_inspection_profile_details(ctx, @cli_util.wrap_exceptions def update_decryption_profile_update_ssl_forward_proxy_profile_details(ctx, from_json, network_firewall_policy_id, decryption_profile_name, is_expired_certificate_blocked, is_untrusted_issuer_blocked, is_revocation_status_timeout_blocked, is_unsupported_version_blocked, is_unsupported_cipher_blocked, is_unknown_revocation_status_blocked, are_certificate_extensions_restricted, is_auto_include_alt_name, is_out_of_capacity_blocked, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(decryption_profile_name, six.string_types) and len(decryption_profile_name.strip()) == 0: + if isinstance(decryption_profile_name, str) and len(decryption_profile_name.strip()) == 0: raise click.UsageError('Parameter --decryption-profile-name cannot be whitespace or empty string') kwargs = {} @@ -4533,10 +4532,10 @@ def update_decryption_profile_update_ssl_forward_proxy_profile_details(ctx, from @cli_util.wrap_exceptions def update_decryption_rule(ctx, from_json, force, network_firewall_policy_id, decryption_rule_name, condition, action, decryption_profile, secret, position, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(decryption_rule_name, six.string_types) and len(decryption_rule_name.strip()) == 0: + if isinstance(decryption_rule_name, str) and len(decryption_rule_name.strip()) == 0: raise click.UsageError('Parameter --decryption-rule-name cannot be whitespace or empty string') if not force: if condition or position: @@ -4586,10 +4585,10 @@ def update_decryption_rule(ctx, from_json, force, network_firewall_policy_id, de @cli_util.wrap_exceptions def update_mapped_secret(ctx, from_json, network_firewall_policy_id, mapped_secret_name, source, type, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(mapped_secret_name, six.string_types) and len(mapped_secret_name.strip()) == 0: + if isinstance(mapped_secret_name, str) and len(mapped_secret_name.strip()) == 0: raise click.UsageError('Parameter --mapped-secret-name cannot be whitespace or empty string') kwargs = {} @@ -4627,10 +4626,10 @@ def update_mapped_secret(ctx, from_json, network_firewall_policy_id, mapped_secr @cli_util.wrap_exceptions def update_mapped_secret_update_vault_mapped_secret_details(ctx, from_json, network_firewall_policy_id, mapped_secret_name, type, vault_secret_id, version_number, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(mapped_secret_name, six.string_types) and len(mapped_secret_name.strip()) == 0: + if isinstance(mapped_secret_name, str) and len(mapped_secret_name.strip()) == 0: raise click.UsageError('Parameter --mapped-secret-name cannot be whitespace or empty string') kwargs = {} @@ -4672,10 +4671,10 @@ def update_mapped_secret_update_vault_mapped_secret_details(ctx, from_json, netw @cli_util.wrap_exceptions def update_nat_rule(ctx, from_json, force, network_firewall_policy_id, nat_rule_name, type, description, position, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(nat_rule_name, six.string_types) and len(nat_rule_name.strip()) == 0: + if isinstance(nat_rule_name, str) and len(nat_rule_name.strip()) == 0: raise click.UsageError('Parameter --nat-rule-name cannot be whitespace or empty string') if not force: if position: @@ -4724,10 +4723,10 @@ def update_nat_rule(ctx, from_json, force, network_firewall_policy_id, nat_rule_ @cli_util.wrap_exceptions def update_nat_rule_update_nat_v4_rule_details(ctx, from_json, force, network_firewall_policy_id, nat_rule_name, condition, action, description, position, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(nat_rule_name, six.string_types) and len(nat_rule_name.strip()) == 0: + if isinstance(nat_rule_name, str) and len(nat_rule_name.strip()) == 0: raise click.UsageError('Parameter --nat-rule-name cannot be whitespace or empty string') if not force: if position or condition: @@ -4781,7 +4780,7 @@ def update_nat_rule_update_nat_v4_rule_details(ctx, from_json, force, network_fi @cli_util.wrap_exceptions def update_network_firewall(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_id, display_name, network_firewall_policy_id, network_security_group_ids, nat_configuration, freeform_tags, defined_tags, if_match): - if isinstance(network_firewall_id, six.string_types) and len(network_firewall_id.strip()) == 0: + if isinstance(network_firewall_id, str) and len(network_firewall_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-id cannot be whitespace or empty string') if not force: if network_security_group_ids or nat_configuration or freeform_tags or defined_tags: @@ -4866,7 +4865,7 @@ def update_network_firewall(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_network_firewall_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_firewall_policy_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4945,10 +4944,10 @@ def update_network_firewall_policy(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_security_rule(ctx, from_json, force, network_firewall_policy_id, security_rule_name, condition, action, inspection, position, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(security_rule_name, six.string_types) and len(security_rule_name.strip()) == 0: + if isinstance(security_rule_name, str) and len(security_rule_name.strip()) == 0: raise click.UsageError('Parameter --security-rule-name cannot be whitespace or empty string') if not force: if condition or position: @@ -4992,10 +4991,10 @@ def update_security_rule(ctx, from_json, force, network_firewall_policy_id, secu @cli_util.wrap_exceptions def update_service(ctx, from_json, network_firewall_policy_id, service_name, type, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(service_name, six.string_types) and len(service_name.strip()) == 0: + if isinstance(service_name, str) and len(service_name.strip()) == 0: raise click.UsageError('Parameter --service-name cannot be whitespace or empty string') kwargs = {} @@ -5029,10 +5028,10 @@ def update_service(ctx, from_json, network_firewall_policy_id, service_name, typ @cli_util.wrap_exceptions def update_service_update_tcp_service_details(ctx, from_json, force, network_firewall_policy_id, service_name, port_ranges, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(service_name, six.string_types) and len(service_name.strip()) == 0: + if isinstance(service_name, str) and len(service_name.strip()) == 0: raise click.UsageError('Parameter --service-name cannot be whitespace or empty string') if not force: if port_ranges: @@ -5072,10 +5071,10 @@ def update_service_update_tcp_service_details(ctx, from_json, force, network_fir @cli_util.wrap_exceptions def update_service_update_udp_service_details(ctx, from_json, force, network_firewall_policy_id, service_name, port_ranges, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(service_name, six.string_types) and len(service_name.strip()) == 0: + if isinstance(service_name, str) and len(service_name.strip()) == 0: raise click.UsageError('Parameter --service-name cannot be whitespace or empty string') if not force: if port_ranges: @@ -5115,10 +5114,10 @@ def update_service_update_udp_service_details(ctx, from_json, force, network_fir @cli_util.wrap_exceptions def update_service_list(ctx, from_json, force, network_firewall_policy_id, service_list_name, services, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(service_list_name, six.string_types) and len(service_list_name.strip()) == 0: + if isinstance(service_list_name, str) and len(service_list_name.strip()) == 0: raise click.UsageError('Parameter --service-list-name cannot be whitespace or empty string') if not force: if services: @@ -5162,10 +5161,10 @@ def update_service_list(ctx, from_json, force, network_firewall_policy_id, servi @cli_util.wrap_exceptions def update_tunnel_inspection_rule(ctx, from_json, force, network_firewall_policy_id, tunnel_inspection_rule_name, protocol, action, position, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(tunnel_inspection_rule_name, six.string_types) and len(tunnel_inspection_rule_name.strip()) == 0: + if isinstance(tunnel_inspection_rule_name, str) and len(tunnel_inspection_rule_name.strip()) == 0: raise click.UsageError('Parameter --tunnel-inspection-rule-name cannot be whitespace or empty string') if not force: if position: @@ -5214,10 +5213,10 @@ def update_tunnel_inspection_rule(ctx, from_json, force, network_firewall_policy @cli_util.wrap_exceptions def update_tunnel_inspection_rule_update_vxlan_inspection_rule_details(ctx, from_json, force, network_firewall_policy_id, tunnel_inspection_rule_name, condition, action, position, profile_parameterconflict, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(tunnel_inspection_rule_name, six.string_types) and len(tunnel_inspection_rule_name.strip()) == 0: + if isinstance(tunnel_inspection_rule_name, str) and len(tunnel_inspection_rule_name.strip()) == 0: raise click.UsageError('Parameter --tunnel-inspection-rule-name cannot be whitespace or empty string') if not force: if position or condition or profile_parameterconflict: @@ -5266,10 +5265,10 @@ def update_tunnel_inspection_rule_update_vxlan_inspection_rule_details(ctx, from @cli_util.wrap_exceptions def update_url_list(ctx, from_json, force, network_firewall_policy_id, url_list_name, urls, if_match): - if isinstance(network_firewall_policy_id, six.string_types) and len(network_firewall_policy_id.strip()) == 0: + if isinstance(network_firewall_policy_id, str) and len(network_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --network-firewall-policy-id cannot be whitespace or empty string') - if isinstance(url_list_name, six.string_types) and len(url_list_name.strip()) == 0: + if isinstance(url_list_name, str) and len(url_list_name.strip()) == 0: raise click.UsageError('Parameter --url-list-name cannot be whitespace or empty string') if not force: if urls: diff --git a/services/network_load_balancer/src/oci_cli_network_load_balancer/generated/networkloadbalancer_cli.py b/services/network_load_balancer/src/oci_cli_network_load_balancer/generated/networkloadbalancer_cli.py index 9e491eadb..f66454344 100644 --- a/services/network_load_balancer/src/oci_cli_network_load_balancer/generated/networkloadbalancer_cli.py +++ b/services/network_load_balancer/src/oci_cli_network_load_balancer/generated/networkloadbalancer_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -169,7 +168,7 @@ def network_load_balancer_health_group(): @cli_util.wrap_exceptions def change_network_load_balancer_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, compartment_id, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -250,10 +249,10 @@ def change_network_load_balancer_compartment(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def create_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, port, backend_set_name, name, ip_address, target_id, weight, is_drain, is_backup, is_offline, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -353,7 +352,7 @@ def create_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def create_backend_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, name, policy, health_checker, is_preserve_source, is_fail_open, is_instant_failover_enabled, is_instant_failover_tcp_reset_enabled, are_operationally_active_backends_preferred, ip_version, backends, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -453,7 +452,7 @@ def create_backend_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def create_listener(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, name, default_backend_set_name, port, protocol, ip_version, is_ppv2_enabled, tcp_idle_timeout, udp_idle_timeout, l3_ip_idle_timeout, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -677,13 +676,13 @@ def create_network_load_balancer(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, backend_set_name, backend_name, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -746,10 +745,10 @@ def delete_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_backend_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, backend_set_name, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -809,10 +808,10 @@ def delete_backend_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_listener(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, listener_name, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(listener_name, six.string_types) and len(listener_name.strip()) == 0: + if isinstance(listener_name, str) and len(listener_name.strip()) == 0: raise click.UsageError('Parameter --listener-name cannot be whitespace or empty string') kwargs = {} @@ -869,7 +868,7 @@ def delete_listener(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_network_load_balancer(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -929,13 +928,13 @@ def delete_network_load_balancer(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def get_backend(ctx, from_json, network_load_balancer_id, backend_set_name, backend_name, if_none_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -967,13 +966,13 @@ def get_backend(ctx, from_json, network_load_balancer_id, backend_set_name, back @cli_util.wrap_exceptions def get_backend_health(ctx, from_json, network_load_balancer_id, backend_set_name, backend_name): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -1003,13 +1002,13 @@ def get_backend_health(ctx, from_json, network_load_balancer_id, backend_set_nam @cli_util.wrap_exceptions def get_backend_operational_status(ctx, from_json, network_load_balancer_id, backend_set_name, backend_name): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -1039,10 +1038,10 @@ def get_backend_operational_status(ctx, from_json, network_load_balancer_id, bac @cli_util.wrap_exceptions def get_backend_set(ctx, from_json, network_load_balancer_id, backend_set_name, if_none_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -1070,10 +1069,10 @@ def get_backend_set(ctx, from_json, network_load_balancer_id, backend_set_name, @cli_util.wrap_exceptions def get_backend_set_health(ctx, from_json, network_load_balancer_id, backend_set_name): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -1102,10 +1101,10 @@ def get_backend_set_health(ctx, from_json, network_load_balancer_id, backend_set @cli_util.wrap_exceptions def get_health_checker(ctx, from_json, network_load_balancer_id, backend_set_name, if_none_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -1136,10 +1135,10 @@ def get_health_checker(ctx, from_json, network_load_balancer_id, backend_set_nam @cli_util.wrap_exceptions def get_listener(ctx, from_json, network_load_balancer_id, listener_name, if_none_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(listener_name, six.string_types) and len(listener_name.strip()) == 0: + if isinstance(listener_name, str) and len(listener_name.strip()) == 0: raise click.UsageError('Parameter --listener-name cannot be whitespace or empty string') kwargs = {} @@ -1167,7 +1166,7 @@ def get_listener(ctx, from_json, network_load_balancer_id, listener_name, if_non @cli_util.wrap_exceptions def get_network_load_balancer(ctx, from_json, network_load_balancer_id, if_none_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1191,7 +1190,7 @@ def get_network_load_balancer(ctx, from_json, network_load_balancer_id, if_none_ @cli_util.wrap_exceptions def get_network_load_balancer_health(ctx, from_json, network_load_balancer_id): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1213,7 +1212,7 @@ def get_network_load_balancer_health(ctx, from_json, network_load_balancer_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1247,7 +1246,7 @@ def list_backend_sets(ctx, from_json, all_pages, page_size, network_load_balance if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1312,10 +1311,10 @@ def list_backends(ctx, from_json, all_pages, page_size, network_load_balancer_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') kwargs = {} @@ -1380,7 +1379,7 @@ def list_listeners(ctx, from_json, all_pages, page_size, network_load_balancer_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') kwargs = {} @@ -1652,7 +1651,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1707,7 +1706,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1824,13 +1823,13 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, lim @cli_util.wrap_exceptions def update_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, backend_set_name, backend_name, weight, is_backup, is_drain, is_offline, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') - if isinstance(backend_name, six.string_types) and len(backend_name.strip()) == 0: + if isinstance(backend_name, str) and len(backend_name.strip()) == 0: raise click.UsageError('Parameter --backend-name cannot be whitespace or empty string') kwargs = {} @@ -1920,10 +1919,10 @@ def update_backend(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def update_backend_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, backend_set_name, policy, is_preserve_source, is_fail_open, is_instant_failover_enabled, is_instant_failover_tcp_reset_enabled, are_operationally_active_backends_preferred, ip_version, backends, health_checker, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') if not force: if backends or health_checker: @@ -2045,10 +2044,10 @@ def update_backend_set(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_health_checker(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, backend_set_name, protocol, port, retries, timeout_in_millis, interval_in_millis, url_path, response_body_regex, return_code, request_data, response_data, dns, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(backend_set_name, six.string_types) and len(backend_set_name.strip()) == 0: + if isinstance(backend_set_name, str) and len(backend_set_name.strip()) == 0: raise click.UsageError('Parameter --backend-set-name cannot be whitespace or empty string') if not force: if dns: @@ -2162,10 +2161,10 @@ def update_health_checker(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_listener(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, listener_name, default_backend_set_name, port, protocol, ip_version, is_ppv2_enabled, tcp_idle_timeout, udp_idle_timeout, l3_ip_idle_timeout, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') - if isinstance(listener_name, six.string_types) and len(listener_name.strip()) == 0: + if isinstance(listener_name, str) and len(listener_name.strip()) == 0: raise click.UsageError('Parameter --listener-name cannot be whitespace or empty string') kwargs = {} @@ -2267,7 +2266,7 @@ def update_listener(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def update_network_load_balancer(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, display_name, is_preserve_source_destination, is_symmetric_hash_enabled, nlb_ip_version, subnet_ipv6_cidr, assigned_ipv6, freeform_tags, defined_tags, security_attributes, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or security_attributes: @@ -2367,7 +2366,7 @@ def update_network_load_balancer(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_network_security_groups(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_load_balancer_id, network_security_group_ids, if_match): - if isinstance(network_load_balancer_id, six.string_types) and len(network_load_balancer_id.strip()) == 0: + if isinstance(network_load_balancer_id, str) and len(network_load_balancer_id.strip()) == 0: raise click.UsageError('Parameter --network-load-balancer-id cannot be whitespace or empty string') if not force: if network_security_group_ids: diff --git a/services/nosql/src/oci_cli_nosql/generated/nosql_cli.py b/services/nosql/src/oci_cli_nosql/generated/nosql_cli.py index 236d9faaf..34b8664f5 100644 --- a/services/nosql/src/oci_cli_nosql/generated/nosql_cli.py +++ b/services/nosql/src/oci_cli_nosql/generated/nosql_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -84,7 +83,7 @@ def table_group(): @cli_util.wrap_exceptions def change_table_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, table_name_or_id, to_compartment_id, from_compartment_id, if_match): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -150,7 +149,7 @@ def change_table_compartment(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_index(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, table_name_or_id, name, keys, compartment_id, is_if_not_exists): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -219,7 +218,7 @@ def create_index(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def create_replica(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, table_name_or_id, region_parameterconflict, compartment_id, max_read_units, max_write_units, if_match): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -365,10 +364,10 @@ def create_table(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_index(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, table_name_or_id, index_name, compartment_id, is_if_exists, if_match): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') - if isinstance(index_name, six.string_types) and len(index_name.strip()) == 0: + if isinstance(index_name, str) and len(index_name.strip()) == 0: raise click.UsageError('Parameter --index-name cannot be whitespace or empty string') kwargs = {} @@ -431,10 +430,10 @@ def delete_index(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_replica(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, table_name_or_id, region_parameterconflict, compartment_id, if_match): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') - if isinstance(region_parameterconflict, six.string_types) and len(region_parameterconflict.strip()) == 0: + if isinstance(region_parameterconflict, str) and len(region_parameterconflict.strip()) == 0: raise click.UsageError('Parameter --region-parameterconflict cannot be whitespace or empty string') kwargs = {} @@ -494,7 +493,7 @@ def delete_replica(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_row(ctx, from_json, table_name_or_id, key, compartment_id, is_get_return_row, timeout_in_ms, if_match): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -532,7 +531,7 @@ def delete_row(ctx, from_json, table_name_or_id, key, compartment_id, is_get_ret @cli_util.wrap_exceptions def delete_table(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, table_name_or_id, compartment_id, is_if_exists, if_match): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -592,7 +591,7 @@ def delete_table(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_work_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -664,10 +663,10 @@ def get_configuration(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_index(ctx, from_json, table_name_or_id, index_name, compartment_id): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') - if isinstance(index_name, six.string_types) and len(index_name.strip()) == 0: + if isinstance(index_name, str) and len(index_name.strip()) == 0: raise click.UsageError('Parameter --index-name cannot be whitespace or empty string') kwargs = {} @@ -696,7 +695,7 @@ def get_index(ctx, from_json, table_name_or_id, index_name, compartment_id): @cli_util.wrap_exceptions def get_row(ctx, from_json, table_name_or_id, key, compartment_id, consistency, timeout_in_ms): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -726,7 +725,7 @@ def get_row(ctx, from_json, table_name_or_id, key, compartment_id, consistency, @cli_util.wrap_exceptions def get_table(ctx, from_json, table_name_or_id, compartment_id): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -750,7 +749,7 @@ def get_table(ctx, from_json, table_name_or_id, compartment_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -784,7 +783,7 @@ def list_indexes(ctx, from_json, all_pages, page_size, table_name_or_id, compart if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -848,7 +847,7 @@ def list_table_usage(ctx, from_json, all_pages, page_size, table_name_or_id, com if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') kwargs = {} @@ -965,7 +964,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1016,7 +1015,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1460,7 +1459,7 @@ def update_configuration_update_hosted_configuration_details(ctx, from_json, for @cli_util.wrap_exceptions def update_row(ctx, from_json, force, table_name_or_id, value, compartment_id, option, is_get_return_row, timeout_in_ms, ttl, is_ttl_use_table_default, identity_cache_size, is_exact_match, if_match): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') if not force: if value: @@ -1527,7 +1526,7 @@ def update_row(ctx, from_json, force, table_name_or_id, value, compartment_id, o @cli_util.wrap_exceptions def update_table(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, table_name_or_id, compartment_id, ddl_statement, table_limits, freeform_tags, defined_tags, if_match): - if isinstance(table_name_or_id, six.string_types) and len(table_name_or_id.strip()) == 0: + if isinstance(table_name_or_id, str) and len(table_name_or_id.strip()) == 0: raise click.UsageError('Parameter --table-name-or-id cannot be whitespace or empty string') if not force: if table_limits or freeform_tags or defined_tags: diff --git a/services/object_storage/src/oci_cli_object_storage/generated/objectstorage_cli.py b/services/object_storage/src/oci_cli_object_storage/generated/objectstorage_cli.py index b8bf63443..059637ef8 100644 --- a/services/object_storage/src/oci_cli_object_storage/generated/objectstorage_cli.py +++ b/services/object_storage/src/oci_cli_object_storage/generated/objectstorage_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -129,13 +128,13 @@ def object_group(): @cli_util.wrap_exceptions def abort_multipart_upload(ctx, from_json, namespace_name, bucket_name, object_name, upload_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -161,7 +160,7 @@ def abort_multipart_upload(ctx, from_json, namespace_name, bucket_name, object_n @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -190,13 +189,13 @@ def cancel_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def commit_multipart_upload(ctx, from_json, namespace_name, bucket_name, object_name, upload_id, parts_to_commit, parts_to_exclude, if_match, if_none_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -257,10 +256,10 @@ def commit_multipart_upload(ctx, from_json, namespace_name, bucket_name, object_ @cli_util.wrap_exceptions def copy_object(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, bucket_name, source_object_name, destination_region, destination_namespace, destination_bucket, destination_object_name, source_object_if_match_e_tag, source_version_id, destination_object_if_match_e_tag, destination_object_if_none_match_e_tag, destination_object_metadata, destination_object_storage_tier, opc_sse_customer_algorithm, opc_sse_customer_key, opc_sse_customer_key_sha256, opc_source_sse_customer_algorithm, opc_source_sse_customer_key, opc_source_sse_customer_key_sha256, opc_sse_kms_key_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -362,7 +361,7 @@ def copy_object(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def create_bucket(ctx, from_json, namespace_name, name, compartment_id, metadata, public_access_type, storage_tier, object_events_enabled, freeform_tags, defined_tags, kms_key_id, versioning, auto_tiering): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -435,10 +434,10 @@ def create_bucket(ctx, from_json, namespace_name, name, compartment_id, metadata @cli_util.wrap_exceptions def create_multipart_upload(ctx, from_json, namespace_name, bucket_name, object, content_type, content_language, content_encoding, content_disposition, cache_control, storage_tier, metadata, if_match, if_none_match, opc_sse_customer_algorithm, opc_sse_customer_key, opc_sse_customer_key_sha256, opc_sse_kms_key_id, opc_checksum_algorithm): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -507,10 +506,10 @@ def create_multipart_upload(ctx, from_json, namespace_name, bucket_name, object, @cli_util.wrap_exceptions def create_preauthenticated_request(ctx, from_json, namespace_name, bucket_name, name, access_type, time_expires, bucket_listing_action, object_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -561,7 +560,7 @@ def create_preauthenticated_request(ctx, from_json, namespace_name, bucket_name, @cli_util.wrap_exceptions def create_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, name, compartment_id, subnet_id, prefix, access_targets, additional_prefixes, private_endpoint_ip, nsg_ids, freeform_tags, defined_tags): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -638,10 +637,10 @@ def create_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def create_replication_policy(ctx, from_json, namespace_name, bucket_name, name, destination_region_name, destination_bucket_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -675,10 +674,10 @@ def create_replication_policy(ctx, from_json, namespace_name, bucket_name, name, @cli_util.wrap_exceptions def create_retention_rule(ctx, from_json, namespace_name, bucket_name, display_name, duration, time_rule_locked): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -717,10 +716,10 @@ def create_retention_rule(ctx, from_json, namespace_name, bucket_name, display_n @cli_util.wrap_exceptions def delete_bucket(ctx, from_json, namespace_name, bucket_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -750,13 +749,13 @@ def delete_bucket(ctx, from_json, namespace_name, bucket_name, if_match): @cli_util.wrap_exceptions def delete_object(ctx, from_json, namespace_name, bucket_name, object_name, if_match, version_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -787,10 +786,10 @@ def delete_object(ctx, from_json, namespace_name, bucket_name, object_name, if_m @cli_util.wrap_exceptions def delete_object_lifecycle_policy(ctx, from_json, namespace_name, bucket_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -818,13 +817,13 @@ def delete_object_lifecycle_policy(ctx, from_json, namespace_name, bucket_name, @cli_util.wrap_exceptions def delete_preauthenticated_request(ctx, from_json, namespace_name, bucket_name, par_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(par_id, six.string_types) and len(par_id.strip()) == 0: + if isinstance(par_id, str) and len(par_id.strip()) == 0: raise click.UsageError('Parameter --par-id cannot be whitespace or empty string') kwargs = {} @@ -854,10 +853,10 @@ def delete_preauthenticated_request(ctx, from_json, namespace_name, bucket_name, @cli_util.wrap_exceptions def delete_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, pe_name, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(pe_name, six.string_types) and len(pe_name.strip()) == 0: + if isinstance(pe_name, str) and len(pe_name.strip()) == 0: raise click.UsageError('Parameter --pe-name cannot be whitespace or empty string') kwargs = {} @@ -912,13 +911,13 @@ def delete_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_replication_policy(ctx, from_json, namespace_name, bucket_name, replication_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') kwargs = {} @@ -946,13 +945,13 @@ def delete_replication_policy(ctx, from_json, namespace_name, bucket_name, repli @cli_util.wrap_exceptions def delete_retention_rule(ctx, from_json, namespace_name, bucket_name, retention_rule_id, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(retention_rule_id, six.string_types) and len(retention_rule_id.strip()) == 0: + if isinstance(retention_rule_id, str) and len(retention_rule_id.strip()) == 0: raise click.UsageError('Parameter --retention-rule-id cannot be whitespace or empty string') kwargs = {} @@ -982,10 +981,10 @@ def delete_retention_rule(ctx, from_json, namespace_name, bucket_name, retention @cli_util.wrap_exceptions def get_bucket(ctx, from_json, namespace_name, bucket_name, if_match, if_none_match, fields): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1038,7 +1037,7 @@ def get_namespace(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_namespace_metadata(ctx, from_json, namespace_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1076,13 +1075,13 @@ def get_namespace_metadata(ctx, from_json, namespace_name): @cli_util.wrap_exceptions def get_object(ctx, from_json, file, namespace_name, bucket_name, object_name, version_id, if_match, if_none_match, range, opc_sse_customer_algorithm, opc_sse_customer_key, opc_sse_customer_key_sha256, http_response_content_disposition, http_response_cache_control, http_response_content_type, http_response_content_language, http_response_content_encoding, http_response_expires): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -1155,10 +1154,10 @@ def get_object(ctx, from_json, file, namespace_name, bucket_name, object_name, v @cli_util.wrap_exceptions def get_object_lifecycle_policy(ctx, from_json, namespace_name, bucket_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1183,13 +1182,13 @@ def get_object_lifecycle_policy(ctx, from_json, namespace_name, bucket_name): @cli_util.wrap_exceptions def get_preauthenticated_request(ctx, from_json, namespace_name, bucket_name, par_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(par_id, six.string_types) and len(par_id.strip()) == 0: + if isinstance(par_id, str) and len(par_id.strip()) == 0: raise click.UsageError('Parameter --par-id cannot be whitespace or empty string') kwargs = {} @@ -1216,10 +1215,10 @@ def get_preauthenticated_request(ctx, from_json, namespace_name, bucket_name, pa @cli_util.wrap_exceptions def get_private_endpoint(ctx, from_json, namespace_name, pe_name, if_match, if_none_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(pe_name, six.string_types) and len(pe_name.strip()) == 0: + if isinstance(pe_name, str) and len(pe_name.strip()) == 0: raise click.UsageError('Parameter --pe-name cannot be whitespace or empty string') kwargs = {} @@ -1248,13 +1247,13 @@ def get_private_endpoint(ctx, from_json, namespace_name, pe_name, if_match, if_n @cli_util.wrap_exceptions def get_replication_policy(ctx, from_json, namespace_name, bucket_name, replication_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(replication_id, six.string_types) and len(replication_id.strip()) == 0: + if isinstance(replication_id, str) and len(replication_id.strip()) == 0: raise click.UsageError('Parameter --replication-id cannot be whitespace or empty string') kwargs = {} @@ -1280,13 +1279,13 @@ def get_replication_policy(ctx, from_json, namespace_name, bucket_name, replicat @cli_util.wrap_exceptions def get_retention_rule(ctx, from_json, namespace_name, bucket_name, retention_rule_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(retention_rule_id, six.string_types) and len(retention_rule_id.strip()) == 0: + if isinstance(retention_rule_id, str) and len(retention_rule_id.strip()) == 0: raise click.UsageError('Parameter --retention-rule-id cannot be whitespace or empty string') kwargs = {} @@ -1310,7 +1309,7 @@ def get_retention_rule(ctx, from_json, namespace_name, bucket_name, retention_ru @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1335,10 +1334,10 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def head_bucket(ctx, from_json, namespace_name, bucket_name, if_match, if_none_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1373,13 +1372,13 @@ def head_bucket(ctx, from_json, namespace_name, bucket_name, if_match, if_none_m @cli_util.wrap_exceptions def head_object(ctx, from_json, namespace_name, bucket_name, object_name, version_id, if_match, if_none_match, opc_sse_customer_algorithm, opc_sse_customer_key, opc_sse_customer_key_sha256): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -1428,7 +1427,7 @@ def list_buckets(ctx, from_json, all_pages, page_size, namespace_name, compartme if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1487,13 +1486,13 @@ def list_multipart_upload_parts(ctx, from_json, all_pages, page_size, namespace_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -1554,10 +1553,10 @@ def list_multipart_uploads(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1622,10 +1621,10 @@ def list_object_versions(ctx, from_json, all_pages, page_size, namespace_name, b if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1697,10 +1696,10 @@ def list_object_versions(ctx, from_json, all_pages, page_size, namespace_name, b @cli_util.wrap_exceptions def list_objects(ctx, from_json, all_pages, namespace_name, bucket_name, prefix, start, end, limit, delimiter, fields, start_after): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1746,10 +1745,10 @@ def list_preauthenticated_requests(ctx, from_json, all_pages, page_size, namespa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1808,7 +1807,7 @@ def list_private_endpoints(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -1867,10 +1866,10 @@ def list_replication_policies(ctx, from_json, all_pages, page_size, namespace_na if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1925,10 +1924,10 @@ def list_replication_sources(ctx, from_json, all_pages, page_size, namespace_nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -1978,10 +1977,10 @@ def list_replication_sources(ctx, from_json, all_pages, page_size, namespace_nam @cli_util.wrap_exceptions def list_retention_rules(ctx, from_json, all_pages, namespace_name, bucket_name, page): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -2020,7 +2019,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2071,7 +2070,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2167,10 +2166,10 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pri @cli_util.wrap_exceptions def make_bucket_writable(ctx, from_json, namespace_name, bucket_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -2234,13 +2233,13 @@ def make_bucket_writable(ctx, from_json, namespace_name, bucket_name): @cli_util.wrap_exceptions def put_object(ctx, from_json, namespace_name, bucket_name, object_name, put_object_body, content_length, if_match, if_none_match, expect, content_md5, opc_checksum_algorithm, opc_content_crc32c, opc_content_sha256, opc_content_sha384, content_type, content_language, content_encoding, content_disposition, cache_control, opc_sse_customer_algorithm, opc_sse_customer_key, opc_sse_customer_key_sha256, opc_sse_kms_key_id, storage_tier, opc_meta_): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -2316,10 +2315,10 @@ def put_object(ctx, from_json, namespace_name, bucket_name, object_name, put_obj @cli_util.wrap_exceptions def put_object_lifecycle_policy(ctx, from_json, force, namespace_name, bucket_name, items, if_match, if_none_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') if not force: if items: @@ -2363,10 +2362,10 @@ def put_object_lifecycle_policy(ctx, from_json, force, namespace_name, bucket_na @cli_util.wrap_exceptions def reencrypt_bucket(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, bucket_name): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -2428,13 +2427,13 @@ def reencrypt_bucket(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def reencrypt_object(ctx, from_json, namespace_name, bucket_name, object_name, kms_key_id, sse_customer_key, source_sse_customer_key, version_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -2481,10 +2480,10 @@ def reencrypt_object(ctx, from_json, namespace_name, bucket_name, object_name, k @cli_util.wrap_exceptions def rename_object(ctx, from_json, namespace_name, bucket_name, source_name, new_name, src_obj_if_match_e_tag, new_obj_if_match_e_tag, new_obj_if_none_match_e_tag): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -2526,10 +2525,10 @@ def rename_object(ctx, from_json, namespace_name, bucket_name, source_name, new_ @cli_util.wrap_exceptions def restore_objects(ctx, from_json, namespace_name, bucket_name, object_name, hours, version_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -2576,10 +2575,10 @@ def restore_objects(ctx, from_json, namespace_name, bucket_name, object_name, ho @cli_util.wrap_exceptions def update_bucket(ctx, from_json, namespace_name, bucket_name, compartment_id, metadata, public_access_type, object_events_enabled, freeform_tags, defined_tags, kms_key_id, versioning, auto_tiering, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -2642,7 +2641,7 @@ def update_bucket(ctx, from_json, namespace_name, bucket_name, compartment_id, m @cli_util.wrap_exceptions def update_namespace_metadata(ctx, from_json, namespace_name, default_s3_compartment_id, default_swift_compartment_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} @@ -2678,10 +2677,10 @@ def update_namespace_metadata(ctx, from_json, namespace_name, default_s3_compart @cli_util.wrap_exceptions def update_object_storage_tier(ctx, from_json, namespace_name, bucket_name, object_name, storage_tier, version_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -2729,10 +2728,10 @@ def update_object_storage_tier(ctx, from_json, namespace_name, bucket_name, obje @cli_util.wrap_exceptions def update_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace_name, pe_name, name, namespace, access_targets, freeform_tags, defined_tags, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(pe_name, six.string_types) and len(pe_name.strip()) == 0: + if isinstance(pe_name, str) and len(pe_name.strip()) == 0: raise click.UsageError('Parameter --pe-name cannot be whitespace or empty string') kwargs = {} @@ -2810,13 +2809,13 @@ def update_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_retention_rule(ctx, from_json, force, namespace_name, bucket_name, retention_rule_id, display_name, duration, time_rule_locked, if_match): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(retention_rule_id, six.string_types) and len(retention_rule_id.strip()) == 0: + if isinstance(retention_rule_id, str) and len(retention_rule_id.strip()) == 0: raise click.UsageError('Parameter --retention-rule-id cannot be whitespace or empty string') if not force: if duration: @@ -2891,13 +2890,13 @@ def update_retention_rule(ctx, from_json, force, namespace_name, bucket_name, re @cli_util.wrap_exceptions def upload_part(ctx, from_json, namespace_name, bucket_name, object_name, upload_id, upload_part_num, upload_part_body, content_length, if_match, if_none_match, expect, content_md5, opc_checksum_algorithm, opc_content_crc32c, opc_content_sha256, opc_content_sha384, opc_sse_customer_algorithm, opc_sse_customer_key, opc_sse_customer_key_sha256, opc_sse_kms_key_id): - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} diff --git a/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/get_object_tasks.py b/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/get_object_tasks.py index 322e789ca..0a9daa692 100644 --- a/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/get_object_tasks.py +++ b/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/get_object_tasks.py @@ -13,7 +13,6 @@ import heapq import oci import os -import six import threading import random import time @@ -131,7 +130,7 @@ def __init__(self, object_storage_client, callbacks_container, object_storage_re else: self.part_size = self.DEFAULT_MULTIPART_DOWNLOAD_SIZE - if isinstance(destination_file_handle, six.string_types): + if isinstance(destination_file_handle, str): # If it's a string, treat it like a file path. Also, since we open the file of our own volition, close it after we're # done. To constrast, if someone provided us something we assume is a file (or file-like) then don't auto-close because # they may want to do something with it after we've done our work @@ -281,7 +280,7 @@ def __init__(self, object_storage_client, callbacks_container, destination_file_ self.add_pending_write_lock = add_pending_write_lock self.retry_count = 0 if isinstance(self.object_storage_client.retry_strategy, oci.retry.NoneRetryStrategy) else DEFAULT_RETRY_COUNT self.destination_file_handle = destination_file_handle - self.downloaded_data = six.BytesIO() + self.downloaded_data = io.BytesIO() if 'chunk_written_callback' in self.kwargs: self.chunk_written_callback = self.kwargs['chunk_written_callback'] @@ -315,7 +314,7 @@ def do_work_hook(self): ) def _get_object(self): - downloaded_data = six.BytesIO() + downloaded_data = io.BytesIO() get_object_response = _make_retrying_get_call(self.object_storage_client, **self.kwargs) total_size = 0 for chunk in get_object_response.data.raw.stream(None, decode_content=False): diff --git a/services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py b/services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py index 010f42533..ac7a92c6a 100644 --- a/services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py +++ b/services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py @@ -20,7 +20,6 @@ import click import dateutil.parser import pytz -import six # noqa: F401 from oci import exceptions from oci.object_storage import UploadManager, MultipartObjectAssembler from oci.object_storage.transfer import constants @@ -298,10 +297,10 @@ def list_object_versions(ctx, from_json, all_pages, page_size, namespace_name, b elif not all_pages and limit is None: limit = 100 - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') kwargs = {} @@ -2661,13 +2660,13 @@ def update_retention_rule(ctx, **kwargs): bucket_name = kwargs['bucket_name'] retention_rule_id = kwargs['retention_rule_id'] - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') - if isinstance(bucket_name, six.string_types) and len(bucket_name.strip()) == 0: + if isinstance(bucket_name, str) and len(bucket_name.strip()) == 0: raise click.UsageError('Parameter --bucket-name cannot be whitespace or empty string') - if isinstance(retention_rule_id, six.string_types) and len(retention_rule_id.strip()) == 0: + if isinstance(retention_rule_id, str) and len(retention_rule_id.strip()) == 0: raise click.UsageError('Parameter --retention-rule-id cannot be whitespace or empty string') # Gather the values to be sent to the API as the body (UpdateRetentionRuleDetails) diff --git a/services/object_storage/tests/integ/test_object_storage_bulk_operations.py b/services/object_storage/tests/integ/test_object_storage_bulk_operations.py index 9f3e8f2ea..212977d9c 100644 --- a/services/object_storage/tests/integ/test_object_storage_bulk_operations.py +++ b/services/object_storage/tests/integ/test_object_storage_bulk_operations.py @@ -15,7 +15,6 @@ import oci import pytest -import six from oci.object_storage.models import CreatePreauthenticatedRequestDetails, CreateReplicationPolicyDetails, \ CreateMultipartUploadDetails @@ -796,7 +795,7 @@ def test_bulk_put_get_delete_with_inclusions(object_storage_client): 'subfolder': ['blah.pdf', 'hello.txt', 'testfile3.png'], 'subfolder/subfolder2': ['xyz.jpg', 'blag.txt', 'byz.jpg', 'testfile4.png'] } - for folder, files in six.iteritems(folders_to_files): + for folder, files in folders_to_files.items(): folder_path = os.path.join(inclusion_test_folder, folder) if not os.path.exists(folder_path): os.makedirs(folder_path) @@ -942,7 +941,7 @@ def test_bulk_put_get_delete_with_exclusions(object_storage_client): 'subfolder': ['blah.pdf', 'hello.txt', 'testfile3.png'], 'subfolder/subfolder2': ['xyz.jpg', 'blag.txt', 'byz.jpg', 'testfile4.png'] } - for folder, files in six.iteritems(folders_to_files): + for folder, files in folders_to_files.items(): folder_path = os.path.join(exclusion_test_folder, folder) if not os.path.exists(folder_path): os.makedirs(folder_path) diff --git a/services/oce/src/oci_cli_oce_instance/generated/oceinstance_cli.py b/services/oce/src/oci_cli_oce_instance/generated/oceinstance_cli.py index 301970cc6..2500eecaa 100644 --- a/services/oce/src/oci_cli_oce_instance/generated/oceinstance_cli.py +++ b/services/oce/src/oci_cli_oce_instance/generated/oceinstance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -66,7 +65,7 @@ def oce_instance_group(): @cli_util.wrap_exceptions def change_oce_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oce_instance_id, compartment_id, if_match): - if isinstance(oce_instance_id, six.string_types) and len(oce_instance_id.strip()) == 0: + if isinstance(oce_instance_id, str) and len(oce_instance_id.strip()) == 0: raise click.UsageError('Parameter --oce-instance-id cannot be whitespace or empty string') kwargs = {} @@ -236,7 +235,7 @@ def create_oce_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_oce_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oce_instance_id, if_match): - if isinstance(oce_instance_id, six.string_types) and len(oce_instance_id.strip()) == 0: + if isinstance(oce_instance_id, str) and len(oce_instance_id.strip()) == 0: raise click.UsageError('Parameter --oce-instance-id cannot be whitespace or empty string') kwargs = {} @@ -287,7 +286,7 @@ def delete_oce_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_oce_instance(ctx, from_json, oce_instance_id): - if isinstance(oce_instance_id, six.string_types) and len(oce_instance_id.strip()) == 0: + if isinstance(oce_instance_id, str) and len(oce_instance_id.strip()) == 0: raise click.UsageError('Parameter --oce-instance-id cannot be whitespace or empty string') kwargs = {} @@ -309,7 +308,7 @@ def get_oce_instance(ctx, from_json, oce_instance_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -403,7 +402,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -454,7 +453,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -563,7 +562,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, res @cli_util.wrap_exceptions def update_oce_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oce_instance_id, description, waf_primary_domain, instance_license_type, instance_usage_type, add_on_features, lifecycle_details, dr_region, freeform_tags, defined_tags, if_match): - if isinstance(oce_instance_id, six.string_types) and len(oce_instance_id.strip()) == 0: + if isinstance(oce_instance_id, str) and len(oce_instance_id.strip()) == 0: raise click.UsageError('Parameter --oce-instance-id cannot be whitespace or empty string') if not force: if add_on_features or freeform_tags or defined_tags: diff --git a/services/oci_control_center/src/oci_cli_occ_metrics/generated/occmetrics_cli.py b/services/oci_control_center/src/oci_cli_occ_metrics/generated/occmetrics_cli.py index b38403658..749b94ebb 100644 --- a/services/oci_control_center/src/oci_cli_occ_metrics/generated/occmetrics_cli.py +++ b/services/oci_control_center/src/oci_cli_occ_metrics/generated/occmetrics_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -62,7 +61,7 @@ def list_metric_properties(ctx, from_json, all_pages, page_size, namespace_name, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(namespace_name, six.string_types) and len(namespace_name.strip()) == 0: + if isinstance(namespace_name, str) and len(namespace_name.strip()) == 0: raise click.UsageError('Parameter --namespace-name cannot be whitespace or empty string') kwargs = {} diff --git a/services/ocvp/src/oci_cli_cluster/generated/cluster_cli.py b/services/ocvp/src/oci_cli_cluster/generated/cluster_cli.py index c14916665..25b8b4852 100644 --- a/services/ocvp/src/oci_cli_cluster/generated/cluster_cli.py +++ b/services/ocvp/src/oci_cli_cluster/generated/cluster_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -183,7 +182,7 @@ def create_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -234,7 +233,7 @@ def delete_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_cluster(ctx, from_json, cluster_id): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs = {} @@ -337,7 +336,7 @@ def list_clusters(ctx, from_json, all_pages, page_size, sddc_id, display_name, l @cli_util.wrap_exceptions def update_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, cluster_id, display_name, network_configuration, vmware_software_version, esxi_software_version, freeform_tags, defined_tags, if_match): - if isinstance(cluster_id, six.string_types) and len(cluster_id.strip()) == 0: + if isinstance(cluster_id, str) and len(cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') if not force: if network_configuration or freeform_tags or defined_tags: diff --git a/services/ocvp/src/oci_cli_esxi_host/generated/esxihost_cli.py b/services/ocvp/src/oci_cli_esxi_host/generated/esxihost_cli.py index a9ed10628..7457d65d2 100644 --- a/services/ocvp/src/oci_cli_esxi_host/generated/esxihost_cli.py +++ b/services/ocvp/src/oci_cli_esxi_host/generated/esxihost_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -171,7 +170,7 @@ def create_esxi_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def delete_esxi_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, esxi_host_id, if_match): - if isinstance(esxi_host_id, six.string_types) and len(esxi_host_id.strip()) == 0: + if isinstance(esxi_host_id, str) and len(esxi_host_id.strip()) == 0: raise click.UsageError('Parameter --esxi-host-id cannot be whitespace or empty string') kwargs = {} @@ -222,7 +221,7 @@ def delete_esxi_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def get_esxi_host(ctx, from_json, esxi_host_id): - if isinstance(esxi_host_id, six.string_types) and len(esxi_host_id.strip()) == 0: + if isinstance(esxi_host_id, str) and len(esxi_host_id.strip()) == 0: raise click.UsageError('Parameter --esxi-host-id cannot be whitespace or empty string') kwargs = {} @@ -248,7 +247,7 @@ def get_esxi_host(ctx, from_json, esxi_host_id): @cli_util.wrap_exceptions def inplace_upgrade(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, esxi_host_id, if_match): - if isinstance(esxi_host_id, six.string_types) and len(esxi_host_id.strip()) == 0: + if isinstance(esxi_host_id, str) and len(esxi_host_id.strip()) == 0: raise click.UsageError('Parameter --esxi-host-id cannot be whitespace or empty string') kwargs = {} @@ -382,7 +381,7 @@ def list_esxi_hosts(ctx, from_json, all_pages, page_size, sddc_id, cluster_id, c @cli_util.wrap_exceptions def replace_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, esxi_host_id, esxi_software_version, if_match): - if isinstance(esxi_host_id, six.string_types) and len(esxi_host_id.strip()) == 0: + if isinstance(esxi_host_id, str) and len(esxi_host_id.strip()) == 0: raise click.UsageError('Parameter --esxi-host-id cannot be whitespace or empty string') kwargs = {} @@ -445,7 +444,7 @@ def replace_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def swap_billing(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, esxi_host_id, swap_billing_host_id, if_match): - if isinstance(esxi_host_id, six.string_types) and len(esxi_host_id.strip()) == 0: + if isinstance(esxi_host_id, str) and len(esxi_host_id.strip()) == 0: raise click.UsageError('Parameter --esxi-host-id cannot be whitespace or empty string') kwargs = {} @@ -513,7 +512,7 @@ def swap_billing(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def update_esxi_host(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, esxi_host_id, display_name, next_commitment, billing_donor_host_id, freeform_tags, defined_tags, if_match): - if isinstance(esxi_host_id, six.string_types) and len(esxi_host_id.strip()) == 0: + if isinstance(esxi_host_id, str) and len(esxi_host_id.strip()) == 0: raise click.UsageError('Parameter --esxi-host-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/ocvp/src/oci_cli_sddc/generated/sddc_cli.py b/services/ocvp/src/oci_cli_sddc/generated/sddc_cli.py index 96c5bb6a0..042f731e6 100644 --- a/services/ocvp/src/oci_cli_sddc/generated/sddc_cli.py +++ b/services/ocvp/src/oci_cli_sddc/generated/sddc_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -76,7 +75,7 @@ def supported_commitment_summary_group(): @cli_util.wrap_exceptions def cancel_downgrade_hcx(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sddc_id, if_match): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') kwargs = {} @@ -129,7 +128,7 @@ def cancel_downgrade_hcx(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def change_sddc_compartment(ctx, from_json, sddc_id, compartment_id, if_match): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') kwargs = {} @@ -254,7 +253,7 @@ def create_sddc(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def delete_sddc(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sddc_id, if_match): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') kwargs = {} @@ -310,7 +309,7 @@ def delete_sddc(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def downgrade_hcx(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, reserving_hcx_on_premise_license_keys, sddc_id, if_match): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') kwargs = {} @@ -366,7 +365,7 @@ def downgrade_hcx(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def get_sddc(ctx, from_json, sddc_id): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') kwargs = {} @@ -624,7 +623,7 @@ def list_supported_vmware_software_versions(ctx, from_json, all_pages, page_size @cli_util.wrap_exceptions def refresh_hcx_license_status(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sddc_id, if_match): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') kwargs = {} @@ -677,7 +676,7 @@ def refresh_hcx_license_status(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def retrieve_password(ctx, from_json, sddc_id, type, if_match): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') kwargs = {} @@ -723,7 +722,7 @@ def retrieve_password(ctx, from_json, sddc_id, type, if_match): @cli_util.wrap_exceptions def update_sddc(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sddc_id, display_name, vmware_software_version, esxi_software_version, ssh_authorized_keys, freeform_tags, defined_tags, if_match): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -800,7 +799,7 @@ def update_sddc(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def upgrade_hcx(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sddc_id, if_match): - if isinstance(sddc_id, six.string_types) and len(sddc_id.strip()) == 0: + if isinstance(sddc_id, str) and len(sddc_id.strip()) == 0: raise click.UsageError('Parameter --sddc-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/ocvp/src/oci_cli_work_request/generated/workrequest_cli.py b/services/ocvp/src/oci_cli_work_request/generated/workrequest_cli.py index a68894f44..a0e1af615 100644 --- a/services/ocvp/src/oci_cli_work_request/generated/workrequest_cli.py +++ b/services/ocvp/src/oci_cli_work_request/generated/workrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -56,7 +55,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -85,7 +84,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -136,7 +135,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/oda/src/oci_cli_management/generated/management_cli.py b/services/oda/src/oci_cli_management/generated/management_cli.py index 03325df0d..dfcce1fe0 100644 --- a/services/oda/src/oci_cli_management/generated/management_cli.py +++ b/services/oda/src/oci_cli_management/generated/management_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -116,10 +115,10 @@ def channel_group(): @cli_util.wrap_exceptions def bulk_create_skill_entities(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, skill_id, items): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -179,10 +178,10 @@ def bulk_create_skill_entities(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def cascading_delete_skill_custom_entities(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, skill_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -241,7 +240,7 @@ def cascading_delete_skill_custom_entities(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def change_oda_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_private_endpoint_id, compartment_id, if_match): - if isinstance(oda_private_endpoint_id, six.string_types) and len(oda_private_endpoint_id.strip()) == 0: + if isinstance(oda_private_endpoint_id, str) and len(oda_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -298,7 +297,7 @@ def change_oda_private_endpoint_compartment(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def configure_digital_assistant_parameters(ctx, from_json, oda_instance_id, parameters): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -344,7 +343,7 @@ def configure_digital_assistant_parameters(ctx, from_json, oda_instance_id, para @cli_util.wrap_exceptions def create_authentication_provider(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, grant_type, identity_provider, name, token_endpoint_url, client_id, client_secret, scopes, authorization_endpoint_url, short_authorization_code_request_url, revoke_token_endpoint_url, subject_claim, refresh_token_retention_period_in_days, redirect_url, is_visible, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -433,7 +432,7 @@ def create_authentication_provider(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def create_channel(ctx, from_json, oda_instance_id, name, type, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -481,7 +480,7 @@ def create_channel(ctx, from_json, oda_instance_id, name, type, description, ses @cli_util.wrap_exceptions def create_channel_create_ms_teams_channel_details(ctx, from_json, oda_instance_id, name, msa_app_id, msa_app_password, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -540,7 +539,7 @@ def create_channel_create_ms_teams_channel_details(ctx, from_json, oda_instance_ @cli_util.wrap_exceptions def create_channel_create_web_channel_details(ctx, from_json, oda_instance_id, name, is_client_authentication_enabled, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, max_token_expiration_time_in_minutes, allowed_domains, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -599,7 +598,7 @@ def create_channel_create_web_channel_details(ctx, from_json, oda_instance_id, n @cli_util.wrap_exceptions def create_channel_create_facebook_channel_details(ctx, from_json, oda_instance_id, name, app_secret, page_access_token, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -652,7 +651,7 @@ def create_channel_create_facebook_channel_details(ctx, from_json, oda_instance_ @cli_util.wrap_exceptions def create_channel_create_application_channel_details(ctx, from_json, oda_instance_id, name, is_authenticated_user_id, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, outbound_url): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -715,7 +714,7 @@ def create_channel_create_application_channel_details(ctx, from_json, oda_instan @cli_util.wrap_exceptions def create_channel_create_service_cloud_channel_details(ctx, from_json, oda_instance_id, name, domain_name, host_name_prefix, user_name, password, client_type, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -772,7 +771,7 @@ def create_channel_create_service_cloud_channel_details(ctx, from_json, oda_inst @cli_util.wrap_exceptions def create_channel_create_slack_channel_details(ctx, from_json, oda_instance_id, name, client_id, signing_secret, client_secret, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, auth_success_url, auth_error_url, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -842,7 +841,7 @@ def create_channel_create_slack_channel_details(ctx, from_json, oda_instance_id, @cli_util.wrap_exceptions def create_channel_create_osvc_channel_details(ctx, from_json, oda_instance_id, name, host, port, user_name, password, total_session_count, authentication_provider_name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, channel_service, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -902,7 +901,7 @@ def create_channel_create_osvc_channel_details(ctx, from_json, oda_instance_id, @cli_util.wrap_exceptions def create_channel_create_app_event_channel_details(ctx, from_json, oda_instance_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, outbound_url, event_sink_bot_ids): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -964,7 +963,7 @@ def create_channel_create_app_event_channel_details(ctx, from_json, oda_instance @cli_util.wrap_exceptions def create_channel_create_oss_channel_details(ctx, from_json, oda_instance_id, name, inbound_message_topic, outbound_message_topic, bootstrap_servers, security_protocol, sasl_mechanism, tenancy_name, user_name, stream_pool_id, auth_token, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, event_sink_bot_ids): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1025,7 +1024,7 @@ def create_channel_create_oss_channel_details(ctx, from_json, oda_instance_id, n @cli_util.wrap_exceptions def create_channel_create_cortana_channel_details(ctx, from_json, oda_instance_id, name, msa_app_id, msa_app_password, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1079,7 +1078,7 @@ def create_channel_create_cortana_channel_details(ctx, from_json, oda_instance_i @cli_util.wrap_exceptions def create_channel_create_android_channel_details(ctx, from_json, oda_instance_id, name, is_client_authentication_enabled, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, max_token_expiration_time_in_minutes, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1138,7 +1137,7 @@ def create_channel_create_android_channel_details(ctx, from_json, oda_instance_i @cli_util.wrap_exceptions def create_channel_create_twilio_channel_details(ctx, from_json, oda_instance_id, name, account_sid, phone_number, auth_token, is_mms_enabled, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, original_connectors_url, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1197,7 +1196,7 @@ def create_channel_create_twilio_channel_details(ctx, from_json, oda_instance_id @cli_util.wrap_exceptions def create_channel_create_webhook_channel_details(ctx, from_json, oda_instance_id, name, outbound_url, payload_version, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1251,7 +1250,7 @@ def create_channel_create_webhook_channel_details(ctx, from_json, oda_instance_i @cli_util.wrap_exceptions def create_channel_create_ios_channel_details(ctx, from_json, oda_instance_id, name, is_client_authentication_enabled, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, max_token_expiration_time_in_minutes, bot_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1310,7 +1309,7 @@ def create_channel_create_ios_channel_details(ctx, from_json, oda_instance_id, n @cli_util.wrap_exceptions def create_digital_assistant(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, kind, category, description, platform_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1397,7 +1396,7 @@ def create_digital_assistant(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def create_digital_assistant_create_digital_assistant_version_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, id, version_parameterconflict, category, description, platform_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1489,7 +1488,7 @@ def create_digital_assistant_create_digital_assistant_version_details(ctx, from_ @cli_util.wrap_exceptions def create_digital_assistant_clone_digital_assistant_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, id, name, display_name, category, description, platform_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags, version_parameterconflict): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1585,7 +1584,7 @@ def create_digital_assistant_clone_digital_assistant_details(ctx, from_json, wai @cli_util.wrap_exceptions def create_digital_assistant_create_new_digital_assistant_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, name, display_name, category, description, platform_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags, version_parameterconflict, native_language_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1683,7 +1682,7 @@ def create_digital_assistant_create_new_digital_assistant_details(ctx, from_json @cli_util.wrap_exceptions def create_digital_assistant_extend_digital_assistant_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, id, name, display_name, category, description, platform_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags, version_parameterconflict): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1907,7 +1906,7 @@ def create_oda_private_endpoint_attachment(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def create_oda_private_endpoint_scan_proxy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scan_listener_type, protocol, scan_listener_infos, oda_private_endpoint_id): - if isinstance(oda_private_endpoint_id, six.string_types) and len(oda_private_endpoint_id.strip()) == 0: + if isinstance(oda_private_endpoint_id, str) and len(oda_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -1975,7 +1974,7 @@ def create_oda_private_endpoint_scan_proxy(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def create_skill(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, kind, category, description, platform_version, dialog_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2068,7 +2067,7 @@ def create_skill(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def create_skill_clone_skill_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, id, name, display_name, category, description, platform_version, dialog_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags, version_parameterconflict): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2168,7 +2167,7 @@ def create_skill_clone_skill_details(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def create_skill_create_new_skill_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, name, display_name, version_parameterconflict, category, description, platform_version, dialog_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags, native_language_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2266,7 +2265,7 @@ def create_skill_create_new_skill_details(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def create_skill_create_skill_version_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, id, version_parameterconflict, category, description, platform_version, dialog_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2362,7 +2361,7 @@ def create_skill_create_skill_version_details(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def create_skill_extend_skill_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, id, name, display_name, category, description, platform_version, dialog_version, multilingual_mode, primary_language_tag, freeform_tags, defined_tags, version_parameterconflict): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2456,10 +2455,10 @@ def create_skill_extend_skill_details(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def create_skill_parameter(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, skill_id, name, display_name, type, value, description): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -2525,7 +2524,7 @@ def create_skill_parameter(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def create_translator(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, type, base_url, auth_token, properties, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2589,10 +2588,10 @@ def create_translator(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_authentication_provider(ctx, from_json, oda_instance_id, authentication_provider_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(authentication_provider_id, six.string_types) and len(authentication_provider_id.strip()) == 0: + if isinstance(authentication_provider_id, str) and len(authentication_provider_id.strip()) == 0: raise click.UsageError('Parameter --authentication-provider-id cannot be whitespace or empty string') kwargs = {} @@ -2620,10 +2619,10 @@ def delete_authentication_provider(ctx, from_json, oda_instance_id, authenticati @cli_util.wrap_exceptions def delete_channel(ctx, from_json, oda_instance_id, channel_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -2651,10 +2650,10 @@ def delete_channel(ctx, from_json, oda_instance_id, channel_id, if_match): @cli_util.wrap_exceptions def delete_digital_assistant(ctx, from_json, oda_instance_id, digital_assistant_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(digital_assistant_id, six.string_types) and len(digital_assistant_id.strip()) == 0: + if isinstance(digital_assistant_id, str) and len(digital_assistant_id.strip()) == 0: raise click.UsageError('Parameter --digital-assistant-id cannot be whitespace or empty string') kwargs = {} @@ -2684,7 +2683,7 @@ def delete_digital_assistant(ctx, from_json, oda_instance_id, digital_assistant_ @cli_util.wrap_exceptions def delete_oda_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_private_endpoint_id, if_match): - if isinstance(oda_private_endpoint_id, six.string_types) and len(oda_private_endpoint_id.strip()) == 0: + if isinstance(oda_private_endpoint_id, str) and len(oda_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2740,7 +2739,7 @@ def delete_oda_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_oda_private_endpoint_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_private_endpoint_attachment_id, if_match): - if isinstance(oda_private_endpoint_attachment_id, six.string_types) and len(oda_private_endpoint_attachment_id.strip()) == 0: + if isinstance(oda_private_endpoint_attachment_id, str) and len(oda_private_endpoint_attachment_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -2797,10 +2796,10 @@ def delete_oda_private_endpoint_attachment(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def delete_oda_private_endpoint_scan_proxy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_private_endpoint_scan_proxy_id, oda_private_endpoint_id, if_match): - if isinstance(oda_private_endpoint_scan_proxy_id, six.string_types) and len(oda_private_endpoint_scan_proxy_id.strip()) == 0: + if isinstance(oda_private_endpoint_scan_proxy_id, str) and len(oda_private_endpoint_scan_proxy_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-scan-proxy-id cannot be whitespace or empty string') - if isinstance(oda_private_endpoint_id, six.string_types) and len(oda_private_endpoint_id.strip()) == 0: + if isinstance(oda_private_endpoint_id, str) and len(oda_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2855,10 +2854,10 @@ def delete_oda_private_endpoint_scan_proxy(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def delete_skill(ctx, from_json, oda_instance_id, skill_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -2887,13 +2886,13 @@ def delete_skill(ctx, from_json, oda_instance_id, skill_id, if_match): @cli_util.wrap_exceptions def delete_skill_parameter(ctx, from_json, oda_instance_id, skill_id, parameter_name, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') - if isinstance(parameter_name, six.string_types) and len(parameter_name.strip()) == 0: + if isinstance(parameter_name, str) and len(parameter_name.strip()) == 0: raise click.UsageError('Parameter --parameter-name cannot be whitespace or empty string') kwargs = {} @@ -2922,10 +2921,10 @@ def delete_skill_parameter(ctx, from_json, oda_instance_id, skill_id, parameter_ @cli_util.wrap_exceptions def delete_translator(ctx, from_json, oda_instance_id, translator_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(translator_id, six.string_types) and len(translator_id.strip()) == 0: + if isinstance(translator_id, str) and len(translator_id.strip()) == 0: raise click.UsageError('Parameter --translator-id cannot be whitespace or empty string') kwargs = {} @@ -2955,10 +2954,10 @@ def delete_translator(ctx, from_json, oda_instance_id, translator_id, if_match): @cli_util.wrap_exceptions def export_digital_assistant(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, digital_assistant_id, target): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(digital_assistant_id, six.string_types) and len(digital_assistant_id.strip()) == 0: + if isinstance(digital_assistant_id, str) and len(digital_assistant_id.strip()) == 0: raise click.UsageError('Parameter --digital-assistant-id cannot be whitespace or empty string') kwargs = {} @@ -3018,10 +3017,10 @@ def export_digital_assistant(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def export_skill(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, skill_id, target): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -3078,10 +3077,10 @@ def export_skill(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def get_authentication_provider(ctx, from_json, oda_instance_id, authentication_provider_id, if_none_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(authentication_provider_id, six.string_types) and len(authentication_provider_id.strip()) == 0: + if isinstance(authentication_provider_id, str) and len(authentication_provider_id.strip()) == 0: raise click.UsageError('Parameter --authentication-provider-id cannot be whitespace or empty string') kwargs = {} @@ -3108,10 +3107,10 @@ def get_authentication_provider(ctx, from_json, oda_instance_id, authentication_ @cli_util.wrap_exceptions def get_channel(ctx, from_json, oda_instance_id, channel_id, if_none_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -3138,10 +3137,10 @@ def get_channel(ctx, from_json, oda_instance_id, channel_id, if_none_match): @cli_util.wrap_exceptions def get_digital_assistant(ctx, from_json, oda_instance_id, digital_assistant_id, if_none_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(digital_assistant_id, six.string_types) and len(digital_assistant_id.strip()) == 0: + if isinstance(digital_assistant_id, str) and len(digital_assistant_id.strip()) == 0: raise click.UsageError('Parameter --digital-assistant-id cannot be whitespace or empty string') kwargs = {} @@ -3169,13 +3168,13 @@ def get_digital_assistant(ctx, from_json, oda_instance_id, digital_assistant_id, @cli_util.wrap_exceptions def get_digital_assistant_parameter(ctx, from_json, oda_instance_id, digital_assistant_id, parameter_name, if_none_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(digital_assistant_id, six.string_types) and len(digital_assistant_id.strip()) == 0: + if isinstance(digital_assistant_id, str) and len(digital_assistant_id.strip()) == 0: raise click.UsageError('Parameter --digital-assistant-id cannot be whitespace or empty string') - if isinstance(parameter_name, six.string_types) and len(parameter_name.strip()) == 0: + if isinstance(parameter_name, str) and len(parameter_name.strip()) == 0: raise click.UsageError('Parameter --parameter-name cannot be whitespace or empty string') kwargs = {} @@ -3201,7 +3200,7 @@ def get_digital_assistant_parameter(ctx, from_json, oda_instance_id, digital_ass @cli_util.wrap_exceptions def get_oda_private_endpoint(ctx, from_json, oda_private_endpoint_id): - if isinstance(oda_private_endpoint_id, six.string_types) and len(oda_private_endpoint_id.strip()) == 0: + if isinstance(oda_private_endpoint_id, str) and len(oda_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -3223,7 +3222,7 @@ def get_oda_private_endpoint(ctx, from_json, oda_private_endpoint_id): @cli_util.wrap_exceptions def get_oda_private_endpoint_attachment(ctx, from_json, oda_private_endpoint_attachment_id): - if isinstance(oda_private_endpoint_attachment_id, six.string_types) and len(oda_private_endpoint_attachment_id.strip()) == 0: + if isinstance(oda_private_endpoint_attachment_id, str) and len(oda_private_endpoint_attachment_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-attachment-id cannot be whitespace or empty string') kwargs = {} @@ -3246,10 +3245,10 @@ def get_oda_private_endpoint_attachment(ctx, from_json, oda_private_endpoint_att @cli_util.wrap_exceptions def get_oda_private_endpoint_scan_proxy(ctx, from_json, oda_private_endpoint_scan_proxy_id, oda_private_endpoint_id): - if isinstance(oda_private_endpoint_scan_proxy_id, six.string_types) and len(oda_private_endpoint_scan_proxy_id.strip()) == 0: + if isinstance(oda_private_endpoint_scan_proxy_id, str) and len(oda_private_endpoint_scan_proxy_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-scan-proxy-id cannot be whitespace or empty string') - if isinstance(oda_private_endpoint_id, six.string_types) and len(oda_private_endpoint_id.strip()) == 0: + if isinstance(oda_private_endpoint_id, str) and len(oda_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -3274,10 +3273,10 @@ def get_oda_private_endpoint_scan_proxy(ctx, from_json, oda_private_endpoint_sca @cli_util.wrap_exceptions def get_skill(ctx, from_json, oda_instance_id, skill_id, if_none_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -3305,13 +3304,13 @@ def get_skill(ctx, from_json, oda_instance_id, skill_id, if_none_match): @cli_util.wrap_exceptions def get_skill_parameter(ctx, from_json, oda_instance_id, skill_id, parameter_name, if_none_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') - if isinstance(parameter_name, six.string_types) and len(parameter_name.strip()) == 0: + if isinstance(parameter_name, str) and len(parameter_name.strip()) == 0: raise click.UsageError('Parameter --parameter-name cannot be whitespace or empty string') kwargs = {} @@ -3339,10 +3338,10 @@ def get_skill_parameter(ctx, from_json, oda_instance_id, skill_id, parameter_nam @cli_util.wrap_exceptions def get_translator(ctx, from_json, oda_instance_id, translator_id, if_none_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(translator_id, six.string_types) and len(translator_id.strip()) == 0: + if isinstance(translator_id, str) and len(translator_id.strip()) == 0: raise click.UsageError('Parameter --translator-id cannot be whitespace or empty string') kwargs = {} @@ -3371,7 +3370,7 @@ def get_translator(ctx, from_json, oda_instance_id, translator_id, if_none_match @cli_util.wrap_exceptions def import_bot(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, source): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3448,7 +3447,7 @@ def list_authentication_providers(ctx, from_json, all_pages, page_size, oda_inst if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3528,7 +3527,7 @@ def list_channels(ctx, from_json, all_pages, page_size, oda_instance_id, id, nam if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3606,10 +3605,10 @@ def list_digital_assistant_parameters(ctx, from_json, all_pages, page_size, oda_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(digital_assistant_id, six.string_types) and len(digital_assistant_id.strip()) == 0: + if isinstance(digital_assistant_id, str) and len(digital_assistant_id.strip()) == 0: raise click.UsageError('Parameter --digital-assistant-id cannot be whitespace or empty string') kwargs = {} @@ -3695,7 +3694,7 @@ def list_digital_assistants(ctx, from_json, all_pages, page_size, oda_instance_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -3846,7 +3845,7 @@ def list_oda_private_endpoint_scan_proxies(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_private_endpoint_id, six.string_types) and len(oda_private_endpoint_id.strip()) == 0: + if isinstance(oda_private_endpoint_id, str) and len(oda_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -3986,10 +3985,10 @@ def list_skill_parameters(ctx, from_json, all_pages, page_size, oda_instance_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -4075,7 +4074,7 @@ def list_skills(ctx, from_json, all_pages, page_size, oda_instance_id, id, categ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4162,7 +4161,7 @@ def list_translators(ctx, from_json, all_pages, page_size, oda_instance_id, id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -4223,10 +4222,10 @@ def list_translators(ctx, from_json, all_pages, page_size, oda_instance_id, id, @cli_util.wrap_exceptions def publish_digital_assistant(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, digital_assistant_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(digital_assistant_id, six.string_types) and len(digital_assistant_id.strip()) == 0: + if isinstance(digital_assistant_id, str) and len(digital_assistant_id.strip()) == 0: raise click.UsageError('Parameter --digital-assistant-id cannot be whitespace or empty string') kwargs = {} @@ -4279,10 +4278,10 @@ def publish_digital_assistant(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def publish_skill(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, skill_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -4332,10 +4331,10 @@ def publish_skill(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def rotate_channel_keys(ctx, from_json, oda_instance_id, channel_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -4365,10 +4364,10 @@ def rotate_channel_keys(ctx, from_json, oda_instance_id, channel_id, if_match): @cli_util.wrap_exceptions def start_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -4421,10 +4420,10 @@ def start_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def stop_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') kwargs = {} @@ -4478,10 +4477,10 @@ def stop_channel(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def train_skill(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, skill_id, items, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') kwargs = {} @@ -4556,10 +4555,10 @@ def train_skill(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def update_authentication_provider(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, authentication_provider_id, token_endpoint_url, authorization_endpoint_url, short_authorization_code_request_url, revoke_token_endpoint_url, client_id, client_secret, scopes, subject_claim, refresh_token_retention_period_in_days, redirect_url, freeform_tags, defined_tags, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(authentication_provider_id, six.string_types) and len(authentication_provider_id.strip()) == 0: + if isinstance(authentication_provider_id, str) and len(authentication_provider_id.strip()) == 0: raise click.UsageError('Parameter --authentication-provider-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4663,10 +4662,10 @@ def update_authentication_provider(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_channel(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, type, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4761,10 +4760,10 @@ def update_channel(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_channel_update_osvc_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, host, port, user_name, password, total_session_count, channel_service, authentication_provider_name, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4882,10 +4881,10 @@ def update_channel_update_osvc_channel_details(ctx, from_json, force, wait_for_s @cli_util.wrap_exceptions def update_channel_update_oss_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, event_sink_bot_ids, inbound_message_topic, outbound_message_topic, bootstrap_servers, security_protocol, sasl_mechanism, tenancy_name, user_name, stream_pool_id, auth_token, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or event_sink_bot_ids: @@ -5002,10 +5001,10 @@ def update_channel_update_oss_channel_details(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_channel_update_android_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, max_token_expiration_time_in_minutes, is_client_authentication_enabled, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5101,10 +5100,10 @@ def update_channel_update_android_channel_details(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_channel_update_ms_teams_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, msa_app_id, msa_app_password, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5199,10 +5198,10 @@ def update_channel_update_ms_teams_channel_details(ctx, from_json, force, wait_f @cli_util.wrap_exceptions def update_channel_update_app_event_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, outbound_url, event_sink_bot_ids, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or event_sink_bot_ids: @@ -5300,10 +5299,10 @@ def update_channel_update_app_event_channel_details(ctx, from_json, force, wait_ @cli_util.wrap_exceptions def update_channel_update_web_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, max_token_expiration_time_in_minutes, is_client_authentication_enabled, allowed_domains, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5402,10 +5401,10 @@ def update_channel_update_web_channel_details(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_channel_update_ios_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, max_token_expiration_time_in_minutes, is_client_authentication_enabled, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5504,10 +5503,10 @@ def update_channel_update_ios_channel_details(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_channel_update_slack_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, client_id, auth_success_url, auth_error_url, signing_secret, client_secret, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5622,10 +5621,10 @@ def update_channel_update_slack_channel_details(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_channel_update_service_cloud_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, domain_name, host_name_prefix, user_name, password, client_type, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5730,10 +5729,10 @@ def update_channel_update_service_cloud_channel_details(ctx, from_json, force, w @cli_util.wrap_exceptions def update_channel_update_twilio_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, account_sid, phone_number, auth_token, is_mms_enabled, original_connectors_url, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5838,10 +5837,10 @@ def update_channel_update_twilio_channel_details(ctx, from_json, force, wait_for @cli_util.wrap_exceptions def update_channel_update_webhook_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, outbound_url, payload_version, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -5936,10 +5935,10 @@ def update_channel_update_webhook_channel_details(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_channel_update_application_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, outbound_url, is_authenticated_user_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6032,10 +6031,10 @@ def update_channel_update_application_channel_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_channel_update_facebook_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, app_secret, page_access_token, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6131,10 +6130,10 @@ def update_channel_update_facebook_channel_details(ctx, from_json, force, wait_f @cli_util.wrap_exceptions def update_channel_update_cortana_channel_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, channel_id, name, description, session_expiry_duration_in_milliseconds, freeform_tags, defined_tags, msa_app_id, msa_app_password, bot_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(channel_id, six.string_types) and len(channel_id.strip()) == 0: + if isinstance(channel_id, str) and len(channel_id.strip()) == 0: raise click.UsageError('Parameter --channel-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6226,10 +6225,10 @@ def update_channel_update_cortana_channel_details(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_digital_assistant(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, digital_assistant_id, category, description, freeform_tags, defined_tags, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(digital_assistant_id, six.string_types) and len(digital_assistant_id.strip()) == 0: + if isinstance(digital_assistant_id, str) and len(digital_assistant_id.strip()) == 0: raise click.UsageError('Parameter --digital-assistant-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6304,13 +6303,13 @@ def update_digital_assistant(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_digital_assistant_parameter(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, digital_assistant_id, parameter_name, value, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(digital_assistant_id, six.string_types) and len(digital_assistant_id.strip()) == 0: + if isinstance(digital_assistant_id, str) and len(digital_assistant_id.strip()) == 0: raise click.UsageError('Parameter --digital-assistant-id cannot be whitespace or empty string') - if isinstance(parameter_name, six.string_types) and len(parameter_name.strip()) == 0: + if isinstance(parameter_name, str) and len(parameter_name.strip()) == 0: raise click.UsageError('Parameter --parameter-name cannot be whitespace or empty string') kwargs = {} @@ -6374,7 +6373,7 @@ def update_digital_assistant_parameter(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_oda_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_private_endpoint_id, display_name, description, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(oda_private_endpoint_id, six.string_types) and len(oda_private_endpoint_id.strip()) == 0: + if isinstance(oda_private_endpoint_id, str) and len(oda_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --oda-private-endpoint-id cannot be whitespace or empty string') if not force: if nsg_ids or freeform_tags or defined_tags: @@ -6458,10 +6457,10 @@ def update_oda_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_skill(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, skill_id, category, description, freeform_tags, defined_tags, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6538,13 +6537,13 @@ def update_skill(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_skill_parameter(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, skill_id, parameter_name, display_name, description, value, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(skill_id, six.string_types) and len(skill_id.strip()) == 0: + if isinstance(skill_id, str) and len(skill_id.strip()) == 0: raise click.UsageError('Parameter --skill-id cannot be whitespace or empty string') - if isinstance(parameter_name, six.string_types) and len(parameter_name.strip()) == 0: + if isinstance(parameter_name, str) and len(parameter_name.strip()) == 0: raise click.UsageError('Parameter --parameter-name cannot be whitespace or empty string') kwargs = {} @@ -6617,10 +6616,10 @@ def update_skill_parameter(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_translator(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, translator_id, base_url, auth_token, properties, freeform_tags, defined_tags, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(translator_id, six.string_types) and len(translator_id.strip()) == 0: + if isinstance(translator_id, str) and len(translator_id.strip()) == 0: raise click.UsageError('Parameter --translator-id cannot be whitespace or empty string') if not force: if properties or freeform_tags or defined_tags: diff --git a/services/oda/src/oci_cli_oda/generated/oda_cli.py b/services/oda/src/oci_cli_oda/generated/oda_cli.py index 54b53e3e6..5c55dc7ab 100644 --- a/services/oda/src/oci_cli_oda/generated/oda_cli.py +++ b/services/oda/src/oci_cli_oda/generated/oda_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -89,7 +88,7 @@ def work_request_group(): @cli_util.wrap_exceptions def change_oda_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, compartment_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -240,7 +239,7 @@ def create_oda_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def create_oda_instance_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, attach_to_id, attachment_type, owner, attachment_metadata, restricted_operations, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -314,7 +313,7 @@ def create_oda_instance_attachment(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_oda_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, retention_time, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -373,10 +372,10 @@ def delete_oda_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_oda_instance_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, attachment_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') kwargs = {} @@ -428,7 +427,7 @@ def delete_oda_instance_attachment(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def get_oda_instance(ctx, from_json, oda_instance_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -452,10 +451,10 @@ def get_oda_instance(ctx, from_json, oda_instance_id): @cli_util.wrap_exceptions def get_oda_instance_attachment(ctx, from_json, oda_instance_id, attachment_id, include_owner_metadata): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') kwargs = {} @@ -482,7 +481,7 @@ def get_oda_instance_attachment(ctx, from_json, oda_instance_id, attachment_id, @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -519,7 +518,7 @@ def list_oda_instance_attachments(ctx, from_json, all_pages, page_size, oda_inst if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -658,7 +657,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -723,7 +722,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -843,7 +842,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, oda @cli_util.wrap_exceptions def start_oda_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -898,7 +897,7 @@ def start_oda_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def stop_oda_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -958,7 +957,7 @@ def stop_oda_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_oda_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1036,10 +1035,10 @@ def update_oda_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_oda_instance_attachment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, attachment_id, attachment_metadata, restricted_operations, owner, freeform_tags, defined_tags, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(attachment_id, six.string_types) and len(attachment_id.strip()) == 0: + if isinstance(attachment_id, str) and len(attachment_id.strip()) == 0: raise click.UsageError('Parameter --attachment-id cannot be whitespace or empty string') if not force: if restricted_operations or owner or freeform_tags or defined_tags: diff --git a/services/oda/src/oci_cli_odapackage/generated/odapackage_cli.py b/services/oda/src/oci_cli_odapackage/generated/odapackage_cli.py index 382576604..7f2bbbe52 100644 --- a/services/oda/src/oci_cli_odapackage/generated/odapackage_cli.py +++ b/services/oda/src/oci_cli_odapackage/generated/odapackage_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def imported_package_group(): @cli_util.wrap_exceptions def create_imported_package(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, current_package_id, oda_instance_id, parameter_values, freeform_tags, defined_tags): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -128,10 +127,10 @@ def create_imported_package(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_imported_package(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oda_instance_id, package_id, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(package_id, six.string_types) and len(package_id.strip()) == 0: + if isinstance(package_id, str) and len(package_id.strip()) == 0: raise click.UsageError('Parameter --package-id cannot be whitespace or empty string') kwargs = {} @@ -184,10 +183,10 @@ def delete_imported_package(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def get_imported_package(ctx, from_json, oda_instance_id, package_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(package_id, six.string_types) and len(package_id.strip()) == 0: + if isinstance(package_id, str) and len(package_id.strip()) == 0: raise click.UsageError('Parameter --package-id cannot be whitespace or empty string') kwargs = {} @@ -211,10 +210,10 @@ def get_imported_package(ctx, from_json, oda_instance_id, package_id): @cli_util.wrap_exceptions def get_package(ctx, from_json, oda_instance_id, package_id): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(package_id, six.string_types) and len(package_id.strip()) == 0: + if isinstance(package_id, str) and len(package_id.strip()) == 0: raise click.UsageError('Parameter --package-id cannot be whitespace or empty string') kwargs = {} @@ -255,7 +254,7 @@ def list_imported_packages(ctx, from_json, all_pages, page_size, oda_instance_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') kwargs = {} @@ -398,10 +397,10 @@ def list_packages(ctx, from_json, all_pages, page_size, oda_instance_id, resourc @cli_util.wrap_exceptions def update_imported_package(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, current_package_id, parameter_values, oda_instance_id, package_id, freeform_tags, defined_tags, is_replace_skills, if_match): - if isinstance(oda_instance_id, six.string_types) and len(oda_instance_id.strip()) == 0: + if isinstance(oda_instance_id, str) and len(oda_instance_id.strip()) == 0: raise click.UsageError('Parameter --oda-instance-id cannot be whitespace or empty string') - if isinstance(package_id, six.string_types) and len(package_id.strip()) == 0: + if isinstance(package_id, str) and len(package_id.strip()) == 0: raise click.UsageError('Parameter --package-id cannot be whitespace or empty string') if not force: if parameter_values or freeform_tags or defined_tags: diff --git a/services/onesubscription/src/oci_cli_billing_schedule/generated/billingschedule_cli.py b/services/onesubscription/src/oci_cli_billing_schedule/generated/billingschedule_cli.py index 73af827b1..d24e20bd4 100644 --- a/services/onesubscription/src/oci_cli_billing_schedule/generated/billingschedule_cli.py +++ b/services/onesubscription/src/oci_cli_billing_schedule/generated/billingschedule_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/onesubscription/src/oci_cli_commitment/generated/commitment_cli.py b/services/onesubscription/src/oci_cli_commitment/generated/commitment_cli.py index 5db75943e..b6e354ee7 100644 --- a/services/onesubscription/src/oci_cli_commitment/generated/commitment_cli.py +++ b/services/onesubscription/src/oci_cli_commitment/generated/commitment_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -41,7 +40,7 @@ def commitment_group(): @cli_util.wrap_exceptions def get_commitment(ctx, from_json, commitment_id): - if isinstance(commitment_id, six.string_types) and len(commitment_id.strip()) == 0: + if isinstance(commitment_id, str) and len(commitment_id.strip()) == 0: raise click.UsageError('Parameter --commitment-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/onesubscription/src/oci_cli_computed_usage/generated/computedusage_cli.py b/services/onesubscription/src/oci_cli_computed_usage/generated/computedusage_cli.py index 8c92d0743..a29394dcd 100644 --- a/services/onesubscription/src/oci_cli_computed_usage/generated/computedusage_cli.py +++ b/services/onesubscription/src/oci_cli_computed_usage/generated/computedusage_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -50,7 +49,7 @@ def computed_usage_group(): @cli_util.wrap_exceptions def get_computed_usage(ctx, from_json, computed_usage_id, compartment_id, fields): - if isinstance(computed_usage_id, six.string_types) and len(computed_usage_id.strip()) == 0: + if isinstance(computed_usage_id, str) and len(computed_usage_id.strip()) == 0: raise click.UsageError('Parameter --computed-usage-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/onesubscription/src/oci_cli_invoice_summary/generated/invoicesummary_cli.py b/services/onesubscription/src/oci_cli_invoice_summary/generated/invoicesummary_cli.py index 371208ac7..74b968b3c 100644 --- a/services/onesubscription/src/oci_cli_invoice_summary/generated/invoicesummary_cli.py +++ b/services/onesubscription/src/oci_cli_invoice_summary/generated/invoicesummary_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/onesubscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py b/services/onesubscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py index 459d53d7f..37f24d496 100644 --- a/services/onesubscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py +++ b/services/onesubscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/onesubscription/src/oci_cli_ratecard/generated/ratecard_cli.py b/services/onesubscription/src/oci_cli_ratecard/generated/ratecard_cli.py index 1f68a7c24..b19333fff 100644 --- a/services/onesubscription/src/oci_cli_ratecard/generated/ratecard_cli.py +++ b/services/onesubscription/src/oci_cli_ratecard/generated/ratecard_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/onesubscription/src/oci_cli_subscribed_service/generated/subscribedservice_cli.py b/services/onesubscription/src/oci_cli_subscribed_service/generated/subscribedservice_cli.py index eb91b3954..d6ee3421a 100644 --- a/services/onesubscription/src/oci_cli_subscribed_service/generated/subscribedservice_cli.py +++ b/services/onesubscription/src/oci_cli_subscribed_service/generated/subscribedservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -42,7 +41,7 @@ def subscribed_service_group(): @cli_util.wrap_exceptions def get_subscribed_service(ctx, from_json, subscribed_service_id, fields): - if isinstance(subscribed_service_id, six.string_types) and len(subscribed_service_id.strip()) == 0: + if isinstance(subscribed_service_id, str) and len(subscribed_service_id.strip()) == 0: raise click.UsageError('Parameter --subscribed-service-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/onesubscription/src/oci_cli_subscription/generated/subscription_cli.py b/services/onesubscription/src/oci_cli_subscription/generated/subscription_cli.py index 2890e64b9..992be838e 100644 --- a/services/onesubscription/src/oci_cli_subscription/generated/subscription_cli.py +++ b/services/onesubscription/src/oci_cli_subscription/generated/subscription_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/ons/src/oci_cli_notification_control_plane/generated/notificationcontrolplane_cli.py b/services/ons/src/oci_cli_notification_control_plane/generated/notificationcontrolplane_cli.py index bbfdb4c19..03acbb06d 100644 --- a/services/ons/src/oci_cli_notification_control_plane/generated/notificationcontrolplane_cli.py +++ b/services/ons/src/oci_cli_notification_control_plane/generated/notificationcontrolplane_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -46,7 +45,7 @@ def notification_topic_group(): @cli_util.wrap_exceptions def change_topic_compartment(ctx, from_json, topic_id, compartment_id, if_match): - if isinstance(topic_id, six.string_types) and len(topic_id.strip()) == 0: + if isinstance(topic_id, str) and len(topic_id.strip()) == 0: raise click.UsageError('Parameter --topic-id cannot be whitespace or empty string') kwargs = {} @@ -128,7 +127,7 @@ def create_topic(ctx, from_json, name, compartment_id, description, freeform_tag @cli_util.wrap_exceptions def delete_topic(ctx, from_json, topic_id, if_match): - if isinstance(topic_id, six.string_types) and len(topic_id.strip()) == 0: + if isinstance(topic_id, str) and len(topic_id.strip()) == 0: raise click.UsageError('Parameter --topic-id cannot be whitespace or empty string') kwargs = {} @@ -154,7 +153,7 @@ def delete_topic(ctx, from_json, topic_id, if_match): @cli_util.wrap_exceptions def get_topic(ctx, from_json, topic_id): - if isinstance(topic_id, six.string_types) and len(topic_id.strip()) == 0: + if isinstance(topic_id, str) and len(topic_id.strip()) == 0: raise click.UsageError('Parameter --topic-id cannot be whitespace or empty string') kwargs = {} @@ -252,7 +251,7 @@ def list_topics(ctx, from_json, all_pages, page_size, compartment_id, id, name, @cli_util.wrap_exceptions def update_topic(ctx, from_json, force, topic_id, description, freeform_tags, defined_tags, if_match): - if isinstance(topic_id, six.string_types) and len(topic_id.strip()) == 0: + if isinstance(topic_id, str) and len(topic_id.strip()) == 0: raise click.UsageError('Parameter --topic-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/ons/src/oci_cli_notification_data_plane/generated/notificationdataplane_cli.py b/services/ons/src/oci_cli_notification_data_plane/generated/notificationdataplane_cli.py index 9d89380f9..1dcdb0fdb 100644 --- a/services/ons/src/oci_cli_notification_data_plane/generated/notificationdataplane_cli.py +++ b/services/ons/src/oci_cli_notification_data_plane/generated/notificationdataplane_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -53,7 +52,7 @@ def notification_topic_group(): @cli_util.wrap_exceptions def change_subscription_compartment(ctx, from_json, subscription_id, compartment_id, if_match): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -168,7 +167,7 @@ def create_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subscription_id, if_match): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -235,7 +234,7 @@ def delete_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_confirm_subscription(ctx, from_json, id, token, protocol): - if isinstance(id, six.string_types) and len(id.strip()) == 0: + if isinstance(id, str) and len(id.strip()) == 0: raise click.UsageError('Parameter --id cannot be whitespace or empty string') kwargs = {} @@ -261,7 +260,7 @@ def get_confirm_subscription(ctx, from_json, id, token, protocol): @cli_util.wrap_exceptions def get_subscription(ctx, from_json, subscription_id): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -291,7 +290,7 @@ def get_subscription(ctx, from_json, subscription_id): @cli_util.wrap_exceptions def get_unsubscription(ctx, from_json, id, token, protocol): - if isinstance(id, six.string_types) and len(id.strip()) == 0: + if isinstance(id, str) and len(id.strip()) == 0: raise click.UsageError('Parameter --id cannot be whitespace or empty string') kwargs = {} @@ -385,7 +384,7 @@ def list_subscriptions(ctx, from_json, all_pages, page_size, compartment_id, top @cli_util.wrap_exceptions def publish_message(ctx, from_json, topic_id, body, title, message_type): - if isinstance(topic_id, six.string_types) and len(topic_id.strip()) == 0: + if isinstance(topic_id, str) and len(topic_id.strip()) == 0: raise click.UsageError('Parameter --topic-id cannot be whitespace or empty string') kwargs = {} @@ -419,7 +418,7 @@ def publish_message(ctx, from_json, topic_id, body, title, message_type): @cli_util.wrap_exceptions def resend_subscription_confirmation(ctx, from_json, id): - if isinstance(id, six.string_types) and len(id.strip()) == 0: + if isinstance(id, str) and len(id.strip()) == 0: raise click.UsageError('Parameter --id cannot be whitespace or empty string') kwargs = {} @@ -452,7 +451,7 @@ def resend_subscription_confirmation(ctx, from_json, id): @cli_util.wrap_exceptions def update_subscription(ctx, from_json, force, subscription_id, delivery_policy, freeform_tags, defined_tags, if_match): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') if not force: if delivery_policy or freeform_tags or defined_tags: diff --git a/services/opa/src/oci_cli_opa_instance/generated/opainstance_cli.py b/services/opa/src/oci_cli_opa_instance/generated/opainstance_cli.py index 62bb2a58c..0370c87aa 100644 --- a/services/opa/src/oci_cli_opa_instance/generated/opainstance_cli.py +++ b/services/opa/src/oci_cli_opa_instance/generated/opainstance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -70,7 +69,7 @@ def opa_instance_collection_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -99,7 +98,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_opa_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opa_instance_id, compartment_id, if_match): - if isinstance(opa_instance_id, six.string_types) and len(opa_instance_id.strip()) == 0: + if isinstance(opa_instance_id, str) and len(opa_instance_id.strip()) == 0: raise click.UsageError('Parameter --opa-instance-id cannot be whitespace or empty string') kwargs = {} @@ -245,7 +244,7 @@ def create_opa_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_opa_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opa_instance_id, if_match): - if isinstance(opa_instance_id, six.string_types) and len(opa_instance_id.strip()) == 0: + if isinstance(opa_instance_id, str) and len(opa_instance_id.strip()) == 0: raise click.UsageError('Parameter --opa-instance-id cannot be whitespace or empty string') kwargs = {} @@ -296,7 +295,7 @@ def delete_opa_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_opa_instance(ctx, from_json, opa_instance_id): - if isinstance(opa_instance_id, six.string_types) and len(opa_instance_id.strip()) == 0: + if isinstance(opa_instance_id, str) and len(opa_instance_id.strip()) == 0: raise click.UsageError('Parameter --opa-instance-id cannot be whitespace or empty string') kwargs = {} @@ -318,7 +317,7 @@ def get_opa_instance(ctx, from_json, opa_instance_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -411,7 +410,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -468,7 +467,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -582,7 +581,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def start_opa_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opa_instance_id, if_match): - if isinstance(opa_instance_id, six.string_types) and len(opa_instance_id.strip()) == 0: + if isinstance(opa_instance_id, str) and len(opa_instance_id.strip()) == 0: raise click.UsageError('Parameter --opa-instance-id cannot be whitespace or empty string') kwargs = {} @@ -637,7 +636,7 @@ def start_opa_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def stop_opa_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opa_instance_id, if_match): - if isinstance(opa_instance_id, six.string_types) and len(opa_instance_id.strip()) == 0: + if isinstance(opa_instance_id, str) and len(opa_instance_id.strip()) == 0: raise click.UsageError('Parameter --opa-instance-id cannot be whitespace or empty string') kwargs = {} @@ -697,7 +696,7 @@ def stop_opa_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_opa_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, opa_instance_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(opa_instance_id, six.string_types) and len(opa_instance_id.strip()) == 0: + if isinstance(opa_instance_id, str) and len(opa_instance_id.strip()) == 0: raise click.UsageError('Parameter --opa-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/opensearch/src/oci_cli_opensearch_cluster/generated/opensearchcluster_cli.py b/services/opensearch/src/oci_cli_opensearch_cluster/generated/opensearchcluster_cli.py index 047a0f252..ad88ba404 100644 --- a/services/opensearch/src/oci_cli_opensearch_cluster/generated/opensearchcluster_cli.py +++ b/services/opensearch/src/oci_cli_opensearch_cluster/generated/opensearchcluster_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -96,7 +95,7 @@ def work_request_log_entry_collection_group(): @cli_util.wrap_exceptions def backup_opensearch_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_id, compartment_id, display_name, if_match): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -158,7 +157,7 @@ def backup_opensearch_cluster(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def configure_outbound_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_id, inbound_cluster_ids, if_match): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -400,7 +399,7 @@ def create_opensearch_cluster(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_opensearch_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_id, if_match): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -451,7 +450,7 @@ def delete_opensearch_cluster(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_opensearch_cluster(ctx, from_json, opensearch_cluster_id): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -473,7 +472,7 @@ def get_opensearch_cluster(ctx, from_json, opensearch_cluster_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -629,7 +628,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -680,7 +679,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -785,7 +784,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def opensearch_cluster_restore(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_id, opensearch_cluster_backup_id, compartment_id, prefix, if_match): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -855,7 +854,7 @@ def opensearch_cluster_restore(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def resize_opensearch_cluster_horizontal(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_id, master_node_count, data_node_count, opendashboard_node_count, search_node_count, freeform_tags, defined_tags, if_match): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -948,7 +947,7 @@ def resize_opensearch_cluster_horizontal(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def resize_opensearch_cluster_vertical(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_id, master_node_host_ocpu_count, master_node_host_memory_gb, master_node_host_shape, data_node_host_ocpu_count, data_node_host_memory_gb, data_node_storage_gb, data_node_host_shape, opendashboard_node_host_ocpu_count, opendashboard_node_host_memory_gb, opendashboard_node_host_shape, search_node_host_shape, search_node_host_ocpu_count, search_node_host_memory_gb, search_node_storage_gb, freeform_tags, defined_tags, if_match): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -1068,7 +1067,7 @@ def resize_opensearch_cluster_vertical(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_opensearch_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_id, display_name, software_version, security_mode, security_master_user_name, security_master_user_password_hash, security_saml_config, backup_policy, reverse_connection_endpoint_customer_ips, outbound_cluster_config, maintenance_details, freeform_tags, defined_tags, if_match): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') if not force: if security_saml_config or backup_policy or reverse_connection_endpoint_customer_ips or outbound_cluster_config or maintenance_details or freeform_tags or defined_tags: @@ -1172,7 +1171,7 @@ def update_opensearch_cluster(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def upgrade_open_search_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_id, original_cluster_display_name, desired_software_version, upgrade_type, is_clone, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(opensearch_cluster_id, six.string_types) and len(opensearch_cluster_id.strip()) == 0: + if isinstance(opensearch_cluster_id, str) and len(opensearch_cluster_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/opensearch/src/oci_cli_opensearch_cluster_backup/generated/opensearchclusterbackup_cli.py b/services/opensearch/src/oci_cli_opensearch_cluster_backup/generated/opensearchclusterbackup_cli.py index e9c18830f..9393a0853 100644 --- a/services/opensearch/src/oci_cli_opensearch_cluster_backup/generated/opensearchclusterbackup_cli.py +++ b/services/opensearch/src/oci_cli_opensearch_cluster_backup/generated/opensearchclusterbackup_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -53,7 +52,7 @@ def opensearch_cluster_backup_collection_group(): @cli_util.wrap_exceptions def delete_opensearch_cluster_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_backup_id, if_match): - if isinstance(opensearch_cluster_backup_id, six.string_types) and len(opensearch_cluster_backup_id.strip()) == 0: + if isinstance(opensearch_cluster_backup_id, str) and len(opensearch_cluster_backup_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-backup-id cannot be whitespace or empty string') kwargs = {} @@ -104,7 +103,7 @@ def delete_opensearch_cluster_backup(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def get_opensearch_cluster_backup(ctx, from_json, opensearch_cluster_backup_id): - if isinstance(opensearch_cluster_backup_id, six.string_types) and len(opensearch_cluster_backup_id.strip()) == 0: + if isinstance(opensearch_cluster_backup_id, str) and len(opensearch_cluster_backup_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-backup-id cannot be whitespace or empty string') kwargs = {} @@ -200,7 +199,7 @@ def list_opensearch_cluster_backups(ctx, from_json, all_pages, page_size, compar @cli_util.wrap_exceptions def update_opensearch_cluster_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_backup_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(opensearch_cluster_backup_id, six.string_types) and len(opensearch_cluster_backup_id.strip()) == 0: + if isinstance(opensearch_cluster_backup_id, str) and len(opensearch_cluster_backup_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-backup-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/opensearch/src/oci_cli_opensearch_cluster_pipeline/generated/opensearchclusterpipeline_cli.py b/services/opensearch/src/oci_cli_opensearch_cluster_pipeline/generated/opensearchclusterpipeline_cli.py index c7099d5f3..a60ce4490 100644 --- a/services/opensearch/src/oci_cli_opensearch_cluster_pipeline/generated/opensearchclusterpipeline_cli.py +++ b/services/opensearch/src/oci_cli_opensearch_cluster_pipeline/generated/opensearchclusterpipeline_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -159,7 +158,7 @@ def create_opensearch_cluster_pipeline(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_opensearch_cluster_pipeline(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_pipeline_id, if_match): - if isinstance(opensearch_cluster_pipeline_id, six.string_types) and len(opensearch_cluster_pipeline_id.strip()) == 0: + if isinstance(opensearch_cluster_pipeline_id, str) and len(opensearch_cluster_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -210,7 +209,7 @@ def delete_opensearch_cluster_pipeline(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def get_opensearch_cluster_pipeline(ctx, from_json, opensearch_cluster_pipeline_id): - if isinstance(opensearch_cluster_pipeline_id, six.string_types) and len(opensearch_cluster_pipeline_id.strip()) == 0: + if isinstance(opensearch_cluster_pipeline_id, str) and len(opensearch_cluster_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-pipeline-id cannot be whitespace or empty string') kwargs = {} @@ -321,7 +320,7 @@ def list_opensearch_cluster_pipelines(ctx, from_json, all_pages, page_size, comp @cli_util.wrap_exceptions def update_opensearch_cluster_pipeline(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, opensearch_cluster_pipeline_id, display_name, ocpu_count, memory_gb, node_count, node_shape, pipeline_configuration_body, data_prepper_configuration_body, vcn_id, subnet_id, vcn_compartment_id, subnet_compartment_id, nsg_id, reverse_connection_endpoints, freeform_tags, defined_tags, if_match, opc_dry_run): - if isinstance(opensearch_cluster_pipeline_id, six.string_types) and len(opensearch_cluster_pipeline_id.strip()) == 0: + if isinstance(opensearch_cluster_pipeline_id, str) and len(opensearch_cluster_pipeline_id.strip()) == 0: raise click.UsageError('Parameter --opensearch-cluster-pipeline-id cannot be whitespace or empty string') if not force: if reverse_connection_endpoints or freeform_tags or defined_tags: diff --git a/services/operator_access_control/src/oci_cli_access_requests/generated/accessrequests_cli.py b/services/operator_access_control/src/oci_cli_access_requests/generated/accessrequests_cli.py index 089ab10d2..1d582156d 100644 --- a/services/operator_access_control/src/oci_cli_access_requests/generated/accessrequests_cli.py +++ b/services/operator_access_control/src/oci_cli_access_requests/generated/accessrequests_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -58,7 +57,7 @@ def access_request_group(): @cli_util.wrap_exceptions def approve_access_request(ctx, from_json, access_request_id, approver_comment, audit_type, additional_message, time_of_user_creation, if_match): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -98,7 +97,7 @@ def approve_access_request(ctx, from_json, access_request_id, approver_comment, @cli_util.wrap_exceptions def get_access_request(ctx, from_json, access_request_id): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -121,7 +120,7 @@ def get_access_request(ctx, from_json, access_request_id): @cli_util.wrap_exceptions def get_audit_log_report(ctx, from_json, access_request_id, enable_process_tree): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -150,7 +149,7 @@ def get_audit_log_report(ctx, from_json, access_request_id, enable_process_tree) @cli_util.wrap_exceptions def interaction_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, access_request_id, more_info_details, if_match): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -211,7 +210,7 @@ def list_access_request_histories(ctx, from_json, all_pages, page_size, access_r if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -331,7 +330,7 @@ def list_interactions(ctx, from_json, all_pages, page_size, access_request_id, l if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -377,7 +376,7 @@ def list_interactions(ctx, from_json, all_pages, page_size, access_request_id, l @cli_util.wrap_exceptions def reject_access_request(ctx, from_json, access_request_id, approver_comment, if_match): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -413,7 +412,7 @@ def reject_access_request(ctx, from_json, access_request_id, approver_comment, i @cli_util.wrap_exceptions def review_access_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, access_request_id, approver_comment, if_match): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} @@ -469,7 +468,7 @@ def review_access_request(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def revoke_access_request(ctx, from_json, access_request_id, approver_comment, if_match): - if isinstance(access_request_id, six.string_types) and len(access_request_id.strip()) == 0: + if isinstance(access_request_id, str) and len(access_request_id.strip()) == 0: raise click.UsageError('Parameter --access-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/operator_access_control/src/oci_cli_operator_actions/generated/operatoractions_cli.py b/services/operator_access_control/src/oci_cli_operator_actions/generated/operatoractions_cli.py index 1054aefc8..ba6e4935d 100644 --- a/services/operator_access_control/src/oci_cli_operator_actions/generated/operatoractions_cli.py +++ b/services/operator_access_control/src/oci_cli_operator_actions/generated/operatoractions_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -48,7 +47,7 @@ def operator_action_group(): @cli_util.wrap_exceptions def get_operator_action(ctx, from_json, operator_action_id): - if isinstance(operator_action_id, six.string_types) and len(operator_action_id.strip()) == 0: + if isinstance(operator_action_id, str) and len(operator_action_id.strip()) == 0: raise click.UsageError('Parameter --operator-action-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/operator_access_control/src/oci_cli_operator_control/generated/operatorcontrol_cli.py b/services/operator_access_control/src/oci_cli_operator_control/generated/operatorcontrol_cli.py index 14784a560..a1cca221a 100644 --- a/services/operator_access_control/src/oci_cli_operator_control/generated/operatorcontrol_cli.py +++ b/services/operator_access_control/src/oci_cli_operator_control/generated/operatorcontrol_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -46,7 +45,7 @@ def operator_control_group(): @cli_util.wrap_exceptions def change_operator_control_compartment(ctx, from_json, operator_control_id, compartment_id, if_match): - if isinstance(operator_control_id, six.string_types) and len(operator_control_id.strip()) == 0: + if isinstance(operator_control_id, str) and len(operator_control_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-id cannot be whitespace or empty string') kwargs = {} @@ -172,7 +171,7 @@ def create_operator_control(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_operator_control(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, operator_control_id, description, if_match): - if isinstance(operator_control_id, six.string_types) and len(operator_control_id.strip()) == 0: + if isinstance(operator_control_id, str) and len(operator_control_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-id cannot be whitespace or empty string') kwargs = {} @@ -233,7 +232,7 @@ def delete_operator_control(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def get_operator_control(ctx, from_json, operator_control_id): - if isinstance(operator_control_id, six.string_types) and len(operator_control_id.strip()) == 0: + if isinstance(operator_control_id, str) and len(operator_control_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-id cannot be whitespace or empty string') kwargs = {} @@ -334,7 +333,7 @@ def list_operator_controls(ctx, from_json, all_pages, page_size, compartment_id, @cli_util.wrap_exceptions def update_operator_control(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, operator_control_id, operator_control_name, approver_groups_list, is_fully_pre_approved, description, approvers_list, pre_approved_op_action_list, email_id_list, number_of_approvers, system_message, freeform_tags, defined_tags, if_match): - if isinstance(operator_control_id, six.string_types) and len(operator_control_id.strip()) == 0: + if isinstance(operator_control_id, str) and len(operator_control_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-id cannot be whitespace or empty string') if not force: if approvers_list or approver_groups_list or pre_approved_op_action_list or email_id_list or freeform_tags or defined_tags: diff --git a/services/operator_access_control/src/oci_cli_operator_control_assignment/generated/operatorcontrolassignment_cli.py b/services/operator_access_control/src/oci_cli_operator_control_assignment/generated/operatorcontrolassignment_cli.py index fddcbc207..5868a3993 100644 --- a/services/operator_access_control/src/oci_cli_operator_control_assignment/generated/operatorcontrolassignment_cli.py +++ b/services/operator_access_control/src/oci_cli_operator_control_assignment/generated/operatorcontrolassignment_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -46,7 +45,7 @@ def operator_control_assignment_group(): @cli_util.wrap_exceptions def change_operator_control_assignment_compartment(ctx, from_json, operator_control_assignment_id, compartment_id, if_match): - if isinstance(operator_control_assignment_id, six.string_types) and len(operator_control_assignment_id.strip()) == 0: + if isinstance(operator_control_assignment_id, str) and len(operator_control_assignment_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -188,7 +187,7 @@ def create_operator_control_assignment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_operator_control_assignment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, operator_control_assignment_id, description, if_match): - if isinstance(operator_control_assignment_id, six.string_types) and len(operator_control_assignment_id.strip()) == 0: + if isinstance(operator_control_assignment_id, str) and len(operator_control_assignment_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -249,7 +248,7 @@ def delete_operator_control_assignment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def get_assignment_validation_status(ctx, from_json, operator_control_assignment_id): - if isinstance(operator_control_assignment_id, six.string_types) and len(operator_control_assignment_id.strip()) == 0: + if isinstance(operator_control_assignment_id, str) and len(operator_control_assignment_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -271,7 +270,7 @@ def get_assignment_validation_status(ctx, from_json, operator_control_assignment @cli_util.wrap_exceptions def get_operator_control_assignment(ctx, from_json, operator_control_assignment_id): - if isinstance(operator_control_assignment_id, six.string_types) and len(operator_control_assignment_id.strip()) == 0: + if isinstance(operator_control_assignment_id, str) and len(operator_control_assignment_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-assignment-id cannot be whitespace or empty string') kwargs = {} @@ -376,7 +375,7 @@ def list_operator_control_assignments(ctx, from_json, all_pages, page_size, comp @cli_util.wrap_exceptions def update_operator_control_assignment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, operator_control_assignment_id, is_enforced_always, time_assignment_from, time_assignment_to, comment, is_log_forwarded, remote_syslog_server_address, remote_syslog_server_port, remote_syslog_server_ca_cert, is_hypervisor_log_forwarded, is_auto_approve_during_maintenance, freeform_tags, defined_tags, if_match): - if isinstance(operator_control_assignment_id, six.string_types) and len(operator_control_assignment_id.strip()) == 0: + if isinstance(operator_control_assignment_id, str) and len(operator_control_assignment_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-assignment-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -467,7 +466,7 @@ def update_operator_control_assignment(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def validate_operator_assignment(ctx, from_json, operator_control_assignment_id, action_name, if_match): - if isinstance(operator_control_assignment_id, six.string_types) and len(operator_control_assignment_id.strip()) == 0: + if isinstance(operator_control_assignment_id, str) and len(operator_control_assignment_id.strip()) == 0: raise click.UsageError('Parameter --operator-control-assignment-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/opsi/src/oci_cli_operations_insights/generated/operationsinsights_cli.py b/services/opsi/src/oci_cli_operations_insights/generated/operationsinsights_cli.py index 33924164e..a2f9d1884 100644 --- a/services/opsi/src/oci_cli_operations_insights/generated/operationsinsights_cli.py +++ b/services/opsi/src/oci_cli_operations_insights/generated/operationsinsights_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -149,7 +148,7 @@ def work_requests_group(): @cli_util.wrap_exceptions def add_exadata_insight_members(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, entity_source, exadata_insight_id, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -212,7 +211,7 @@ def add_exadata_insight_members(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def add_exadata_insight_members_add_pe_comanaged_exadata_insight_members_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, member_entity_details, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -279,7 +278,7 @@ def add_exadata_insight_members_add_pe_comanaged_exadata_insight_members_details @cli_util.wrap_exceptions def add_exadata_insight_members_add_em_managed_external_exadata_insight_members_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, member_entity_details, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -346,7 +345,7 @@ def add_exadata_insight_members_add_em_managed_external_exadata_insight_members_ @cli_util.wrap_exceptions def add_exadata_insight_members_add_macs_managed_cloud_exadata_insight_members_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, member_entity_details, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -413,7 +412,7 @@ def add_exadata_insight_members_add_macs_managed_cloud_exadata_insight_members_d @cli_util.wrap_exceptions def change_autonomous_database_insight_advanced_features(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, credential_details, database_insight_id, opsi_private_endpoint_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -481,7 +480,7 @@ def change_autonomous_database_insight_advanced_features(ctx, from_json, wait_fo @cli_util.wrap_exceptions def change_autonomous_database_insight_advanced_features_credential_by_named_credentials(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, database_insight_id, opsi_private_endpoint_id, if_match, credential_details_credential_source_name, credential_details_named_credential_id): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -556,7 +555,7 @@ def change_autonomous_database_insight_advanced_features_credential_by_named_cre @cli_util.wrap_exceptions def change_autonomous_database_insight_advanced_features_credentials_by_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, database_insight_id, opsi_private_endpoint_id, if_match, credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -632,7 +631,7 @@ def change_autonomous_database_insight_advanced_features_credentials_by_source(c @cli_util.wrap_exceptions def change_autonomous_database_insight_advanced_features_credential_by_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, database_insight_id, opsi_private_endpoint_id, if_match, credential_details_credential_source_name, credential_details_user_name, credential_details_password_secret_id, credential_details_wallet_secret_id, credential_details_role): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -716,7 +715,7 @@ def change_autonomous_database_insight_advanced_features_credential_by_vault(ctx @cli_util.wrap_exceptions def change_autonomous_database_insight_advanced_features_credential_by_iam(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, database_insight_id, opsi_private_endpoint_id, if_match, credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -786,7 +785,7 @@ def change_autonomous_database_insight_advanced_features_credential_by_iam(ctx, @cli_util.wrap_exceptions def change_awr_hub_source_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, awr_hub_source_id, compartment_id, if_match): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') kwargs = {} @@ -847,7 +846,7 @@ def change_awr_hub_source_compartment(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def change_database_insight_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, compartment_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -908,7 +907,7 @@ def change_database_insight_compartment(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def change_enterprise_manager_bridge_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, enterprise_manager_bridge_id, compartment_id, if_match): - if isinstance(enterprise_manager_bridge_id, six.string_types) and len(enterprise_manager_bridge_id.strip()) == 0: + if isinstance(enterprise_manager_bridge_id, str) and len(enterprise_manager_bridge_id.strip()) == 0: raise click.UsageError('Parameter --enterprise-manager-bridge-id cannot be whitespace or empty string') kwargs = {} @@ -969,7 +968,7 @@ def change_enterprise_manager_bridge_compartment(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_exadata_insight_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, compartment_id, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1030,7 +1029,7 @@ def change_exadata_insight_compartment(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def change_external_mysql_database_insight_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, database_connector_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1091,7 +1090,7 @@ def change_external_mysql_database_insight_connection(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def change_host_insight_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, compartment_id, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1154,7 +1153,7 @@ def change_host_insight_compartment(ctx, from_json, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def change_macs_managed_autonomous_database_insight_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, connection_credential_details, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1220,7 +1219,7 @@ def change_macs_managed_autonomous_database_insight_connection(ctx, from_json, w @cli_util.wrap_exceptions def change_macs_managed_autonomous_database_insight_connection_credential_by_named_credentials(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, if_match, connection_credential_details_credential_source_name, connection_credential_details_named_credential_id): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1293,7 +1292,7 @@ def change_macs_managed_autonomous_database_insight_connection_credential_by_nam @cli_util.wrap_exceptions def change_macs_managed_autonomous_database_insight_connection_credentials_by_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, if_match, connection_credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1367,7 +1366,7 @@ def change_macs_managed_autonomous_database_insight_connection_credentials_by_so @cli_util.wrap_exceptions def change_macs_managed_autonomous_database_insight_connection_credential_by_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, if_match, connection_credential_details_credential_source_name, connection_credential_details_user_name, connection_credential_details_password_secret_id, connection_credential_details_wallet_secret_id, connection_credential_details_role): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1449,7 +1448,7 @@ def change_macs_managed_autonomous_database_insight_connection_credential_by_vau @cli_util.wrap_exceptions def change_macs_managed_autonomous_database_insight_connection_credential_by_iam(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, if_match, connection_credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1519,7 +1518,7 @@ def change_macs_managed_autonomous_database_insight_connection_credential_by_iam @cli_util.wrap_exceptions def change_macs_managed_cloud_database_insight_connection(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, connection_credential_details, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1585,7 +1584,7 @@ def change_macs_managed_cloud_database_insight_connection(ctx, from_json, wait_f @cli_util.wrap_exceptions def change_macs_managed_cloud_database_insight_connection_credential_by_named_credentials(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, if_match, connection_credential_details_credential_source_name, connection_credential_details_named_credential_id): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1658,7 +1657,7 @@ def change_macs_managed_cloud_database_insight_connection_credential_by_named_cr @cli_util.wrap_exceptions def change_macs_managed_cloud_database_insight_connection_credentials_by_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, if_match, connection_credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1732,7 +1731,7 @@ def change_macs_managed_cloud_database_insight_connection_credentials_by_source( @cli_util.wrap_exceptions def change_macs_managed_cloud_database_insight_connection_credential_by_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, if_match, connection_credential_details_credential_source_name, connection_credential_details_user_name, connection_credential_details_password_secret_id, connection_credential_details_wallet_secret_id, connection_credential_details_role): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1814,7 +1813,7 @@ def change_macs_managed_cloud_database_insight_connection_credential_by_vault(ct @cli_util.wrap_exceptions def change_macs_managed_cloud_database_insight_connection_credential_by_iam(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, management_agent_id, connection_details, if_match, connection_credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -1882,7 +1881,7 @@ def change_macs_managed_cloud_database_insight_connection_credential_by_iam(ctx, @cli_util.wrap_exceptions def change_news_report_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, news_report_id, compartment_id, if_match): - if isinstance(news_report_id, six.string_types) and len(news_report_id.strip()) == 0: + if isinstance(news_report_id, str) and len(news_report_id.strip()) == 0: raise click.UsageError('Parameter --news-report-id cannot be whitespace or empty string') kwargs = {} @@ -1943,7 +1942,7 @@ def change_news_report_compartment(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def change_operations_insights_private_endpoint_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_private_endpoint_id, compartment_id, if_match): - if isinstance(operations_insights_private_endpoint_id, six.string_types) and len(operations_insights_private_endpoint_id.strip()) == 0: + if isinstance(operations_insights_private_endpoint_id, str) and len(operations_insights_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2006,7 +2005,7 @@ def change_operations_insights_private_endpoint_compartment(ctx, from_json, wait @cli_util.wrap_exceptions def change_operations_insights_warehouse_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_warehouse_id, compartment_id, if_match): - if isinstance(operations_insights_warehouse_id, six.string_types) and len(operations_insights_warehouse_id.strip()) == 0: + if isinstance(operations_insights_warehouse_id, str) and len(operations_insights_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -2067,7 +2066,7 @@ def change_operations_insights_warehouse_compartment(ctx, from_json, wait_for_st @cli_util.wrap_exceptions def change_opsi_configuration_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opsi_configuration_id, compartment_id, if_match): - if isinstance(opsi_configuration_id, six.string_types) and len(opsi_configuration_id.strip()) == 0: + if isinstance(opsi_configuration_id, str) and len(opsi_configuration_id.strip()) == 0: raise click.UsageError('Parameter --opsi-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -2131,7 +2130,7 @@ def change_opsi_configuration_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_pe_comanaged_database_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, service_name, credential_details, opsi_private_endpoint_id, connection_details, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -2201,7 +2200,7 @@ def change_pe_comanaged_database_insight(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def change_pe_comanaged_database_insight_credential_by_named_credentials(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, service_name, opsi_private_endpoint_id, connection_details, if_match, credential_details_credential_source_name, credential_details_named_credential_id): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -2278,7 +2277,7 @@ def change_pe_comanaged_database_insight_credential_by_named_credentials(ctx, fr @cli_util.wrap_exceptions def change_pe_comanaged_database_insight_credentials_by_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, service_name, opsi_private_endpoint_id, connection_details, if_match, credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -2356,7 +2355,7 @@ def change_pe_comanaged_database_insight_credentials_by_source(ctx, from_json, w @cli_util.wrap_exceptions def change_pe_comanaged_database_insight_credential_by_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, service_name, opsi_private_endpoint_id, connection_details, if_match, credential_details_credential_source_name, credential_details_user_name, credential_details_password_secret_id, credential_details_wallet_secret_id, credential_details_role): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -2442,7 +2441,7 @@ def change_pe_comanaged_database_insight_credential_by_vault(ctx, from_json, wai @cli_util.wrap_exceptions def change_pe_comanaged_database_insight_credential_by_iam(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, service_name, opsi_private_endpoint_id, connection_details, if_match, credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -4386,7 +4385,7 @@ def create_opsi_configuration_create_opsi_ux_configuration_details(ctx, from_jso @cli_util.wrap_exceptions def delete_awr_hub(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, awr_hub_id, if_match): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -4440,10 +4439,10 @@ def delete_awr_hub(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_awr_hub_object(ctx, from_json, awr_hub_source_id, object_name, if_match): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -4473,7 +4472,7 @@ def delete_awr_hub_object(ctx, from_json, awr_hub_source_id, object_name, if_mat @cli_util.wrap_exceptions def delete_awr_hub_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, awr_hub_source_id, if_match): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') kwargs = {} @@ -4529,7 +4528,7 @@ def delete_awr_hub_source(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def delete_database_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -4585,7 +4584,7 @@ def delete_database_insight(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_enterprise_manager_bridge(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, enterprise_manager_bridge_id, if_match): - if isinstance(enterprise_manager_bridge_id, six.string_types) and len(enterprise_manager_bridge_id.strip()) == 0: + if isinstance(enterprise_manager_bridge_id, str) and len(enterprise_manager_bridge_id.strip()) == 0: raise click.UsageError('Parameter --enterprise-manager-bridge-id cannot be whitespace or empty string') kwargs = {} @@ -4641,7 +4640,7 @@ def delete_enterprise_manager_bridge(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def delete_exadata_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -4697,7 +4696,7 @@ def delete_exadata_insight(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_host_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') kwargs = {} @@ -4753,7 +4752,7 @@ def delete_host_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_news_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, news_report_id, if_match): - if isinstance(news_report_id, six.string_types) and len(news_report_id.strip()) == 0: + if isinstance(news_report_id, str) and len(news_report_id.strip()) == 0: raise click.UsageError('Parameter --news-report-id cannot be whitespace or empty string') kwargs = {} @@ -4809,7 +4808,7 @@ def delete_news_report(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_operations_insights_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_private_endpoint_id, if_match): - if isinstance(operations_insights_private_endpoint_id, six.string_types) and len(operations_insights_private_endpoint_id.strip()) == 0: + if isinstance(operations_insights_private_endpoint_id, str) and len(operations_insights_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -4865,7 +4864,7 @@ def delete_operations_insights_private_endpoint(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def delete_operations_insights_warehouse(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_warehouse_id, if_match): - if isinstance(operations_insights_warehouse_id, six.string_types) and len(operations_insights_warehouse_id.strip()) == 0: + if isinstance(operations_insights_warehouse_id, str) and len(operations_insights_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -4921,7 +4920,7 @@ def delete_operations_insights_warehouse(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def delete_operations_insights_warehouse_user(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_warehouse_user_id, if_match): - if isinstance(operations_insights_warehouse_user_id, six.string_types) and len(operations_insights_warehouse_user_id.strip()) == 0: + if isinstance(operations_insights_warehouse_user_id, str) and len(operations_insights_warehouse_user_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-user-id cannot be whitespace or empty string') kwargs = {} @@ -4977,7 +4976,7 @@ def delete_operations_insights_warehouse_user(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def delete_opsi_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, opsi_configuration_id, if_match): - if isinstance(opsi_configuration_id, six.string_types) and len(opsi_configuration_id.strip()) == 0: + if isinstance(opsi_configuration_id, str) and len(opsi_configuration_id.strip()) == 0: raise click.UsageError('Parameter --opsi-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -5032,7 +5031,7 @@ def delete_opsi_configuration(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def disable_autonomous_database_insight_advanced_features(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5087,7 +5086,7 @@ def disable_autonomous_database_insight_advanced_features(ctx, from_json, wait_f @cli_util.wrap_exceptions def disable_awr_hub_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, awr_hub_source_id, if_match): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') kwargs = {} @@ -5142,7 +5141,7 @@ def disable_awr_hub_source(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def disable_database_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5197,7 +5196,7 @@ def disable_database_insight(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def disable_exadata_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5252,7 +5251,7 @@ def disable_exadata_insight(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def disable_host_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5305,7 +5304,7 @@ def disable_host_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def download_operations_insights_warehouse_wallet(ctx, from_json, file, operations_insights_warehouse_id, operations_insights_warehouse_wallet_password): - if isinstance(operations_insights_warehouse_id, six.string_types) and len(operations_insights_warehouse_id.strip()) == 0: + if isinstance(operations_insights_warehouse_id, str) and len(operations_insights_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -5361,7 +5360,7 @@ def download_operations_insights_warehouse_wallet(ctx, from_json, file, operatio @cli_util.wrap_exceptions def enable_autonomous_database_insight_advanced_features(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, credential_details, database_insight_id, opsi_private_endpoint_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5429,7 +5428,7 @@ def enable_autonomous_database_insight_advanced_features(ctx, from_json, wait_fo @cli_util.wrap_exceptions def enable_autonomous_database_insight_advanced_features_credential_by_named_credentials(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, database_insight_id, opsi_private_endpoint_id, if_match, credential_details_credential_source_name, credential_details_named_credential_id): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5504,7 +5503,7 @@ def enable_autonomous_database_insight_advanced_features_credential_by_named_cre @cli_util.wrap_exceptions def enable_autonomous_database_insight_advanced_features_credentials_by_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, database_insight_id, opsi_private_endpoint_id, if_match, credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5580,7 +5579,7 @@ def enable_autonomous_database_insight_advanced_features_credentials_by_source(c @cli_util.wrap_exceptions def enable_autonomous_database_insight_advanced_features_credential_by_vault(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, database_insight_id, opsi_private_endpoint_id, if_match, credential_details_credential_source_name, credential_details_user_name, credential_details_password_secret_id, credential_details_wallet_secret_id, credential_details_role): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5664,7 +5663,7 @@ def enable_autonomous_database_insight_advanced_features_credential_by_vault(ctx @cli_util.wrap_exceptions def enable_autonomous_database_insight_advanced_features_credential_by_iam(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connection_details, database_insight_id, opsi_private_endpoint_id, if_match, credential_details_credential_source_name): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5733,7 +5732,7 @@ def enable_autonomous_database_insight_advanced_features_credential_by_iam(ctx, @cli_util.wrap_exceptions def enable_awr_hub_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, awr_hub_source_id, if_match): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') kwargs = {} @@ -5789,7 +5788,7 @@ def enable_awr_hub_source(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def enable_database_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, entity_source, database_insight_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5849,7 +5848,7 @@ def enable_database_insight(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def enable_database_insight_enable_em_managed_external_database_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5910,7 +5909,7 @@ def enable_database_insight_enable_em_managed_external_database_insight_details( @cli_util.wrap_exceptions def enable_database_insight_enable_mds_my_sql_database_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -5978,7 +5977,7 @@ def enable_database_insight_enable_mds_my_sql_database_insight_details(ctx, from @cli_util.wrap_exceptions def enable_database_insight_enable_macs_managed_autonomous_database_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, management_agent_id, connection_details, connection_credential_details, database_insight_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6053,7 +6052,7 @@ def enable_database_insight_enable_macs_managed_autonomous_database_insight_deta @cli_util.wrap_exceptions def enable_database_insight_enable_external_mysql_database_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, database_connector_id, database_insight_id, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6123,7 +6122,7 @@ def enable_database_insight_enable_external_mysql_database_insight_details(ctx, @cli_util.wrap_exceptions def enable_database_insight_enable_autonomous_database_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, is_advanced_features_enabled, database_insight_id, database_resource_type, connection_details, credential_details, opsi_private_endpoint_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6213,7 +6212,7 @@ def enable_database_insight_enable_autonomous_database_insight_details(ctx, from @cli_util.wrap_exceptions def enable_database_insight_enable_macs_managed_cloud_database_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, management_agent_id, connection_details, connection_credential_details, database_insight_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6295,7 +6294,7 @@ def enable_database_insight_enable_macs_managed_cloud_database_insight_details(c @cli_util.wrap_exceptions def enable_database_insight_enable_pe_comanaged_database_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, opsi_private_endpoint_id, service_name, credential_details, database_insight_id, connection_details, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6373,7 +6372,7 @@ def enable_database_insight_enable_pe_comanaged_database_insight_details(ctx, fr @cli_util.wrap_exceptions def enable_exadata_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, entity_source, exadata_insight_id, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6433,7 +6432,7 @@ def enable_exadata_insight(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def enable_exadata_insight_enable_macs_managed_cloud_exadata_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6494,7 +6493,7 @@ def enable_exadata_insight_enable_macs_managed_cloud_exadata_insight_details(ctx @cli_util.wrap_exceptions def enable_exadata_insight_enable_pe_comanaged_exadata_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6555,7 +6554,7 @@ def enable_exadata_insight_enable_pe_comanaged_exadata_insight_details(ctx, from @cli_util.wrap_exceptions def enable_exadata_insight_enable_em_managed_external_exadata_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6617,7 +6616,7 @@ def enable_exadata_insight_enable_em_managed_external_exadata_insight_details(ct @cli_util.wrap_exceptions def enable_host_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, entity_source, host_insight_id, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6677,7 +6676,7 @@ def enable_host_insight(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def enable_host_insight_enable_macs_managed_external_host_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6738,7 +6737,7 @@ def enable_host_insight_enable_macs_managed_external_host_insight_details(ctx, f @cli_util.wrap_exceptions def enable_host_insight_enable_macs_managed_cloud_host_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6799,7 +6798,7 @@ def enable_host_insight_enable_macs_managed_cloud_host_insight_details(ctx, from @cli_util.wrap_exceptions def enable_host_insight_enable_em_managed_external_host_insight_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') kwargs = {} @@ -6864,7 +6863,7 @@ def enable_host_insight_enable_em_managed_external_host_insight_details(ctx, fro @cli_util.wrap_exceptions def get_awr_database_report(ctx, from_json, awr_hub_id, awr_source_database_identifier, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, report_type, report_format): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -6909,7 +6908,7 @@ def get_awr_database_report(ctx, from_json, awr_hub_id, awr_source_database_iden @cli_util.wrap_exceptions def get_awr_database_sql_report(ctx, from_json, awr_hub_id, awr_source_database_identifier, sql_id, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, report_format): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -6945,7 +6944,7 @@ def get_awr_database_sql_report(ctx, from_json, awr_hub_id, awr_source_database_ @cli_util.wrap_exceptions def get_awr_hub(ctx, from_json, awr_hub_id): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -6969,10 +6968,10 @@ def get_awr_hub(ctx, from_json, awr_hub_id): @cli_util.wrap_exceptions def get_awr_hub_object(ctx, from_json, file, awr_hub_source_id, object_name): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -7017,7 +7016,7 @@ def get_awr_hub_object(ctx, from_json, file, awr_hub_source_id, object_name): @cli_util.wrap_exceptions def get_awr_hub_source(ctx, from_json, awr_hub_source_id): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') kwargs = {} @@ -7046,7 +7045,7 @@ def get_awr_hub_source(ctx, from_json, awr_hub_source_id): @cli_util.wrap_exceptions def get_awr_report(ctx, from_json, awr_hub_id, awr_source_database_identifier, report_format, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -7081,7 +7080,7 @@ def get_awr_report(ctx, from_json, awr_hub_id, awr_source_database_identifier, r @cli_util.wrap_exceptions def get_database_insight(ctx, from_json, database_insight_id): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') kwargs = {} @@ -7103,7 +7102,7 @@ def get_database_insight(ctx, from_json, database_insight_id): @cli_util.wrap_exceptions def get_enterprise_manager_bridge(ctx, from_json, enterprise_manager_bridge_id): - if isinstance(enterprise_manager_bridge_id, six.string_types) and len(enterprise_manager_bridge_id.strip()) == 0: + if isinstance(enterprise_manager_bridge_id, str) and len(enterprise_manager_bridge_id.strip()) == 0: raise click.UsageError('Parameter --enterprise-manager-bridge-id cannot be whitespace or empty string') kwargs = {} @@ -7125,7 +7124,7 @@ def get_enterprise_manager_bridge(ctx, from_json, enterprise_manager_bridge_id): @cli_util.wrap_exceptions def get_exadata_insight(ctx, from_json, exadata_insight_id): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') kwargs = {} @@ -7147,7 +7146,7 @@ def get_exadata_insight(ctx, from_json, exadata_insight_id): @cli_util.wrap_exceptions def get_host_insight(ctx, from_json, host_insight_id): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') kwargs = {} @@ -7169,7 +7168,7 @@ def get_host_insight(ctx, from_json, host_insight_id): @cli_util.wrap_exceptions def get_news_report(ctx, from_json, news_report_id): - if isinstance(news_report_id, six.string_types) and len(news_report_id.strip()) == 0: + if isinstance(news_report_id, str) and len(news_report_id.strip()) == 0: raise click.UsageError('Parameter --news-report-id cannot be whitespace or empty string') kwargs = {} @@ -7191,7 +7190,7 @@ def get_news_report(ctx, from_json, news_report_id): @cli_util.wrap_exceptions def get_operations_insights_private_endpoint(ctx, from_json, operations_insights_private_endpoint_id): - if isinstance(operations_insights_private_endpoint_id, six.string_types) and len(operations_insights_private_endpoint_id.strip()) == 0: + if isinstance(operations_insights_private_endpoint_id, str) and len(operations_insights_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -7213,7 +7212,7 @@ def get_operations_insights_private_endpoint(ctx, from_json, operations_insights @cli_util.wrap_exceptions def get_operations_insights_warehouse(ctx, from_json, operations_insights_warehouse_id): - if isinstance(operations_insights_warehouse_id, six.string_types) and len(operations_insights_warehouse_id.strip()) == 0: + if isinstance(operations_insights_warehouse_id, str) and len(operations_insights_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -7235,7 +7234,7 @@ def get_operations_insights_warehouse(ctx, from_json, operations_insights_wareho @cli_util.wrap_exceptions def get_operations_insights_warehouse_user(ctx, from_json, operations_insights_warehouse_user_id): - if isinstance(operations_insights_warehouse_user_id, six.string_types) and len(operations_insights_warehouse_user_id.strip()) == 0: + if isinstance(operations_insights_warehouse_user_id, str) and len(operations_insights_warehouse_user_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-user-id cannot be whitespace or empty string') kwargs = {} @@ -7261,7 +7260,7 @@ def get_operations_insights_warehouse_user(ctx, from_json, operations_insights_w @cli_util.wrap_exceptions def get_opsi_configuration(ctx, from_json, opsi_configuration_id, opsi_config_field, config_item_custom_status, config_items_applicable_context, config_item_field): - if isinstance(opsi_configuration_id, six.string_types) and len(opsi_configuration_id.strip()) == 0: + if isinstance(opsi_configuration_id, str) and len(opsi_configuration_id.strip()) == 0: raise click.UsageError('Parameter --opsi-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -7292,7 +7291,7 @@ def get_opsi_configuration(ctx, from_json, opsi_configuration_id, opsi_config_fi @cli_util.wrap_exceptions def get_opsi_data_object(ctx, from_json, compartment_id, opsi_data_object_identifier): - if isinstance(opsi_data_object_identifier, six.string_types) and len(opsi_data_object_identifier.strip()) == 0: + if isinstance(opsi_data_object_identifier, str) and len(opsi_data_object_identifier.strip()) == 0: raise click.UsageError('Parameter --opsi-data-object-identifier cannot be whitespace or empty string') kwargs = {} @@ -7315,7 +7314,7 @@ def get_opsi_data_object(ctx, from_json, compartment_id, opsi_data_object_identi @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -7338,10 +7337,10 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def head_awr_hub_object(ctx, from_json, awr_hub_source_id, object_name): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -8219,7 +8218,7 @@ def list_awr_database_snapshots(ctx, from_json, all_pages, page_size, awr_hub_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -8292,7 +8291,7 @@ def list_awr_databases(ctx, from_json, all_pages, page_size, awr_hub_id, name, t if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -8359,7 +8358,7 @@ def list_awr_hub_objects(ctx, from_json, all_pages, page_size, awr_hub_source_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') kwargs = {} @@ -8565,7 +8564,7 @@ def list_awr_snapshots(ctx, from_json, all_pages, page_size, awr_hub_id, awr_sou if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -9374,7 +9373,7 @@ def list_importable_enterprise_manager_entities(ctx, from_json, all_pages, page_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(enterprise_manager_bridge_id, six.string_types) and len(enterprise_manager_bridge_id.strip()) == 0: + if isinstance(enterprise_manager_bridge_id, str) and len(enterprise_manager_bridge_id.strip()) == 0: raise click.UsageError('Parameter --enterprise-manager-bridge-id cannot be whitespace or empty string') kwargs = {} @@ -9984,10 +9983,10 @@ def list_warehouse_data_objects(ctx, from_json, all_pages, page_size, warehouse_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(warehouse_type, six.string_types) and len(warehouse_type.strip()) == 0: + if isinstance(warehouse_type, str) and len(warehouse_type.strip()) == 0: raise click.UsageError('Parameter --warehouse-type cannot be whitespace or empty string') - if isinstance(warehouse_id, six.string_types) and len(warehouse_id.strip()) == 0: + if isinstance(warehouse_id, str) and len(warehouse_id.strip()) == 0: raise click.UsageError('Parameter --warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -10055,7 +10054,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -10112,7 +10111,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -10228,10 +10227,10 @@ def list_work_requests(ctx, from_json, all_pages, page_size, page, limit, compar @cli_util.wrap_exceptions def put_awr_hub_object(ctx, from_json, put_awr_hub_object_body, awr_hub_source_id, object_name, if_match): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') - if isinstance(object_name, six.string_types) and len(object_name.strip()) == 0: + if isinstance(object_name, str) and len(object_name.strip()) == 0: raise click.UsageError('Parameter --object-name cannot be whitespace or empty string') kwargs = {} @@ -10458,10 +10457,10 @@ def query_opsi_data_object_data_data_object_templatized_query(ctx, from_json, co @cli_util.wrap_exceptions def query_warehouse_data_object_data(ctx, from_json, warehouse_type, warehouse_id, query_parameterconflict, limit, page): - if isinstance(warehouse_type, six.string_types) and len(warehouse_type.strip()) == 0: + if isinstance(warehouse_type, str) and len(warehouse_type.strip()) == 0: raise click.UsageError('Parameter --warehouse-type cannot be whitespace or empty string') - if isinstance(warehouse_id, six.string_types) and len(warehouse_id.strip()) == 0: + if isinstance(warehouse_id, str) and len(warehouse_id.strip()) == 0: raise click.UsageError('Parameter --warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -10502,10 +10501,10 @@ def query_warehouse_data_object_data(ctx, from_json, warehouse_type, warehouse_i @cli_util.wrap_exceptions def query_warehouse_data_object_data_data_object_standard_query(ctx, from_json, warehouse_type, warehouse_id, limit, page, query_bind_params, query_query_execution_timeout_in_seconds, query_statement, query_time_filters): - if isinstance(warehouse_type, six.string_types) and len(warehouse_type.strip()) == 0: + if isinstance(warehouse_type, str) and len(warehouse_type.strip()) == 0: raise click.UsageError('Parameter --warehouse-type cannot be whitespace or empty string') - if isinstance(warehouse_id, six.string_types) and len(warehouse_id.strip()) == 0: + if isinstance(warehouse_id, str) and len(warehouse_id.strip()) == 0: raise click.UsageError('Parameter --warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -10565,10 +10564,10 @@ def query_warehouse_data_object_data_data_object_standard_query(ctx, from_json, @cli_util.wrap_exceptions def query_warehouse_data_object_data_data_object_templatized_query(ctx, from_json, warehouse_type, warehouse_id, limit, page, query_bind_params, query_query_execution_timeout_in_seconds, query_select_list, query_from_clause, query_where_conditions_list, query_group_by_list, query_having_conditions_list, query_order_by_list, query_time_filters): - if isinstance(warehouse_type, six.string_types) and len(warehouse_type.strip()) == 0: + if isinstance(warehouse_type, str) and len(warehouse_type.strip()) == 0: raise click.UsageError('Parameter --warehouse-type cannot be whitespace or empty string') - if isinstance(warehouse_id, six.string_types) and len(warehouse_id.strip()) == 0: + if isinstance(warehouse_id, str) and len(warehouse_id.strip()) == 0: raise click.UsageError('Parameter --warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -10633,7 +10632,7 @@ def query_warehouse_data_object_data_data_object_templatized_query(ctx, from_jso @cli_util.wrap_exceptions def rotate_operations_insights_warehouse_wallet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_warehouse_id, if_match): - if isinstance(operations_insights_warehouse_id, six.string_types) and len(operations_insights_warehouse_id.strip()) == 0: + if isinstance(operations_insights_warehouse_id, str) and len(operations_insights_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -11088,7 +11087,7 @@ def summarize_addm_db_sql_statements(ctx, from_json, compartment_id, sql_identif @cli_util.wrap_exceptions def summarize_awr_database_cpu_usages(ctx, from_json, awr_hub_id, awr_source_database_identifier, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, session_type, page, limit, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11142,7 +11141,7 @@ def summarize_awr_database_cpu_usages(ctx, from_json, awr_hub_id, awr_source_dat @cli_util.wrap_exceptions def summarize_awr_database_metrics(ctx, from_json, awr_hub_id, awr_source_database_identifier, name, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, page, limit, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11195,7 +11194,7 @@ def summarize_awr_database_metrics(ctx, from_json, awr_hub_id, awr_source_databa @cli_util.wrap_exceptions def summarize_awr_database_parameter_changes(ctx, from_json, awr_hub_id, awr_source_database_identifier, name, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, page, limit, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11256,7 +11255,7 @@ def summarize_awr_database_parameter_changes(ctx, from_json, awr_hub_id, awr_sou @cli_util.wrap_exceptions def summarize_awr_database_parameters(ctx, from_json, awr_hub_id, awr_source_database_identifier, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, name, name_contains, value_changed, value_default, value_modified, page, limit, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11314,7 +11313,7 @@ def summarize_awr_database_parameters(ctx, from_json, awr_hub_id, awr_source_dat @cli_util.wrap_exceptions def summarize_awr_database_snapshot_ranges(ctx, from_json, awr_hub_id, name, time_greater_than_or_equal_to, time_less_than_or_equal_to, page, limit, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11361,7 +11360,7 @@ def summarize_awr_database_snapshot_ranges(ctx, from_json, awr_hub_id, name, tim @cli_util.wrap_exceptions def summarize_awr_database_sysstats(ctx, from_json, awr_hub_id, awr_source_database_identifier, name, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, page, limit, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11413,7 +11412,7 @@ def summarize_awr_database_sysstats(ctx, from_json, awr_hub_id, awr_source_datab @cli_util.wrap_exceptions def summarize_awr_database_top_wait_events(ctx, from_json, awr_hub_id, awr_source_database_identifier, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, session_type, top_n, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11468,7 +11467,7 @@ def summarize_awr_database_top_wait_events(ctx, from_json, awr_hub_id, awr_sourc @cli_util.wrap_exceptions def summarize_awr_database_wait_event_buckets(ctx, from_json, awr_hub_id, awr_source_database_identifier, name, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, num_bucket, min_value, max_value, page, limit, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11528,7 +11527,7 @@ def summarize_awr_database_wait_event_buckets(ctx, from_json, awr_hub_id, awr_so @cli_util.wrap_exceptions def summarize_awr_database_wait_events(ctx, from_json, awr_hub_id, awr_source_database_identifier, instance_number, begin_snapshot_identifier_greater_than_or_equal_to, end_snapshot_identifier_less_than_or_equal_to, time_greater_than_or_equal_to, time_less_than_or_equal_to, name, session_type, page, limit, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -11579,7 +11578,7 @@ def summarize_awr_database_wait_events(ctx, from_json, awr_hub_id, awr_source_da @cli_util.wrap_exceptions def summarize_awr_sources_summaries(ctx, from_json, awr_hub_id, compartment_id, name, limit, page, sort_by, sort_order): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') kwargs = {} @@ -13568,7 +13567,7 @@ def summarize_host_insight_top_processes_usage_trend(ctx, from_json, compartment @cli_util.wrap_exceptions def summarize_operations_insights_warehouse_resource_usage(ctx, from_json, operations_insights_warehouse_id): - if isinstance(operations_insights_warehouse_id, six.string_types) and len(operations_insights_warehouse_id.strip()) == 0: + if isinstance(operations_insights_warehouse_id, str) and len(operations_insights_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-id cannot be whitespace or empty string') kwargs = {} @@ -14713,7 +14712,7 @@ def test_macs_managed_cloud_database_insight_connection_credential_by_iam(ctx, f @cli_util.wrap_exceptions def update_awr_hub(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, awr_hub_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(awr_hub_id, six.string_types) and len(awr_hub_id.strip()) == 0: + if isinstance(awr_hub_id, str) and len(awr_hub_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -14789,7 +14788,7 @@ def update_awr_hub(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_awr_hub_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, awr_hub_source_id, type, freeform_tags, defined_tags, if_match): - if isinstance(awr_hub_source_id, six.string_types) and len(awr_hub_source_id.strip()) == 0: + if isinstance(awr_hub_source_id, str) and len(awr_hub_source_id.strip()) == 0: raise click.UsageError('Parameter --awr-hub-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -14865,7 +14864,7 @@ def update_awr_hub_source(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_database_insight(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, entity_source, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -14938,7 +14937,7 @@ def update_database_insight(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_database_insight_update_macs_managed_external_database_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15012,7 +15011,7 @@ def update_database_insight_update_macs_managed_external_database_insight_detail @cli_util.wrap_exceptions def update_database_insight_update_em_managed_external_database_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15086,7 +15085,7 @@ def update_database_insight_update_em_managed_external_database_insight_details( @cli_util.wrap_exceptions def update_database_insight_update_pe_comanaged_database_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15160,7 +15159,7 @@ def update_database_insight_update_pe_comanaged_database_insight_details(ctx, fr @cli_util.wrap_exceptions def update_database_insight_update_autonomous_database_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15234,7 +15233,7 @@ def update_database_insight_update_autonomous_database_insight_details(ctx, from @cli_util.wrap_exceptions def update_database_insight_update_mds_my_sql_database_insight(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15308,7 +15307,7 @@ def update_database_insight_update_mds_my_sql_database_insight(ctx, from_json, f @cli_util.wrap_exceptions def update_database_insight_update_macs_managed_cloud_database_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15382,7 +15381,7 @@ def update_database_insight_update_macs_managed_cloud_database_insight_details(c @cli_util.wrap_exceptions def update_database_insight_update_external_mysql_database_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15456,7 +15455,7 @@ def update_database_insight_update_external_mysql_database_insight_details(ctx, @cli_util.wrap_exceptions def update_database_insight_update_macs_managed_autonomous_database_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, database_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(database_insight_id, six.string_types) and len(database_insight_id.strip()) == 0: + if isinstance(database_insight_id, str) and len(database_insight_id.strip()) == 0: raise click.UsageError('Parameter --database-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15532,7 +15531,7 @@ def update_database_insight_update_macs_managed_autonomous_database_insight_deta @cli_util.wrap_exceptions def update_enterprise_manager_bridge(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, enterprise_manager_bridge_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(enterprise_manager_bridge_id, six.string_types) and len(enterprise_manager_bridge_id.strip()) == 0: + if isinstance(enterprise_manager_bridge_id, str) and len(enterprise_manager_bridge_id.strip()) == 0: raise click.UsageError('Parameter --enterprise-manager-bridge-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15611,7 +15610,7 @@ def update_enterprise_manager_bridge(ctx, from_json, force, wait_for_state, max_ @cli_util.wrap_exceptions def update_exadata_insight(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, entity_source, freeform_tags, defined_tags, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15684,7 +15683,7 @@ def update_exadata_insight(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_exadata_insight_update_pe_comanaged_exadata_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15758,7 +15757,7 @@ def update_exadata_insight_update_pe_comanaged_exadata_insight_details(ctx, from @cli_util.wrap_exceptions def update_exadata_insight_update_macs_managed_cloud_exadata_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15833,7 +15832,7 @@ def update_exadata_insight_update_macs_managed_cloud_exadata_insight_details(ctx @cli_util.wrap_exceptions def update_exadata_insight_update_em_managed_external_exadata_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, exadata_insight_id, freeform_tags, defined_tags, is_auto_sync_enabled, if_match): - if isinstance(exadata_insight_id, six.string_types) and len(exadata_insight_id.strip()) == 0: + if isinstance(exadata_insight_id, str) and len(exadata_insight_id.strip()) == 0: raise click.UsageError('Parameter --exadata-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15911,7 +15910,7 @@ def update_exadata_insight_update_em_managed_external_exadata_insight_details(ct @cli_util.wrap_exceptions def update_host_insight(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, entity_source, freeform_tags, defined_tags, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -15984,7 +15983,7 @@ def update_host_insight(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_host_insight_update_macs_managed_cloud_database_host_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -16058,7 +16057,7 @@ def update_host_insight_update_macs_managed_cloud_database_host_insight_details( @cli_util.wrap_exceptions def update_host_insight_update_em_managed_external_host_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -16132,7 +16131,7 @@ def update_host_insight_update_em_managed_external_host_insight_details(ctx, fro @cli_util.wrap_exceptions def update_host_insight_update_macs_managed_external_host_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -16206,7 +16205,7 @@ def update_host_insight_update_macs_managed_external_host_insight_details(ctx, f @cli_util.wrap_exceptions def update_host_insight_update_macs_managed_cloud_host_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -16280,7 +16279,7 @@ def update_host_insight_update_macs_managed_cloud_host_insight_details(ctx, from @cli_util.wrap_exceptions def update_host_insight_update_pe_comanaged_host_insight_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, host_insight_id, freeform_tags, defined_tags, if_match): - if isinstance(host_insight_id, six.string_types) and len(host_insight_id.strip()) == 0: + if isinstance(host_insight_id, str) and len(host_insight_id.strip()) == 0: raise click.UsageError('Parameter --host-insight-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -16365,7 +16364,7 @@ def update_host_insight_update_pe_comanaged_host_insight_details(ctx, from_json, @cli_util.wrap_exceptions def update_news_report(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, news_report_id, status, news_frequency, locale, content_types, ons_topic_id, freeform_tags, defined_tags, name, description, day_of_week, are_child_compartments_included, tag_filters, match_rule, if_match): - if isinstance(news_report_id, six.string_types) and len(news_report_id.strip()) == 0: + if isinstance(news_report_id, str) and len(news_report_id.strip()) == 0: raise click.UsageError('Parameter --news-report-id cannot be whitespace or empty string') if not force: if content_types or freeform_tags or defined_tags or tag_filters: @@ -16473,7 +16472,7 @@ def update_news_report(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_operations_insights_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_private_endpoint_id, display_name, description, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(operations_insights_private_endpoint_id, six.string_types) and len(operations_insights_private_endpoint_id.strip()) == 0: + if isinstance(operations_insights_private_endpoint_id, str) and len(operations_insights_private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-private-endpoint-id cannot be whitespace or empty string') if not force: if nsg_ids or freeform_tags or defined_tags: @@ -16558,7 +16557,7 @@ def update_operations_insights_private_endpoint(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_operations_insights_warehouse(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_warehouse_id, display_name, cpu_allocated, compute_model, storage_allocated_in_gbs, freeform_tags, defined_tags, if_match): - if isinstance(operations_insights_warehouse_id, six.string_types) and len(operations_insights_warehouse_id.strip()) == 0: + if isinstance(operations_insights_warehouse_id, str) and len(operations_insights_warehouse_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -16646,7 +16645,7 @@ def update_operations_insights_warehouse(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_operations_insights_warehouse_user(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, operations_insights_warehouse_user_id, connection_password, is_awr_data_access, is_em_data_access, is_opsi_data_access, freeform_tags, defined_tags, if_match): - if isinstance(operations_insights_warehouse_user_id, six.string_types) and len(operations_insights_warehouse_user_id.strip()) == 0: + if isinstance(operations_insights_warehouse_user_id, str) and len(operations_insights_warehouse_user_id.strip()) == 0: raise click.UsageError('Parameter --operations-insights-warehouse-user-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -16737,7 +16736,7 @@ def update_operations_insights_warehouse_user(ctx, from_json, force, wait_for_st @cli_util.wrap_exceptions def update_opsi_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, opsi_configuration_id, opsi_config_type, display_name, description, freeform_tags, defined_tags, system_tags, config_items, if_match): - if isinstance(opsi_configuration_id, six.string_types) and len(opsi_configuration_id.strip()) == 0: + if isinstance(opsi_configuration_id, str) and len(opsi_configuration_id.strip()) == 0: raise click.UsageError('Parameter --opsi-configuration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags or config_items: @@ -16828,7 +16827,7 @@ def update_opsi_configuration(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_opsi_configuration_update_opsi_ux_configuration_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, opsi_configuration_id, display_name, description, freeform_tags, defined_tags, system_tags, config_items, if_match): - if isinstance(opsi_configuration_id, six.string_types) and len(opsi_configuration_id.strip()) == 0: + if isinstance(opsi_configuration_id, str) and len(opsi_configuration_id.strip()) == 0: raise click.UsageError('Parameter --opsi-configuration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags or config_items: diff --git a/services/optimizer/src/oci_cli_optimizer/generated/optimizer_cli.py b/services/optimizer/src/oci_cli_optimizer/generated/optimizer_cli.py index 21def5bd3..de605ca0f 100644 --- a/services/optimizer/src/oci_cli_optimizer/generated/optimizer_cli.py +++ b/services/optimizer/src/oci_cli_optimizer/generated/optimizer_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -167,7 +166,7 @@ def resource_action_summary_group(): @cli_util.wrap_exceptions def bulk_apply_recommendations(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, recommendation_id, status, resource_action_ids, actions, time_status_end): - if isinstance(recommendation_id, six.string_types) and len(recommendation_id.strip()) == 0: + if isinstance(recommendation_id, str) and len(recommendation_id.strip()) == 0: raise click.UsageError('Parameter --recommendation-id cannot be whitespace or empty string') kwargs = {} @@ -318,7 +317,7 @@ def create_profile(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def delete_profile(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, profile_id, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -439,7 +438,7 @@ def filter_resource_actions(ctx, from_json, compartment_id, compartment_id_in_su @cli_util.wrap_exceptions def get_category(ctx, from_json, category_id): - if isinstance(category_id, six.string_types) and len(category_id.strip()) == 0: + if isinstance(category_id, str) and len(category_id.strip()) == 0: raise click.UsageError('Parameter --category-id cannot be whitespace or empty string') kwargs = {} @@ -461,7 +460,7 @@ def get_category(ctx, from_json, category_id): @cli_util.wrap_exceptions def get_enrollment_status(ctx, from_json, enrollment_status_id): - if isinstance(enrollment_status_id, six.string_types) and len(enrollment_status_id.strip()) == 0: + if isinstance(enrollment_status_id, str) and len(enrollment_status_id.strip()) == 0: raise click.UsageError('Parameter --enrollment-status-id cannot be whitespace or empty string') kwargs = {} @@ -483,7 +482,7 @@ def get_enrollment_status(ctx, from_json, enrollment_status_id): @cli_util.wrap_exceptions def get_profile(ctx, from_json, profile_id): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -505,7 +504,7 @@ def get_profile(ctx, from_json, profile_id): @cli_util.wrap_exceptions def get_recommendation(ctx, from_json, recommendation_id): - if isinstance(recommendation_id, six.string_types) and len(recommendation_id.strip()) == 0: + if isinstance(recommendation_id, str) and len(recommendation_id.strip()) == 0: raise click.UsageError('Parameter --recommendation-id cannot be whitespace or empty string') kwargs = {} @@ -528,7 +527,7 @@ def get_recommendation(ctx, from_json, recommendation_id): @cli_util.wrap_exceptions def get_resource_action(ctx, from_json, resource_action_id, include_resource_metadata): - if isinstance(resource_action_id, six.string_types) and len(resource_action_id.strip()) == 0: + if isinstance(resource_action_id, str) and len(resource_action_id.strip()) == 0: raise click.UsageError('Parameter --resource-action-id cannot be whitespace or empty string') kwargs = {} @@ -552,7 +551,7 @@ def get_resource_action(ctx, from_json, resource_action_id, include_resource_met @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1238,7 +1237,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1289,7 +1288,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1386,7 +1385,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def update_enrollment_status(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, enrollment_status_id, status, if_match): - if isinstance(enrollment_status_id, six.string_types) and len(enrollment_status_id.strip()) == 0: + if isinstance(enrollment_status_id, str) and len(enrollment_status_id.strip()) == 0: raise click.UsageError('Parameter --enrollment-status-id cannot be whitespace or empty string') kwargs = {} @@ -1456,7 +1455,7 @@ def update_enrollment_status(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_profile(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, profile_id, description, aggregation_interval_in_days, defined_tags, freeform_tags, system_tags, levels_configuration, target_compartments, target_tags, name, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or system_tags or levels_configuration or target_compartments or target_tags: @@ -1548,7 +1547,7 @@ def update_profile(ctx, from_json, force, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_recommendation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, recommendation_id, status, time_status_end, if_match): - if isinstance(recommendation_id, six.string_types) and len(recommendation_id.strip()) == 0: + if isinstance(recommendation_id, str) and len(recommendation_id.strip()) == 0: raise click.UsageError('Parameter --recommendation-id cannot be whitespace or empty string') kwargs = {} @@ -1613,7 +1612,7 @@ def update_recommendation(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def update_resource_action(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, resource_action_id, status, time_status_end, if_match): - if isinstance(resource_action_id, six.string_types) and len(resource_action_id.strip()) == 0: + if isinstance(resource_action_id, str) and len(resource_action_id.strip()) == 0: raise click.UsageError('Parameter --resource-action-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/os_management_hub/src/oci_cli_event/generated/event_cli.py b/services/os_management_hub/src/oci_cli_event/generated/event_cli.py index c64bd0ef6..f45975187 100644 --- a/services/os_management_hub/src/oci_cli_event/generated/event_cli.py +++ b/services/os_management_hub/src/oci_cli_event/generated/event_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -51,7 +50,7 @@ def event_group(): @cli_util.wrap_exceptions def change_event_compartment(ctx, from_json, compartment_id, event_id, if_match): - if isinstance(event_id, six.string_types) and len(event_id.strip()) == 0: + if isinstance(event_id, str) and len(event_id.strip()) == 0: raise click.UsageError('Parameter --event-id cannot be whitespace or empty string') kwargs = {} @@ -85,7 +84,7 @@ def change_event_compartment(ctx, from_json, compartment_id, event_id, if_match) @cli_util.wrap_exceptions def delete_event(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, event_id, if_match): - if isinstance(event_id, six.string_types) and len(event_id.strip()) == 0: + if isinstance(event_id, str) and len(event_id.strip()) == 0: raise click.UsageError('Parameter --event-id cannot be whitespace or empty string') kwargs = {} @@ -138,7 +137,7 @@ def delete_event(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_event_content(ctx, from_json, event_id, if_match): - if isinstance(event_id, six.string_types) and len(event_id.strip()) == 0: + if isinstance(event_id, str) and len(event_id.strip()) == 0: raise click.UsageError('Parameter --event-id cannot be whitespace or empty string') kwargs = {} @@ -162,7 +161,7 @@ def delete_event_content(ctx, from_json, event_id, if_match): @cli_util.wrap_exceptions def get_event(ctx, from_json, event_id): - if isinstance(event_id, six.string_types) and len(event_id.strip()) == 0: + if isinstance(event_id, str) and len(event_id.strip()) == 0: raise click.UsageError('Parameter --event-id cannot be whitespace or empty string') kwargs = {} @@ -185,7 +184,7 @@ def get_event(ctx, from_json, event_id): @cli_util.wrap_exceptions def get_event_content(ctx, from_json, file, event_id): - if isinstance(event_id, six.string_types) and len(event_id.strip()) == 0: + if isinstance(event_id, str) and len(event_id.strip()) == 0: raise click.UsageError('Parameter --event-id cannot be whitespace or empty string') kwargs = {} @@ -233,7 +232,7 @@ def get_event_content(ctx, from_json, file, event_id): @cli_util.wrap_exceptions def import_event_content(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, event_id, if_match): - if isinstance(event_id, six.string_types) and len(event_id.strip()) == 0: + if isinstance(event_id, str) and len(event_id.strip()) == 0: raise click.UsageError('Parameter --event-id cannot be whitespace or empty string') kwargs = {} @@ -378,7 +377,7 @@ def list_events(ctx, from_json, all_pages, page_size, event_summary, event_summa @cli_util.wrap_exceptions def update_event(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, event_id, freeform_tags, defined_tags, if_match): - if isinstance(event_id, six.string_types) and len(event_id.strip()) == 0: + if isinstance(event_id, str) and len(event_id.strip()) == 0: raise click.UsageError('Parameter --event-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/os_management_hub/src/oci_cli_lifecycle_environment/generated/lifecycleenvironment_cli.py b/services/os_management_hub/src/oci_cli_lifecycle_environment/generated/lifecycleenvironment_cli.py index 557a227f8..78c9efada 100644 --- a/services/os_management_hub/src/oci_cli_lifecycle_environment/generated/lifecycleenvironment_cli.py +++ b/services/os_management_hub/src/oci_cli_lifecycle_environment/generated/lifecycleenvironment_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -54,7 +53,7 @@ def lifecycle_environment_group(): @cli_util.wrap_exceptions def attach_managed_instances_to_lifecycle_stage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, lifecycle_stage_id, managed_instance_details, if_match): - if isinstance(lifecycle_stage_id, six.string_types) and len(lifecycle_stage_id.strip()) == 0: + if isinstance(lifecycle_stage_id, str) and len(lifecycle_stage_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-stage-id cannot be whitespace or empty string') kwargs = {} @@ -112,7 +111,7 @@ def attach_managed_instances_to_lifecycle_stage(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def change_lifecycle_environment_compartment(ctx, from_json, lifecycle_environment_id, compartment_id, if_match): - if isinstance(lifecycle_environment_id, six.string_types) and len(lifecycle_environment_id.strip()) == 0: + if isinstance(lifecycle_environment_id, str) and len(lifecycle_environment_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-environment-id cannot be whitespace or empty string') kwargs = {} @@ -223,7 +222,7 @@ def create_lifecycle_environment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_lifecycle_environment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, lifecycle_environment_id, if_match): - if isinstance(lifecycle_environment_id, six.string_types) and len(lifecycle_environment_id.strip()) == 0: + if isinstance(lifecycle_environment_id, str) and len(lifecycle_environment_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-environment-id cannot be whitespace or empty string') kwargs = {} @@ -287,7 +286,7 @@ def delete_lifecycle_environment(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def detach_managed_instances_from_lifecycle_stage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, lifecycle_stage_id, managed_instance_details, if_match): - if isinstance(lifecycle_stage_id, six.string_types) and len(lifecycle_stage_id.strip()) == 0: + if isinstance(lifecycle_stage_id, str) and len(lifecycle_stage_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-stage-id cannot be whitespace or empty string') kwargs = {} @@ -343,7 +342,7 @@ def detach_managed_instances_from_lifecycle_stage(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def get_lifecycle_environment(ctx, from_json, lifecycle_environment_id): - if isinstance(lifecycle_environment_id, six.string_types) and len(lifecycle_environment_id.strip()) == 0: + if isinstance(lifecycle_environment_id, str) and len(lifecycle_environment_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-environment-id cannot be whitespace or empty string') kwargs = {} @@ -365,7 +364,7 @@ def get_lifecycle_environment(ctx, from_json, lifecycle_environment_id): @cli_util.wrap_exceptions def get_lifecycle_stage(ctx, from_json, lifecycle_stage_id): - if isinstance(lifecycle_stage_id, six.string_types) and len(lifecycle_stage_id.strip()) == 0: + if isinstance(lifecycle_stage_id, str) and len(lifecycle_stage_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-stage-id cannot be whitespace or empty string') kwargs = {} @@ -485,7 +484,7 @@ def list_lifecycle_stage_installed_packages(ctx, from_json, all_pages, page_size if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(lifecycle_stage_id, six.string_types) and len(lifecycle_stage_id.strip()) == 0: + if isinstance(lifecycle_stage_id, str) and len(lifecycle_stage_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-stage-id cannot be whitespace or empty string') kwargs = {} @@ -631,7 +630,7 @@ def list_lifecycle_stages(ctx, from_json, all_pages, page_size, compartment_id, @cli_util.wrap_exceptions def promote_software_source_to_lifecycle_stage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, lifecycle_stage_id, work_request_details, software_source_id, if_match): - if isinstance(lifecycle_stage_id, six.string_types) and len(lifecycle_stage_id.strip()) == 0: + if isinstance(lifecycle_stage_id, str) and len(lifecycle_stage_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-stage-id cannot be whitespace or empty string') kwargs = {} @@ -697,7 +696,7 @@ def promote_software_source_to_lifecycle_stage(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def reboot_lifecycle_stage(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, lifecycle_stage_id, reboot_timeout_in_mins, work_request_details, if_match): - if isinstance(lifecycle_stage_id, six.string_types) and len(lifecycle_stage_id.strip()) == 0: + if isinstance(lifecycle_stage_id, str) and len(lifecycle_stage_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-stage-id cannot be whitespace or empty string') kwargs = {} @@ -770,7 +769,7 @@ def reboot_lifecycle_stage(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_lifecycle_environment(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, lifecycle_environment_id, display_name, description, stages, freeform_tags, defined_tags, if_match): - if isinstance(lifecycle_environment_id, six.string_types) and len(lifecycle_environment_id.strip()) == 0: + if isinstance(lifecycle_environment_id, str) and len(lifecycle_environment_id.strip()) == 0: raise click.UsageError('Parameter --lifecycle-environment-id cannot be whitespace or empty string') if not force: if stages or freeform_tags or defined_tags: diff --git a/services/os_management_hub/src/oci_cli_managed_instance/generated/managedinstance_cli.py b/services/os_management_hub/src/oci_cli_managed_instance/generated/managedinstance_cli.py index 5fcaa18f5..5601f6774 100644 --- a/services/os_management_hub/src/oci_cli_managed_instance/generated/managedinstance_cli.py +++ b/services/os_management_hub/src/oci_cli_managed_instance/generated/managedinstance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -62,7 +61,7 @@ def windows_update_group(): @cli_util.wrap_exceptions def associate_managed_instances_with_management_station(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_station_id, managed_instances, work_request_details, if_match): - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') kwargs = {} @@ -123,7 +122,7 @@ def associate_managed_instances_with_management_station(ctx, from_json, wait_for @cli_util.wrap_exceptions def attach_profile_to_managed_instance(ctx, from_json, managed_instance_id, profile_id, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -158,7 +157,7 @@ def attach_profile_to_managed_instance(ctx, from_json, managed_instance_id, prof @cli_util.wrap_exceptions def attach_software_sources_to_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, software_sources, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -222,7 +221,7 @@ def attach_software_sources_to_managed_instance(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def delete_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -274,7 +273,7 @@ def delete_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def detach_profile_from_managed_instance(ctx, from_json, managed_instance_id, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -304,7 +303,7 @@ def detach_profile_from_managed_instance(ctx, from_json, managed_instance_id, if @cli_util.wrap_exceptions def detach_software_sources_from_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, software_sources, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -370,7 +369,7 @@ def detach_software_sources_from_managed_instance(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def disable_module_stream_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, module_name, stream_name, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -439,7 +438,7 @@ def disable_module_stream_on_managed_instance(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def enable_module_stream_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, module_name, stream_name, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -501,7 +500,7 @@ def enable_module_stream_on_managed_instance(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def get_managed_instance(ctx, from_json, managed_instance_id): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -523,7 +522,7 @@ def get_managed_instance(ctx, from_json, managed_instance_id): @cli_util.wrap_exceptions def get_windows_update(ctx, from_json, windows_update_id): - if isinstance(windows_update_id, six.string_types) and len(windows_update_id.strip()) == 0: + if isinstance(windows_update_id, str) and len(windows_update_id.strip()) == 0: raise click.UsageError('Parameter --windows-update-id cannot be whitespace or empty string') kwargs = {} @@ -617,7 +616,7 @@ def install_all_windows_updates_on_managed_instances_in_compartment(ctx, from_js @cli_util.wrap_exceptions def install_module_stream_profile_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, module_name, stream_name, profile_name, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -688,7 +687,7 @@ def install_module_stream_profile_on_managed_instance(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def install_packages_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, package_names, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -754,7 +753,7 @@ def install_packages_on_managed_instance(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def install_windows_updates_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, windows_update_name, windows_update_types, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -834,7 +833,7 @@ def list_managed_instance_available_packages(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -904,7 +903,7 @@ def list_managed_instance_available_software_sources(ctx, from_json, all_pages, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -977,7 +976,7 @@ def list_managed_instance_available_windows_updates(ctx, from_json, all_pages, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1056,7 +1055,7 @@ def list_managed_instance_errata(ctx, from_json, all_pages, page_size, managed_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1134,7 +1133,7 @@ def list_managed_instance_installed_packages(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1209,7 +1208,7 @@ def list_managed_instance_installed_windows_updates(ctx, from_json, all_pages, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1284,7 +1283,7 @@ def list_managed_instance_modules(ctx, from_json, all_pages, page_size, wait_for if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1385,7 +1384,7 @@ def list_managed_instance_updatable_packages(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1665,7 +1664,7 @@ def list_windows_updates(ctx, from_json, all_pages, page_size, compartment_id, c @cli_util.wrap_exceptions def manage_module_streams_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, is_dry_run, enable, disable, install, remove, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1744,7 +1743,7 @@ def manage_module_streams_on_managed_instance(ctx, from_json, wait_for_state, ma @cli_util.wrap_exceptions def reboot_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, reboot_timeout_in_mins, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1809,7 +1808,7 @@ def reboot_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def refresh_software_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1868,7 +1867,7 @@ def refresh_software_on_managed_instance(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def remove_module_stream_profile_from_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, module_name, stream_name, profile_name, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1939,7 +1938,7 @@ def remove_module_stream_profile_from_managed_instance(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def remove_packages_from_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, package_names, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2006,7 +2005,7 @@ def remove_packages_from_managed_instance(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def switch_module_stream_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, module_name, stream_name, work_request_details, software_source_id, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -2140,7 +2139,7 @@ def update_all_packages_on_managed_instances_in_compartment(ctx, from_json, wait @cli_util.wrap_exceptions def update_managed_instance(ctx, from_json, force, managed_instance_id, description, primary_management_station_id, secondary_management_station_id, notification_topic_id, autonomous_settings, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') if not force: if autonomous_settings: @@ -2194,7 +2193,7 @@ def update_managed_instance(ctx, from_json, force, managed_instance_id, descript @cli_util.wrap_exceptions def update_packages_on_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, package_names, update_types, work_request_details, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/os_management_hub/src/oci_cli_managed_instance_group/generated/managedinstancegroup_cli.py b/services/os_management_hub/src/oci_cli_managed_instance_group/generated/managedinstancegroup_cli.py index 7207756db..e5b0bf481 100644 --- a/services/os_management_hub/src/oci_cli_managed_instance_group/generated/managedinstancegroup_cli.py +++ b/services/os_management_hub/src/oci_cli_managed_instance_group/generated/managedinstancegroup_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -48,7 +47,7 @@ def managed_instance_group_group(): @cli_util.wrap_exceptions def attach_managed_instances_to_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, managed_instances, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -113,7 +112,7 @@ def attach_managed_instances_to_managed_instance_group(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def attach_software_sources_to_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, software_sources, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -174,7 +173,7 @@ def attach_software_sources_to_managed_instance_group(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def change_managed_instance_group_compartment(ctx, from_json, managed_instance_group_id, compartment_id, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -297,7 +296,7 @@ def create_managed_instance_group(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -358,7 +357,7 @@ def delete_managed_instance_group(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def detach_managed_instances_from_managed_instance_group(ctx, from_json, managed_instance_group_id, managed_instances, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -390,7 +389,7 @@ def detach_managed_instances_from_managed_instance_group(ctx, from_json, managed @cli_util.wrap_exceptions def detach_software_sources_from_managed_instance_group(ctx, from_json, managed_instance_group_id, software_sources, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -430,7 +429,7 @@ def detach_software_sources_from_managed_instance_group(ctx, from_json, managed_ @cli_util.wrap_exceptions def disable_module_stream_on_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, module_name, stream_name, software_source_id, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -503,7 +502,7 @@ def disable_module_stream_on_managed_instance_group(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def enable_module_stream_on_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, module_name, stream_name, software_source_id, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -568,7 +567,7 @@ def enable_module_stream_on_managed_instance_group(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def get_managed_instance_group(ctx, from_json, managed_instance_group_id): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -599,7 +598,7 @@ def get_managed_instance_group(ctx, from_json, managed_instance_group_id): @cli_util.wrap_exceptions def install_module_stream_profile_on_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, module_name, stream_name, profile_name, software_source_id, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -674,7 +673,7 @@ def install_module_stream_profile_on_managed_instance_group(ctx, from_json, wait @cli_util.wrap_exceptions def install_packages_on_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, package_names, work_request_details, is_latest, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -742,7 +741,7 @@ def install_packages_on_managed_instance_group(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def install_windows_updates_on_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, windows_update_types, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -817,7 +816,7 @@ def list_managed_instance_group_available_modules(ctx, from_json, all_pages, pag if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -888,7 +887,7 @@ def list_managed_instance_group_available_packages(ctx, from_json, all_pages, pa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -960,7 +959,7 @@ def list_managed_instance_group_available_software_sources(ctx, from_json, all_p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1036,7 +1035,7 @@ def list_managed_instance_group_installed_packages(ctx, from_json, all_pages, pa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1120,7 +1119,7 @@ def list_managed_instance_group_modules(ctx, from_json, all_pages, page_size, wa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1308,7 +1307,7 @@ def list_managed_instance_groups(ctx, from_json, all_pages, page_size, compartme @cli_util.wrap_exceptions def manage_module_streams_on_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, is_dry_run, enable, disable, install, remove, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1387,7 +1386,7 @@ def manage_module_streams_on_managed_instance_group(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def reboot_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, reboot_timeout_in_mins, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1457,7 +1456,7 @@ def reboot_managed_instance_group(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def remove_module_stream_profile_from_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, module_name, stream_name, profile_name, software_source_id, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1531,7 +1530,7 @@ def remove_module_stream_profile_from_managed_instance_group(ctx, from_json, wai @cli_util.wrap_exceptions def remove_packages_from_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, package_names, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1598,7 +1597,7 @@ def remove_packages_from_managed_instance_group(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def switch_module_stream_on_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, module_name, stream_name, software_source_id, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1667,7 +1666,7 @@ def switch_module_stream_on_managed_instance_group(ctx, from_json, wait_for_stat @cli_util.wrap_exceptions def update_all_packages_on_managed_instance_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, update_types, work_request_details, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') kwargs = {} @@ -1739,7 +1738,7 @@ def update_all_packages_on_managed_instance_group(ctx, from_json, wait_for_state @cli_util.wrap_exceptions def update_managed_instance_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_group_id, display_name, description, notification_topic_id, autonomous_settings, freeform_tags, defined_tags, if_match): - if isinstance(managed_instance_group_id, six.string_types) and len(managed_instance_group_id.strip()) == 0: + if isinstance(managed_instance_group_id, str) and len(managed_instance_group_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-group-id cannot be whitespace or empty string') if not force: if autonomous_settings or freeform_tags or defined_tags: diff --git a/services/os_management_hub/src/oci_cli_management_station/generated/managementstation_cli.py b/services/os_management_hub/src/oci_cli_management_station/generated/managementstation_cli.py index cfeb7a4e4..ece02e018 100644 --- a/services/os_management_hub/src/oci_cli_management_station/generated/managementstation_cli.py +++ b/services/os_management_hub/src/oci_cli_management_station/generated/managementstation_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -51,7 +50,7 @@ def management_station_group(): @cli_util.wrap_exceptions def change_management_station_compartment(ctx, from_json, management_station_id, compartment_id, if_match): - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') kwargs = {} @@ -158,7 +157,7 @@ def create_management_station(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_management_station(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_station_id, if_match): - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') kwargs = {} @@ -217,7 +216,7 @@ def delete_management_station(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def get_management_station(ctx, from_json, management_station_id): - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') kwargs = {} @@ -333,7 +332,7 @@ def list_mirrors(ctx, from_json, all_pages, page_size, management_station_id, di if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') kwargs = {} @@ -391,7 +390,7 @@ def list_mirrors(ctx, from_json, all_pages, page_size, management_station_id, di @cli_util.wrap_exceptions def refresh_management_station_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_station_id, if_match): - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') kwargs = {} @@ -447,7 +446,7 @@ def refresh_management_station_config(ctx, from_json, wait_for_state, max_wait_s @cli_util.wrap_exceptions def synchronize_mirrors(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_station_id, software_source_list, if_match): - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') kwargs = {} @@ -508,10 +507,10 @@ def synchronize_mirrors(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def synchronize_single_mirrors(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, management_station_id, mirror_id, if_match): - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') - if isinstance(mirror_id, six.string_types) and len(mirror_id.strip()) == 0: + if isinstance(mirror_id, str) and len(mirror_id.strip()) == 0: raise click.UsageError('Parameter --mirror-id cannot be whitespace or empty string') kwargs = {} @@ -576,7 +575,7 @@ def synchronize_single_mirrors(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_management_station(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, management_station_id, display_name, description, hostname, is_auto_config_enabled, proxy_parameterconflict, mirror, freeform_tags, defined_tags, if_match): - if isinstance(management_station_id, six.string_types) and len(management_station_id.strip()) == 0: + if isinstance(management_station_id, str) and len(management_station_id.strip()) == 0: raise click.UsageError('Parameter --management-station-id cannot be whitespace or empty string') if not force: if proxy_parameterconflict or mirror or freeform_tags or defined_tags: diff --git a/services/os_management_hub/src/oci_cli_onboarding/generated/onboarding_cli.py b/services/os_management_hub/src/oci_cli_onboarding/generated/onboarding_cli.py index 6077158ca..4fd99212d 100644 --- a/services/os_management_hub/src/oci_cli_onboarding/generated/onboarding_cli.py +++ b/services/os_management_hub/src/oci_cli_onboarding/generated/onboarding_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -51,7 +50,7 @@ def profile_group(): @cli_util.wrap_exceptions def attach_lifecycle_stage_to_profile(ctx, from_json, profile_id, lifecycle_stage_id, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -82,7 +81,7 @@ def attach_lifecycle_stage_to_profile(ctx, from_json, profile_id, lifecycle_stag @cli_util.wrap_exceptions def attach_managed_instance_group_to_profile(ctx, from_json, profile_id, managed_instance_group_id, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -113,7 +112,7 @@ def attach_managed_instance_group_to_profile(ctx, from_json, profile_id, managed @cli_util.wrap_exceptions def attach_management_station_to_profile(ctx, from_json, profile_id, management_station_id, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -144,7 +143,7 @@ def attach_management_station_to_profile(ctx, from_json, profile_id, management_ @cli_util.wrap_exceptions def attach_software_sources_to_profile(ctx, from_json, profile_id, software_sources, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -175,7 +174,7 @@ def attach_software_sources_to_profile(ctx, from_json, profile_id, software_sour @cli_util.wrap_exceptions def change_profile_compartment(ctx, from_json, profile_id, compartment_id, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -705,7 +704,7 @@ def create_profile_create_lifecycle_profile_details(ctx, from_json, wait_for_sta @cli_util.wrap_exceptions def delete_profile(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, profile_id, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -766,7 +765,7 @@ def delete_profile(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def detach_software_sources_from_profile(ctx, from_json, profile_id, software_sources, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -795,7 +794,7 @@ def detach_software_sources_from_profile(ctx, from_json, profile_id, software_so @cli_util.wrap_exceptions def get_profile(ctx, from_json, profile_id): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -818,10 +817,10 @@ def get_profile(ctx, from_json, profile_id): @cli_util.wrap_exceptions def get_profile_version(ctx, from_json, profile_id, profile_version): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') - if isinstance(profile_version, six.string_types) and len(profile_version.strip()) == 0: + if isinstance(profile_version, str) and len(profile_version.strip()) == 0: raise click.UsageError('Parameter --profile-version cannot be whitespace or empty string') kwargs = {} @@ -860,7 +859,7 @@ def list_profile_available_software_sources(ctx, from_json, all_pages, page_size if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') kwargs = {} @@ -1023,7 +1022,7 @@ def list_profiles(ctx, from_json, all_pages, page_size, compartment_id, display_ @cli_util.wrap_exceptions def update_profile(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, profile_id, display_name, description, is_default_profile, freeform_tags, defined_tags, if_match): - if isinstance(profile_id, six.string_types) and len(profile_id.strip()) == 0: + if isinstance(profile_id, str) and len(profile_id.strip()) == 0: raise click.UsageError('Parameter --profile-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/os_management_hub/src/oci_cli_reporting_managed_instance/generated/reportingmanagedinstance_cli.py b/services/os_management_hub/src/oci_cli_reporting_managed_instance/generated/reportingmanagedinstance_cli.py index 3a8193c94..a9c0f29f2 100644 --- a/services/os_management_hub/src/oci_cli_reporting_managed_instance/generated/reportingmanagedinstance_cli.py +++ b/services/os_management_hub/src/oci_cli_reporting_managed_instance/generated/reportingmanagedinstance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -150,7 +149,7 @@ def get_managed_instance_analytic_content(ctx, from_json, file, compartment_id, @cli_util.wrap_exceptions def get_managed_instance_content(ctx, from_json, file, managed_instance_id, vulnerability_type, advisory_name, advisory_name_contains, advisory_type, vulnerability_name, vulnerability_name_contains, report_format): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/os_management_hub/src/oci_cli_scheduled_job/generated/scheduledjob_cli.py b/services/os_management_hub/src/oci_cli_scheduled_job/generated/scheduledjob_cli.py index 1c225fb86..244c7e2de 100644 --- a/services/os_management_hub/src/oci_cli_scheduled_job/generated/scheduledjob_cli.py +++ b/services/os_management_hub/src/oci_cli_scheduled_job/generated/scheduledjob_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -44,7 +43,7 @@ def scheduled_job_group(): @cli_util.wrap_exceptions def change_scheduled_job_compartment(ctx, from_json, scheduled_job_id, compartment_id, if_match): - if isinstance(scheduled_job_id, six.string_types) and len(scheduled_job_id.strip()) == 0: + if isinstance(scheduled_job_id, str) and len(scheduled_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-job-id cannot be whitespace or empty string') kwargs = {} @@ -191,7 +190,7 @@ def create_scheduled_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_scheduled_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduled_job_id, if_match): - if isinstance(scheduled_job_id, six.string_types) and len(scheduled_job_id.strip()) == 0: + if isinstance(scheduled_job_id, str) and len(scheduled_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-job-id cannot be whitespace or empty string') kwargs = {} @@ -250,7 +249,7 @@ def delete_scheduled_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def get_scheduled_job(ctx, from_json, scheduled_job_id): - if isinstance(scheduled_job_id, six.string_types) and len(scheduled_job_id.strip()) == 0: + if isinstance(scheduled_job_id, str) and len(scheduled_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-job-id cannot be whitespace or empty string') kwargs = {} @@ -385,7 +384,7 @@ def list_scheduled_jobs(ctx, from_json, all_pages, page_size, compartment_id, di @cli_util.wrap_exceptions def run_scheduled_job_now(ctx, from_json, scheduled_job_id, if_match): - if isinstance(scheduled_job_id, six.string_types) and len(scheduled_job_id.strip()) == 0: + if isinstance(scheduled_job_id, str) and len(scheduled_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-job-id cannot be whitespace or empty string') kwargs = {} @@ -425,7 +424,7 @@ def run_scheduled_job_now(ctx, from_json, scheduled_job_id, if_match): @cli_util.wrap_exceptions def update_scheduled_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, scheduled_job_id, display_name, description, schedule_type, time_next_execution, recurring_rule, operations, freeform_tags, defined_tags, retry_intervals, if_match): - if isinstance(scheduled_job_id, six.string_types) and len(scheduled_job_id.strip()) == 0: + if isinstance(scheduled_job_id, str) and len(scheduled_job_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-job-id cannot be whitespace or empty string') if not force: if operations or freeform_tags or defined_tags or retry_intervals: diff --git a/services/os_management_hub/src/oci_cli_software_source/generated/softwaresource_cli.py b/services/os_management_hub/src/oci_cli_software_source/generated/softwaresource_cli.py index 1e8ae18b7..95a9e8328 100644 --- a/services/os_management_hub/src/oci_cli_software_source/generated/softwaresource_cli.py +++ b/services/os_management_hub/src/oci_cli_software_source/generated/softwaresource_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -76,7 +75,7 @@ def package_group_group(): @cli_util.wrap_exceptions def add_packages_to_software_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, packages, is_continue_on_missing_packages, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -160,7 +159,7 @@ def change_availability_of_software_sources(ctx, from_json, software_source_avai @cli_util.wrap_exceptions def change_software_source_compartment(ctx, from_json, software_source_id, compartment_id, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -757,7 +756,7 @@ def create_software_source_create_third_party_software_source_details(ctx, from_ @cli_util.wrap_exceptions def delete_software_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -817,7 +816,7 @@ def delete_software_source(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def get_erratum(ctx, from_json, compartment_id, name): - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') kwargs = {} @@ -842,10 +841,10 @@ def get_erratum(ctx, from_json, compartment_id, name): @cli_util.wrap_exceptions def get_module_stream(ctx, from_json, software_source_id, module_name, stream_name): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') - if isinstance(module_name, six.string_types) and len(module_name.strip()) == 0: + if isinstance(module_name, str) and len(module_name.strip()) == 0: raise click.UsageError('Parameter --module-name cannot be whitespace or empty string') kwargs = {} @@ -872,10 +871,10 @@ def get_module_stream(ctx, from_json, software_source_id, module_name, stream_na @cli_util.wrap_exceptions def get_module_stream_profile(ctx, from_json, software_source_id, profile_name, module_name, stream_name): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') - if isinstance(profile_name, six.string_types) and len(profile_name.strip()) == 0: + if isinstance(profile_name, str) and len(profile_name.strip()) == 0: raise click.UsageError('Parameter --profile-name cannot be whitespace or empty string') kwargs = {} @@ -901,10 +900,10 @@ def get_module_stream_profile(ctx, from_json, software_source_id, profile_name, @cli_util.wrap_exceptions def get_package_group(ctx, from_json, software_source_id, package_group_id): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') - if isinstance(package_group_id, six.string_types) and len(package_group_id.strip()) == 0: + if isinstance(package_group_id, str) and len(package_group_id.strip()) == 0: raise click.UsageError('Parameter --package-group-id cannot be whitespace or empty string') kwargs = {} @@ -928,10 +927,10 @@ def get_package_group(ctx, from_json, software_source_id, package_group_id): @cli_util.wrap_exceptions def get_software_package(ctx, from_json, software_source_id, software_package_name): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') - if isinstance(software_package_name, six.string_types) and len(software_package_name.strip()) == 0: + if isinstance(software_package_name, str) and len(software_package_name.strip()) == 0: raise click.UsageError('Parameter --software-package-name cannot be whitespace or empty string') kwargs = {} @@ -954,7 +953,7 @@ def get_software_package(ctx, from_json, software_source_id, software_package_na @cli_util.wrap_exceptions def get_software_package_by_name(ctx, from_json, software_package_name): - if isinstance(software_package_name, six.string_types) and len(software_package_name.strip()) == 0: + if isinstance(software_package_name, str) and len(software_package_name.strip()) == 0: raise click.UsageError('Parameter --software-package-name cannot be whitespace or empty string') kwargs = {} @@ -976,7 +975,7 @@ def get_software_package_by_name(ctx, from_json, software_package_name): @cli_util.wrap_exceptions def get_software_source(ctx, from_json, software_source_id): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -999,7 +998,7 @@ def get_software_source(ctx, from_json, software_source_id): @cli_util.wrap_exceptions def get_software_source_manifest(ctx, from_json, file, software_source_id): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -1131,7 +1130,7 @@ def list_available_software_packages(ctx, from_json, all_pages, page_size, softw if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -1353,7 +1352,7 @@ def list_module_stream_profiles(ctx, from_json, all_pages, page_size, software_s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -1424,7 +1423,7 @@ def list_module_streams(ctx, from_json, all_pages, page_size, software_source_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -1497,7 +1496,7 @@ def list_package_groups(ctx, from_json, all_pages, page_size, software_source_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -1576,7 +1575,7 @@ def list_software_package_software_sources(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(software_package_name, six.string_types) and len(software_package_name.strip()) == 0: + if isinstance(software_package_name, str) and len(software_package_name.strip()) == 0: raise click.UsageError('Parameter --software-package-name cannot be whitespace or empty string') kwargs = {} @@ -1661,7 +1660,7 @@ def list_software_packages(ctx, from_json, all_pages, page_size, software_source if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -1848,7 +1847,7 @@ def list_software_sources(ctx, from_json, all_pages, page_size, compartment_id, @cli_util.wrap_exceptions def remove_packages_from_software_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, packages, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -1909,7 +1908,7 @@ def remove_packages_from_software_source(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def replace_packages_in_software_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, packages, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -2109,7 +2108,7 @@ def search_software_source_package_groups(ctx, from_json, software_source_ids, s @cli_util.wrap_exceptions def software_source_generate_metadata(ctx, from_json, software_source_id, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} @@ -2144,7 +2143,7 @@ def software_source_generate_metadata(ctx, from_json, software_source_id, if_mat @cli_util.wrap_exceptions def update_software_source(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, compartment_id, display_name, description, software_source_type, freeform_tags, defined_tags, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2238,7 +2237,7 @@ def update_software_source(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_software_source_update_custom_software_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, compartment_id, display_name, description, freeform_tags, defined_tags, vendor_software_sources, custom_software_source_filter, is_automatically_updated, is_auto_resolve_dependencies, is_latest_content_only, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or vendor_software_sources or custom_software_source_filter: @@ -2345,7 +2344,7 @@ def update_software_source_update_custom_software_source_details(ctx, from_json, @cli_util.wrap_exceptions def update_software_source_update_private_software_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, compartment_id, display_name, description, freeform_tags, defined_tags, url, gpg_key_url, is_gpg_check_enabled, is_ssl_verify_enabled, advanced_repo_options, is_mirror_sync_allowed, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2449,7 +2448,7 @@ def update_software_source_update_private_software_source_details(ctx, from_json @cli_util.wrap_exceptions def update_software_source_update_versioned_custom_software_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, compartment_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2535,7 +2534,7 @@ def update_software_source_update_versioned_custom_software_source_details(ctx, @cli_util.wrap_exceptions def update_software_source_update_vendor_software_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, compartment_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2627,7 +2626,7 @@ def update_software_source_update_vendor_software_source_details(ctx, from_json, @cli_util.wrap_exceptions def update_software_source_update_third_party_software_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, software_source_id, compartment_id, display_name, description, freeform_tags, defined_tags, url, gpg_key_url, is_gpg_check_enabled, is_ssl_verify_enabled, advanced_repo_options, is_mirror_sync_allowed, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2726,7 +2725,7 @@ def update_software_source_update_third_party_software_source_details(ctx, from_ @cli_util.wrap_exceptions def update_software_source_manifest(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, update_software_source_manifest_details, software_source_id, if_match): - if isinstance(software_source_id, six.string_types) and len(software_source_id.strip()) == 0: + if isinstance(software_source_id, str) and len(software_source_id.strip()) == 0: raise click.UsageError('Parameter --software-source-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/os_management_hub/src/oci_cli_work_request/generated/workrequest_cli.py b/services/os_management_hub/src/oci_cli_work_request/generated/workrequest_cli.py index b9079d8a5..ea6148421 100644 --- a/services/os_management_hub/src/oci_cli_work_request/generated/workrequest_cli.py +++ b/services/os_management_hub/src/oci_cli_work_request/generated/workrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -42,7 +41,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -77,7 +76,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -138,7 +137,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -288,7 +287,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def rerun_work_request(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, work_request_id, managed_instances, work_request_details, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/osp_gateway/src/oci_cli_address_rule_service/generated/addressruleservice_cli.py b/services/osp_gateway/src/oci_cli_address_rule_service/generated/addressruleservice_cli.py index 58239a3f7..56520cc69 100644 --- a/services/osp_gateway/src/oci_cli_address_rule_service/generated/addressruleservice_cli.py +++ b/services/osp_gateway/src/oci_cli_address_rule_service/generated/addressruleservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -43,7 +42,7 @@ def address_rule_group(): @cli_util.wrap_exceptions def get_address_rule(ctx, from_json, osp_home_region, compartment_id, country_code): - if isinstance(country_code, six.string_types) and len(country_code.strip()) == 0: + if isinstance(country_code, str) and len(country_code.strip()) == 0: raise click.UsageError('Parameter --country-code cannot be whitespace or empty string') kwargs = {} diff --git a/services/osp_gateway/src/oci_cli_address_service/generated/addressservice_cli.py b/services/osp_gateway/src/oci_cli_address_service/generated/addressservice_cli.py index 72555217d..feeabf3e8 100644 --- a/services/osp_gateway/src/oci_cli_address_service/generated/addressservice_cli.py +++ b/services/osp_gateway/src/oci_cli_address_service/generated/addressservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -43,7 +42,7 @@ def address_group(): @cli_util.wrap_exceptions def get_address(ctx, from_json, osp_home_region, compartment_id, address_id): - if isinstance(address_id, six.string_types) and len(address_id.strip()) == 0: + if isinstance(address_id, str) and len(address_id.strip()) == 0: raise click.UsageError('Parameter --address-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/osp_gateway/src/oci_cli_invoice_service/generated/invoiceservice_cli.py b/services/osp_gateway/src/oci_cli_invoice_service/generated/invoiceservice_cli.py index ef28993c1..3af5acfaa 100644 --- a/services/osp_gateway/src/oci_cli_invoice_service/generated/invoiceservice_cli.py +++ b/services/osp_gateway/src/oci_cli_invoice_service/generated/invoiceservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -44,7 +43,7 @@ def invoice_group(): @cli_util.wrap_exceptions def download_pdf_content(ctx, from_json, file, osp_home_region, compartment_id, internal_invoice_id): - if isinstance(internal_invoice_id, six.string_types) and len(internal_invoice_id.strip()) == 0: + if isinstance(internal_invoice_id, str) and len(internal_invoice_id.strip()) == 0: raise click.UsageError('Parameter --internal-invoice-id cannot be whitespace or empty string') kwargs = {} @@ -92,7 +91,7 @@ def download_pdf_content(ctx, from_json, file, osp_home_region, compartment_id, @cli_util.wrap_exceptions def get_invoice(ctx, from_json, osp_home_region, compartment_id, internal_invoice_id): - if isinstance(internal_invoice_id, six.string_types) and len(internal_invoice_id.strip()) == 0: + if isinstance(internal_invoice_id, str) and len(internal_invoice_id.strip()) == 0: raise click.UsageError('Parameter --internal-invoice-id cannot be whitespace or empty string') kwargs = {} @@ -125,7 +124,7 @@ def list_invoice_lines(ctx, from_json, all_pages, page_size, osp_home_region, co if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(internal_invoice_id, six.string_types) and len(internal_invoice_id.strip()) == 0: + if isinstance(internal_invoice_id, str) and len(internal_invoice_id.strip()) == 0: raise click.UsageError('Parameter --internal-invoice-id cannot be whitespace or empty string') kwargs = {} @@ -263,7 +262,7 @@ def list_invoices(ctx, from_json, all_pages, page_size, osp_home_region, compart @cli_util.wrap_exceptions def pay_invoice(ctx, from_json, osp_home_region, internal_invoice_id, compartment_id, email, language_code, return_url, if_match): - if isinstance(internal_invoice_id, six.string_types) and len(internal_invoice_id.strip()) == 0: + if isinstance(internal_invoice_id, str) and len(internal_invoice_id.strip()) == 0: raise click.UsageError('Parameter --internal-invoice-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/osp_gateway/src/oci_cli_subscription_service/generated/subscriptionservice_cli.py b/services/osp_gateway/src/oci_cli_subscription_service/generated/subscriptionservice_cli.py index b526c71fd..8abf3e565 100644 --- a/services/osp_gateway/src/oci_cli_subscription_service/generated/subscriptionservice_cli.py +++ b/services/osp_gateway/src/oci_cli_subscription_service/generated/subscriptionservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -47,7 +46,7 @@ def subscription_group(): @cli_util.wrap_exceptions def authorize_subscription_payment(ctx, from_json, osp_home_region, subscription_id, compartment_id, subscription, language_code, email, if_match): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -82,7 +81,7 @@ def authorize_subscription_payment(ctx, from_json, osp_home_region, subscription @cli_util.wrap_exceptions def get_subscription(ctx, from_json, subscription_id, osp_home_region, compartment_id): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -170,7 +169,7 @@ def list_subscriptions(ctx, from_json, all_pages, page_size, osp_home_region, co @cli_util.wrap_exceptions def pay_subscription(ctx, from_json, osp_home_region, subscription_id, compartment_id, subscription, language_code, email, if_match): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -209,7 +208,7 @@ def pay_subscription(ctx, from_json, osp_home_region, subscription_id, compartme @cli_util.wrap_exceptions def update_subscription(ctx, from_json, force, subscription_id, osp_home_region, compartment_id, subscription, email, if_match): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') if not force: if subscription: diff --git a/services/osub_billing_schedule/src/oci_cli_billing_schedule/generated/billingschedule_cli.py b/services/osub_billing_schedule/src/oci_cli_billing_schedule/generated/billingschedule_cli.py index 3d950cf97..080a3296a 100644 --- a/services/osub_billing_schedule/src/oci_cli_billing_schedule/generated/billingschedule_cli.py +++ b/services/osub_billing_schedule/src/oci_cli_billing_schedule/generated/billingschedule_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 diff --git a/services/osub_organization_subscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py b/services/osub_organization_subscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py index 22e41dc7a..71abffcbd 100644 --- a/services/osub_organization_subscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py +++ b/services/osub_organization_subscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 diff --git a/services/osub_subscription/src/oci_cli_commitment/generated/commitment_cli.py b/services/osub_subscription/src/oci_cli_commitment/generated/commitment_cli.py index 4170cc741..7465ccd99 100644 --- a/services/osub_subscription/src/oci_cli_commitment/generated/commitment_cli.py +++ b/services/osub_subscription/src/oci_cli_commitment/generated/commitment_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -50,7 +49,7 @@ def commitment_group(): @cli_util.wrap_exceptions def get_commitment(ctx, from_json, commitment_id, x_one_gateway_subscription_id, x_one_origin_region): - if isinstance(commitment_id, six.string_types) and len(commitment_id.strip()) == 0: + if isinstance(commitment_id, str) and len(commitment_id.strip()) == 0: raise click.UsageError('Parameter --commitment-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/osub_subscription/src/oci_cli_ratecard/generated/ratecard_cli.py b/services/osub_subscription/src/oci_cli_ratecard/generated/ratecard_cli.py index 26a85acc8..2e7781038 100644 --- a/services/osub_subscription/src/oci_cli_ratecard/generated/ratecard_cli.py +++ b/services/osub_subscription/src/oci_cli_ratecard/generated/ratecard_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/osub_subscription/src/oci_cli_subscription/generated/subscription_cli.py b/services/osub_subscription/src/oci_cli_subscription/generated/subscription_cli.py index 88fce02ab..7de008107 100644 --- a/services/osub_subscription/src/oci_cli_subscription/generated/subscription_cli.py +++ b/services/osub_subscription/src/oci_cli_subscription/generated/subscription_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/osub_usage/src/oci_cli_computed_usage/generated/computedusage_cli.py b/services/osub_usage/src/oci_cli_computed_usage/generated/computedusage_cli.py index 0a359993e..6f61141be 100644 --- a/services/osub_usage/src/oci_cli_computed_usage/generated/computedusage_cli.py +++ b/services/osub_usage/src/oci_cli_computed_usage/generated/computedusage_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -50,7 +49,7 @@ def computed_usage_group(): @cli_util.wrap_exceptions def get_computed_usage(ctx, from_json, computed_usage_id, compartment_id, fields, x_one_origin_region): - if isinstance(computed_usage_id, six.string_types) and len(computed_usage_id.strip()) == 0: + if isinstance(computed_usage_id, str) and len(computed_usage_id.strip()) == 0: raise click.UsageError('Parameter --computed-usage-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/psql/src/oci_cli_postgresql/generated/postgresql_cli.py b/services/psql/src/oci_cli_postgresql/generated/postgresql_cli.py index 4da5e8a45..6d49c3eba 100644 --- a/services/psql/src/oci_cli_postgresql/generated/postgresql_cli.py +++ b/services/psql/src/oci_cli_postgresql/generated/postgresql_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -132,7 +131,7 @@ def backup_collection_group(): @cli_util.wrap_exceptions def backup_copy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, compartment_id, regions, retention_period, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -197,7 +196,7 @@ def backup_copy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def change_backup_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, compartment_id, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -255,7 +254,7 @@ def change_backup_compartment(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_configuration_compartment(ctx, from_json, configuration_id, compartment_id, if_match): - if isinstance(configuration_id, six.string_types) and len(configuration_id.strip()) == 0: + if isinstance(configuration_id, str) and len(configuration_id.strip()) == 0: raise click.UsageError('Parameter --configuration-id cannot be whitespace or empty string') kwargs = {} @@ -289,7 +288,7 @@ def change_configuration_compartment(ctx, from_json, configuration_id, compartme @cli_util.wrap_exceptions def change_db_system_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, compartment_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -979,7 +978,7 @@ def create_db_system_none_source_details(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def delete_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -1035,7 +1034,7 @@ def delete_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_id, if_match): - if isinstance(configuration_id, six.string_types) and len(configuration_id.strip()) == 0: + if isinstance(configuration_id, str) and len(configuration_id.strip()) == 0: raise click.UsageError('Parameter --configuration-id cannot be whitespace or empty string') kwargs = {} @@ -1099,7 +1098,7 @@ def delete_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1156,7 +1155,7 @@ def delete_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def failover_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, ad, db_instance_id, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1217,7 +1216,7 @@ def failover_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_backup(ctx, from_json, backup_id): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -1239,7 +1238,7 @@ def get_backup(ctx, from_json, backup_id): @cli_util.wrap_exceptions def get_configuration(ctx, from_json, configuration_id): - if isinstance(configuration_id, six.string_types) and len(configuration_id.strip()) == 0: + if isinstance(configuration_id, str) and len(configuration_id.strip()) == 0: raise click.UsageError('Parameter --configuration-id cannot be whitespace or empty string') kwargs = {} @@ -1261,7 +1260,7 @@ def get_configuration(ctx, from_json, configuration_id): @cli_util.wrap_exceptions def get_connection_details(ctx, from_json, db_system_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1284,7 +1283,7 @@ def get_connection_details(ctx, from_json, db_system_id): @cli_util.wrap_exceptions def get_db_system(ctx, from_json, db_system_id, excluded_fields): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1308,7 +1307,7 @@ def get_db_system(ctx, from_json, db_system_id, excluded_fields): @cli_util.wrap_exceptions def get_default_configuration(ctx, from_json, default_configuration_id): - if isinstance(default_configuration_id, six.string_types) and len(default_configuration_id.strip()) == 0: + if isinstance(default_configuration_id, str) and len(default_configuration_id.strip()) == 0: raise click.UsageError('Parameter --default-configuration-id cannot be whitespace or empty string') kwargs = {} @@ -1330,7 +1329,7 @@ def get_default_configuration(ctx, from_json, default_configuration_id): @cli_util.wrap_exceptions def get_primary_db_instance(ctx, from_json, db_system_id): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1352,7 +1351,7 @@ def get_primary_db_instance(ctx, from_json, db_system_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1720,7 +1719,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1777,7 +1776,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1894,7 +1893,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def patch_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, items, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -1957,7 +1956,7 @@ def patch_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def reset_master_user_password(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, password_details, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -2018,7 +2017,7 @@ def reset_master_user_password(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def reset_master_user_password_plain_text_password_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, password_details_password, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -2083,7 +2082,7 @@ def reset_master_user_password_plain_text_password_details(ctx, from_json, wait_ @cli_util.wrap_exceptions def reset_master_user_password_vault_secret_password_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, password_details_secret_id, password_details_secret_version, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -2149,7 +2148,7 @@ def reset_master_user_password_vault_secret_password_details(ctx, from_json, wai @cli_util.wrap_exceptions def restart_db_instance_in_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, db_instance_id, restart_type, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -2212,7 +2211,7 @@ def restart_db_instance_in_db_system(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def restore_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, backup_id, ad, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') kwargs = {} @@ -2281,7 +2280,7 @@ def restore_db_system(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, display_name, description, retention_period, freeform_tags, defined_tags, if_match): - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2361,7 +2360,7 @@ def update_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_id, display_name, description, freeform_tags, defined_tags, compatible_shapes, if_match): - if isinstance(configuration_id, six.string_types) and len(configuration_id.strip()) == 0: + if isinstance(configuration_id, str) and len(configuration_id.strip()) == 0: raise click.UsageError('Parameter --configuration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or compatible_shapes: @@ -2447,7 +2446,7 @@ def update_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_db_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, display_name, description, shape, instance_ocpu_count, instance_memory_size_in_gbs, db_configuration_params, management_policy, storage_details, network_details, freeform_tags, defined_tags, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') if not force: if db_configuration_params or management_policy or storage_details or network_details or freeform_tags or defined_tags: @@ -2546,10 +2545,10 @@ def update_db_system(ctx, from_json, force, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_db_system_db_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, db_system_id, db_instance_id, display_name, description, if_match): - if isinstance(db_system_id, six.string_types) and len(db_system_id.strip()) == 0: + if isinstance(db_system_id, str) and len(db_system_id.strip()) == 0: raise click.UsageError('Parameter --db-system-id cannot be whitespace or empty string') - if isinstance(db_instance_id, six.string_types) and len(db_instance_id.strip()) == 0: + if isinstance(db_instance_id, str) and len(db_instance_id.strip()) == 0: raise click.UsageError('Parameter --db-instance-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/queue/src/oci_cli_queue/generated/queue_cli.py b/services/queue/src/oci_cli_queue/generated/queue_cli.py index 69971beaa..ea81db587 100644 --- a/services/queue/src/oci_cli_queue/generated/queue_cli.py +++ b/services/queue/src/oci_cli_queue/generated/queue_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -78,10 +77,10 @@ def updated_message_group(): @cli_util.wrap_exceptions def delete_message(ctx, from_json, queue_id, message_receipt): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') - if isinstance(message_receipt, six.string_types) and len(message_receipt.strip()) == 0: + if isinstance(message_receipt, str) and len(message_receipt.strip()) == 0: raise click.UsageError('Parameter --message-receipt cannot be whitespace or empty string') kwargs = {} @@ -105,7 +104,7 @@ def delete_message(ctx, from_json, queue_id, message_receipt): @cli_util.wrap_exceptions def delete_messages(ctx, from_json, queue_id, entries): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -140,7 +139,7 @@ def delete_messages(ctx, from_json, queue_id, entries): @cli_util.wrap_exceptions def get_messages(ctx, from_json, queue_id, visibility_in_seconds, timeout_in_seconds, limit, channel_filter): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -171,7 +170,7 @@ def get_messages(ctx, from_json, queue_id, visibility_in_seconds, timeout_in_sec @cli_util.wrap_exceptions def get_stats(ctx, from_json, queue_id, channel_id): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -203,7 +202,7 @@ def list_channels(ctx, from_json, all_pages, page_size, queue_id, limit, page, c if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -250,7 +249,7 @@ def list_channels(ctx, from_json, all_pages, page_size, queue_id, limit, page, c @cli_util.wrap_exceptions def put_messages(ctx, from_json, queue_id, messages): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -279,10 +278,10 @@ def put_messages(ctx, from_json, queue_id, messages): @cli_util.wrap_exceptions def update_message(ctx, from_json, queue_id, message_receipt, visibility_in_seconds): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') - if isinstance(message_receipt, six.string_types) and len(message_receipt.strip()) == 0: + if isinstance(message_receipt, str) and len(message_receipt.strip()) == 0: raise click.UsageError('Parameter --message-receipt cannot be whitespace or empty string') kwargs = {} @@ -311,7 +310,7 @@ def update_message(ctx, from_json, queue_id, message_receipt, visibility_in_seco @cli_util.wrap_exceptions def update_messages(ctx, from_json, queue_id, entries): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/queue/src/oci_cli_queue_admin/generated/queueadmin_cli.py b/services/queue/src/oci_cli_queue_admin/generated/queueadmin_cli.py index 06a90b7c9..e41bbd881 100644 --- a/services/queue/src/oci_cli_queue_admin/generated/queueadmin_cli.py +++ b/services/queue/src/oci_cli_queue_admin/generated/queueadmin_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -81,7 +80,7 @@ def work_request_log_entry_collection_group(): @cli_util.wrap_exceptions def change_queue_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, queue_id, compartment_id, if_match): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -229,7 +228,7 @@ def create_queue(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_queue(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, queue_id, if_match): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -280,7 +279,7 @@ def delete_queue(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def get_queue(ctx, from_json, queue_id): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -302,7 +301,7 @@ def get_queue(ctx, from_json, queue_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -393,7 +392,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -444,7 +443,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -544,7 +543,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def purge_queue(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, queue_id, purge_type, channel_ids, if_match): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') kwargs = {} @@ -616,7 +615,7 @@ def purge_queue(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def update_queue(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, queue_id, display_name, visibility_in_seconds, timeout_in_seconds, channel_consumption_limit, dead_letter_queue_delivery_count, custom_encryption_key_id, freeform_tags, defined_tags, if_match): - if isinstance(queue_id, six.string_types) and len(queue_id.strip()) == 0: + if isinstance(queue_id, str) and len(queue_id.strip()) == 0: raise click.UsageError('Parameter --queue-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/recovery/src/oci_cli_database_recovery/generated/databaserecovery_cli.py b/services/recovery/src/oci_cli_database_recovery/generated/databaserecovery_cli.py index 147feebce..9c6f877ec 100644 --- a/services/recovery/src/oci_cli_database_recovery/generated/databaserecovery_cli.py +++ b/services/recovery/src/oci_cli_database_recovery/generated/databaserecovery_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -104,7 +103,7 @@ def work_request_log_entry_collection_group(): @cli_util.wrap_exceptions def cancel_protected_database_deletion(ctx, from_json, protected_database_id, if_match): - if isinstance(protected_database_id, six.string_types) and len(protected_database_id.strip()) == 0: + if isinstance(protected_database_id, str) and len(protected_database_id.strip()) == 0: raise click.UsageError('Parameter --protected-database-id cannot be whitespace or empty string') kwargs = {} @@ -133,7 +132,7 @@ def cancel_protected_database_deletion(ctx, from_json, protected_database_id, if @cli_util.wrap_exceptions def change_protected_database_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, protected_database_id, compartment_id, if_match): - if isinstance(protected_database_id, six.string_types) and len(protected_database_id.strip()) == 0: + if isinstance(protected_database_id, str) and len(protected_database_id.strip()) == 0: raise click.UsageError('Parameter --protected-database-id cannot be whitespace or empty string') kwargs = {} @@ -195,7 +194,7 @@ def change_protected_database_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_protected_database_subscription(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, protected_database_id, subscription_id, is_default, if_match): - if isinstance(protected_database_id, six.string_types) and len(protected_database_id.strip()) == 0: + if isinstance(protected_database_id, str) and len(protected_database_id.strip()) == 0: raise click.UsageError('Parameter --protected-database-id cannot be whitespace or empty string') kwargs = {} @@ -261,7 +260,7 @@ def change_protected_database_subscription(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def change_protection_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, protection_policy_id, compartment_id, if_match): - if isinstance(protection_policy_id, six.string_types) and len(protection_policy_id.strip()) == 0: + if isinstance(protection_policy_id, str) and len(protection_policy_id.strip()) == 0: raise click.UsageError('Parameter --protection-policy-id cannot be whitespace or empty string') kwargs = {} @@ -322,7 +321,7 @@ def change_protection_policy_compartment(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def change_recovery_service_subnet_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, recovery_service_subnet_id, compartment_id, if_match): - if isinstance(recovery_service_subnet_id, six.string_types) and len(recovery_service_subnet_id.strip()) == 0: + if isinstance(recovery_service_subnet_id, str) and len(recovery_service_subnet_id.strip()) == 0: raise click.UsageError('Parameter --recovery-service-subnet-id cannot be whitespace or empty string') kwargs = {} @@ -648,7 +647,7 @@ def create_recovery_service_subnet(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_protected_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, protected_database_id, deletion_schedule, if_match): - if isinstance(protected_database_id, six.string_types) and len(protected_database_id.strip()) == 0: + if isinstance(protected_database_id, str) and len(protected_database_id.strip()) == 0: raise click.UsageError('Parameter --protected-database-id cannot be whitespace or empty string') kwargs = {} @@ -706,7 +705,7 @@ def delete_protected_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_protection_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, protection_policy_id, if_match): - if isinstance(protection_policy_id, six.string_types) and len(protection_policy_id.strip()) == 0: + if isinstance(protection_policy_id, str) and len(protection_policy_id.strip()) == 0: raise click.UsageError('Parameter --protection-policy-id cannot be whitespace or empty string') kwargs = {} @@ -762,7 +761,7 @@ def delete_protection_policy(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_recovery_service_subnet(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, recovery_service_subnet_id, if_match): - if isinstance(recovery_service_subnet_id, six.string_types) and len(recovery_service_subnet_id.strip()) == 0: + if isinstance(recovery_service_subnet_id, str) and len(recovery_service_subnet_id.strip()) == 0: raise click.UsageError('Parameter --recovery-service-subnet-id cannot be whitespace or empty string') kwargs = {} @@ -816,7 +815,7 @@ def delete_recovery_service_subnet(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def fetch_protected_database_configuration(ctx, from_json, file, protected_database_id, configuration_type, if_match): - if isinstance(protected_database_id, six.string_types) and len(protected_database_id.strip()) == 0: + if isinstance(protected_database_id, str) and len(protected_database_id.strip()) == 0: raise click.UsageError('Parameter --protected-database-id cannot be whitespace or empty string') kwargs = {} @@ -869,7 +868,7 @@ def fetch_protected_database_configuration(ctx, from_json, file, protected_datab @cli_util.wrap_exceptions def get_protected_database(ctx, from_json, protected_database_id): - if isinstance(protected_database_id, six.string_types) and len(protected_database_id.strip()) == 0: + if isinstance(protected_database_id, str) and len(protected_database_id.strip()) == 0: raise click.UsageError('Parameter --protected-database-id cannot be whitespace or empty string') kwargs = {} @@ -891,7 +890,7 @@ def get_protected_database(ctx, from_json, protected_database_id): @cli_util.wrap_exceptions def get_protection_policy(ctx, from_json, protection_policy_id): - if isinstance(protection_policy_id, six.string_types) and len(protection_policy_id.strip()) == 0: + if isinstance(protection_policy_id, str) and len(protection_policy_id.strip()) == 0: raise click.UsageError('Parameter --protection-policy-id cannot be whitespace or empty string') kwargs = {} @@ -913,7 +912,7 @@ def get_protection_policy(ctx, from_json, protection_policy_id): @cli_util.wrap_exceptions def get_recovery_service_subnet(ctx, from_json, recovery_service_subnet_id): - if isinstance(recovery_service_subnet_id, six.string_types) and len(recovery_service_subnet_id.strip()) == 0: + if isinstance(recovery_service_subnet_id, str) and len(recovery_service_subnet_id.strip()) == 0: raise click.UsageError('Parameter --recovery-service-subnet-id cannot be whitespace or empty string') kwargs = {} @@ -935,7 +934,7 @@ def get_recovery_service_subnet(ctx, from_json, recovery_service_subnet_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1167,7 +1166,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1224,7 +1223,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1340,7 +1339,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def schedule_protected_database_deletion(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, protected_database_id, deletion_schedule, if_match): - if isinstance(protected_database_id, six.string_types) and len(protected_database_id.strip()) == 0: + if isinstance(protected_database_id, str) and len(protected_database_id.strip()) == 0: raise click.UsageError('Parameter --protected-database-id cannot be whitespace or empty string') kwargs = {} @@ -1414,7 +1413,7 @@ def schedule_protected_database_deletion(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def update_protected_database(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, protected_database_id, display_name, database_size, database_size_in_gbs, password, protection_policy_id, recovery_service_subnets, is_redo_logs_shipped, freeform_tags, defined_tags, if_match): - if isinstance(protected_database_id, six.string_types) and len(protected_database_id.strip()) == 0: + if isinstance(protected_database_id, str) and len(protected_database_id.strip()) == 0: raise click.UsageError('Parameter --protected-database-id cannot be whitespace or empty string') if not force: if recovery_service_subnets or freeform_tags or defined_tags: @@ -1512,7 +1511,7 @@ def update_protected_database(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_protection_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, protection_policy_id, display_name, backup_retention_period_in_days, policy_locked_date_time, freeform_tags, defined_tags, if_match): - if isinstance(protection_policy_id, six.string_types) and len(protection_policy_id.strip()) == 0: + if isinstance(protection_policy_id, str) and len(protection_policy_id.strip()) == 0: raise click.UsageError('Parameter --protection-policy-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1596,7 +1595,7 @@ def update_protection_policy(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_recovery_service_subnet(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, recovery_service_subnet_id, display_name, subnets, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(recovery_service_subnet_id, six.string_types) and len(recovery_service_subnet_id.strip()) == 0: + if isinstance(recovery_service_subnet_id, str) and len(recovery_service_subnet_id.strip()) == 0: raise click.UsageError('Parameter --recovery-service-subnet-id cannot be whitespace or empty string') if not force: if subnets or nsg_ids or freeform_tags or defined_tags: diff --git a/services/redis/src/oci_cli_oci_cache_config_set/generated/ocicacheconfigset_cli.py b/services/redis/src/oci_cli_oci_cache_config_set/generated/ocicacheconfigset_cli.py index c9c2ea3c9..ba2440c5c 100644 --- a/services/redis/src/oci_cli_oci_cache_config_set/generated/ocicacheconfigset_cli.py +++ b/services/redis/src/oci_cli_oci_cache_config_set/generated/ocicacheconfigset_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -60,7 +59,7 @@ def associated_oci_cache_cluster_summary_group(): @cli_util.wrap_exceptions def change_oci_cache_config_set_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oci_cache_config_set_id, compartment_id, if_match): - if isinstance(oci_cache_config_set_id, six.string_types) and len(oci_cache_config_set_id.strip()) == 0: + if isinstance(oci_cache_config_set_id, str) and len(oci_cache_config_set_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-config-set-id cannot be whitespace or empty string') kwargs = {} @@ -192,7 +191,7 @@ def create_oci_cache_config_set(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_oci_cache_config_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oci_cache_config_set_id, if_match): - if isinstance(oci_cache_config_set_id, six.string_types) and len(oci_cache_config_set_id.strip()) == 0: + if isinstance(oci_cache_config_set_id, str) and len(oci_cache_config_set_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-config-set-id cannot be whitespace or empty string') kwargs = {} @@ -243,7 +242,7 @@ def delete_oci_cache_config_set(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def get_oci_cache_config_set(ctx, from_json, oci_cache_config_set_id): - if isinstance(oci_cache_config_set_id, six.string_types) and len(oci_cache_config_set_id.strip()) == 0: + if isinstance(oci_cache_config_set_id, str) and len(oci_cache_config_set_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-config-set-id cannot be whitespace or empty string') kwargs = {} @@ -274,7 +273,7 @@ def list_associated_oci_cache_clusters(ctx, from_json, all_pages, page_size, oci if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oci_cache_config_set_id, six.string_types) and len(oci_cache_config_set_id.strip()) == 0: + if isinstance(oci_cache_config_set_id, str) and len(oci_cache_config_set_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-config-set-id cannot be whitespace or empty string') kwargs = {} @@ -396,7 +395,7 @@ def list_oci_cache_config_sets(ctx, from_json, all_pages, page_size, compartment @cli_util.wrap_exceptions def update_oci_cache_config_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oci_cache_config_set_id, display_name, description, freeform_tags, defined_tags, if_match): - if isinstance(oci_cache_config_set_id, six.string_types) and len(oci_cache_config_set_id.strip()) == 0: + if isinstance(oci_cache_config_set_id, str) and len(oci_cache_config_set_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-config-set-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/redis/src/oci_cli_oci_cache_default_config_set/generated/ocicachedefaultconfigset_cli.py b/services/redis/src/oci_cli_oci_cache_default_config_set/generated/ocicachedefaultconfigset_cli.py index 3ee7f94f9..51af93087 100644 --- a/services/redis/src/oci_cli_oci_cache_default_config_set/generated/ocicachedefaultconfigset_cli.py +++ b/services/redis/src/oci_cli_oci_cache_default_config_set/generated/ocicachedefaultconfigset_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -49,7 +48,7 @@ def oci_cache_default_config_set_summary_group(): @cli_util.wrap_exceptions def get_oci_cache_default_config_set(ctx, from_json, compartment_id, oci_cache_default_config_set_id): - if isinstance(oci_cache_default_config_set_id, six.string_types) and len(oci_cache_default_config_set_id.strip()) == 0: + if isinstance(oci_cache_default_config_set_id, str) and len(oci_cache_default_config_set_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-default-config-set-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/redis/src/oci_cli_oci_cache_user/generated/ocicacheuser_cli.py b/services/redis/src/oci_cli_oci_cache_user/generated/ocicacheuser_cli.py index b6b828abd..52dba7152 100644 --- a/services/redis/src/oci_cli_oci_cache_user/generated/ocicacheuser_cli.py +++ b/services/redis/src/oci_cli_oci_cache_user/generated/ocicacheuser_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -67,7 +66,7 @@ def oci_cache_user_group(): @cli_util.wrap_exceptions def change_oci_cache_user_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oci_cache_user_id, compartment_id, if_match): - if isinstance(oci_cache_user_id, six.string_types) and len(oci_cache_user_id.strip()) == 0: + if isinstance(oci_cache_user_id, str) and len(oci_cache_user_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-user-id cannot be whitespace or empty string') kwargs = {} @@ -351,7 +350,7 @@ def create_oci_cache_user_password_authentication_mode(ctx, from_json, wait_for_ @cli_util.wrap_exceptions def delete_oci_cache_user(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, oci_cache_user_id, if_match): - if isinstance(oci_cache_user_id, six.string_types) and len(oci_cache_user_id.strip()) == 0: + if isinstance(oci_cache_user_id, str) and len(oci_cache_user_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-user-id cannot be whitespace or empty string') kwargs = {} @@ -402,7 +401,7 @@ def delete_oci_cache_user(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def get_oci_cache_user(ctx, from_json, oci_cache_user_id): - if isinstance(oci_cache_user_id, six.string_types) and len(oci_cache_user_id.strip()) == 0: + if isinstance(oci_cache_user_id, str) and len(oci_cache_user_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-user-id cannot be whitespace or empty string') kwargs = {} @@ -435,7 +434,7 @@ def list_attached_redis_clusters(ctx, from_json, all_pages, page_size, oci_cache if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(oci_cache_user_id, six.string_types) and len(oci_cache_user_id.strip()) == 0: + if isinstance(oci_cache_user_id, str) and len(oci_cache_user_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-user-id cannot be whitespace or empty string') kwargs = {} @@ -557,7 +556,7 @@ def list_oci_cache_users(ctx, from_json, all_pages, page_size, compartment_id, n @cli_util.wrap_exceptions def update_oci_cache_user(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oci_cache_user_id, description, authentication_mode, acl_string, status, freeform_tags, defined_tags, if_match): - if isinstance(oci_cache_user_id, six.string_types) and len(oci_cache_user_id.strip()) == 0: + if isinstance(oci_cache_user_id, str) and len(oci_cache_user_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-user-id cannot be whitespace or empty string') if not force: if authentication_mode or freeform_tags or defined_tags: @@ -644,7 +643,7 @@ def update_oci_cache_user(ctx, from_json, force, wait_for_state, max_wait_second @cli_util.wrap_exceptions def update_oci_cache_user_iam_authentication_mode(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oci_cache_user_id, description, acl_string, status, freeform_tags, defined_tags, if_match): - if isinstance(oci_cache_user_id, six.string_types) and len(oci_cache_user_id.strip()) == 0: + if isinstance(oci_cache_user_id, str) and len(oci_cache_user_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-user-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -732,7 +731,7 @@ def update_oci_cache_user_iam_authentication_mode(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_oci_cache_user_password_authentication_mode(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, oci_cache_user_id, authentication_mode_hashed_passwords, description, acl_string, status, freeform_tags, defined_tags, if_match): - if isinstance(oci_cache_user_id, six.string_types) and len(oci_cache_user_id.strip()) == 0: + if isinstance(oci_cache_user_id, str) and len(oci_cache_user_id.strip()) == 0: raise click.UsageError('Parameter --oci-cache-user-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/redis/src/oci_cli_redis_cluster/generated/rediscluster_cli.py b/services/redis/src/oci_cli_redis_cluster/generated/rediscluster_cli.py index 1b09a4176..2bc13e9cb 100644 --- a/services/redis/src/oci_cli_redis_cluster/generated/rediscluster_cli.py +++ b/services/redis/src/oci_cli_redis_cluster/generated/rediscluster_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -88,7 +87,7 @@ def node_summary_group(): @cli_util.wrap_exceptions def attach_oci_cache_users(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, redis_cluster_id, oci_cache_users, if_match): - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -146,7 +145,7 @@ def attach_oci_cache_users(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -175,7 +174,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_redis_cluster_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, redis_cluster_id, compartment_id, if_match): - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -323,7 +322,7 @@ def create_redis_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_redis_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, redis_cluster_id, if_match): - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -379,7 +378,7 @@ def delete_redis_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def detach_oci_cache_users(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, redis_cluster_id, oci_cache_users, if_match): - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -435,7 +434,7 @@ def detach_oci_cache_users(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def get_redis_cluster(ctx, from_json, redis_cluster_id): - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -457,7 +456,7 @@ def get_redis_cluster(ctx, from_json, redis_cluster_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -490,7 +489,7 @@ def list_attached_oci_cache_users(ctx, from_json, all_pages, page_size, redis_cl if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -552,7 +551,7 @@ def list_redis_cluster_nodes(ctx, from_json, all_pages, page_size, redis_cluster if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -673,7 +672,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -730,7 +729,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -854,7 +853,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_redis_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, redis_cluster_id, oci_cache_config_set_id, shard_count, display_name, node_count, node_memory_in_gbs, software_version, nsg_ids, freeform_tags, defined_tags, if_match): - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') if not force: if nsg_ids or freeform_tags or defined_tags: diff --git a/services/redis/src/oci_cli_redis_identity/generated/redisidentity_cli.py b/services/redis/src/oci_cli_redis_identity/generated/redisidentity_cli.py index 665da3980..406564d2f 100644 --- a/services/redis/src/oci_cli_redis_identity/generated/redisidentity_cli.py +++ b/services/redis/src/oci_cli_redis_identity/generated/redisidentity_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -46,7 +45,7 @@ def create_identity_token_details_group(): @cli_util.wrap_exceptions def create_identity_token(ctx, from_json, public_key, redis_user, redis_cluster_id, freeform_tags, defined_tags, if_match): - if isinstance(redis_cluster_id, six.string_types) and len(redis_cluster_id.strip()) == 0: + if isinstance(redis_cluster_id, str) and len(redis_cluster_id.strip()) == 0: raise click.UsageError('Parameter --redis-cluster-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/resource_manager/src/oci_cli_resource_manager/generated/resourcemanager_cli.py b/services/resource_manager/src/oci_cli_resource_manager/generated/resourcemanager_cli.py index 4a47dfaf5..4ca912648 100644 --- a/services/resource_manager/src/oci_cli_resource_manager/generated/resourcemanager_cli.py +++ b/services/resource_manager/src/oci_cli_resource_manager/generated/resourcemanager_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -133,7 +132,7 @@ def job_output_summary_group(): @cli_util.wrap_exceptions def cancel_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, if_match, is_forced): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -196,7 +195,7 @@ def cancel_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s @cli_util.wrap_exceptions def change_configuration_source_provider_compartment(ctx, from_json, configuration_source_provider_id, compartment_id, if_match): - if isinstance(configuration_source_provider_id, six.string_types) and len(configuration_source_provider_id.strip()) == 0: + if isinstance(configuration_source_provider_id, str) and len(configuration_source_provider_id.strip()) == 0: raise click.UsageError('Parameter --configuration-source-provider-id cannot be whitespace or empty string') kwargs = {} @@ -227,7 +226,7 @@ def change_configuration_source_provider_compartment(ctx, from_json, configurati @cli_util.wrap_exceptions def change_private_endpoint_compartment(ctx, from_json, private_endpoint_id, compartment_id, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -261,7 +260,7 @@ def change_private_endpoint_compartment(ctx, from_json, private_endpoint_id, com @cli_util.wrap_exceptions def change_stack_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, compartment_id, if_match): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') kwargs = {} @@ -319,7 +318,7 @@ def change_stack_compartment(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def change_template_compartment(ctx, from_json, template_id, compartment_id, if_match): - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') kwargs = {} @@ -2382,7 +2381,7 @@ def create_template_create_template_zip_upload_config_source_details(ctx, from_j @cli_util.wrap_exceptions def delete_configuration_source_provider(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_source_provider_id, if_match): - if isinstance(configuration_source_provider_id, six.string_types) and len(configuration_source_provider_id.strip()) == 0: + if isinstance(configuration_source_provider_id, str) and len(configuration_source_provider_id.strip()) == 0: raise click.UsageError('Parameter --configuration-source-provider-id cannot be whitespace or empty string') kwargs = {} @@ -2446,7 +2445,7 @@ def delete_configuration_source_provider(ctx, from_json, wait_for_state, max_wai @cli_util.wrap_exceptions def delete_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, private_endpoint_id, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2510,7 +2509,7 @@ def delete_private_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_stack(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, if_match): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') kwargs = {} @@ -2574,7 +2573,7 @@ def delete_stack(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval @cli_util.wrap_exceptions def delete_template(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, template_id, if_match): - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') kwargs = {} @@ -2639,7 +2638,7 @@ def delete_template(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def detect_stack_drift(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, if_match, resource_addresses, is_provider_upgrade_required): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') kwargs = {} @@ -2700,7 +2699,7 @@ def detect_stack_drift(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_configuration_source_provider(ctx, from_json, configuration_source_provider_id): - if isinstance(configuration_source_provider_id, six.string_types) and len(configuration_source_provider_id.strip()) == 0: + if isinstance(configuration_source_provider_id, str) and len(configuration_source_provider_id.strip()) == 0: raise click.UsageError('Parameter --configuration-source-provider-id cannot be whitespace or empty string') kwargs = {} @@ -2722,7 +2721,7 @@ def get_configuration_source_provider(ctx, from_json, configuration_source_provi @cli_util.wrap_exceptions def get_job(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2744,7 +2743,7 @@ def get_job(ctx, from_json, job_id): @cli_util.wrap_exceptions def get_job_detailed_log_content(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2773,7 +2772,7 @@ def get_job_detailed_log_content(ctx, from_json, job_id): @cli_util.wrap_exceptions def get_job_logs(ctx, from_json, job_id, type, level_greater_than_or_equal_to, sort_order, limit, page, timestamp_greater_than_or_equal_to, timestamp_less_than_or_equal_to): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2809,7 +2808,7 @@ def get_job_logs(ctx, from_json, job_id, type, level_greater_than_or_equal_to, s @cli_util.wrap_exceptions def get_job_logs_content(ctx, from_json, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2832,7 +2831,7 @@ def get_job_logs_content(ctx, from_json, job_id): @cli_util.wrap_exceptions def get_job_tf_config(ctx, from_json, file, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2878,7 +2877,7 @@ def get_job_tf_config(ctx, from_json, file, job_id): @cli_util.wrap_exceptions def get_job_tf_plan(ctx, from_json, file, job_id, tf_plan_format): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2925,7 +2924,7 @@ def get_job_tf_plan(ctx, from_json, file, job_id, tf_plan_format): @cli_util.wrap_exceptions def get_job_tf_state(ctx, from_json, file, job_id): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -2969,7 +2968,7 @@ def get_job_tf_state(ctx, from_json, file, job_id): @cli_util.wrap_exceptions def get_private_endpoint(ctx, from_json, private_endpoint_id): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -2992,7 +2991,7 @@ def get_private_endpoint(ctx, from_json, private_endpoint_id): @cli_util.wrap_exceptions def get_reachable_ip(ctx, from_json, private_ip, private_endpoint_id): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') kwargs = {} @@ -3015,7 +3014,7 @@ def get_reachable_ip(ctx, from_json, private_ip, private_endpoint_id): @cli_util.wrap_exceptions def get_stack(ctx, from_json, stack_id): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') kwargs = {} @@ -3038,7 +3037,7 @@ def get_stack(ctx, from_json, stack_id): @cli_util.wrap_exceptions def get_stack_tf_config(ctx, from_json, file, stack_id): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') kwargs = {} @@ -3083,7 +3082,7 @@ def get_stack_tf_config(ctx, from_json, file, stack_id): @cli_util.wrap_exceptions def get_stack_tf_state(ctx, from_json, file, stack_id): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') kwargs = {} @@ -3127,7 +3126,7 @@ def get_stack_tf_state(ctx, from_json, file, stack_id): @cli_util.wrap_exceptions def get_template(ctx, from_json, template_id): - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') kwargs = {} @@ -3150,7 +3149,7 @@ def get_template(ctx, from_json, template_id): @cli_util.wrap_exceptions def get_template_logo(ctx, from_json, file, template_id): - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') kwargs = {} @@ -3195,7 +3194,7 @@ def get_template_logo(ctx, from_json, file, template_id): @cli_util.wrap_exceptions def get_template_tf_config(ctx, from_json, file, template_id): - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') kwargs = {} @@ -3239,7 +3238,7 @@ def get_template_tf_config(ctx, from_json, file, template_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3332,7 +3331,7 @@ def list_job_associated_resources(ctx, from_json, all_pages, page_size, job_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -3388,7 +3387,7 @@ def list_job_outputs(ctx, from_json, all_pages, page_size, job_id, compartment_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -3595,7 +3594,7 @@ def list_stack_associated_resources(ctx, from_json, all_pages, page_size, stack_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') kwargs = {} @@ -3652,7 +3651,7 @@ def list_stack_resource_drift_details(ctx, from_json, all_pages, page_size, stac if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') kwargs = {} @@ -3874,7 +3873,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -3931,7 +3930,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4041,7 +4040,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, res @cli_util.wrap_exceptions def update_configuration_source_provider(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_source_provider_id, display_name, description, config_source_provider_type, private_server_config_details, freeform_tags, defined_tags, if_match): - if isinstance(configuration_source_provider_id, six.string_types) and len(configuration_source_provider_id.strip()) == 0: + if isinstance(configuration_source_provider_id, str) and len(configuration_source_provider_id.strip()) == 0: raise click.UsageError('Parameter --configuration-source-provider-id cannot be whitespace or empty string') if not force: if private_server_config_details or freeform_tags or defined_tags: @@ -4127,7 +4126,7 @@ def update_configuration_source_provider(ctx, from_json, force, wait_for_state, @cli_util.wrap_exceptions def update_configuration_source_provider_update_bitbucket_cloud_username_app_password_configuration_source_provider_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_source_provider_id, display_name, description, private_server_config_details, freeform_tags, defined_tags, api_endpoint, username, secret_id, if_match): - if isinstance(configuration_source_provider_id, six.string_types) and len(configuration_source_provider_id.strip()) == 0: + if isinstance(configuration_source_provider_id, str) and len(configuration_source_provider_id.strip()) == 0: raise click.UsageError('Parameter --configuration-source-provider-id cannot be whitespace or empty string') if not force: if private_server_config_details or freeform_tags or defined_tags: @@ -4220,7 +4219,7 @@ def update_configuration_source_provider_update_bitbucket_cloud_username_app_pas @cli_util.wrap_exceptions def update_configuration_source_provider_update_bitbucket_server_access_token_configuration_source_provider_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_source_provider_id, display_name, description, private_server_config_details, freeform_tags, defined_tags, secret_id, api_endpoint, if_match): - if isinstance(configuration_source_provider_id, six.string_types) and len(configuration_source_provider_id.strip()) == 0: + if isinstance(configuration_source_provider_id, str) and len(configuration_source_provider_id.strip()) == 0: raise click.UsageError('Parameter --configuration-source-provider-id cannot be whitespace or empty string') if not force: if private_server_config_details or freeform_tags or defined_tags: @@ -4310,7 +4309,7 @@ def update_configuration_source_provider_update_bitbucket_server_access_token_co @cli_util.wrap_exceptions def update_configuration_source_provider_update_gitlab_access_token_configuration_source_provider_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_source_provider_id, display_name, description, private_server_config_details, freeform_tags, defined_tags, api_endpoint, access_token, if_match): - if isinstance(configuration_source_provider_id, six.string_types) and len(configuration_source_provider_id.strip()) == 0: + if isinstance(configuration_source_provider_id, str) and len(configuration_source_provider_id.strip()) == 0: raise click.UsageError('Parameter --configuration-source-provider-id cannot be whitespace or empty string') if not force: if private_server_config_details or freeform_tags or defined_tags: @@ -4400,7 +4399,7 @@ def update_configuration_source_provider_update_gitlab_access_token_configuratio @cli_util.wrap_exceptions def update_configuration_source_provider_update_github_access_token_configuration_source_provider_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, configuration_source_provider_id, display_name, description, private_server_config_details, freeform_tags, defined_tags, api_endpoint, access_token, if_match): - if isinstance(configuration_source_provider_id, six.string_types) and len(configuration_source_provider_id.strip()) == 0: + if isinstance(configuration_source_provider_id, str) and len(configuration_source_provider_id.strip()) == 0: raise click.UsageError('Parameter --configuration-source-provider-id cannot be whitespace or empty string') if not force: if private_server_config_details or freeform_tags or defined_tags: @@ -4486,7 +4485,7 @@ def update_configuration_source_provider_update_github_access_token_configuratio @cli_util.wrap_exceptions def update_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, job_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -4564,7 +4563,7 @@ def update_job(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def update_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, private_endpoint_id, display_name, description, vcn_id, subnet_id, dns_zones, nsg_id_list, is_used_with_configuration_source_provider, freeform_tags, defined_tags, if_match): - if isinstance(private_endpoint_id, six.string_types) and len(private_endpoint_id.strip()) == 0: + if isinstance(private_endpoint_id, str) and len(private_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --private-endpoint-id cannot be whitespace or empty string') if not force: if dns_zones or nsg_id_list or freeform_tags or defined_tags: @@ -4660,7 +4659,7 @@ def update_private_endpoint(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_stack(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, display_name, description, config_source, custom_terraform_provider, is_third_party_provider_experience_enabled, variables, terraform_version, freeform_tags, defined_tags, if_match): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') if not force: if config_source or custom_terraform_provider or variables or freeform_tags or defined_tags: @@ -4760,7 +4759,7 @@ def update_stack(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_stack_update_bitbucket_cloud_config_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, config_source_configuration_source_provider_id, display_name, description, custom_terraform_provider, is_third_party_provider_experience_enabled, variables, terraform_version, freeform_tags, defined_tags, if_match, config_source_working_directory, config_source_repository_url, config_source_branch_name, config_source_workspace_id): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') if not force: if custom_terraform_provider or variables or freeform_tags or defined_tags: @@ -4874,7 +4873,7 @@ def update_stack_update_bitbucket_cloud_config_source_details(ctx, from_json, fo @cli_util.wrap_exceptions def update_stack_update_bitbucket_server_config_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, config_source_configuration_source_provider_id, display_name, description, custom_terraform_provider, is_third_party_provider_experience_enabled, variables, terraform_version, freeform_tags, defined_tags, if_match, config_source_working_directory, config_source_repository_url, config_source_branch_name, config_source_project_id, config_source_repository_id): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') if not force: if custom_terraform_provider or variables or freeform_tags or defined_tags: @@ -4989,7 +4988,7 @@ def update_stack_update_bitbucket_server_config_source_details(ctx, from_json, f @cli_util.wrap_exceptions def update_stack_update_git_config_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, config_source_configuration_source_provider_id, display_name, description, custom_terraform_provider, is_third_party_provider_experience_enabled, variables, terraform_version, freeform_tags, defined_tags, if_match, config_source_working_directory, config_source_repository_url, config_source_branch_name): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') if not force: if custom_terraform_provider or variables or freeform_tags or defined_tags: @@ -5098,7 +5097,7 @@ def update_stack_update_git_config_source_details(ctx, from_json, force, wait_fo @cli_util.wrap_exceptions def update_stack_update_object_storage_config_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, display_name, description, custom_terraform_provider, is_third_party_provider_experience_enabled, variables, terraform_version, freeform_tags, defined_tags, if_match, config_source_working_directory, config_source_region, config_source_namespace, config_source_bucket_name): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') if not force: if custom_terraform_provider or variables or freeform_tags or defined_tags: @@ -5207,7 +5206,7 @@ def update_stack_update_object_storage_config_source_details(ctx, from_json, for @cli_util.wrap_exceptions def update_stack_update_zip_upload_config_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, display_name, description, custom_terraform_provider, is_third_party_provider_experience_enabled, variables, terraform_version, freeform_tags, defined_tags, if_match, config_source_working_directory, config_source_zip_file_base64_encoded): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') if not force: if custom_terraform_provider or variables or freeform_tags or defined_tags: @@ -5312,7 +5311,7 @@ def update_stack_update_zip_upload_config_source_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_stack_update_dev_ops_config_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stack_id, config_source_project_id, config_source_repository_id, display_name, description, custom_terraform_provider, is_third_party_provider_experience_enabled, variables, terraform_version, freeform_tags, defined_tags, if_match, config_source_working_directory, config_source_branch_name): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') if not force: if custom_terraform_provider or variables or freeform_tags or defined_tags: @@ -5414,7 +5413,7 @@ def update_stack_update_dev_ops_config_source_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_template(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, template_id, display_name, description, long_description, logo_file_base64_encoded, template_config_source, freeform_tags, defined_tags, if_match): - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') if not force: if template_config_source or freeform_tags or defined_tags: @@ -5502,7 +5501,7 @@ def update_template(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_template_update_template_zip_upload_config_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, template_id, display_name, description, long_description, logo_file_base64_encoded, freeform_tags, defined_tags, if_match, template_config_source_zip_file_base64_encoded): - if isinstance(template_id, six.string_types) and len(template_id.strip()) == 0: + if isinstance(template_id, str) and len(template_id.strip()) == 0: raise click.UsageError('Parameter --template-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/resource_manager/src/oci_cli_resource_manager/resourcemanager_cli_extended.py b/services/resource_manager/src/oci_cli_resource_manager/resourcemanager_cli_extended.py index 26dcfd05a..27b7d4a39 100644 --- a/services/resource_manager/src/oci_cli_resource_manager/resourcemanager_cli_extended.py +++ b/services/resource_manager/src/oci_cli_resource_manager/resourcemanager_cli_extended.py @@ -5,7 +5,6 @@ import click import os import os.path -import six import sys from services.resource_manager.src.oci_cli_resource_manager.generated import resourcemanager_cli from oci_cli import cli_util @@ -307,7 +306,7 @@ def get_job_logs_extended(ctx, job_id, type, level_greater_than_or_equal_to, sor if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(job_id, six.string_types) and len(job_id.strip()) == 0: + if isinstance(job_id, str) and len(job_id.strip()) == 0: raise click.UsageError('Parameter --job-id cannot be whitespace or empty string') kwargs = {} @@ -480,7 +479,7 @@ def update_template_update_template_zip_upload_config_source_details_extended(ct @cli_util.wrap_exceptions def copy_stack(ctx, from_json, stack_id, destination_region, destination_compartment_id, display_name, description, freeform_tags, defined_tags, variables, access_token): - if isinstance(stack_id, six.string_types) and len(stack_id.strip()) == 0: + if isinstance(stack_id, str) and len(stack_id.strip()) == 0: raise click.UsageError('Parameter --stack-id cannot be whitespace or empty string') if destination_region is not None and not is_region(destination_region): diff --git a/services/resource_scheduler/src/oci_cli_schedule/generated/schedule_cli.py b/services/resource_scheduler/src/oci_cli_schedule/generated/schedule_cli.py index 2c194a0d6..0f8010081 100644 --- a/services/resource_scheduler/src/oci_cli_schedule/generated/schedule_cli.py +++ b/services/resource_scheduler/src/oci_cli_schedule/generated/schedule_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -74,7 +73,7 @@ def resource_type_collection_group(): @cli_util.wrap_exceptions def activate_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -123,7 +122,7 @@ def activate_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -152,7 +151,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_schedule_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, compartment_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -315,7 +314,7 @@ def create_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def deactivate_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -367,7 +366,7 @@ def deactivate_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -426,7 +425,7 @@ def delete_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def get_schedule(ctx, from_json, schedule_id): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -448,7 +447,7 @@ def get_schedule(ctx, from_json, schedule_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -591,7 +590,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -648,7 +647,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -789,7 +788,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, display_name, description, action, recurrence_details, recurrence_type, resource_filters, resources, time_starts, time_ends, freeform_tags, defined_tags, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') if not force: if resource_filters or resources or freeform_tags or defined_tags: diff --git a/services/resource_search/src/oci_cli_resource_search/generated/resourcesearch_cli.py b/services/resource_search/src/oci_cli_resource_search/generated/resourcesearch_cli.py index 86d00dbb9..fff46df3a 100644 --- a/services/resource_search/src/oci_cli_resource_search/generated/resourcesearch_cli.py +++ b/services/resource_search/src/oci_cli_resource_search/generated/resourcesearch_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -47,7 +46,7 @@ def resource_summary_group(): @cli_util.wrap_exceptions def get_resource_type(ctx, from_json, name): - if isinstance(name, six.string_types) and len(name.strip()) == 0: + if isinstance(name, str) and len(name.strip()) == 0: raise click.UsageError('Parameter --name cannot be whitespace or empty string') kwargs = {} diff --git a/services/rover/src/oci_cli_rover/rover_utils.py b/services/rover/src/oci_cli_rover/rover_utils.py index 6ea987d53..b8513964e 100644 --- a/services/rover/src/oci_cli_rover/rover_utils.py +++ b/services/rover/src/oci_cli_rover/rover_utils.py @@ -9,7 +9,6 @@ import sys import time import click -import six import os import oci @@ -49,7 +48,7 @@ def __init__(self, data=None, headers=None): def get_compute_image_helper(ctx, image_id): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') ctx_endpoint = ctx.obj['endpoint'] ctx.obj['endpoint'] = None @@ -67,7 +66,7 @@ def get_compute_image_helper(ctx, image_id): def export_compute_image_helper(ctx, image_id, destinationUri): - if isinstance(image_id, six.string_types) and len(image_id.strip()) == 0: + if isinstance(image_id, str) and len(image_id.strip()) == 0: raise click.UsageError('Parameter --image-id cannot be whitespace or empty string') export_details = { 'destinationType': 'objectStorageUri', @@ -214,7 +213,7 @@ def create_master_key_policy_rover_resource(resource_name, ctx, **kwargs): def setup_master_key_policy(ctx, **kwargs): # Validate master-key-id - if isinstance(kwargs['master_key_id'], six.string_types) and len(kwargs['master_key_id'].strip()) == 0: + if isinstance(kwargs['master_key_id'], str) and len(kwargs['master_key_id'].strip()) == 0: raise click.UsageError('Parameter master_key_id cannot be whitespace or empty string') config = oci.config.from_file(file_location=ctx.obj['config_file'], profile_name=ctx.obj['profile']) root_compartment = config['tenancy'] @@ -270,11 +269,11 @@ def setup_master_key_policy(ctx, **kwargs): def validate_policy_parameters(**kwargs): if 'policy_compartment_id' in kwargs and kwargs['policy_compartment_id']: - if isinstance(kwargs['policy_compartment_id'], six.string_types) and \ + if isinstance(kwargs['policy_compartment_id'], str) and \ len(kwargs['policy_compartment_id'].strip()) == 0: raise click.UsageError('Parameter policy-compartment-id cannot be whitespace or empty string') if 'policy_name' in kwargs and kwargs['policy_name']: - if isinstance(kwargs['policy_name'], six.string_types) and len(kwargs['policy_name'].strip()) == 0: + if isinstance(kwargs['policy_name'], str) and len(kwargs['policy_name'].strip()) == 0: raise click.UsageError('Policy name cannot be whitespace or empty string') diff --git a/services/rover/src/oci_cli_rover_bundle/generated/roverbundle_cli.py b/services/rover/src/oci_cli_rover_bundle/generated/roverbundle_cli.py index 69f121667..3eb9eaed2 100644 --- a/services/rover/src/oci_cli_rover_bundle/generated/roverbundle_cli.py +++ b/services/rover/src/oci_cli_rover_bundle/generated/roverbundle_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def list_rover_cluster_rover_bundle_requests(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -114,7 +113,7 @@ def list_rover_node_rover_bundle_requests(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -168,7 +167,7 @@ def list_rover_node_rover_bundle_requests(ctx, from_json, all_pages, page_size, @cli_util.wrap_exceptions def request_bundle_rover_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, destination_compartment_id, destination_bucket_name, bundle_version, rover_cluster_id): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -232,7 +231,7 @@ def request_bundle_rover_cluster(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def request_bundle_rover_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, destination_compartment_id, destination_bucket_name, bundle_version, rover_node_id): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -291,7 +290,7 @@ def request_bundle_rover_node(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def retrieve_available_bundle_versions_rover_cluster(ctx, from_json, current_rover_bundle_version, rover_cluster_id): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -319,7 +318,7 @@ def retrieve_available_bundle_versions_rover_cluster(ctx, from_json, current_rov @cli_util.wrap_exceptions def retrieve_available_bundle_versions_rover_node(ctx, from_json, current_rover_bundle_version, rover_node_id): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -347,7 +346,7 @@ def retrieve_available_bundle_versions_rover_node(ctx, from_json, current_rover_ @cli_util.wrap_exceptions def retrieve_bundle_status_rover_cluster(ctx, from_json, work_request_id, rover_cluster_id): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -375,7 +374,7 @@ def retrieve_bundle_status_rover_cluster(ctx, from_json, work_request_id, rover_ @cli_util.wrap_exceptions def retrieve_bundle_status_rover_node(ctx, from_json, work_request_id, rover_node_id): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/rover/src/oci_cli_rover_cluster/generated/rovercluster_cli.py b/services/rover/src/oci_cli_rover_cluster/generated/rovercluster_cli.py index 5423ec8cb..088f2ef4c 100644 --- a/services/rover/src/oci_cli_rover_cluster/generated/rovercluster_cli.py +++ b/services/rover/src/oci_cli_rover_cluster/generated/rovercluster_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -50,7 +49,7 @@ def rover_cluster_certificate_group(): @cli_util.wrap_exceptions def change_rover_cluster_compartment(ctx, from_json, rover_cluster_id, compartment_id, if_match): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -231,7 +230,7 @@ def create_rover_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_rover_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, rover_cluster_id, if_match): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -290,7 +289,7 @@ def delete_rover_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def get_rover_cluster(ctx, from_json, rover_cluster_id): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -312,7 +311,7 @@ def get_rover_cluster(ctx, from_json, rover_cluster_id): @cli_util.wrap_exceptions def get_rover_cluster_certificate(ctx, from_json, rover_cluster_id): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -402,7 +401,7 @@ def list_rover_clusters(ctx, from_json, all_pages, page_size, compartment_id, di @cli_util.wrap_exceptions def request_additional_nodes(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, rover_cluster_id, number_of_additional_nodes, if_match): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') kwargs = {} @@ -490,7 +489,7 @@ def request_additional_nodes(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_rover_cluster(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, rover_cluster_id, display_name, cluster_size, customer_shipping_address, cluster_workloads, super_user_password, lifecycle_state, lifecycle_state_details, unlock_passphrase, enclosure_type, point_of_contact, point_of_contact_phone_number, shipping_preference, oracle_shipping_tracking_url, subscription_id, shipping_vendor, time_pickup_expected, is_import_requested, import_compartment_id, import_file_bucket, data_validation_code, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --rover-cluster-id cannot be whitespace or empty string') if not force: if customer_shipping_address or cluster_workloads or freeform_tags or defined_tags or system_tags: diff --git a/services/rover/src/oci_cli_rover_cluster/rovercluster_cli_extended.py b/services/rover/src/oci_cli_rover_cluster/rovercluster_cli_extended.py index 5de98158d..1c5879108 100644 --- a/services/rover/src/oci_cli_rover_cluster/rovercluster_cli_extended.py +++ b/services/rover/src/oci_cli_rover_cluster/rovercluster_cli_extended.py @@ -4,7 +4,6 @@ from __future__ import print_function import click -import six # noqa: F401 from oci_cli import cli_util from oci_cli import json_skeleton_utils from oci_cli import custom_types # noqa: F401 diff --git a/services/rover/src/oci_cli_rover_cluster/rovercluster_utils.py b/services/rover/src/oci_cli_rover_cluster/rovercluster_utils.py index 226fbcba2..ddeb349ba 100644 --- a/services/rover/src/oci_cli_rover_cluster/rovercluster_utils.py +++ b/services/rover/src/oci_cli_rover_cluster/rovercluster_utils.py @@ -4,7 +4,6 @@ import json import click -import six from oci_cli import cli_util from oci_cli.cli_util import formatted_flat_dict @@ -84,7 +83,7 @@ def create_cluster_common(ctx, **kwargs): def show_cluster_common(ctx, **kwargs): - if isinstance(kwargs['cluster_id'], six.string_types) and len(kwargs['cluster_id'].strip()) == 0: + if isinstance(kwargs['cluster_id'], str) and len(kwargs['cluster_id'].strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') result = get_rover_cluster_helper(ctx, kwargs['cluster_id']) @@ -129,7 +128,7 @@ def request_cluster_common(ctx, cluster_type, **kwargs): def delete_cluster_common(ctx, **kwargs): - if isinstance(kwargs['cluster_id'], six.string_types) and len(kwargs['cluster_id'].strip()) == 0: + if isinstance(kwargs['cluster_id'], str) and len(kwargs['cluster_id'].strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs_request = {} @@ -161,7 +160,7 @@ def set_secrets_cluster_common(ctx, **kwargs): def change_cluster_compartment_common(ctx, **kwargs): - if isinstance(kwargs['cluster_id'], six.string_types) and len(kwargs['cluster_id'].strip()) == 0: + if isinstance(kwargs['cluster_id'], str) and len(kwargs['cluster_id'].strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') kwargs.update({'rover_cluster_id': kwargs['cluster_id']}) kwargs.pop('cluster_id') @@ -249,10 +248,10 @@ def get_rover_cluster_certificate_common(ctx, **kwargs): rover_cluster_id = kwargs['cluster_id'] output_file_path = kwargs['output_file_path'] - if isinstance(rover_cluster_id, six.string_types) and len(rover_cluster_id.strip()) == 0: + if isinstance(rover_cluster_id, str) and len(rover_cluster_id.strip()) == 0: raise click.UsageError('Parameter --cluster-id cannot be whitespace or empty string') - if isinstance(output_file_path, six.string_types) and len(output_file_path.strip()) == 0: + if isinstance(output_file_path, str) and len(output_file_path.strip()) == 0: raise click.UsageError('Parameter --output-file-path cannot be whitespace or empty string') kwargs = {'opc_request_id': cli_util.use_or_generate_request_id(ctx.obj['request_id'])} diff --git a/services/rover/src/oci_cli_rover_entitlement/generated/roverentitlement_cli.py b/services/rover/src/oci_cli_rover_entitlement/generated/roverentitlement_cli.py index 77ac8b49e..75c8f8392 100644 --- a/services/rover/src/oci_cli_rover_entitlement/generated/roverentitlement_cli.py +++ b/services/rover/src/oci_cli_rover_entitlement/generated/roverentitlement_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -43,7 +42,7 @@ def rover_entitlement_group(): @cli_util.wrap_exceptions def change_rover_entitlement_compartment(ctx, from_json, rover_entitlement_id, compartment_id, if_match): - if isinstance(rover_entitlement_id, six.string_types) and len(rover_entitlement_id.strip()) == 0: + if isinstance(rover_entitlement_id, str) and len(rover_entitlement_id.strip()) == 0: raise click.UsageError('Parameter --rover-entitlement-id cannot be whitespace or empty string') kwargs = {} @@ -162,7 +161,7 @@ def create_rover_entitlement(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_rover_entitlement(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, rover_entitlement_id, if_match): - if isinstance(rover_entitlement_id, six.string_types) and len(rover_entitlement_id.strip()) == 0: + if isinstance(rover_entitlement_id, str) and len(rover_entitlement_id.strip()) == 0: raise click.UsageError('Parameter --rover-entitlement-id cannot be whitespace or empty string') kwargs = {} @@ -222,7 +221,7 @@ def delete_rover_entitlement(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def get_rover_entitlement(ctx, from_json, rover_entitlement_id, compartment_id): - if isinstance(rover_entitlement_id, six.string_types) and len(rover_entitlement_id.strip()) == 0: + if isinstance(rover_entitlement_id, str) and len(rover_entitlement_id.strip()) == 0: raise click.UsageError('Parameter --rover-entitlement-id cannot be whitespace or empty string') kwargs = {} @@ -323,7 +322,7 @@ def list_rover_entitlements(ctx, from_json, all_pages, page_size, compartment_id @cli_util.wrap_exceptions def update_rover_entitlement(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, rover_entitlement_id, display_name, tenant_id, requestor_name, requestor_email, entitlement_details, lifecycle_state, lifecycle_state_details, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(rover_entitlement_id, six.string_types) and len(rover_entitlement_id.strip()) == 0: + if isinstance(rover_entitlement_id, str) and len(rover_entitlement_id.strip()) == 0: raise click.UsageError('Parameter --rover-entitlement-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags: diff --git a/services/rover/src/oci_cli_rover_node/generated/rovernode_cli.py b/services/rover/src/oci_cli_rover_node/generated/rovernode_cli.py index 904e073d5..27cb98192 100644 --- a/services/rover/src/oci_cli_rover_node/generated/rovernode_cli.py +++ b/services/rover/src/oci_cli_rover_node/generated/rovernode_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -71,7 +70,7 @@ def rover_node_get_rpt_group(): @cli_util.wrap_exceptions def change_rover_node_compartment(ctx, from_json, rover_node_id, compartment_id, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -286,7 +285,7 @@ def create_rover_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_rover_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, rover_node_id, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -345,7 +344,7 @@ def delete_rover_node(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def get_rover_node(ctx, from_json, rover_node_id): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -367,7 +366,7 @@ def get_rover_node(ctx, from_json, rover_node_id): @cli_util.wrap_exceptions def get_rover_node_certificate(ctx, from_json, rover_node_id): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -389,7 +388,7 @@ def get_rover_node_certificate(ctx, from_json, rover_node_id): @cli_util.wrap_exceptions def get_rover_node_encryption_key(ctx, from_json, rover_node_id): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -412,7 +411,7 @@ def get_rover_node_encryption_key(ctx, from_json, rover_node_id): @cli_util.wrap_exceptions def get_rover_node_get_rpt(ctx, from_json, rover_node_id, jwt): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -502,7 +501,7 @@ def list_rover_nodes(ctx, from_json, all_pages, page_size, compartment_id, displ @cli_util.wrap_exceptions def rover_node_action_retrieve_ca_bundle(ctx, from_json, rover_node_id, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -529,7 +528,7 @@ def rover_node_action_retrieve_ca_bundle(ctx, from_json, rover_node_id, if_match @cli_util.wrap_exceptions def rover_node_action_set_key(ctx, from_json, rover_node_id, jwt, public_key, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -564,7 +563,7 @@ def rover_node_action_set_key(ctx, from_json, rover_node_id, jwt, public_key, if @cli_util.wrap_exceptions def rover_node_generate_certificate(ctx, from_json, csr, time_cert_validity_end, rover_node_id, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -597,7 +596,7 @@ def rover_node_generate_certificate(ctx, from_json, csr, time_cert_validity_end, @cli_util.wrap_exceptions def rover_node_renew_certificate(ctx, from_json, csr, time_cert_validity_end, rover_node_id, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -631,7 +630,7 @@ def rover_node_renew_certificate(ctx, from_json, csr, time_cert_validity_end, ro @cli_util.wrap_exceptions def rover_node_replace_certificate_authority(ctx, from_json, certificate_authority_id, rover_node_id, cert_key_algorithm, cert_signature_algorithm, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -667,7 +666,7 @@ def rover_node_replace_certificate_authority(ctx, from_json, certificate_authori @cli_util.wrap_exceptions def rover_node_retrieve_leaf_certificate(ctx, from_json, rover_node_id, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') kwargs = {} @@ -730,7 +729,7 @@ def rover_node_retrieve_leaf_certificate(ctx, from_json, rover_node_id, if_match @cli_util.wrap_exceptions def update_rover_node(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, rover_node_id, display_name, shape, serial_number, customer_shipping_address, node_workloads, super_user_password, unlock_passphrase, point_of_contact, point_of_contact_phone_number, oracle_shipping_tracking_url, shipping_preference, shipping_vendor, time_pickup_expected, lifecycle_state, enclosure_type, lifecycle_state_details, time_return_window_starts, time_return_window_ends, is_import_requested, import_compartment_id, import_file_bucket, data_validation_code, public_key, certificate_authority_id, time_cert_validity_end, common_name, cert_compartment_id, cert_key_algorithm, cert_signature_algorithm, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --rover-node-id cannot be whitespace or empty string') if not force: if customer_shipping_address or node_workloads or freeform_tags or defined_tags or system_tags: diff --git a/services/rover/src/oci_cli_rover_node/rovernode_cli_extended.py b/services/rover/src/oci_cli_rover_node/rovernode_cli_extended.py index 0bdeaa5d1..94a86c56a 100644 --- a/services/rover/src/oci_cli_rover_node/rovernode_cli_extended.py +++ b/services/rover/src/oci_cli_rover_node/rovernode_cli_extended.py @@ -5,7 +5,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 import json from oci_cli import cli_util @@ -378,7 +377,7 @@ def create_rover_node_extended(ctx, **kwargs): @cli_util.wrap_exceptions def show_rover_node_extended(ctx, **kwargs): - if isinstance(kwargs['node_id'], six.string_types) and len(kwargs['node_id'].strip()) == 0: + if isinstance(kwargs['node_id'], str) and len(kwargs['node_id'].strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') result = get_rover_node_helper(ctx, kwargs['node_id']) @@ -443,7 +442,7 @@ def request_rover_node(ctx, **kwargs): @cli_util.wrap_exceptions def delete_rover_node_extended(ctx, **kwargs): - if isinstance(kwargs['node_id'], six.string_types) and len(kwargs['node_id'].strip()) == 0: + if isinstance(kwargs['node_id'], str) and len(kwargs['node_id'].strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') kwargs_request = {} @@ -575,7 +574,7 @@ def list_workload(ctx, **kwargs): @cli_util.wrap_exceptions def change_rover_node_compartment(ctx, **kwargs): - if isinstance(kwargs['node_id'], six.string_types) and len(kwargs['node_id'].strip()) == 0: + if isinstance(kwargs['node_id'], str) and len(kwargs['node_id'].strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') kwargs.update({'rover_node_id': kwargs['node_id']}) kwargs.pop('node_id') @@ -618,7 +617,7 @@ def set_secrets_rover_node(ctx, **kwargs): @cli_util.wrap_exceptions def get_rover_node_encryption_key_extended(ctx, **kwargs): - if isinstance(kwargs['node_id'], six.string_types) and len(kwargs['node_id'].strip()) == 0: + if isinstance(kwargs['node_id'], str) and len(kwargs['node_id'].strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') kwargs.update({'rover_node_id': kwargs['node_id']}) kwargs.pop('node_id') @@ -636,10 +635,10 @@ def get_rover_node_certificate_extended(ctx, **kwargs): rover_node_id = kwargs['node_id'] output_file_path = kwargs['output_file_path'] - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') - if isinstance(output_file_path, six.string_types) and len(output_file_path.strip()) == 0: + if isinstance(output_file_path, str) and len(output_file_path.strip()) == 0: raise click.UsageError('Parameter --output-file-path cannot be whitespace or empty string') kwargs = {} @@ -666,7 +665,7 @@ def get_rover_node_certificate_extended(ctx, **kwargs): def setup_identity_extended(ctx, **kwargs): rover_node_id = kwargs['node_id'] - if isinstance(rover_node_id, six.string_types) and len(rover_node_id.strip()) == 0: + if isinstance(rover_node_id, str) and len(rover_node_id.strip()) == 0: raise click.UsageError('Parameter --node-id cannot be whitespace or empty string') kwargs_show = { diff --git a/services/rover/src/oci_cli_shape/generated/shape_cli.py b/services/rover/src/oci_cli_shape/generated/shape_cli.py index cbf7b38ed..7d9cd0469 100644 --- a/services/rover/src/oci_cli_shape/generated/shape_cli.py +++ b/services/rover/src/oci_cli_shape/generated/shape_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/rover/src/oci_cli_work_requests/generated/workrequests_cli.py b/services/rover/src/oci_cli_work_requests/generated/workrequests_cli.py index 4830ace39..717ee3cc4 100644 --- a/services/rover/src/oci_cli_work_requests/generated/workrequests_cli.py +++ b/services/rover/src/oci_cli_work_requests/generated/workrequests_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -43,7 +42,7 @@ def work_request_group(): @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -67,7 +66,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -98,7 +97,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -155,7 +154,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/sch/src/oci_cli_connector_plugins/generated/connectorplugins_cli.py b/services/sch/src/oci_cli_connector_plugins/generated/connectorplugins_cli.py index 7ca134379..815da805d 100644 --- a/services/sch/src/oci_cli_connector_plugins/generated/connectorplugins_cli.py +++ b/services/sch/src/oci_cli_connector_plugins/generated/connectorplugins_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -51,7 +50,7 @@ def connector_plugin_group(): @cli_util.wrap_exceptions def get_connector_plugin(ctx, from_json, connector_plugin_name): - if isinstance(connector_plugin_name, six.string_types) and len(connector_plugin_name.strip()) == 0: + if isinstance(connector_plugin_name, str) and len(connector_plugin_name.strip()) == 0: raise click.UsageError('Parameter --connector-plugin-name cannot be whitespace or empty string') kwargs = {} diff --git a/services/sch/src/oci_cli_service_connector/generated/serviceconnector_cli.py b/services/sch/src/oci_cli_service_connector/generated/serviceconnector_cli.py index b7e0b47b1..ddd289726 100644 --- a/services/sch/src/oci_cli_service_connector/generated/serviceconnector_cli.py +++ b/services/sch/src/oci_cli_service_connector/generated/serviceconnector_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -73,7 +72,7 @@ def work_request_group(): @cli_util.wrap_exceptions def activate_service_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') kwargs = {} @@ -131,7 +130,7 @@ def activate_service_connector(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def change_service_connector_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, compartment_id, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') kwargs = {} @@ -1166,7 +1165,7 @@ def create_service_connector_streaming_target_details(ctx, from_json, wait_for_s @cli_util.wrap_exceptions def deactivate_service_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') kwargs = {} @@ -1224,7 +1223,7 @@ def deactivate_service_connector(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_service_connector(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') kwargs = {} @@ -1275,7 +1274,7 @@ def delete_service_connector(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def get_service_connector(ctx, from_json, service_connector_id): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') kwargs = {} @@ -1297,7 +1296,7 @@ def get_service_connector(ctx, from_json, service_connector_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1390,7 +1389,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1441,7 +1440,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1549,7 +1548,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def update_service_connector(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, display_name, description, source, tasks, target, freeform_tags, defined_tags, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if source or tasks or target or freeform_tags or defined_tags: @@ -1645,7 +1644,7 @@ def update_service_connector(ctx, from_json, force, wait_for_state, max_wait_sec @cli_util.wrap_exceptions def update_service_connector_logging_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, source_log_sources, display_name, description, tasks, target, freeform_tags, defined_tags, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if tasks or target or freeform_tags or defined_tags: @@ -1742,7 +1741,7 @@ def update_service_connector_logging_source_details(ctx, from_json, force, wait_ @cli_util.wrap_exceptions def update_service_connector_monitoring_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, source_monitoring_sources, display_name, description, tasks, target, freeform_tags, defined_tags, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if tasks or target or freeform_tags or defined_tags: @@ -1840,7 +1839,7 @@ def update_service_connector_monitoring_source_details(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_service_connector_streaming_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, source_stream_id, display_name, description, tasks, target, freeform_tags, defined_tags, if_match, source_cursor): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if tasks or target or freeform_tags or defined_tags: @@ -1941,7 +1940,7 @@ def update_service_connector_streaming_source_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_service_connector_plugin_source_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, source_plugin_name, source_config_map, display_name, description, tasks, target, freeform_tags, defined_tags, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if tasks or target or freeform_tags or defined_tags: @@ -2040,7 +2039,7 @@ def update_service_connector_plugin_source_details(ctx, from_json, force, wait_f @cli_util.wrap_exceptions def update_service_connector_notifications_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, target_topic_id, display_name, description, source, tasks, freeform_tags, defined_tags, if_match, target_enable_formatted_messaging): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if source or tasks or freeform_tags or defined_tags: @@ -2144,7 +2143,7 @@ def update_service_connector_notifications_target_details(ctx, from_json, force, @cli_util.wrap_exceptions def update_service_connector_object_storage_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, target_bucket_name, display_name, description, source, tasks, freeform_tags, defined_tags, if_match, target_namespace, target_object_name_prefix, target_batch_rollover_size_in_mbs, target_batch_rollover_time_in_ms): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if source or tasks or freeform_tags or defined_tags: @@ -2258,7 +2257,7 @@ def update_service_connector_object_storage_target_details(ctx, from_json, force @cli_util.wrap_exceptions def update_service_connector_monitoring_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, target_compartment_id, target_metric_namespace, target_metric, display_name, description, source, tasks, freeform_tags, defined_tags, if_match, target_dimensions): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if source or tasks or freeform_tags or defined_tags: @@ -2363,7 +2362,7 @@ def update_service_connector_monitoring_target_details(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_service_connector_functions_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, target_function_id, display_name, description, source, tasks, freeform_tags, defined_tags, if_match, target_batch_size_in_kbs, target_batch_size_in_num, target_batch_time_in_sec): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if source or tasks or freeform_tags or defined_tags: @@ -2470,7 +2469,7 @@ def update_service_connector_functions_target_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_service_connector_logging_analytics_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, target_log_group_id, display_name, description, source, tasks, freeform_tags, defined_tags, if_match, target_log_source_identifier): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if source or tasks or freeform_tags or defined_tags: @@ -2570,7 +2569,7 @@ def update_service_connector_logging_analytics_target_details(ctx, from_json, fo @cli_util.wrap_exceptions def update_service_connector_streaming_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, target_stream_id, display_name, description, source, tasks, freeform_tags, defined_tags, if_match): - if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0: + if isinstance(service_connector_id, str) and len(service_connector_id.strip()) == 0: raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string') if not force: if source or tasks or freeform_tags or defined_tags: diff --git a/services/secrets/src/oci_cli_secrets/generated/secrets_cli.py b/services/secrets/src/oci_cli_secrets/generated/secrets_cli.py index b6190313b..d95063168 100644 --- a/services/secrets/src/oci_cli_secrets/generated/secrets_cli.py +++ b/services/secrets/src/oci_cli_secrets/generated/secrets_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -50,7 +49,7 @@ def secret_bundle_group(): @cli_util.wrap_exceptions def get_secret_bundle(ctx, from_json, secret_id, version_number, secret_version_name, stage): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} @@ -117,7 +116,7 @@ def list_secret_bundle_versions(ctx, from_json, all_pages, page_size, secret_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/security_attribute/src/oci_cli_security_attribute/generated/securityattribute_cli.py b/services/security_attribute/src/oci_cli_security_attribute/generated/securityattribute_cli.py index 00165aa43..74a930afd 100644 --- a/services/security_attribute/src/oci_cli_security_attribute/generated/securityattribute_cli.py +++ b/services/security_attribute/src/oci_cli_security_attribute/generated/securityattribute_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -149,7 +148,7 @@ def bulk_edit_security_attributes(ctx, from_json, compartment_id, resources, bul @cli_util.wrap_exceptions def cascading_delete_security_attribute_namespace(ctx, from_json, security_attribute_namespace_id, if_match): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -179,7 +178,7 @@ def cascading_delete_security_attribute_namespace(ctx, from_json, security_attri @cli_util.wrap_exceptions def change_security_attribute_namespace_compartment(ctx, from_json, security_attribute_namespace_id, compartment_id, if_match): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -222,7 +221,7 @@ def change_security_attribute_namespace_compartment(ctx, from_json, security_att @cli_util.wrap_exceptions def create_security_attribute(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_attribute_namespace_id, name, description, validator): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -290,7 +289,7 @@ def create_security_attribute(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def create_security_attribute_enum_security_attribute_validator(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_attribute_namespace_id, name, description, validator_values): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -360,7 +359,7 @@ def create_security_attribute_enum_security_attribute_validator(ctx, from_json, @cli_util.wrap_exceptions def create_security_attribute_default_security_attribute_validator(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_attribute_namespace_id, name, description): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -496,10 +495,10 @@ def create_security_attribute_namespace(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def delete_security_attribute(ctx, from_json, security_attribute_namespace_id, security_attribute_name, if_match): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') - if isinstance(security_attribute_name, six.string_types) and len(security_attribute_name.strip()) == 0: + if isinstance(security_attribute_name, str) and len(security_attribute_name.strip()) == 0: raise click.UsageError('Parameter --security-attribute-name cannot be whitespace or empty string') kwargs = {} @@ -529,7 +528,7 @@ def delete_security_attribute(ctx, from_json, security_attribute_namespace_id, s @cli_util.wrap_exceptions def delete_security_attribute_namespace(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_attribute_namespace_id, if_match): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -589,10 +588,10 @@ def delete_security_attribute_namespace(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def get_security_attribute(ctx, from_json, security_attribute_namespace_id, security_attribute_name): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') - if isinstance(security_attribute_name, six.string_types) and len(security_attribute_name.strip()) == 0: + if isinstance(security_attribute_name, str) and len(security_attribute_name.strip()) == 0: raise click.UsageError('Parameter --security-attribute-name cannot be whitespace or empty string') kwargs = {} @@ -615,7 +614,7 @@ def get_security_attribute(ctx, from_json, security_attribute_namespace_id, secu @cli_util.wrap_exceptions def get_security_attribute_namespace(ctx, from_json, security_attribute_namespace_id): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -637,7 +636,7 @@ def get_security_attribute_namespace(ctx, from_json, security_attribute_namespac @cli_util.wrap_exceptions def get_security_attribute_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -730,7 +729,7 @@ def list_security_attribute_work_request_errors(ctx, from_json, all_pages, page_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -781,7 +780,7 @@ def list_security_attribute_work_request_logs(ctx, from_json, all_pages, page_si if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -883,7 +882,7 @@ def list_security_attributes(ctx, from_json, all_pages, page_size, security_attr if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') kwargs = {} @@ -938,10 +937,10 @@ def list_security_attributes(ctx, from_json, all_pages, page_size, security_attr @cli_util.wrap_exceptions def update_security_attribute(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_attribute_namespace_id, security_attribute_name, description, is_retired, validator, if_match): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') - if isinstance(security_attribute_name, six.string_types) and len(security_attribute_name.strip()) == 0: + if isinstance(security_attribute_name, str) and len(security_attribute_name.strip()) == 0: raise click.UsageError('Parameter --security-attribute-name cannot be whitespace or empty string') if not force: if validator: @@ -1014,10 +1013,10 @@ def update_security_attribute(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_security_attribute_enum_security_attribute_validator(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_attribute_namespace_id, security_attribute_name, description, is_retired, if_match, validator_values): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') - if isinstance(security_attribute_name, six.string_types) and len(security_attribute_name.strip()) == 0: + if isinstance(security_attribute_name, str) and len(security_attribute_name.strip()) == 0: raise click.UsageError('Parameter --security-attribute-name cannot be whitespace or empty string') kwargs = {} @@ -1088,10 +1087,10 @@ def update_security_attribute_enum_security_attribute_validator(ctx, from_json, @cli_util.wrap_exceptions def update_security_attribute_default_security_attribute_validator(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, security_attribute_namespace_id, security_attribute_name, description, is_retired, if_match): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') - if isinstance(security_attribute_name, six.string_types) and len(security_attribute_name.strip()) == 0: + if isinstance(security_attribute_name, str) and len(security_attribute_name.strip()) == 0: raise click.UsageError('Parameter --security-attribute-name cannot be whitespace or empty string') kwargs = {} @@ -1169,7 +1168,7 @@ def update_security_attribute_default_security_attribute_validator(ctx, from_jso @cli_util.wrap_exceptions def update_security_attribute_namespace(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, security_attribute_namespace_id, description, is_retired, freeform_tags, defined_tags, if_match): - if isinstance(security_attribute_namespace_id, six.string_types) and len(security_attribute_namespace_id.strip()) == 0: + if isinstance(security_attribute_namespace_id, str) and len(security_attribute_namespace_id.strip()) == 0: raise click.UsageError('Parameter --security-attribute-namespace-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/service_catalog/src/oci_cli_service_catalog/generated/servicecatalog_cli.py b/services/service_catalog/src/oci_cli_service_catalog/generated/servicecatalog_cli.py index ab08bd84b..8d57f1af7 100644 --- a/services/service_catalog/src/oci_cli_service_catalog/generated/servicecatalog_cli.py +++ b/services/service_catalog/src/oci_cli_service_catalog/generated/servicecatalog_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -92,7 +91,7 @@ def application_summary_group(): @cli_util.wrap_exceptions def bulk_replace_service_catalog_associations(ctx, from_json, force, service_catalog_id, items, if_match): - if isinstance(service_catalog_id, six.string_types) and len(service_catalog_id.strip()) == 0: + if isinstance(service_catalog_id, str) and len(service_catalog_id.strip()) == 0: raise click.UsageError('Parameter --service-catalog-id cannot be whitespace or empty string') if not force: if items: @@ -130,7 +129,7 @@ def bulk_replace_service_catalog_associations(ctx, from_json, force, service_cat @cli_util.wrap_exceptions def change_private_application_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, private_application_id, compartment_id, if_match): - if isinstance(private_application_id, six.string_types) and len(private_application_id.strip()) == 0: + if isinstance(private_application_id, str) and len(private_application_id.strip()) == 0: raise click.UsageError('Parameter --private-application-id cannot be whitespace or empty string') kwargs = {} @@ -190,7 +189,7 @@ def change_private_application_compartment(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def change_service_catalog_compartment(ctx, from_json, service_catalog_id, compartment_id, if_match): - if isinstance(service_catalog_id, six.string_types) and len(service_catalog_id.strip()) == 0: + if isinstance(service_catalog_id, str) and len(service_catalog_id.strip()) == 0: raise click.UsageError('Parameter --service-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -471,7 +470,7 @@ def create_service_catalog_association(ctx, from_json, service_catalog_id, entit @cli_util.wrap_exceptions def delete_private_application(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, private_application_id, if_match): - if isinstance(private_application_id, six.string_types) and len(private_application_id.strip()) == 0: + if isinstance(private_application_id, str) and len(private_application_id.strip()) == 0: raise click.UsageError('Parameter --private-application-id cannot be whitespace or empty string') kwargs = {} @@ -527,7 +526,7 @@ def delete_private_application(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_service_catalog(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, service_catalog_id, if_match): - if isinstance(service_catalog_id, six.string_types) and len(service_catalog_id.strip()) == 0: + if isinstance(service_catalog_id, str) and len(service_catalog_id.strip()) == 0: raise click.UsageError('Parameter --service-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -588,7 +587,7 @@ def delete_service_catalog(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_service_catalog_association(ctx, from_json, service_catalog_association_id, if_match): - if isinstance(service_catalog_association_id, six.string_types) and len(service_catalog_association_id.strip()) == 0: + if isinstance(service_catalog_association_id, str) and len(service_catalog_association_id.strip()) == 0: raise click.UsageError('Parameter --service-catalog-association-id cannot be whitespace or empty string') kwargs = {} @@ -612,7 +611,7 @@ def delete_service_catalog_association(ctx, from_json, service_catalog_associati @cli_util.wrap_exceptions def get_private_application(ctx, from_json, private_application_id): - if isinstance(private_application_id, six.string_types) and len(private_application_id.strip()) == 0: + if isinstance(private_application_id, str) and len(private_application_id.strip()) == 0: raise click.UsageError('Parameter --private-application-id cannot be whitespace or empty string') kwargs = {} @@ -635,7 +634,7 @@ def get_private_application(ctx, from_json, private_application_id): @cli_util.wrap_exceptions def get_private_application_action_download_logo(ctx, from_json, file, private_application_id): - if isinstance(private_application_id, six.string_types) and len(private_application_id.strip()) == 0: + if isinstance(private_application_id, str) and len(private_application_id.strip()) == 0: raise click.UsageError('Parameter --private-application-id cannot be whitespace or empty string') kwargs = {} @@ -679,7 +678,7 @@ def get_private_application_action_download_logo(ctx, from_json, file, private_a @cli_util.wrap_exceptions def get_private_application_package(ctx, from_json, private_application_package_id): - if isinstance(private_application_package_id, six.string_types) and len(private_application_package_id.strip()) == 0: + if isinstance(private_application_package_id, str) and len(private_application_package_id.strip()) == 0: raise click.UsageError('Parameter --private-application-package-id cannot be whitespace or empty string') kwargs = {} @@ -702,7 +701,7 @@ def get_private_application_package(ctx, from_json, private_application_package_ @cli_util.wrap_exceptions def get_private_application_package_action_download_config(ctx, from_json, file, private_application_package_id): - if isinstance(private_application_package_id, six.string_types) and len(private_application_package_id.strip()) == 0: + if isinstance(private_application_package_id, str) and len(private_application_package_id.strip()) == 0: raise click.UsageError('Parameter --private-application-package-id cannot be whitespace or empty string') kwargs = {} @@ -746,7 +745,7 @@ def get_private_application_package_action_download_config(ctx, from_json, file, @cli_util.wrap_exceptions def get_service_catalog(ctx, from_json, service_catalog_id): - if isinstance(service_catalog_id, six.string_types) and len(service_catalog_id.strip()) == 0: + if isinstance(service_catalog_id, str) and len(service_catalog_id.strip()) == 0: raise click.UsageError('Parameter --service-catalog-id cannot be whitespace or empty string') kwargs = {} @@ -768,7 +767,7 @@ def get_service_catalog(ctx, from_json, service_catalog_id): @cli_util.wrap_exceptions def get_service_catalog_association(ctx, from_json, service_catalog_association_id): - if isinstance(service_catalog_association_id, six.string_types) and len(service_catalog_association_id.strip()) == 0: + if isinstance(service_catalog_association_id, str) and len(service_catalog_association_id.strip()) == 0: raise click.UsageError('Parameter --service-catalog-association-id cannot be whitespace or empty string') kwargs = {} @@ -790,7 +789,7 @@ def get_service_catalog_association(ctx, from_json, service_catalog_association_ @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1140,7 +1139,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1197,7 +1196,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1318,7 +1317,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_private_application(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, private_application_id, display_name, short_description, long_description, logo_file_base64_encoded, defined_tags, freeform_tags, if_match): - if isinstance(private_application_id, six.string_types) and len(private_application_id.strip()) == 0: + if isinstance(private_application_id, str) and len(private_application_id.strip()) == 0: raise click.UsageError('Parameter --private-application-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: @@ -1403,7 +1402,7 @@ def update_private_application(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_service_catalog(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_catalog_id, display_name, defined_tags, freeform_tags, if_match): - if isinstance(service_catalog_id, six.string_types) and len(service_catalog_id.strip()) == 0: + if isinstance(service_catalog_id, str) and len(service_catalog_id.strip()) == 0: raise click.UsageError('Parameter --service-catalog-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags: diff --git a/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated/servicemanagerproxy_cli.py b/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated/servicemanagerproxy_cli.py index b066addd7..d5a11391f 100644 --- a/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated/servicemanagerproxy_cli.py +++ b/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated/servicemanagerproxy_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -46,7 +45,7 @@ def service_environment_group(): @cli_util.wrap_exceptions def get_service_environment(ctx, from_json, service_environment_id, compartment_id): - if isinstance(service_environment_id, six.string_types) and len(service_environment_id.strip()) == 0: + if isinstance(service_environment_id, str) and len(service_environment_id.strip()) == 0: raise click.UsageError('Parameter --service-environment-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/stack_monitoring/src/oci_cli_stack_monitoring/generated/stackmonitoring_cli.py b/services/stack_monitoring/src/oci_cli_stack_monitoring/generated/stackmonitoring_cli.py index 25a4c9665..f6c48a0c9 100644 --- a/services/stack_monitoring/src/oci_cli_stack_monitoring/generated/stackmonitoring_cli.py +++ b/services/stack_monitoring/src/oci_cli_stack_monitoring/generated/stackmonitoring_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -179,7 +178,7 @@ def work_request_log_entry_collection_group(): @cli_util.wrap_exceptions def apply_monitoring_template(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitoring_template_id, if_match): - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -270,7 +269,7 @@ def associate_monitored_resources(ctx, from_json, compartment_id, association_ty @cli_util.wrap_exceptions def change_config_compartment(ctx, from_json, config_id, compartment_id, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') kwargs = {} @@ -301,7 +300,7 @@ def change_config_compartment(ctx, from_json, config_id, compartment_id, if_matc @cli_util.wrap_exceptions def change_metric_extension_compartment(ctx, from_json, metric_extension_id, compartment_id, if_match): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') kwargs = {} @@ -335,7 +334,7 @@ def change_metric_extension_compartment(ctx, from_json, metric_extension_id, com @cli_util.wrap_exceptions def change_monitored_resource_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_id, compartment_id, if_match): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') kwargs = {} @@ -393,7 +392,7 @@ def change_monitored_resource_compartment(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def change_monitored_resource_task_compartment(ctx, from_json, monitored_resource_task_id, compartment_id, if_match): - if isinstance(monitored_resource_task_id, six.string_types) and len(monitored_resource_task_id.strip()) == 0: + if isinstance(monitored_resource_task_id, str) and len(monitored_resource_task_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-task-id cannot be whitespace or empty string') kwargs = {} @@ -424,7 +423,7 @@ def change_monitored_resource_task_compartment(ctx, from_json, monitored_resourc @cli_util.wrap_exceptions def change_process_set_compartment(ctx, from_json, process_set_id, compartment_id, if_match): - if isinstance(process_set_id, six.string_types) and len(process_set_id.strip()) == 0: + if isinstance(process_set_id, str) and len(process_set_id.strip()) == 0: raise click.UsageError('Parameter --process-set-id cannot be whitespace or empty string') kwargs = {} @@ -464,7 +463,7 @@ def change_process_set_compartment(ctx, from_json, process_set_id, compartment_i @cli_util.wrap_exceptions def create_alarm_condition(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, namespace, resource_type, metric_name, condition_type, conditions, monitoring_template_id, composite_type, freeform_tags, defined_tags): - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -2929,10 +2928,10 @@ def create_process_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_alarm_condition(ctx, from_json, alarm_condition_id, monitoring_template_id, if_match): - if isinstance(alarm_condition_id, six.string_types) and len(alarm_condition_id.strip()) == 0: + if isinstance(alarm_condition_id, str) and len(alarm_condition_id.strip()) == 0: raise click.UsageError('Parameter --alarm-condition-id cannot be whitespace or empty string') - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -2962,7 +2961,7 @@ def delete_alarm_condition(ctx, from_json, alarm_condition_id, monitoring_templa @cli_util.wrap_exceptions def delete_baselineable_metric(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, baselineable_metric_id, if_match): - if isinstance(baselineable_metric_id, six.string_types) and len(baselineable_metric_id.strip()) == 0: + if isinstance(baselineable_metric_id, str) and len(baselineable_metric_id.strip()) == 0: raise click.UsageError('Parameter --baselineable-metric-id cannot be whitespace or empty string') kwargs = {} @@ -3026,7 +3025,7 @@ def delete_baselineable_metric(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, config_id, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') kwargs = {} @@ -3090,7 +3089,7 @@ def delete_config(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_discovery_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, discovery_job_id, if_match): - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') kwargs = {} @@ -3154,7 +3153,7 @@ def delete_discovery_job(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_maintenance_window(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_window_id, if_match): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') kwargs = {} @@ -3210,7 +3209,7 @@ def delete_maintenance_window(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_metric_extension(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, if_match): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') kwargs = {} @@ -3275,7 +3274,7 @@ def delete_metric_extension(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_monitored_resource(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_id, if_match, is_delete_members): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') kwargs = {} @@ -3333,7 +3332,7 @@ def delete_monitored_resource(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_monitored_resource_type(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_type_id, if_match): - if isinstance(monitored_resource_type_id, six.string_types) and len(monitored_resource_type_id.strip()) == 0: + if isinstance(monitored_resource_type_id, str) and len(monitored_resource_type_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-type-id cannot be whitespace or empty string') kwargs = {} @@ -3397,7 +3396,7 @@ def delete_monitored_resource_type(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_monitoring_template(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitoring_template_id, if_match): - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -3461,7 +3460,7 @@ def delete_monitoring_template(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_process_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, process_set_id, if_match): - if isinstance(process_set_id, six.string_types) and len(process_set_id.strip()) == 0: + if isinstance(process_set_id, str) and len(process_set_id.strip()) == 0: raise click.UsageError('Parameter --process-set-id cannot be whitespace or empty string') kwargs = {} @@ -3524,7 +3523,7 @@ def delete_process_set(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def disable_external_database(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_id, if_match): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') kwargs = {} @@ -3580,7 +3579,7 @@ def disable_external_database(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def disable_metric_extension(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, resource_ids, if_match): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') kwargs = {} @@ -3679,7 +3678,7 @@ def disassociate_monitored_resources(ctx, from_json, compartment_id, association @cli_util.wrap_exceptions def enable_metric_extension(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, resource_ids, if_match): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') kwargs = {} @@ -3738,7 +3737,7 @@ def enable_metric_extension(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def evaluate_baselineable_metric(ctx, from_json, resource_id, items, baselineable_metric_id, if_match): - if isinstance(baselineable_metric_id, six.string_types) and len(baselineable_metric_id.strip()) == 0: + if isinstance(baselineable_metric_id, str) and len(baselineable_metric_id.strip()) == 0: raise click.UsageError('Parameter --baselineable-metric-id cannot be whitespace or empty string') kwargs = {} @@ -3770,7 +3769,7 @@ def evaluate_baselineable_metric(ctx, from_json, resource_id, items, baselineabl @cli_util.wrap_exceptions def export_metric_extension(ctx, from_json, file, metric_extension_id, if_match): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') kwargs = {} @@ -3818,7 +3817,7 @@ def export_metric_extension(ctx, from_json, file, metric_extension_id, if_match) @cli_util.wrap_exceptions def export_monitoring_template(ctx, from_json, file, monitoring_template_id, if_match): - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -3865,10 +3864,10 @@ def export_monitoring_template(ctx, from_json, file, monitoring_template_id, if_ @cli_util.wrap_exceptions def get_alarm_condition(ctx, from_json, alarm_condition_id, monitoring_template_id): - if isinstance(alarm_condition_id, six.string_types) and len(alarm_condition_id.strip()) == 0: + if isinstance(alarm_condition_id, str) and len(alarm_condition_id.strip()) == 0: raise click.UsageError('Parameter --alarm-condition-id cannot be whitespace or empty string') - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -3891,7 +3890,7 @@ def get_alarm_condition(ctx, from_json, alarm_condition_id, monitoring_template_ @cli_util.wrap_exceptions def get_baselineable_metric(ctx, from_json, baselineable_metric_id): - if isinstance(baselineable_metric_id, six.string_types) and len(baselineable_metric_id.strip()) == 0: + if isinstance(baselineable_metric_id, str) and len(baselineable_metric_id.strip()) == 0: raise click.UsageError('Parameter --baselineable-metric-id cannot be whitespace or empty string') kwargs = {} @@ -3913,7 +3912,7 @@ def get_baselineable_metric(ctx, from_json, baselineable_metric_id): @cli_util.wrap_exceptions def get_config(ctx, from_json, config_id): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') kwargs = {} @@ -3935,7 +3934,7 @@ def get_config(ctx, from_json, config_id): @cli_util.wrap_exceptions def get_discovery_job(ctx, from_json, discovery_job_id): - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') kwargs = {} @@ -3957,7 +3956,7 @@ def get_discovery_job(ctx, from_json, discovery_job_id): @cli_util.wrap_exceptions def get_maintenance_window(ctx, from_json, maintenance_window_id): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') kwargs = {} @@ -3979,7 +3978,7 @@ def get_maintenance_window(ctx, from_json, maintenance_window_id): @cli_util.wrap_exceptions def get_metric_extension(ctx, from_json, metric_extension_id): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') kwargs = {} @@ -4001,7 +4000,7 @@ def get_metric_extension(ctx, from_json, metric_extension_id): @cli_util.wrap_exceptions def get_monitored_resource(ctx, from_json, monitored_resource_id): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') kwargs = {} @@ -4023,7 +4022,7 @@ def get_monitored_resource(ctx, from_json, monitored_resource_id): @cli_util.wrap_exceptions def get_monitored_resource_task(ctx, from_json, monitored_resource_task_id): - if isinstance(monitored_resource_task_id, six.string_types) and len(monitored_resource_task_id.strip()) == 0: + if isinstance(monitored_resource_task_id, str) and len(monitored_resource_task_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-task-id cannot be whitespace or empty string') kwargs = {} @@ -4045,7 +4044,7 @@ def get_monitored_resource_task(ctx, from_json, monitored_resource_task_id): @cli_util.wrap_exceptions def get_monitored_resource_type(ctx, from_json, monitored_resource_type_id): - if isinstance(monitored_resource_type_id, six.string_types) and len(monitored_resource_type_id.strip()) == 0: + if isinstance(monitored_resource_type_id, str) and len(monitored_resource_type_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-type-id cannot be whitespace or empty string') kwargs = {} @@ -4067,7 +4066,7 @@ def get_monitored_resource_type(ctx, from_json, monitored_resource_type_id): @cli_util.wrap_exceptions def get_monitoring_template(ctx, from_json, monitoring_template_id): - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -4089,7 +4088,7 @@ def get_monitoring_template(ctx, from_json, monitoring_template_id): @cli_util.wrap_exceptions def get_process_set(ctx, from_json, process_set_id): - if isinstance(process_set_id, six.string_types) and len(process_set_id.strip()) == 0: + if isinstance(process_set_id, str) and len(process_set_id.strip()) == 0: raise click.UsageError('Parameter --process-set-id cannot be whitespace or empty string') kwargs = {} @@ -4111,7 +4110,7 @@ def get_process_set(ctx, from_json, process_set_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -4146,7 +4145,7 @@ def list_alarm_conditions(ctx, from_json, all_pages, page_size, monitoring_templ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -4406,7 +4405,7 @@ def list_discovery_job_logs(ctx, from_json, all_pages, page_size, discovery_job_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(discovery_job_id, six.string_types) and len(discovery_job_id.strip()) == 0: + if isinstance(discovery_job_id, str) and len(discovery_job_id.strip()) == 0: raise click.UsageError('Parameter --discovery-job-id cannot be whitespace or empty string') kwargs = {} @@ -4987,7 +4986,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -5044,7 +5043,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -5157,7 +5156,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def manage_license(ctx, from_json, monitored_resource_id, license, if_match): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') kwargs = {} @@ -5190,7 +5189,7 @@ def manage_license(ctx, from_json, monitored_resource_id, license, if_match): @cli_util.wrap_exceptions def publish_metric_extension(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, if_match): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') kwargs = {} @@ -5391,7 +5390,7 @@ def request_summarized_metric_extensions_resources(ctx, from_json, metric_extens @cli_util.wrap_exceptions def retry_failed_maintenance_window_operation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_window_id, if_match): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') kwargs = {} @@ -5571,7 +5570,7 @@ def search_monitored_resource_associations(ctx, from_json, compartment_id, sourc @cli_util.wrap_exceptions def search_monitored_resource_members(ctx, from_json, monitored_resource_id, destination_resource_id, limit_level, sort_by, sort_order, page, limit, if_match): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') kwargs = {} @@ -5749,7 +5748,7 @@ def search_monitored_resources(ctx, from_json, compartment_id, compartment_ids, @cli_util.wrap_exceptions def stop_maintenance_window(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_window_id, if_match): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') kwargs = {} @@ -5805,7 +5804,7 @@ def stop_maintenance_window(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def test_metric_extension(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, resource_ids, if_match): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') kwargs = {} @@ -5865,7 +5864,7 @@ def test_metric_extension(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def unapply_monitoring_template(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitoring_template_id, if_match): - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') kwargs = {} @@ -5932,10 +5931,10 @@ def unapply_monitoring_template(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_alarm_condition(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, alarm_condition_id, monitoring_template_id, namespace, composite_type, resource_type, metric_name, condition_type, conditions, freeform_tags, defined_tags, if_match): - if isinstance(alarm_condition_id, six.string_types) and len(alarm_condition_id.strip()) == 0: + if isinstance(alarm_condition_id, str) and len(alarm_condition_id.strip()) == 0: raise click.UsageError('Parameter --alarm-condition-id cannot be whitespace or empty string') - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') if not force: if conditions or freeform_tags or defined_tags: @@ -6022,7 +6021,7 @@ def update_alarm_condition(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_and_propagate_tags(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_id, freeform_tags, defined_tags, association_types, if_match): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') kwargs = {} @@ -6104,7 +6103,7 @@ def update_and_propagate_tags(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_baselineable_metric(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, id, name, column, namespace, resource_group, is_out_of_box, baselineable_metric_id, lifecycle_state, tenancy_id, compartment_id, resource_type, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(baselineable_metric_id, six.string_types) and len(baselineable_metric_id.strip()) == 0: + if isinstance(baselineable_metric_id, str) and len(baselineable_metric_id.strip()) == 0: raise click.UsageError('Parameter --baselineable-metric-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags: @@ -6195,7 +6194,7 @@ def update_baselineable_metric(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, config_id, display_name, config_type, freeform_tags, defined_tags, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6271,7 +6270,7 @@ def update_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_config_update_compute_auto_activate_plugin_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, config_id, display_name, freeform_tags, defined_tags, is_enabled, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6349,7 +6348,7 @@ def update_config_update_compute_auto_activate_plugin_config_details(ctx, from_j @cli_util.wrap_exceptions def update_config_update_license_enterprise_extensibility_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, config_id, display_name, freeform_tags, defined_tags, is_enabled, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6427,7 +6426,7 @@ def update_config_update_license_enterprise_extensibility_config_details(ctx, fr @cli_util.wrap_exceptions def update_config_update_auto_promote_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, config_id, display_name, freeform_tags, defined_tags, is_enabled, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6505,7 +6504,7 @@ def update_config_update_auto_promote_config_details(ctx, from_json, force, wait @cli_util.wrap_exceptions def update_config_update_license_auto_assign_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, config_id, display_name, freeform_tags, defined_tags, license, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -6592,7 +6591,7 @@ def update_config_update_license_auto_assign_config_details(ctx, from_json, forc @cli_util.wrap_exceptions def update_config_update_onboard_config_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, config_id, display_name, freeform_tags, defined_tags, version_parameterconflict, is_manually_onboarded, policy_names, dynamic_groups, user_groups, additional_configurations, if_match): - if isinstance(config_id, six.string_types) and len(config_id.strip()) == 0: + if isinstance(config_id, str) and len(config_id.strip()) == 0: raise click.UsageError('Parameter --config-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or policy_names or dynamic_groups or user_groups or additional_configurations: @@ -6688,7 +6687,7 @@ def update_config_update_onboard_config_details(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_maintenance_window(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_window_id, description, resources, schedule, freeform_tags, defined_tags, if_match): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') if not force: if resources or schedule or freeform_tags or defined_tags: @@ -6777,7 +6776,7 @@ def update_maintenance_window(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_maintenance_window_recurrent_maintenance_window_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_window_id, schedule_maintenance_window_recurrences, description, resources, freeform_tags, defined_tags, if_match, schedule_time_maintenance_window_start, schedule_time_maintenance_window_end, schedule_maintenance_window_duration): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') if not force: if resources or freeform_tags or defined_tags: @@ -6874,7 +6873,7 @@ def update_maintenance_window_recurrent_maintenance_window_schedule(ctx, from_js @cli_util.wrap_exceptions def update_maintenance_window_one_time_maintenance_window_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, maintenance_window_id, description, resources, freeform_tags, defined_tags, if_match, schedule_time_maintenance_window_start, schedule_time_maintenance_window_end): - if isinstance(maintenance_window_id, six.string_types) and len(maintenance_window_id.strip()) == 0: + if isinstance(maintenance_window_id, str) and len(maintenance_window_id.strip()) == 0: raise click.UsageError('Parameter --maintenance-window-id cannot be whitespace or empty string') if not force: if resources or freeform_tags or defined_tags: @@ -6966,7 +6965,7 @@ def update_maintenance_window_one_time_maintenance_window_schedule(ctx, from_jso @cli_util.wrap_exceptions def update_metric_extension(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, display_name, description, collection_recurrences, metric_list, query_properties, if_match): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') if not force: if metric_list or query_properties: @@ -7053,7 +7052,7 @@ def update_metric_extension(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_metric_extension_sql_update_query_properties(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, display_name, description, collection_recurrences, metric_list, if_match, query_properties_sql_type, query_properties_sql_details, query_properties_in_param_details, query_properties_out_param_details): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') if not force: if metric_list: @@ -7151,7 +7150,7 @@ def update_metric_extension_sql_update_query_properties(ctx, from_json, force, w @cli_util.wrap_exceptions def update_metric_extension_jmx_update_query_properties(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, display_name, description, collection_recurrences, metric_list, if_match, query_properties_managed_bean_query, query_properties_jmx_attributes, query_properties_identity_metric, query_properties_auto_row_prefix, query_properties_is_metric_service_enabled): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') if not force: if metric_list: @@ -7252,7 +7251,7 @@ def update_metric_extension_jmx_update_query_properties(ctx, from_json, force, w @cli_util.wrap_exceptions def update_metric_extension_os_command_update_query_properties(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, display_name, description, collection_recurrences, metric_list, if_match, query_properties_command, query_properties_delimiter, query_properties_script_details, query_properties_arguments, query_properties_starts_with): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') if not force: if metric_list: @@ -7352,7 +7351,7 @@ def update_metric_extension_os_command_update_query_properties(ctx, from_json, f @cli_util.wrap_exceptions def update_metric_extension_http_update_query_properties(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, metric_extension_id, display_name, description, collection_recurrences, metric_list, if_match, query_properties_url, query_properties_response_content_type, query_properties_protocol_type, query_properties_script_details): - if isinstance(metric_extension_id, six.string_types) and len(metric_extension_id.strip()) == 0: + if isinstance(metric_extension_id, str) and len(metric_extension_id.strip()) == 0: raise click.UsageError('Parameter --metric-extension-id cannot be whitespace or empty string') if not force: if metric_list: @@ -7456,7 +7455,7 @@ def update_metric_extension_http_update_query_properties(ctx, from_json, force, @cli_util.wrap_exceptions def update_monitored_resource(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_id, display_name, host_name, resource_time_zone, properties, database_connection_details, credentials, aliases, additional_credentials, additional_aliases, freeform_tags, defined_tags, if_match): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') if not force: if properties or database_connection_details or credentials or aliases or additional_credentials or additional_aliases or freeform_tags or defined_tags: @@ -7573,7 +7572,7 @@ def update_monitored_resource(ctx, from_json, force, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_monitored_resource_pre_existing_credentials(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_id, display_name, host_name, resource_time_zone, properties, database_connection_details, aliases, additional_credentials, additional_aliases, freeform_tags, defined_tags, if_match, credentials_source, credentials_name, credentials_type, credentials_description): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') if not force: if properties or database_connection_details or aliases or additional_credentials or additional_aliases or freeform_tags or defined_tags: @@ -7704,7 +7703,7 @@ def update_monitored_resource_pre_existing_credentials(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_monitored_resource_encrypted_credentials(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_id, credentials_key_id, credentials_properties, display_name, host_name, resource_time_zone, properties, database_connection_details, aliases, additional_credentials, additional_aliases, freeform_tags, defined_tags, if_match, credentials_source, credentials_name, credentials_type, credentials_description): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') if not force: if properties or database_connection_details or aliases or additional_credentials or additional_aliases or freeform_tags or defined_tags: @@ -7836,7 +7835,7 @@ def update_monitored_resource_encrypted_credentials(ctx, from_json, force, wait_ @cli_util.wrap_exceptions def update_monitored_resource_plain_text_credentials(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_id, credentials_properties, display_name, host_name, resource_time_zone, properties, database_connection_details, aliases, additional_credentials, additional_aliases, freeform_tags, defined_tags, if_match, credentials_source, credentials_name, credentials_type, credentials_description): - if isinstance(monitored_resource_id, six.string_types) and len(monitored_resource_id.strip()) == 0: + if isinstance(monitored_resource_id, str) and len(monitored_resource_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-id cannot be whitespace or empty string') if not force: if properties or database_connection_details or aliases or additional_credentials or additional_aliases or freeform_tags or defined_tags: @@ -7948,7 +7947,7 @@ def update_monitored_resource_plain_text_credentials(ctx, from_json, force, wait @cli_util.wrap_exceptions def update_monitored_resource_task(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_task_id, freeform_tags, defined_tags, if_match): - if isinstance(monitored_resource_task_id, six.string_types) and len(monitored_resource_task_id.strip()) == 0: + if isinstance(monitored_resource_task_id, str) and len(monitored_resource_task_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-task-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -8022,7 +8021,7 @@ def update_monitored_resource_task(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_monitored_resource_type(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_type_id, display_name, description, metric_namespace, source_type, resource_category, metadata, freeform_tags, defined_tags, if_match): - if isinstance(monitored_resource_type_id, six.string_types) and len(monitored_resource_type_id.strip()) == 0: + if isinstance(monitored_resource_type_id, str) and len(monitored_resource_type_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-type-id cannot be whitespace or empty string') if not force: if metadata or freeform_tags or defined_tags: @@ -8122,7 +8121,7 @@ def update_monitored_resource_type(ctx, from_json, force, wait_for_state, max_wa @cli_util.wrap_exceptions def update_monitored_resource_type_system_format_resource_type_metadata_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, monitored_resource_type_id, display_name, description, metric_namespace, source_type, resource_category, freeform_tags, defined_tags, if_match, metadata_required_properties, metadata_agent_properties, metadata_valid_properties_for_create, metadata_valid_properties_for_update, metadata_unique_property_sets, metadata_valid_property_values, metadata_valid_sub_resource_types): - if isinstance(monitored_resource_type_id, six.string_types) and len(monitored_resource_type_id.strip()) == 0: + if isinstance(monitored_resource_type_id, str) and len(monitored_resource_type_id.strip()) == 0: raise click.UsageError('Parameter --monitored-resource-type-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -8239,7 +8238,7 @@ def update_monitored_resource_type_system_format_resource_type_metadata_details( @cli_util.wrap_exceptions def update_monitoring_template(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, monitoring_template_id, display_name, description, destinations, is_alarms_enabled, is_split_notification_enabled, members, repeat_notification_duration, message_format, freeform_tags, defined_tags, if_match): - if isinstance(monitoring_template_id, six.string_types) and len(monitoring_template_id.strip()) == 0: + if isinstance(monitoring_template_id, str) and len(monitoring_template_id.strip()) == 0: raise click.UsageError('Parameter --monitoring-template-id cannot be whitespace or empty string') if not force: if destinations or members or freeform_tags or defined_tags: @@ -8333,7 +8332,7 @@ def update_monitoring_template(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_process_set(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, process_set_id, display_name, specification, freeform_tags, defined_tags, if_match): - if isinstance(process_set_id, six.string_types) and len(process_set_id.strip()) == 0: + if isinstance(process_set_id, str) and len(process_set_id.strip()) == 0: raise click.UsageError('Parameter --process-set-id cannot be whitespace or empty string') if not force: if specification or freeform_tags or defined_tags: diff --git a/services/streaming/src/oci_cli_stream/generated/stream_cli.py b/services/streaming/src/oci_cli_stream/generated/stream_cli.py index 57666bb1c..d07ec773b 100644 --- a/services/streaming/src/oci_cli_stream/generated/stream_cli.py +++ b/services/streaming/src/oci_cli_stream/generated/stream_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -58,7 +57,7 @@ def group_group(): @cli_util.wrap_exceptions def consumer_commit(ctx, from_json, stream_id, cursor): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -84,7 +83,7 @@ def consumer_commit(ctx, from_json, stream_id, cursor): @cli_util.wrap_exceptions def consumer_heartbeat(ctx, from_json, stream_id, cursor): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -115,7 +114,7 @@ def consumer_heartbeat(ctx, from_json, stream_id, cursor): @cli_util.wrap_exceptions def create_cursor(ctx, from_json, stream_id, partition, type, offset, time): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -157,7 +156,7 @@ def create_cursor(ctx, from_json, stream_id, partition, type, offset, time): @cli_util.wrap_exceptions def create_group_cursor(ctx, from_json, stream_id, type, group_name, time, instance_name, timeout_in_ms, commit_on_get): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -200,10 +199,10 @@ def create_group_cursor(ctx, from_json, stream_id, type, group_name, time, insta @cli_util.wrap_exceptions def get_group(ctx, from_json, stream_id, group_name): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') - if isinstance(group_name, six.string_types) and len(group_name.strip()) == 0: + if isinstance(group_name, str) and len(group_name.strip()) == 0: raise click.UsageError('Parameter --group-name cannot be whitespace or empty string') kwargs = {} @@ -230,7 +229,7 @@ def get_group(ctx, from_json, stream_id, group_name): @cli_util.wrap_exceptions def get_messages(ctx, from_json, stream_id, cursor, limit): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -258,7 +257,7 @@ def get_messages(ctx, from_json, stream_id, cursor, limit): @cli_util.wrap_exceptions def put_messages(ctx, from_json, stream_id, messages): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -290,10 +289,10 @@ def put_messages(ctx, from_json, stream_id, messages): @cli_util.wrap_exceptions def update_group(ctx, from_json, stream_id, group_name, type, time): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') - if isinstance(group_name, six.string_types) and len(group_name.strip()) == 0: + if isinstance(group_name, str) and len(group_name.strip()) == 0: raise click.UsageError('Parameter --group-name cannot be whitespace or empty string') kwargs = {} diff --git a/services/streaming/src/oci_cli_stream_admin/generated/streamadmin_cli.py b/services/streaming/src/oci_cli_stream_admin/generated/streamadmin_cli.py index 69c949472..9db779c7e 100644 --- a/services/streaming/src/oci_cli_stream_admin/generated/streamadmin_cli.py +++ b/services/streaming/src/oci_cli_stream_admin/generated/streamadmin_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def connect_harness_group(): @cli_util.wrap_exceptions def change_connect_harness_compartment(ctx, from_json, connect_harness_id, compartment_id, if_match): - if isinstance(connect_harness_id, six.string_types) and len(connect_harness_id.strip()) == 0: + if isinstance(connect_harness_id, str) and len(connect_harness_id.strip()) == 0: raise click.UsageError('Parameter --connect-harness-id cannot be whitespace or empty string') kwargs = {} @@ -88,7 +87,7 @@ def change_connect_harness_compartment(ctx, from_json, connect_harness_id, compa @cli_util.wrap_exceptions def change_stream_compartment(ctx, from_json, stream_id, compartment_id, if_match): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -119,7 +118,7 @@ def change_stream_compartment(ctx, from_json, stream_id, compartment_id, if_matc @cli_util.wrap_exceptions def change_stream_pool_compartment(ctx, from_json, stream_pool_id, compartment_id, if_match): - if isinstance(stream_pool_id, six.string_types) and len(stream_pool_id.strip()) == 0: + if isinstance(stream_pool_id, str) and len(stream_pool_id.strip()) == 0: raise click.UsageError('Parameter --stream-pool-id cannot be whitespace or empty string') kwargs = {} @@ -372,7 +371,7 @@ def create_stream_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_connect_harness(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, connect_harness_id, if_match): - if isinstance(connect_harness_id, six.string_types) and len(connect_harness_id.strip()) == 0: + if isinstance(connect_harness_id, str) and len(connect_harness_id.strip()) == 0: raise click.UsageError('Parameter --connect-harness-id cannot be whitespace or empty string') kwargs = {} @@ -436,7 +435,7 @@ def delete_connect_harness(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def delete_stream(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_id, if_match): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -500,7 +499,7 @@ def delete_stream(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_stream_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_pool_id, if_match): - if isinstance(stream_pool_id, six.string_types) and len(stream_pool_id.strip()) == 0: + if isinstance(stream_pool_id, str) and len(stream_pool_id.strip()) == 0: raise click.UsageError('Parameter --stream-pool-id cannot be whitespace or empty string') kwargs = {} @@ -559,7 +558,7 @@ def delete_stream_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_connect_harness(ctx, from_json, connect_harness_id): - if isinstance(connect_harness_id, six.string_types) and len(connect_harness_id.strip()) == 0: + if isinstance(connect_harness_id, str) and len(connect_harness_id.strip()) == 0: raise click.UsageError('Parameter --connect-harness-id cannot be whitespace or empty string') kwargs = {} @@ -581,7 +580,7 @@ def get_connect_harness(ctx, from_json, connect_harness_id): @cli_util.wrap_exceptions def get_stream(ctx, from_json, stream_id): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') kwargs = {} @@ -603,7 +602,7 @@ def get_stream(ctx, from_json, stream_id): @cli_util.wrap_exceptions def get_stream_pool(ctx, from_json, stream_pool_id): - if isinstance(stream_pool_id, six.string_types) and len(stream_pool_id.strip()) == 0: + if isinstance(stream_pool_id, str) and len(stream_pool_id.strip()) == 0: raise click.UsageError('Parameter --stream-pool-id cannot be whitespace or empty string') kwargs = {} @@ -827,7 +826,7 @@ def list_streams(ctx, from_json, all_pages, page_size, compartment_id, stream_po @cli_util.wrap_exceptions def update_connect_harness(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, connect_harness_id, freeform_tags, defined_tags, if_match): - if isinstance(connect_harness_id, six.string_types) and len(connect_harness_id.strip()) == 0: + if isinstance(connect_harness_id, str) and len(connect_harness_id.strip()) == 0: raise click.UsageError('Parameter --connect-harness-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -900,7 +899,7 @@ def update_connect_harness(ctx, from_json, force, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def update_stream(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_id, stream_pool_id, freeform_tags, defined_tags, if_match): - if isinstance(stream_id, six.string_types) and len(stream_id.strip()) == 0: + if isinstance(stream_id, str) and len(stream_id.strip()) == 0: raise click.UsageError('Parameter --stream-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -978,7 +977,7 @@ def update_stream(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_stream_pool(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, stream_pool_id, name, kafka_settings, custom_encryption_key_details, freeform_tags, defined_tags, if_match): - if isinstance(stream_pool_id, six.string_types) and len(stream_pool_id.strip()) == 0: + if isinstance(stream_pool_id, str) and len(stream_pool_id.strip()) == 0: raise click.UsageError('Parameter --stream-pool-id cannot be whitespace or empty string') if not force: if kafka_settings or custom_encryption_key_details or freeform_tags or defined_tags: diff --git a/services/tenant_manager_control_plane/src/oci_cli_domain/generated/domain_cli.py b/services/tenant_manager_control_plane/src/oci_cli_domain/generated/domain_cli.py index def1e4158..a49531161 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_domain/generated/domain_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_domain/generated/domain_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -117,7 +116,7 @@ def create_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def delete_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -176,7 +175,7 @@ def delete_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def get_domain(ctx, from_json, domain_id): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') kwargs = {} @@ -271,7 +270,7 @@ def list_domains(ctx, from_json, all_pages, page_size, compartment_id, domain_id @cli_util.wrap_exceptions def update_domain(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_id, freeform_tags, defined_tags, if_match): - if isinstance(domain_id, six.string_types) and len(domain_id.strip()) == 0: + if isinstance(domain_id, str) and len(domain_id.strip()) == 0: raise click.UsageError('Parameter --domain-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated/domaingovernance_cli.py b/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated/domaingovernance_cli.py index e3f27a05a..66c0c0288 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated/domaingovernance_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated/domaingovernance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -111,7 +110,7 @@ def create_domain_governance(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def delete_domain_governance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_governance_id, if_match): - if isinstance(domain_governance_id, six.string_types) and len(domain_governance_id.strip()) == 0: + if isinstance(domain_governance_id, str) and len(domain_governance_id.strip()) == 0: raise click.UsageError('Parameter --domain-governance-id cannot be whitespace or empty string') kwargs = {} @@ -170,7 +169,7 @@ def delete_domain_governance(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def get_domain_governance(ctx, from_json, domain_governance_id): - if isinstance(domain_governance_id, six.string_types) and len(domain_governance_id.strip()) == 0: + if isinstance(domain_governance_id, str) and len(domain_governance_id.strip()) == 0: raise click.UsageError('Parameter --domain-governance-id cannot be whitespace or empty string') kwargs = {} @@ -267,7 +266,7 @@ def list_domain_governances(ctx, from_json, all_pages, page_size, compartment_id @cli_util.wrap_exceptions def update_domain_governance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, domain_governance_id, subscription_email, is_governance_enabled, freeform_tags, defined_tags, if_match): - if isinstance(domain_governance_id, six.string_types) and len(domain_governance_id.strip()) == 0: + if isinstance(domain_governance_id, str) and len(domain_governance_id.strip()) == 0: raise click.UsageError('Parameter --domain-governance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/tenant_manager_control_plane/src/oci_cli_governance/generated/governance_cli.py b/services/tenant_manager_control_plane/src/oci_cli_governance/generated/governance_cli.py index 81d1901bb..70a330c7a 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_governance/generated/governance_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_governance/generated/governance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -46,10 +45,10 @@ def organization_tenancy_group(): @cli_util.wrap_exceptions def add_governance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, organization_id, organization_tenancy_id, if_match): - if isinstance(organization_id, six.string_types) and len(organization_id.strip()) == 0: + if isinstance(organization_id, str) and len(organization_id.strip()) == 0: raise click.UsageError('Parameter --organization-id cannot be whitespace or empty string') - if isinstance(organization_tenancy_id, six.string_types) and len(organization_tenancy_id.strip()) == 0: + if isinstance(organization_tenancy_id, str) and len(organization_tenancy_id.strip()) == 0: raise click.UsageError('Parameter --organization-tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -106,10 +105,10 @@ def add_governance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def remove_governance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, organization_id, organization_tenancy_id, if_match): - if isinstance(organization_id, six.string_types) and len(organization_id.strip()) == 0: + if isinstance(organization_id, str) and len(organization_id.strip()) == 0: raise click.UsageError('Parameter --organization-id cannot be whitespace or empty string') - if isinstance(organization_tenancy_id, six.string_types) and len(organization_tenancy_id.strip()) == 0: + if isinstance(organization_tenancy_id, str) and len(organization_tenancy_id.strip()) == 0: raise click.UsageError('Parameter --organization-tenancy-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/tenant_manager_control_plane/src/oci_cli_link/generated/link_cli.py b/services/tenant_manager_control_plane/src/oci_cli_link/generated/link_cli.py index c3ef353cd..1b5c1369e 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_link/generated/link_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_link/generated/link_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -46,7 +45,7 @@ def link_group(): @cli_util.wrap_exceptions def delete_link(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, link_id, if_match): - if isinstance(link_id, six.string_types) and len(link_id.strip()) == 0: + if isinstance(link_id, str) and len(link_id.strip()) == 0: raise click.UsageError('Parameter --link-id cannot be whitespace or empty string') kwargs = {} @@ -97,7 +96,7 @@ def delete_link(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def get_link(ctx, from_json, link_id): - if isinstance(link_id, six.string_types) and len(link_id.strip()) == 0: + if isinstance(link_id, str) and len(link_id.strip()) == 0: raise click.UsageError('Parameter --link-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/tenant_manager_control_plane/src/oci_cli_orders/generated/orders_cli.py b/services/tenant_manager_control_plane/src/oci_cli_orders/generated/orders_cli.py index 2f9f97555..076c76068 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_orders/generated/orders_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_orders/generated/orders_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -45,7 +44,7 @@ def order_group(): @cli_util.wrap_exceptions def activate_order(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, activation_token): - if isinstance(activation_token, six.string_types) and len(activation_token.strip()) == 0: + if isinstance(activation_token, str) and len(activation_token.strip()) == 0: raise click.UsageError('Parameter --activation-token cannot be whitespace or empty string') kwargs = {} @@ -99,7 +98,7 @@ def activate_order(ctx, from_json, wait_for_state, max_wait_seconds, wait_interv @cli_util.wrap_exceptions def get_order(ctx, from_json, activation_token): - if isinstance(activation_token, six.string_types) and len(activation_token.strip()) == 0: + if isinstance(activation_token, str) and len(activation_token.strip()) == 0: raise click.UsageError('Parameter --activation-token cannot be whitespace or empty string') kwargs = {} diff --git a/services/tenant_manager_control_plane/src/oci_cli_organization/generated/organization_cli.py b/services/tenant_manager_control_plane/src/oci_cli_organization/generated/organization_cli.py index 837917672..dbbecfafd 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_organization/generated/organization_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_organization/generated/organization_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def child_tenancy_group(): @cli_util.wrap_exceptions def approve_organization_tenancy_for_transfer(ctx, from_json, compartment_id, organization_tenancy_id, if_match): - if isinstance(organization_tenancy_id, six.string_types) and len(organization_tenancy_id.strip()) == 0: + if isinstance(organization_tenancy_id, str) and len(organization_tenancy_id.strip()) == 0: raise click.UsageError('Parameter --organization-tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -158,7 +157,7 @@ def create_child_tenancy(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_organization_tenancy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, organization_tenancy_id, if_match): - if isinstance(organization_tenancy_id, six.string_types) and len(organization_tenancy_id.strip()) == 0: + if isinstance(organization_tenancy_id, str) and len(organization_tenancy_id.strip()) == 0: raise click.UsageError('Parameter --organization-tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -209,7 +208,7 @@ def delete_organization_tenancy(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def get_organization(ctx, from_json, organization_id): - if isinstance(organization_id, six.string_types) and len(organization_id.strip()) == 0: + if isinstance(organization_id, str) and len(organization_id.strip()) == 0: raise click.UsageError('Parameter --organization-id cannot be whitespace or empty string') kwargs = {} @@ -232,10 +231,10 @@ def get_organization(ctx, from_json, organization_id): @cli_util.wrap_exceptions def get_organization_tenancy(ctx, from_json, organization_id, tenancy_id): - if isinstance(organization_id, six.string_types) and len(organization_id.strip()) == 0: + if isinstance(organization_id, str) and len(organization_id.strip()) == 0: raise click.UsageError('Parameter --organization-id cannot be whitespace or empty string') - if isinstance(tenancy_id, six.string_types) and len(tenancy_id.strip()) == 0: + if isinstance(tenancy_id, str) and len(tenancy_id.strip()) == 0: raise click.UsageError('Parameter --tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -265,7 +264,7 @@ def list_organization_tenancies(ctx, from_json, all_pages, page_size, organizati if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(organization_id, six.string_types) and len(organization_id.strip()) == 0: + if isinstance(organization_id, str) and len(organization_id.strip()) == 0: raise click.UsageError('Parameter --organization-id cannot be whitespace or empty string') kwargs = {} @@ -361,7 +360,7 @@ def list_organizations(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def restore_organization_tenancy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, organization_tenancy_id, if_match): - if isinstance(organization_tenancy_id, six.string_types) and len(organization_tenancy_id.strip()) == 0: + if isinstance(organization_tenancy_id, str) and len(organization_tenancy_id.strip()) == 0: raise click.UsageError('Parameter --organization-tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -414,7 +413,7 @@ def restore_organization_tenancy(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def unapprove_organization_tenancy_for_transfer(ctx, from_json, compartment_id, organization_tenancy_id, if_match): - if isinstance(organization_tenancy_id, six.string_types) and len(organization_tenancy_id.strip()) == 0: + if isinstance(organization_tenancy_id, str) and len(organization_tenancy_id.strip()) == 0: raise click.UsageError('Parameter --organization-tenancy-id cannot be whitespace or empty string') kwargs = {} @@ -444,7 +443,7 @@ def unapprove_organization_tenancy_for_transfer(ctx, from_json, compartment_id, @cli_util.wrap_exceptions def update_organization(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, organization_id, default_ucm_subscription_id, if_match): - if isinstance(organization_id, six.string_types) and len(organization_id.strip()) == 0: + if isinstance(organization_id, str) and len(organization_id.strip()) == 0: raise click.UsageError('Parameter --organization-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated/recipientinvitation_cli.py b/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated/recipientinvitation_cli.py index ce36c9b2e..c5d9f43d6 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated/recipientinvitation_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated/recipientinvitation_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -45,7 +44,7 @@ def recipient_invitation_group(): @cli_util.wrap_exceptions def accept_recipient_invitation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, recipient_invitation_id, if_match): - if isinstance(recipient_invitation_id, six.string_types) and len(recipient_invitation_id.strip()) == 0: + if isinstance(recipient_invitation_id, str) and len(recipient_invitation_id.strip()) == 0: raise click.UsageError('Parameter --recipient-invitation-id cannot be whitespace or empty string') kwargs = {} @@ -96,7 +95,7 @@ def accept_recipient_invitation(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def get_recipient_invitation(ctx, from_json, recipient_invitation_id): - if isinstance(recipient_invitation_id, six.string_types) and len(recipient_invitation_id.strip()) == 0: + if isinstance(recipient_invitation_id, str) and len(recipient_invitation_id.strip()) == 0: raise click.UsageError('Parameter --recipient-invitation-id cannot be whitespace or empty string') kwargs = {} @@ -122,7 +121,7 @@ def get_recipient_invitation(ctx, from_json, recipient_invitation_id): @cli_util.wrap_exceptions def ignore_recipient_invitation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, recipient_invitation_id, if_match): - if isinstance(recipient_invitation_id, six.string_types) and len(recipient_invitation_id.strip()) == 0: + if isinstance(recipient_invitation_id, str) and len(recipient_invitation_id.strip()) == 0: raise click.UsageError('Parameter --recipient-invitation-id cannot be whitespace or empty string') kwargs = {} @@ -216,7 +215,7 @@ def list_recipient_invitations(ctx, from_json, all_pages, compartment_id, sender @cli_util.wrap_exceptions def update_recipient_invitation(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, recipient_invitation_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(recipient_invitation_id, six.string_types) and len(recipient_invitation_id.strip()) == 0: + if isinstance(recipient_invitation_id, str) and len(recipient_invitation_id.strip()) == 0: raise click.UsageError('Parameter --recipient-invitation-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated/senderinvitation_cli.py b/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated/senderinvitation_cli.py index 47e610687..a199c5e0d 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated/senderinvitation_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated/senderinvitation_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -45,7 +44,7 @@ def sender_invitation_group(): @cli_util.wrap_exceptions def cancel_sender_invitation(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sender_invitation_id, if_match): - if isinstance(sender_invitation_id, six.string_types) and len(sender_invitation_id.strip()) == 0: + if isinstance(sender_invitation_id, str) and len(sender_invitation_id.strip()) == 0: raise click.UsageError('Parameter --sender-invitation-id cannot be whitespace or empty string') kwargs = {} @@ -173,7 +172,7 @@ def create_sender_invitation(ctx, from_json, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def get_sender_invitation(ctx, from_json, sender_invitation_id): - if isinstance(sender_invitation_id, six.string_types) and len(sender_invitation_id.strip()) == 0: + if isinstance(sender_invitation_id, str) and len(sender_invitation_id.strip()) == 0: raise click.UsageError('Parameter --sender-invitation-id cannot be whitespace or empty string') kwargs = {} @@ -269,7 +268,7 @@ def list_sender_invitations(ctx, from_json, all_pages, page_size, compartment_id @cli_util.wrap_exceptions def update_sender_invitation(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sender_invitation_id, display_name, freeform_tags, defined_tags, if_match): - if isinstance(sender_invitation_id, six.string_types) and len(sender_invitation_id.strip()) == 0: + if isinstance(sender_invitation_id, str) and len(sender_invitation_id.strip()) == 0: raise click.UsageError('Parameter --sender-invitation-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/tenant_manager_control_plane/src/oci_cli_subscription/generated/subscription_cli.py b/services/tenant_manager_control_plane/src/oci_cli_subscription/generated/subscription_cli.py index d43b7c22d..9afbf28d6 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_subscription/generated/subscription_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_subscription/generated/subscription_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -128,7 +127,7 @@ def create_subscription_mapping(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_subscription_mapping(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, subscription_mapping_id, if_match): - if isinstance(subscription_mapping_id, six.string_types) and len(subscription_mapping_id.strip()) == 0: + if isinstance(subscription_mapping_id, str) and len(subscription_mapping_id.strip()) == 0: raise click.UsageError('Parameter --subscription-mapping-id cannot be whitespace or empty string') kwargs = {} @@ -187,7 +186,7 @@ def delete_subscription_mapping(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def get_assigned_subscription(ctx, from_json, assigned_subscription_id): - if isinstance(assigned_subscription_id, six.string_types) and len(assigned_subscription_id.strip()) == 0: + if isinstance(assigned_subscription_id, str) and len(assigned_subscription_id.strip()) == 0: raise click.UsageError('Parameter --assigned-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -209,7 +208,7 @@ def get_assigned_subscription(ctx, from_json, assigned_subscription_id): @cli_util.wrap_exceptions def get_subscription(ctx, from_json, subscription_id): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -231,7 +230,7 @@ def get_subscription(ctx, from_json, subscription_id): @cli_util.wrap_exceptions def get_subscription_mapping(ctx, from_json, subscription_mapping_id): - if isinstance(subscription_mapping_id, six.string_types) and len(subscription_mapping_id.strip()) == 0: + if isinstance(subscription_mapping_id, str) and len(subscription_mapping_id.strip()) == 0: raise click.UsageError('Parameter --subscription-mapping-id cannot be whitespace or empty string') kwargs = {} @@ -262,7 +261,7 @@ def list_assigned_subscription_line_items(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(assigned_subscription_id, six.string_types) and len(assigned_subscription_id.strip()) == 0: + if isinstance(assigned_subscription_id, str) and len(assigned_subscription_id.strip()) == 0: raise click.UsageError('Parameter --assigned-subscription-id cannot be whitespace or empty string') kwargs = {} @@ -372,7 +371,7 @@ def list_assigned_subscriptions(ctx, from_json, all_pages, page_size, compartmen @cli_util.wrap_exceptions def list_available_regions(ctx, from_json, all_pages, subscription_id, page): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -412,7 +411,7 @@ def list_subscription_line_items(ctx, from_json, all_pages, page_size, subscript if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/tenant_manager_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py b/services/tenant_manager_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py index 7b1422d0b..34673c619 100644 --- a/services/tenant_manager_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py +++ b/services/tenant_manager_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -55,7 +54,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -85,7 +84,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -139,7 +138,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/threat_intelligence/src/oci_cli_threatintel/generated/threatintel_cli.py b/services/threat_intelligence/src/oci_cli_threatintel/generated/threatintel_cli.py index 29ab10603..02ae20228 100644 --- a/services/threat_intelligence/src/oci_cli_threatintel/generated/threatintel_cli.py +++ b/services/threat_intelligence/src/oci_cli_threatintel/generated/threatintel_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -62,7 +61,7 @@ def indicator_count_collection_group(): @cli_util.wrap_exceptions def get_indicator(ctx, from_json, indicator_id, compartment_id): - if isinstance(indicator_id, six.string_types) and len(indicator_id.strip()) == 0: + if isinstance(indicator_id, str) and len(indicator_id.strip()) == 0: raise click.UsageError('Parameter --indicator-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/usage/src/oci_cli_resources/generated/resources_cli.py b/services/usage/src/oci_cli_resources/generated/resources_cli.py index 6d5945349..156ac2f02 100644 --- a/services/usage/src/oci_cli_resources/generated/resources_cli.py +++ b/services/usage/src/oci_cli_resources/generated/resources_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/usage/src/oci_cli_rewards/generated/rewards_cli.py b/services/usage/src/oci_cli_rewards/generated/rewards_cli.py index 252cc4c0d..93655f7e9 100644 --- a/services/usage/src/oci_cli_rewards/generated/rewards_cli.py +++ b/services/usage/src/oci_cli_rewards/generated/rewards_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -75,7 +74,7 @@ def product_summary_group(): @cli_util.wrap_exceptions def create_redeemable_user(ctx, from_json, tenancy_id, subscription_id, items, user_id, if_match): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -113,7 +112,7 @@ def create_redeemable_user(ctx, from_json, tenancy_id, subscription_id, items, u @cli_util.wrap_exceptions def delete_redeemable_user(ctx, from_json, email_id, tenancy_id, subscription_id, if_match): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -151,7 +150,7 @@ def list_products(ctx, from_json, all_pages, page_size, tenancy_id, subscription if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -217,7 +216,7 @@ def list_redeemable_users(ctx, from_json, all_pages, page_size, tenancy_id, subs if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -280,7 +279,7 @@ def list_redemptions(ctx, from_json, all_pages, page_size, tenancy_id, subscript if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -337,7 +336,7 @@ def list_redemptions(ctx, from_json, all_pages, page_size, tenancy_id, subscript @cli_util.wrap_exceptions def list_rewards(ctx, from_json, all_pages, tenancy_id, subscription_id): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/usage/src/oci_cli_usagelimits/generated/usagelimits_cli.py b/services/usage/src/oci_cli_usagelimits/generated/usagelimits_cli.py index 0f7730234..424c75747 100644 --- a/services/usage/src/oci_cli_usagelimits/generated/usagelimits_cli.py +++ b/services/usage/src/oci_cli_usagelimits/generated/usagelimits_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/usage_api/src/oci_cli_usageapi/generated/usageapi_cli.py b/services/usage_api/src/oci_cli_usageapi/generated/usageapi_cli.py index f524b8604..137d9c866 100644 --- a/services/usage_api/src/oci_cli_usageapi/generated/usageapi_cli.py +++ b/services/usage_api/src/oci_cli_usageapi/generated/usageapi_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -142,7 +141,7 @@ def create_custom_table(ctx, from_json, compartment_id, saved_report_id, saved_c @cli_util.wrap_exceptions def create_email_recipients_group(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, recipients_list, subscription_id): - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -414,7 +413,7 @@ def create_usage_carbon_emissions_query(ctx, from_json, compartment_id, query_de @cli_util.wrap_exceptions def delete_custom_table(ctx, from_json, custom_table_id, if_match): - if isinstance(custom_table_id, six.string_types) and len(custom_table_id.strip()) == 0: + if isinstance(custom_table_id, str) and len(custom_table_id.strip()) == 0: raise click.UsageError('Parameter --custom-table-id cannot be whitespace or empty string') kwargs = {} @@ -442,10 +441,10 @@ def delete_custom_table(ctx, from_json, custom_table_id, if_match): @cli_util.wrap_exceptions def delete_email_recipients_group(ctx, from_json, email_recipients_group_id, subscription_id, compartment_id, if_match): - if isinstance(email_recipients_group_id, six.string_types) and len(email_recipients_group_id.strip()) == 0: + if isinstance(email_recipients_group_id, str) and len(email_recipients_group_id.strip()) == 0: raise click.UsageError('Parameter --email-recipients-group-id cannot be whitespace or empty string') - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -473,7 +472,7 @@ def delete_email_recipients_group(ctx, from_json, email_recipients_group_id, sub @cli_util.wrap_exceptions def delete_query(ctx, from_json, query_id, if_match): - if isinstance(query_id, six.string_types) and len(query_id.strip()) == 0: + if isinstance(query_id, str) and len(query_id.strip()) == 0: raise click.UsageError('Parameter --query-id cannot be whitespace or empty string') kwargs = {} @@ -502,7 +501,7 @@ def delete_query(ctx, from_json, query_id, if_match): @cli_util.wrap_exceptions def delete_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -563,7 +562,7 @@ def delete_schedule(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def delete_usage_carbon_emissions_query(ctx, from_json, usage_carbon_emissions_query_id, if_match): - if isinstance(usage_carbon_emissions_query_id, six.string_types) and len(usage_carbon_emissions_query_id.strip()) == 0: + if isinstance(usage_carbon_emissions_query_id, str) and len(usage_carbon_emissions_query_id.strip()) == 0: raise click.UsageError('Parameter --usage-carbon-emissions-query-id cannot be whitespace or empty string') kwargs = {} @@ -587,7 +586,7 @@ def delete_usage_carbon_emissions_query(ctx, from_json, usage_carbon_emissions_q @cli_util.wrap_exceptions def get_custom_table(ctx, from_json, custom_table_id): - if isinstance(custom_table_id, six.string_types) and len(custom_table_id.strip()) == 0: + if isinstance(custom_table_id, str) and len(custom_table_id.strip()) == 0: raise click.UsageError('Parameter --custom-table-id cannot be whitespace or empty string') kwargs = {} @@ -611,10 +610,10 @@ def get_custom_table(ctx, from_json, custom_table_id): @cli_util.wrap_exceptions def get_email_recipients_group(ctx, from_json, email_recipients_group_id, subscription_id, compartment_id): - if isinstance(email_recipients_group_id, six.string_types) and len(email_recipients_group_id.strip()) == 0: + if isinstance(email_recipients_group_id, str) and len(email_recipients_group_id.strip()) == 0: raise click.UsageError('Parameter --email-recipients-group-id cannot be whitespace or empty string') - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -638,7 +637,7 @@ def get_email_recipients_group(ctx, from_json, email_recipients_group_id, subscr @cli_util.wrap_exceptions def get_query(ctx, from_json, query_id): - if isinstance(query_id, six.string_types) and len(query_id.strip()) == 0: + if isinstance(query_id, str) and len(query_id.strip()) == 0: raise click.UsageError('Parameter --query-id cannot be whitespace or empty string') kwargs = {} @@ -660,7 +659,7 @@ def get_query(ctx, from_json, query_id): @cli_util.wrap_exceptions def get_schedule(ctx, from_json, schedule_id): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') kwargs = {} @@ -682,7 +681,7 @@ def get_schedule(ctx, from_json, schedule_id): @cli_util.wrap_exceptions def get_scheduled_run(ctx, from_json, scheduled_run_id): - if isinstance(scheduled_run_id, six.string_types) and len(scheduled_run_id.strip()) == 0: + if isinstance(scheduled_run_id, str) and len(scheduled_run_id.strip()) == 0: raise click.UsageError('Parameter --scheduled-run-id cannot be whitespace or empty string') kwargs = {} @@ -704,7 +703,7 @@ def get_scheduled_run(ctx, from_json, scheduled_run_id): @cli_util.wrap_exceptions def get_usage_carbon_emissions_query(ctx, from_json, usage_carbon_emissions_query_id): - if isinstance(usage_carbon_emissions_query_id, six.string_types) and len(usage_carbon_emissions_query_id.strip()) == 0: + if isinstance(usage_carbon_emissions_query_id, str) and len(usage_carbon_emissions_query_id.strip()) == 0: raise click.UsageError('Parameter --usage-carbon-emissions-query-id cannot be whitespace or empty string') kwargs = {} @@ -794,7 +793,7 @@ def list_email_recipients_groups(ctx, from_json, all_pages, page_size, subscript if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') kwargs = {} @@ -1064,7 +1063,7 @@ def list_usage_carbon_emissions_queries(ctx, from_json, all_pages, page_size, co @cli_util.wrap_exceptions def request_average_carbon_emission(ctx, from_json, sku_part_number): - if isinstance(sku_part_number, six.string_types) and len(sku_part_number.strip()) == 0: + if isinstance(sku_part_number, str) and len(sku_part_number.strip()) == 0: raise click.UsageError('Parameter --sku-part-number cannot be whitespace or empty string') kwargs = {} @@ -1087,7 +1086,7 @@ def request_average_carbon_emission(ctx, from_json, sku_part_number): @cli_util.wrap_exceptions def request_clean_energy_usage(ctx, from_json, region_parameterconflict, ad): - if isinstance(region_parameterconflict, six.string_types) and len(region_parameterconflict.strip()) == 0: + if isinstance(region_parameterconflict, str) and len(region_parameterconflict.strip()) == 0: raise click.UsageError('Parameter --region-parameterconflict cannot be whitespace or empty string') kwargs = {} @@ -1284,7 +1283,7 @@ def request_usage_carbon_emissions(ctx, from_json, tenant_id, time_usage_started @cli_util.wrap_exceptions def update_custom_table(ctx, from_json, force, saved_custom_table, custom_table_id, if_match): - if isinstance(custom_table_id, six.string_types) and len(custom_table_id.strip()) == 0: + if isinstance(custom_table_id, str) and len(custom_table_id.strip()) == 0: raise click.UsageError('Parameter --custom-table-id cannot be whitespace or empty string') if not force: if saved_custom_table: @@ -1325,10 +1324,10 @@ def update_custom_table(ctx, from_json, force, saved_custom_table, custom_table_ @cli_util.wrap_exceptions def update_email_recipients_group(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, recipients_list, email_recipients_group_id, subscription_id, compartment_id, if_match): - if isinstance(email_recipients_group_id, six.string_types) and len(email_recipients_group_id.strip()) == 0: + if isinstance(email_recipients_group_id, str) and len(email_recipients_group_id.strip()) == 0: raise click.UsageError('Parameter --email-recipients-group-id cannot be whitespace or empty string') - if isinstance(subscription_id, six.string_types) and len(subscription_id.strip()) == 0: + if isinstance(subscription_id, str) and len(subscription_id.strip()) == 0: raise click.UsageError('Parameter --subscription-id cannot be whitespace or empty string') if not force: if recipients_list: @@ -1389,7 +1388,7 @@ def update_email_recipients_group(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_query(ctx, from_json, force, query_definition, query_id, if_match): - if isinstance(query_id, six.string_types) and len(query_id.strip()) == 0: + if isinstance(query_id, str) and len(query_id.strip()) == 0: raise click.UsageError('Parameter --query-id cannot be whitespace or empty string') if not force: if query_definition: @@ -1432,7 +1431,7 @@ def update_query(ctx, from_json, force, query_definition, query_id, if_match): @cli_util.wrap_exceptions def update_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, description, output_file_format, result_location, freeform_tags, defined_tags, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') if not force: if result_location or freeform_tags or defined_tags: @@ -1514,7 +1513,7 @@ def update_schedule(ctx, from_json, force, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def update_schedule_object_storage_location(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, schedule_id, result_location_region, result_location_namespace, result_location_bucket_name, description, output_file_format, freeform_tags, defined_tags, if_match): - if isinstance(schedule_id, six.string_types) and len(schedule_id.strip()) == 0: + if isinstance(schedule_id, str) and len(schedule_id.strip()) == 0: raise click.UsageError('Parameter --schedule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -1590,7 +1589,7 @@ def update_schedule_object_storage_location(ctx, from_json, force, wait_for_stat @cli_util.wrap_exceptions def update_usage_carbon_emissions_query(ctx, from_json, force, query_definition, usage_carbon_emissions_query_id, if_match): - if isinstance(usage_carbon_emissions_query_id, six.string_types) and len(usage_carbon_emissions_query_id.strip()) == 0: + if isinstance(usage_carbon_emissions_query_id, str) and len(usage_carbon_emissions_query_id.strip()) == 0: raise click.UsageError('Parameter --usage-carbon-emissions-query-id cannot be whitespace or empty string') if not force: if query_definition: diff --git a/services/vault/src/oci_cli_vaults/generated/vaults_cli.py b/services/vault/src/oci_cli_vaults/generated/vaults_cli.py index 4c7bca5ef..8bb14ef0e 100644 --- a/services/vault/src/oci_cli_vaults/generated/vaults_cli.py +++ b/services/vault/src/oci_cli_vaults/generated/vaults_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -48,7 +47,7 @@ def secret_group(): @cli_util.wrap_exceptions def cancel_secret_deletion(ctx, from_json, secret_id, if_match): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} @@ -73,7 +72,7 @@ def cancel_secret_deletion(ctx, from_json, secret_id, if_match): @cli_util.wrap_exceptions def cancel_secret_rotation(ctx, from_json, secret_id, if_match): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} @@ -99,10 +98,10 @@ def cancel_secret_rotation(ctx, from_json, secret_id, if_match): @cli_util.wrap_exceptions def cancel_secret_version_deletion(ctx, from_json, secret_id, secret_version_number, if_match): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') - if isinstance(secret_version_number, six.string_types) and len(secret_version_number.strip()) == 0: + if isinstance(secret_version_number, str) and len(secret_version_number.strip()) == 0: raise click.UsageError('Parameter --secret-version-number cannot be whitespace or empty string') kwargs = {} @@ -131,7 +130,7 @@ def cancel_secret_version_deletion(ctx, from_json, secret_id, secret_version_num @cli_util.wrap_exceptions def change_secret_compartment(ctx, from_json, secret_id, compartment_id, if_match): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} @@ -685,7 +684,7 @@ def create_secret_bytes_generation_context(ctx, from_json, wait_for_state, max_w @cli_util.wrap_exceptions def get_secret(ctx, from_json, secret_id): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} @@ -708,10 +707,10 @@ def get_secret(ctx, from_json, secret_id): @cli_util.wrap_exceptions def get_secret_version(ctx, from_json, secret_id, secret_version_number): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') - if isinstance(secret_version_number, six.string_types) and len(secret_version_number.strip()) == 0: + if isinstance(secret_version_number, str) and len(secret_version_number.strip()) == 0: raise click.UsageError('Parameter --secret-version-number cannot be whitespace or empty string') kwargs = {} @@ -743,7 +742,7 @@ def list_secret_versions(ctx, from_json, all_pages, page_size, secret_id, limit, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} @@ -858,7 +857,7 @@ def list_secrets(ctx, from_json, all_pages, page_size, compartment_id, name, lim @cli_util.wrap_exceptions def rotate_secret(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, secret_id, if_match): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} @@ -919,7 +918,7 @@ def rotate_secret(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva @cli_util.wrap_exceptions def schedule_secret_deletion(ctx, from_json, secret_id, time_of_deletion, if_match): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') kwargs = {} @@ -953,10 +952,10 @@ def schedule_secret_deletion(ctx, from_json, secret_id, time_of_deletion, if_mat @cli_util.wrap_exceptions def schedule_secret_version_deletion(ctx, from_json, secret_id, secret_version_number, time_of_deletion, if_match): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') - if isinstance(secret_version_number, six.string_types) and len(secret_version_number.strip()) == 0: + if isinstance(secret_version_number, str) and len(secret_version_number.strip()) == 0: raise click.UsageError('Parameter --secret-version-number cannot be whitespace or empty string') kwargs = {} @@ -1008,7 +1007,7 @@ def schedule_secret_version_deletion(ctx, from_json, secret_id, secret_version_n @cli_util.wrap_exceptions def update_secret(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, secret_id, current_version_number, defined_tags, description, freeform_tags, metadata, secret_content, replication_config, rotation_config, secret_rules, secret_generation_context, enable_auto_generation, if_match): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or metadata or secret_content or replication_config or rotation_config or secret_rules or secret_generation_context: @@ -1118,7 +1117,7 @@ def update_secret(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_secret_base64_secret_content_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, secret_id, current_version_number, defined_tags, description, freeform_tags, metadata, replication_config, rotation_config, secret_rules, secret_generation_context, enable_auto_generation, if_match, secret_content_name, secret_content_stage, secret_content_content): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or metadata or replication_config or rotation_config or secret_rules or secret_generation_context: @@ -1237,7 +1236,7 @@ def update_secret_base64_secret_content_details(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_secret_passphrase_generation_context(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, secret_id, secret_generation_context_generation_template, current_version_number, defined_tags, description, freeform_tags, metadata, secret_content, replication_config, rotation_config, secret_rules, enable_auto_generation, if_match, secret_generation_context_secret_template, secret_generation_context_passphrase_length): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or metadata or secret_content or replication_config or rotation_config or secret_rules: @@ -1353,7 +1352,7 @@ def update_secret_passphrase_generation_context(ctx, from_json, force, wait_for_ @cli_util.wrap_exceptions def update_secret_ssh_key_generation_context(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, secret_id, secret_generation_context_generation_template, current_version_number, defined_tags, description, freeform_tags, metadata, secret_content, replication_config, rotation_config, secret_rules, enable_auto_generation, if_match, secret_generation_context_secret_template): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or metadata or secret_content or replication_config or rotation_config or secret_rules: @@ -1466,7 +1465,7 @@ def update_secret_ssh_key_generation_context(ctx, from_json, force, wait_for_sta @cli_util.wrap_exceptions def update_secret_bytes_generation_context(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, secret_id, secret_generation_context_generation_template, current_version_number, defined_tags, description, freeform_tags, metadata, secret_content, replication_config, rotation_config, secret_rules, enable_auto_generation, if_match, secret_generation_context_secret_template): - if isinstance(secret_id, six.string_types) and len(secret_id.strip()) == 0: + if isinstance(secret_id, str) and len(secret_id.strip()) == 0: raise click.UsageError('Parameter --secret-id cannot be whitespace or empty string') if not force: if defined_tags or freeform_tags or metadata or secret_content or replication_config or rotation_config or secret_rules: diff --git a/services/vbs_inst/src/oci_cli_vbs_instance/generated/vbsinstance_cli.py b/services/vbs_inst/src/oci_cli_vbs_instance/generated/vbsinstance_cli.py index 567fbca6c..0f6840dc6 100644 --- a/services/vbs_inst/src/oci_cli_vbs_instance/generated/vbsinstance_cli.py +++ b/services/vbs_inst/src/oci_cli_vbs_instance/generated/vbsinstance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -73,7 +72,7 @@ def work_request_group(): @cli_util.wrap_exceptions def change_vbs_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vbs_instance_id, compartment_id, if_match): - if isinstance(vbs_instance_id, six.string_types) and len(vbs_instance_id.strip()) == 0: + if isinstance(vbs_instance_id, str) and len(vbs_instance_id.strip()) == 0: raise click.UsageError('Parameter --vbs-instance-id cannot be whitespace or empty string') kwargs = {} @@ -210,7 +209,7 @@ def create_vbs_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_vbs_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vbs_instance_id, if_match): - if isinstance(vbs_instance_id, six.string_types) and len(vbs_instance_id.strip()) == 0: + if isinstance(vbs_instance_id, str) and len(vbs_instance_id.strip()) == 0: raise click.UsageError('Parameter --vbs-instance-id cannot be whitespace or empty string') kwargs = {} @@ -261,7 +260,7 @@ def delete_vbs_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def get_vbs_instance(ctx, from_json, vbs_instance_id): - if isinstance(vbs_instance_id, six.string_types) and len(vbs_instance_id.strip()) == 0: + if isinstance(vbs_instance_id, str) and len(vbs_instance_id.strip()) == 0: raise click.UsageError('Parameter --vbs-instance-id cannot be whitespace or empty string') kwargs = {} @@ -283,7 +282,7 @@ def get_vbs_instance(ctx, from_json, vbs_instance_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -377,7 +376,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -434,7 +433,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -549,7 +548,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_vbs_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vbs_instance_id, display_name, is_resource_usage_agreement_granted, resource_compartment_id, freeform_tags, defined_tags, if_match): - if isinstance(vbs_instance_id, six.string_types) and len(vbs_instance_id.strip()) == 0: + if isinstance(vbs_instance_id, str) and len(vbs_instance_id.strip()) == 0: raise click.UsageError('Parameter --vbs-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: diff --git a/services/visual_builder/src/oci_cli_vb_instance/generated/vbinstance_cli.py b/services/visual_builder/src/oci_cli_vb_instance/generated/vbinstance_cli.py index 9fcc979d5..b884ac4dc 100644 --- a/services/visual_builder/src/oci_cli_vb_instance/generated/vbinstance_cli.py +++ b/services/visual_builder/src/oci_cli_vb_instance/generated/vbinstance_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -88,7 +87,7 @@ def work_request_log_entry_collection_group(): @cli_util.wrap_exceptions def change_vb_instance_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vb_instance_id, compartment_id, if_match): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') kwargs = {} @@ -440,7 +439,7 @@ def create_vb_instance_public_endpoint_details(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def delete_vb_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vb_instance_id, if_match): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') kwargs = {} @@ -491,7 +490,7 @@ def delete_vb_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_vb_instance(ctx, from_json, vb_instance_id): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') kwargs = {} @@ -513,7 +512,7 @@ def get_vb_instance(ctx, from_json, vb_instance_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -605,7 +604,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, compartment_i if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -660,7 +659,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, compartment_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -762,7 +761,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def reconfigure_private_endpoint_vb_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vb_instance_id, if_match): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') kwargs = {} @@ -815,7 +814,7 @@ def reconfigure_private_endpoint_vb_instance(ctx, from_json, wait_for_state, max @cli_util.wrap_exceptions def request_summarized_applications(ctx, from_json, vb_instance_id, idcs_open_id, if_match): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') kwargs = {} @@ -850,7 +849,7 @@ def request_summarized_applications(ctx, from_json, vb_instance_id, idcs_open_id @cli_util.wrap_exceptions def start_vb_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vb_instance_id, if_match): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') kwargs = {} @@ -905,7 +904,7 @@ def start_vb_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def stop_vb_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, vb_instance_id, if_match): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') kwargs = {} @@ -972,7 +971,7 @@ def stop_vb_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def update_vb_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vb_instance_id, display_name, freeform_tags, defined_tags, idcs_open_id, node_count, is_visual_builder_enabled, custom_endpoint, alternate_custom_endpoints, network_endpoint_details, if_match): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or custom_endpoint or alternate_custom_endpoints or network_endpoint_details: @@ -1077,7 +1076,7 @@ def update_vb_instance(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_vb_instance_update_public_endpoint_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vb_instance_id, display_name, freeform_tags, defined_tags, idcs_open_id, node_count, is_visual_builder_enabled, custom_endpoint, alternate_custom_endpoints, if_match, network_endpoint_details_allowlisted_http_ips, network_endpoint_details_allowlisted_http_vcns): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or custom_endpoint or alternate_custom_endpoints: @@ -1186,7 +1185,7 @@ def update_vb_instance_update_public_endpoint_details(ctx, from_json, force, wai @cli_util.wrap_exceptions def update_vb_instance_update_private_endpoint_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, vb_instance_id, display_name, freeform_tags, defined_tags, idcs_open_id, node_count, is_visual_builder_enabled, custom_endpoint, alternate_custom_endpoints, if_match, network_endpoint_details_subnet_id, network_endpoint_details_network_security_group_ids): - if isinstance(vb_instance_id, six.string_types) and len(vb_instance_id.strip()) == 0: + if isinstance(vb_instance_id, str) and len(vb_instance_id.strip()) == 0: raise click.UsageError('Parameter --vb-instance-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or custom_endpoint or alternate_custom_endpoints: diff --git a/services/vn_monitoring/src/oci_cli_vn_monitoring/generated/vnmonitoring_cli.py b/services/vn_monitoring/src/oci_cli_vn_monitoring/generated/vnmonitoring_cli.py index d84fd450b..62e4310ab 100644 --- a/services/vn_monitoring/src/oci_cli_vn_monitoring/generated/vnmonitoring_cli.py +++ b/services/vn_monitoring/src/oci_cli_vn_monitoring/generated/vnmonitoring_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -85,7 +84,7 @@ def path_analyzer_test_group(): @cli_util.wrap_exceptions def change_path_analyzer_test_compartment(ctx, from_json, path_analyzer_test_id, compartment_id, if_match): - if isinstance(path_analyzer_test_id, six.string_types) and len(path_analyzer_test_id.strip()) == 0: + if isinstance(path_analyzer_test_id, str) and len(path_analyzer_test_id.strip()) == 0: raise click.UsageError('Parameter --path-analyzer-test-id cannot be whitespace or empty string') kwargs = {} @@ -194,7 +193,7 @@ def create_path_analyzer_test(ctx, from_json, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def delete_path_analyzer_test(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, path_analyzer_test_id, if_match): - if isinstance(path_analyzer_test_id, six.string_types) and len(path_analyzer_test_id.strip()) == 0: + if isinstance(path_analyzer_test_id, str) and len(path_analyzer_test_id.strip()) == 0: raise click.UsageError('Parameter --path-analyzer-test-id cannot be whitespace or empty string') kwargs = {} @@ -445,7 +444,7 @@ def get_path_analysis_persisted_get_path_analysis_details(ctx, from_json, wait_f @cli_util.wrap_exceptions def get_path_analyzer_test(ctx, from_json, path_analyzer_test_id): - if isinstance(path_analyzer_test_id, six.string_types) and len(path_analyzer_test_id.strip()) == 0: + if isinstance(path_analyzer_test_id, str) and len(path_analyzer_test_id.strip()) == 0: raise click.UsageError('Parameter --path-analyzer-test-id cannot be whitespace or empty string') kwargs = {} @@ -467,7 +466,7 @@ def get_path_analyzer_test(ctx, from_json, path_analyzer_test_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -564,7 +563,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -623,7 +622,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -681,7 +680,7 @@ def list_work_request_results(ctx, from_json, all_pages, page_size, work_request if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -805,7 +804,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_path_analyzer_test(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, path_analyzer_test_id, display_name, protocol, source_endpoint, destination_endpoint, protocol_parameters, query_options, freeform_tags, defined_tags, if_match): - if isinstance(path_analyzer_test_id, six.string_types) and len(path_analyzer_test_id.strip()) == 0: + if isinstance(path_analyzer_test_id, str) and len(path_analyzer_test_id.strip()) == 0: raise click.UsageError('Parameter --path-analyzer-test-id cannot be whitespace or empty string') if not force: if source_endpoint or destination_endpoint or protocol_parameters or query_options or freeform_tags or defined_tags: diff --git a/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated/vulnerabilityscanning_cli.py b/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated/vulnerabilityscanning_cli.py index 0f0dc9d69..60e27ea6f 100644 --- a/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated/vulnerabilityscanning_cli.py +++ b/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated/vulnerabilityscanning_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -140,7 +139,7 @@ def host_agent_scan_result_group(): @cli_util.wrap_exceptions def change_container_scan_recipe_compartment(ctx, from_json, container_scan_recipe_id, compartment_id, if_match): - if isinstance(container_scan_recipe_id, six.string_types) and len(container_scan_recipe_id.strip()) == 0: + if isinstance(container_scan_recipe_id, str) and len(container_scan_recipe_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -171,7 +170,7 @@ def change_container_scan_recipe_compartment(ctx, from_json, container_scan_reci @cli_util.wrap_exceptions def change_container_scan_result_compartment(ctx, from_json, container_scan_result_id, compartment_id, if_match): - if isinstance(container_scan_result_id, six.string_types) and len(container_scan_result_id.strip()) == 0: + if isinstance(container_scan_result_id, str) and len(container_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -202,7 +201,7 @@ def change_container_scan_result_compartment(ctx, from_json, container_scan_resu @cli_util.wrap_exceptions def change_container_scan_target_compartment(ctx, from_json, container_scan_target_id, compartment_id, if_match): - if isinstance(container_scan_target_id, six.string_types) and len(container_scan_target_id.strip()) == 0: + if isinstance(container_scan_target_id, str) and len(container_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-target-id cannot be whitespace or empty string') kwargs = {} @@ -233,7 +232,7 @@ def change_container_scan_target_compartment(ctx, from_json, container_scan_targ @cli_util.wrap_exceptions def change_host_agent_scan_result_compartment(ctx, from_json, host_agent_scan_result_id, compartment_id, if_match): - if isinstance(host_agent_scan_result_id, six.string_types) and len(host_agent_scan_result_id.strip()) == 0: + if isinstance(host_agent_scan_result_id, str) and len(host_agent_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-agent-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -264,7 +263,7 @@ def change_host_agent_scan_result_compartment(ctx, from_json, host_agent_scan_re @cli_util.wrap_exceptions def change_host_cis_benchmark_scan_result_compartment(ctx, from_json, host_cis_benchmark_scan_result_id, compartment_id, if_match): - if isinstance(host_cis_benchmark_scan_result_id, six.string_types) and len(host_cis_benchmark_scan_result_id.strip()) == 0: + if isinstance(host_cis_benchmark_scan_result_id, str) and len(host_cis_benchmark_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-cis-benchmark-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -295,7 +294,7 @@ def change_host_cis_benchmark_scan_result_compartment(ctx, from_json, host_cis_b @cli_util.wrap_exceptions def change_host_endpoint_protection_scan_result_compartment(ctx, from_json, host_endpoint_protection_scan_result_id, compartment_id, if_match): - if isinstance(host_endpoint_protection_scan_result_id, six.string_types) and len(host_endpoint_protection_scan_result_id.strip()) == 0: + if isinstance(host_endpoint_protection_scan_result_id, str) and len(host_endpoint_protection_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-endpoint-protection-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -326,7 +325,7 @@ def change_host_endpoint_protection_scan_result_compartment(ctx, from_json, host @cli_util.wrap_exceptions def change_host_port_scan_result_compartment(ctx, from_json, host_port_scan_result_id, compartment_id, if_match): - if isinstance(host_port_scan_result_id, six.string_types) and len(host_port_scan_result_id.strip()) == 0: + if isinstance(host_port_scan_result_id, str) and len(host_port_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-port-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -357,7 +356,7 @@ def change_host_port_scan_result_compartment(ctx, from_json, host_port_scan_resu @cli_util.wrap_exceptions def change_host_scan_recipe_compartment(ctx, from_json, host_scan_recipe_id, compartment_id, if_match): - if isinstance(host_scan_recipe_id, six.string_types) and len(host_scan_recipe_id.strip()) == 0: + if isinstance(host_scan_recipe_id, str) and len(host_scan_recipe_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -388,7 +387,7 @@ def change_host_scan_recipe_compartment(ctx, from_json, host_scan_recipe_id, com @cli_util.wrap_exceptions def change_host_scan_target_compartment(ctx, from_json, host_scan_target_id, compartment_id, if_match): - if isinstance(host_scan_target_id, six.string_types) and len(host_scan_target_id.strip()) == 0: + if isinstance(host_scan_target_id, str) and len(host_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-target-id cannot be whitespace or empty string') kwargs = {} @@ -802,7 +801,7 @@ def create_host_scan_target(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_container_scan_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, container_scan_recipe_id, if_match): - if isinstance(container_scan_recipe_id, six.string_types) and len(container_scan_recipe_id.strip()) == 0: + if isinstance(container_scan_recipe_id, str) and len(container_scan_recipe_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -858,7 +857,7 @@ def delete_container_scan_recipe(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_container_scan_result(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, container_scan_result_id, if_match): - if isinstance(container_scan_result_id, six.string_types) and len(container_scan_result_id.strip()) == 0: + if isinstance(container_scan_result_id, str) and len(container_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -914,7 +913,7 @@ def delete_container_scan_result(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_container_scan_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, container_scan_target_id, if_match): - if isinstance(container_scan_target_id, six.string_types) and len(container_scan_target_id.strip()) == 0: + if isinstance(container_scan_target_id, str) and len(container_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-target-id cannot be whitespace or empty string') kwargs = {} @@ -970,7 +969,7 @@ def delete_container_scan_target(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_host_agent_scan_result(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_agent_scan_result_id, if_match): - if isinstance(host_agent_scan_result_id, six.string_types) and len(host_agent_scan_result_id.strip()) == 0: + if isinstance(host_agent_scan_result_id, str) and len(host_agent_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-agent-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1026,7 +1025,7 @@ def delete_host_agent_scan_result(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_host_cis_benchmark_scan_result(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_cis_benchmark_scan_result_id, if_match): - if isinstance(host_cis_benchmark_scan_result_id, six.string_types) and len(host_cis_benchmark_scan_result_id.strip()) == 0: + if isinstance(host_cis_benchmark_scan_result_id, str) and len(host_cis_benchmark_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-cis-benchmark-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1082,7 +1081,7 @@ def delete_host_cis_benchmark_scan_result(ctx, from_json, wait_for_state, max_wa @cli_util.wrap_exceptions def delete_host_endpoint_protection_scan_result(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_endpoint_protection_scan_result_id, if_match): - if isinstance(host_endpoint_protection_scan_result_id, six.string_types) and len(host_endpoint_protection_scan_result_id.strip()) == 0: + if isinstance(host_endpoint_protection_scan_result_id, str) and len(host_endpoint_protection_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-endpoint-protection-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1138,7 +1137,7 @@ def delete_host_endpoint_protection_scan_result(ctx, from_json, wait_for_state, @cli_util.wrap_exceptions def delete_host_port_scan_result(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_port_scan_result_id, if_match): - if isinstance(host_port_scan_result_id, six.string_types) and len(host_port_scan_result_id.strip()) == 0: + if isinstance(host_port_scan_result_id, str) and len(host_port_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-port-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1194,7 +1193,7 @@ def delete_host_port_scan_result(ctx, from_json, wait_for_state, max_wait_second @cli_util.wrap_exceptions def delete_host_scan_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_scan_recipe_id, if_match): - if isinstance(host_scan_recipe_id, six.string_types) and len(host_scan_recipe_id.strip()) == 0: + if isinstance(host_scan_recipe_id, str) and len(host_scan_recipe_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -1250,7 +1249,7 @@ def delete_host_scan_recipe(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_host_scan_target(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, host_scan_target_id, if_match): - if isinstance(host_scan_target_id, six.string_types) and len(host_scan_target_id.strip()) == 0: + if isinstance(host_scan_target_id, str) and len(host_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-target-id cannot be whitespace or empty string') kwargs = {} @@ -1413,7 +1412,7 @@ def export_host_vulnerability_csv(ctx, from_json, file, compartment_id, time_las @cli_util.wrap_exceptions def get_container_scan_recipe(ctx, from_json, container_scan_recipe_id): - if isinstance(container_scan_recipe_id, six.string_types) and len(container_scan_recipe_id.strip()) == 0: + if isinstance(container_scan_recipe_id, str) and len(container_scan_recipe_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -1435,7 +1434,7 @@ def get_container_scan_recipe(ctx, from_json, container_scan_recipe_id): @cli_util.wrap_exceptions def get_container_scan_result(ctx, from_json, container_scan_result_id): - if isinstance(container_scan_result_id, six.string_types) and len(container_scan_result_id.strip()) == 0: + if isinstance(container_scan_result_id, str) and len(container_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1457,7 +1456,7 @@ def get_container_scan_result(ctx, from_json, container_scan_result_id): @cli_util.wrap_exceptions def get_container_scan_target(ctx, from_json, container_scan_target_id): - if isinstance(container_scan_target_id, six.string_types) and len(container_scan_target_id.strip()) == 0: + if isinstance(container_scan_target_id, str) and len(container_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-target-id cannot be whitespace or empty string') kwargs = {} @@ -1479,7 +1478,7 @@ def get_container_scan_target(ctx, from_json, container_scan_target_id): @cli_util.wrap_exceptions def get_host_agent_scan_result(ctx, from_json, host_agent_scan_result_id): - if isinstance(host_agent_scan_result_id, six.string_types) and len(host_agent_scan_result_id.strip()) == 0: + if isinstance(host_agent_scan_result_id, str) and len(host_agent_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-agent-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1501,7 +1500,7 @@ def get_host_agent_scan_result(ctx, from_json, host_agent_scan_result_id): @cli_util.wrap_exceptions def get_host_cis_benchmark_scan_result(ctx, from_json, host_cis_benchmark_scan_result_id): - if isinstance(host_cis_benchmark_scan_result_id, six.string_types) and len(host_cis_benchmark_scan_result_id.strip()) == 0: + if isinstance(host_cis_benchmark_scan_result_id, str) and len(host_cis_benchmark_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-cis-benchmark-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1523,7 +1522,7 @@ def get_host_cis_benchmark_scan_result(ctx, from_json, host_cis_benchmark_scan_r @cli_util.wrap_exceptions def get_host_endpoint_protection_scan_result(ctx, from_json, host_endpoint_protection_scan_result_id): - if isinstance(host_endpoint_protection_scan_result_id, six.string_types) and len(host_endpoint_protection_scan_result_id.strip()) == 0: + if isinstance(host_endpoint_protection_scan_result_id, str) and len(host_endpoint_protection_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-endpoint-protection-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1545,7 +1544,7 @@ def get_host_endpoint_protection_scan_result(ctx, from_json, host_endpoint_prote @cli_util.wrap_exceptions def get_host_port_scan_result(ctx, from_json, host_port_scan_result_id): - if isinstance(host_port_scan_result_id, six.string_types) and len(host_port_scan_result_id.strip()) == 0: + if isinstance(host_port_scan_result_id, str) and len(host_port_scan_result_id.strip()) == 0: raise click.UsageError('Parameter --host-port-scan-result-id cannot be whitespace or empty string') kwargs = {} @@ -1567,7 +1566,7 @@ def get_host_port_scan_result(ctx, from_json, host_port_scan_result_id): @cli_util.wrap_exceptions def get_host_scan_recipe(ctx, from_json, host_scan_recipe_id): - if isinstance(host_scan_recipe_id, six.string_types) and len(host_scan_recipe_id.strip()) == 0: + if isinstance(host_scan_recipe_id, str) and len(host_scan_recipe_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-recipe-id cannot be whitespace or empty string') kwargs = {} @@ -1589,7 +1588,7 @@ def get_host_scan_recipe(ctx, from_json, host_scan_recipe_id): @cli_util.wrap_exceptions def get_host_scan_target(ctx, from_json, host_scan_target_id): - if isinstance(host_scan_target_id, six.string_types) and len(host_scan_target_id.strip()) == 0: + if isinstance(host_scan_target_id, str) and len(host_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-target-id cannot be whitespace or empty string') kwargs = {} @@ -1611,7 +1610,7 @@ def get_host_scan_target(ctx, from_json, host_scan_target_id): @cli_util.wrap_exceptions def get_host_vulnerability(ctx, from_json, host_vulnerability_id): - if isinstance(host_vulnerability_id, six.string_types) and len(host_vulnerability_id.strip()) == 0: + if isinstance(host_vulnerability_id, str) and len(host_vulnerability_id.strip()) == 0: raise click.UsageError('Parameter --host-vulnerability-id cannot be whitespace or empty string') kwargs = {} @@ -1633,7 +1632,7 @@ def get_host_vulnerability(ctx, from_json, host_vulnerability_id): @cli_util.wrap_exceptions def get_vulnerability(ctx, from_json, vulnerability_id): - if isinstance(vulnerability_id, six.string_types) and len(vulnerability_id.strip()) == 0: + if isinstance(vulnerability_id, str) and len(vulnerability_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-id cannot be whitespace or empty string') kwargs = {} @@ -1655,7 +1654,7 @@ def get_vulnerability(ctx, from_json, vulnerability_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2234,7 +2233,7 @@ def list_host_scan_target_errors(ctx, from_json, all_pages, page_size, compartme if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(host_scan_target_id, six.string_types) and len(host_scan_target_id.strip()) == 0: + if isinstance(host_scan_target_id, str) and len(host_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-target-id cannot be whitespace or empty string') kwargs = {} @@ -2422,7 +2421,7 @@ def list_host_vulnerability_impacted_hosts(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(host_vulnerability_id, six.string_types) and len(host_vulnerability_id.strip()) == 0: + if isinstance(host_vulnerability_id, str) and len(host_vulnerability_id.strip()) == 0: raise click.UsageError('Parameter --host-vulnerability-id cannot be whitespace or empty string') kwargs = {} @@ -2545,7 +2544,7 @@ def list_vulnerability_impacted_containers(ctx, from_json, all_pages, page_size, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(vulnerability_id, six.string_types) and len(vulnerability_id.strip()) == 0: + if isinstance(vulnerability_id, str) and len(vulnerability_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-id cannot be whitespace or empty string') kwargs = {} @@ -2602,7 +2601,7 @@ def list_vulnerability_impacted_hosts(ctx, from_json, all_pages, page_size, vuln if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(vulnerability_id, six.string_types) and len(vulnerability_id.strip()) == 0: + if isinstance(vulnerability_id, str) and len(vulnerability_id.strip()) == 0: raise click.UsageError('Parameter --vulnerability-id cannot be whitespace or empty string') kwargs = {} @@ -2657,7 +2656,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2708,7 +2707,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -2810,7 +2809,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, pag @cli_util.wrap_exceptions def update_container_scan_recipe(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, container_scan_recipe_id, display_name, image_count, scan_settings, freeform_tags, defined_tags, if_match): - if isinstance(container_scan_recipe_id, six.string_types) and len(container_scan_recipe_id.strip()) == 0: + if isinstance(container_scan_recipe_id, str) and len(container_scan_recipe_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-recipe-id cannot be whitespace or empty string') if not force: if scan_settings or freeform_tags or defined_tags: @@ -2895,7 +2894,7 @@ def update_container_scan_recipe(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_container_scan_target(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, container_scan_target_id, display_name, description, target_registry, container_scan_recipe_id, freeform_tags, defined_tags, if_match): - if isinstance(container_scan_target_id, six.string_types) and len(container_scan_target_id.strip()) == 0: + if isinstance(container_scan_target_id, str) and len(container_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-target-id cannot be whitespace or empty string') if not force: if target_registry or freeform_tags or defined_tags: @@ -2985,7 +2984,7 @@ def update_container_scan_target(ctx, from_json, force, wait_for_state, max_wait @cli_util.wrap_exceptions def update_container_scan_target_update_ocir_container_scan_registry_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, container_scan_target_id, display_name, description, container_scan_recipe_id, freeform_tags, defined_tags, if_match, target_registry_url, target_registry_compartment_id, target_registry_repositories): - if isinstance(container_scan_target_id, six.string_types) and len(container_scan_target_id.strip()) == 0: + if isinstance(container_scan_target_id, str) and len(container_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --container-scan-target-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3083,7 +3082,7 @@ def update_container_scan_target_update_ocir_container_scan_registry_details(ctx @cli_util.wrap_exceptions def update_host_scan_recipe(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, host_scan_recipe_id, display_name, port_settings, agent_settings, application_settings, schedule, freeform_tags, defined_tags, if_match): - if isinstance(host_scan_recipe_id, six.string_types) and len(host_scan_recipe_id.strip()) == 0: + if isinstance(host_scan_recipe_id, str) and len(host_scan_recipe_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-recipe-id cannot be whitespace or empty string') if not force: if port_settings or agent_settings or application_settings or schedule or freeform_tags or defined_tags: @@ -3175,7 +3174,7 @@ def update_host_scan_recipe(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_host_scan_target(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, host_scan_target_id, display_name, description, target_compartment_id, instance_ids, host_scan_recipe_id, freeform_tags, defined_tags, if_match): - if isinstance(host_scan_target_id, six.string_types) and len(host_scan_target_id.strip()) == 0: + if isinstance(host_scan_target_id, str) and len(host_scan_target_id.strip()) == 0: raise click.UsageError('Parameter --host-scan-target-id cannot be whitespace or empty string') if not force: if instance_ids or freeform_tags or defined_tags: diff --git a/services/waa/src/oci_cli_waa/generated/waa_cli.py b/services/waa/src/oci_cli_waa/generated/waa_cli.py index 3a62fd80a..454afa136 100644 --- a/services/waa/src/oci_cli_waa/generated/waa_cli.py +++ b/services/waa/src/oci_cli_waa/generated/waa_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -59,7 +58,7 @@ def web_app_acceleration_group(): @cli_util.wrap_exceptions def change_web_app_acceleration_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_acceleration_id, compartment_id, if_match): - if isinstance(web_app_acceleration_id, six.string_types) and len(web_app_acceleration_id.strip()) == 0: + if isinstance(web_app_acceleration_id, str) and len(web_app_acceleration_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-id cannot be whitespace or empty string') kwargs = {} @@ -120,7 +119,7 @@ def change_web_app_acceleration_compartment(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def change_web_app_acceleration_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_acceleration_policy_id, compartment_id, if_match): - if isinstance(web_app_acceleration_policy_id, six.string_types) and len(web_app_acceleration_policy_id.strip()) == 0: + if isinstance(web_app_acceleration_policy_id, str) and len(web_app_acceleration_policy_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-policy-id cannot be whitespace or empty string') kwargs = {} @@ -406,7 +405,7 @@ def create_web_app_acceleration_policy(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def delete_web_app_acceleration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_acceleration_id, if_match): - if isinstance(web_app_acceleration_id, six.string_types) and len(web_app_acceleration_id.strip()) == 0: + if isinstance(web_app_acceleration_id, str) and len(web_app_acceleration_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-id cannot be whitespace or empty string') kwargs = {} @@ -462,7 +461,7 @@ def delete_web_app_acceleration(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_web_app_acceleration_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_acceleration_policy_id, if_match): - if isinstance(web_app_acceleration_policy_id, six.string_types) and len(web_app_acceleration_policy_id.strip()) == 0: + if isinstance(web_app_acceleration_policy_id, str) and len(web_app_acceleration_policy_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-policy-id cannot be whitespace or empty string') kwargs = {} @@ -513,7 +512,7 @@ def delete_web_app_acceleration_policy(ctx, from_json, wait_for_state, max_wait_ @cli_util.wrap_exceptions def get_web_app_acceleration(ctx, from_json, web_app_acceleration_id): - if isinstance(web_app_acceleration_id, six.string_types) and len(web_app_acceleration_id.strip()) == 0: + if isinstance(web_app_acceleration_id, str) and len(web_app_acceleration_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-id cannot be whitespace or empty string') kwargs = {} @@ -535,7 +534,7 @@ def get_web_app_acceleration(ctx, from_json, web_app_acceleration_id): @cli_util.wrap_exceptions def get_web_app_acceleration_policy(ctx, from_json, web_app_acceleration_policy_id): - if isinstance(web_app_acceleration_policy_id, six.string_types) and len(web_app_acceleration_policy_id.strip()) == 0: + if isinstance(web_app_acceleration_policy_id, str) and len(web_app_acceleration_policy_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-policy-id cannot be whitespace or empty string') kwargs = {} @@ -690,7 +689,7 @@ def list_web_app_accelerations(ctx, from_json, all_pages, page_size, compartment @cli_util.wrap_exceptions def purge_web_app_acceleration_cache(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_acceleration_id, purge_type): - if isinstance(web_app_acceleration_id, six.string_types) and len(web_app_acceleration_id.strip()) == 0: + if isinstance(web_app_acceleration_id, str) and len(web_app_acceleration_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-id cannot be whitespace or empty string') kwargs = {} @@ -747,7 +746,7 @@ def purge_web_app_acceleration_cache(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def purge_web_app_acceleration_cache_purge_entire_web_app_acceleration_cache_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_acceleration_id): - if isinstance(web_app_acceleration_id, six.string_types) and len(web_app_acceleration_id.strip()) == 0: + if isinstance(web_app_acceleration_id, str) and len(web_app_acceleration_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-id cannot be whitespace or empty string') kwargs = {} @@ -812,7 +811,7 @@ def purge_web_app_acceleration_cache_purge_entire_web_app_acceleration_cache_det @cli_util.wrap_exceptions def update_web_app_acceleration(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_acceleration_id, display_name, web_app_acceleration_policy_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(web_app_acceleration_id, six.string_types) and len(web_app_acceleration_id.strip()) == 0: + if isinstance(web_app_acceleration_id, str) and len(web_app_acceleration_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags: @@ -897,7 +896,7 @@ def update_web_app_acceleration(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_web_app_acceleration_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_acceleration_policy_id, display_name, response_caching_policy, response_compression_policy, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(web_app_acceleration_policy_id, six.string_types) and len(web_app_acceleration_policy_id.strip()) == 0: + if isinstance(web_app_acceleration_policy_id, str) and len(web_app_acceleration_policy_id.strip()) == 0: raise click.UsageError('Parameter --web-app-acceleration-policy-id cannot be whitespace or empty string') if not force: if response_caching_policy or response_compression_policy or freeform_tags or defined_tags or system_tags: diff --git a/services/waa/src/oci_cli_work_request/generated/workrequest_cli.py b/services/waa/src/oci_cli_work_request/generated/workrequest_cli.py index 43371e131..a395fae89 100644 --- a/services/waa/src/oci_cli_work_request/generated/workrequest_cli.py +++ b/services/waa/src/oci_cli_work_request/generated/workrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -57,7 +56,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -86,7 +85,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -137,7 +136,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/waas/src/oci_cli_redirect/generated/redirect_cli.py b/services/waas/src/oci_cli_redirect/generated/redirect_cli.py index 840ee368a..6ec4d1618 100644 --- a/services/waas/src/oci_cli_redirect/generated/redirect_cli.py +++ b/services/waas/src/oci_cli_redirect/generated/redirect_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -45,7 +44,7 @@ def http_redirect_group(): @cli_util.wrap_exceptions def change_http_redirect_compartment(ctx, from_json, http_redirect_id, compartment_id, if_match): - if isinstance(http_redirect_id, six.string_types) and len(http_redirect_id.strip()) == 0: + if isinstance(http_redirect_id, str) and len(http_redirect_id.strip()) == 0: raise click.UsageError('Parameter --http-redirect-id cannot be whitespace or empty string') kwargs = {} @@ -156,7 +155,7 @@ def create_http_redirect(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def delete_http_redirect(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, http_redirect_id, if_match): - if isinstance(http_redirect_id, six.string_types) and len(http_redirect_id.strip()) == 0: + if isinstance(http_redirect_id, str) and len(http_redirect_id.strip()) == 0: raise click.UsageError('Parameter --http-redirect-id cannot be whitespace or empty string') kwargs = {} @@ -207,7 +206,7 @@ def delete_http_redirect(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def get_http_redirect(ctx, from_json, http_redirect_id): - if isinstance(http_redirect_id, six.string_types) and len(http_redirect_id.strip()) == 0: + if isinstance(http_redirect_id, str) and len(http_redirect_id.strip()) == 0: raise click.UsageError('Parameter --http-redirect-id cannot be whitespace or empty string') kwargs = {} @@ -312,7 +311,7 @@ def list_http_redirects(ctx, from_json, all_pages, page_size, compartment_id, li @cli_util.wrap_exceptions def update_http_redirect(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, http_redirect_id, display_name, target, response_code, freeform_tags, defined_tags, if_match): - if isinstance(http_redirect_id, six.string_types) and len(http_redirect_id.strip()) == 0: + if isinstance(http_redirect_id, str) and len(http_redirect_id.strip()) == 0: raise click.UsageError('Parameter --http-redirect-id cannot be whitespace or empty string') if not force: if target or freeform_tags or defined_tags: diff --git a/services/waas/src/oci_cli_waas/generated/waas_cli.py b/services/waas/src/oci_cli_waas/generated/waas_cli.py index 468afc529..be6b00308 100644 --- a/services/waas/src/oci_cli_waas/generated/waas_cli.py +++ b/services/waas/src/oci_cli_waas/generated/waas_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -257,7 +256,7 @@ def waf_config_group(): @cli_util.wrap_exceptions def accept_recommendations(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, protection_rule_keys, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -311,7 +310,7 @@ def accept_recommendations(ctx, from_json, wait_for_state, max_wait_seconds, wai @cli_util.wrap_exceptions def cancel_work_request(ctx, from_json, work_request_id, if_match): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -337,7 +336,7 @@ def cancel_work_request(ctx, from_json, work_request_id, if_match): @cli_util.wrap_exceptions def change_address_list_compartment(ctx, from_json, address_list_id, compartment_id, if_match): - if isinstance(address_list_id, six.string_types) and len(address_list_id.strip()) == 0: + if isinstance(address_list_id, str) and len(address_list_id.strip()) == 0: raise click.UsageError('Parameter --address-list-id cannot be whitespace or empty string') kwargs = {} @@ -368,7 +367,7 @@ def change_address_list_compartment(ctx, from_json, address_list_id, compartment @cli_util.wrap_exceptions def change_certificate_compartment(ctx, from_json, certificate_id, compartment_id, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -399,7 +398,7 @@ def change_certificate_compartment(ctx, from_json, certificate_id, compartment_i @cli_util.wrap_exceptions def change_custom_protection_rule_compartment(ctx, from_json, custom_protection_rule_id, compartment_id, if_match): - if isinstance(custom_protection_rule_id, six.string_types) and len(custom_protection_rule_id.strip()) == 0: + if isinstance(custom_protection_rule_id, str) and len(custom_protection_rule_id.strip()) == 0: raise click.UsageError('Parameter --custom-protection-rule-id cannot be whitespace or empty string') kwargs = {} @@ -430,7 +429,7 @@ def change_custom_protection_rule_compartment(ctx, from_json, custom_protection_ @cli_util.wrap_exceptions def change_waas_policy_compartment(ctx, from_json, waas_policy_id, compartment_id, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -802,7 +801,7 @@ def create_waas_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_address_list(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, address_list_id, if_match): - if isinstance(address_list_id, six.string_types) and len(address_list_id.strip()) == 0: + if isinstance(address_list_id, str) and len(address_list_id.strip()) == 0: raise click.UsageError('Parameter --address-list-id cannot be whitespace or empty string') kwargs = {} @@ -866,7 +865,7 @@ def delete_address_list(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def delete_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, if_match): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -930,7 +929,7 @@ def delete_certificate(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def delete_custom_protection_rule(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, custom_protection_rule_id, if_match): - if isinstance(custom_protection_rule_id, six.string_types) and len(custom_protection_rule_id.strip()) == 0: + if isinstance(custom_protection_rule_id, str) and len(custom_protection_rule_id.strip()) == 0: raise click.UsageError('Parameter --custom-protection-rule-id cannot be whitespace or empty string') kwargs = {} @@ -994,7 +993,7 @@ def delete_custom_protection_rule(ctx, from_json, wait_for_state, max_wait_secon @cli_util.wrap_exceptions def delete_waas_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1045,7 +1044,7 @@ def delete_waas_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def get_address_list(ctx, from_json, address_list_id): - if isinstance(address_list_id, six.string_types) and len(address_list_id.strip()) == 0: + if isinstance(address_list_id, str) and len(address_list_id.strip()) == 0: raise click.UsageError('Parameter --address-list-id cannot be whitespace or empty string') kwargs = {} @@ -1067,7 +1066,7 @@ def get_address_list(ctx, from_json, address_list_id): @cli_util.wrap_exceptions def get_certificate(ctx, from_json, certificate_id): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') kwargs = {} @@ -1089,7 +1088,7 @@ def get_certificate(ctx, from_json, certificate_id): @cli_util.wrap_exceptions def get_custom_protection_rule(ctx, from_json, custom_protection_rule_id): - if isinstance(custom_protection_rule_id, six.string_types) and len(custom_protection_rule_id.strip()) == 0: + if isinstance(custom_protection_rule_id, str) and len(custom_protection_rule_id.strip()) == 0: raise click.UsageError('Parameter --custom-protection-rule-id cannot be whitespace or empty string') kwargs = {} @@ -1111,7 +1110,7 @@ def get_custom_protection_rule(ctx, from_json, custom_protection_rule_id): @cli_util.wrap_exceptions def get_device_fingerprint_challenge(ctx, from_json, waas_policy_id): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1133,7 +1132,7 @@ def get_device_fingerprint_challenge(ctx, from_json, waas_policy_id): @cli_util.wrap_exceptions def get_human_interaction_challenge(ctx, from_json, waas_policy_id): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1155,7 +1154,7 @@ def get_human_interaction_challenge(ctx, from_json, waas_policy_id): @cli_util.wrap_exceptions def get_js_challenge(ctx, from_json, waas_policy_id): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1177,7 +1176,7 @@ def get_js_challenge(ctx, from_json, waas_policy_id): @cli_util.wrap_exceptions def get_policy_config(ctx, from_json, waas_policy_id): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1200,10 +1199,10 @@ def get_policy_config(ctx, from_json, waas_policy_id): @cli_util.wrap_exceptions def get_protection_rule(ctx, from_json, waas_policy_id, protection_rule_key): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') - if isinstance(protection_rule_key, six.string_types) and len(protection_rule_key.strip()) == 0: + if isinstance(protection_rule_key, str) and len(protection_rule_key.strip()) == 0: raise click.UsageError('Parameter --protection-rule-key cannot be whitespace or empty string') kwargs = {} @@ -1226,7 +1225,7 @@ def get_protection_rule(ctx, from_json, waas_policy_id, protection_rule_key): @cli_util.wrap_exceptions def get_protection_settings(ctx, from_json, waas_policy_id): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1248,7 +1247,7 @@ def get_protection_settings(ctx, from_json, waas_policy_id): @cli_util.wrap_exceptions def get_waas_policy(ctx, from_json, waas_policy_id): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1270,7 +1269,7 @@ def get_waas_policy(ctx, from_json, waas_policy_id): @cli_util.wrap_exceptions def get_waf_address_rate_limiting(ctx, from_json, waas_policy_id): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1292,7 +1291,7 @@ def get_waf_address_rate_limiting(ctx, from_json, waas_policy_id): @cli_util.wrap_exceptions def get_waf_config(ctx, from_json, waas_policy_id): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1314,7 +1313,7 @@ def get_waf_config(ctx, from_json, waas_policy_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1343,7 +1342,7 @@ def list_access_rules(ctx, from_json, all_pages, page_size, waas_policy_id, limi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1463,7 +1462,7 @@ def list_caching_rules(ctx, from_json, all_pages, page_size, waas_policy_id, lim if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1516,7 +1515,7 @@ def list_captchas(ctx, from_json, all_pages, page_size, waas_policy_id, limit, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1757,7 +1756,7 @@ def list_good_bots(ctx, from_json, all_pages, page_size, waas_policy_id, limit, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1810,7 +1809,7 @@ def list_protection_rules(ctx, from_json, all_pages, page_size, waas_policy_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1868,7 +1867,7 @@ def list_recommendations(ctx, from_json, all_pages, page_size, waas_policy_id, r if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -1921,7 +1920,7 @@ def list_threat_feeds(ctx, from_json, all_pages, page_size, waas_policy_id, limi if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2043,7 +2042,7 @@ def list_waas_policy_custom_protection_rules(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2101,7 +2100,7 @@ def list_waf_blocked_requests(ctx, from_json, all_pages, page_size, waas_policy_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2177,7 +2176,7 @@ def list_waf_logs(ctx, from_json, all_pages, page_size, waas_policy_id, limit, p if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2268,7 +2267,7 @@ def list_waf_requests(ctx, from_json, all_pages, page_size, waas_policy_id, time if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2325,7 +2324,7 @@ def list_waf_traffic(ctx, from_json, all_pages, page_size, waas_policy_id, time_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2380,7 +2379,7 @@ def list_whitelists(ctx, from_json, all_pages, page_size, waas_policy_id, limit, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2487,7 +2486,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, waas_policy_id, com @cli_util.wrap_exceptions def purge_cache(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, if_match, resources): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2558,7 +2557,7 @@ def purge_cache(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_ @cli_util.wrap_exceptions def update_access_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, access_rules, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2623,7 +2622,7 @@ def update_access_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_address_list(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, address_list_id, if_match, display_name, addresses, freeform_tags, defined_tags): - if isinstance(address_list_id, six.string_types) and len(address_list_id.strip()) == 0: + if isinstance(address_list_id, str) and len(address_list_id.strip()) == 0: raise click.UsageError('Parameter --address-list-id cannot be whitespace or empty string') if not force: if addresses or freeform_tags or defined_tags: @@ -2701,7 +2700,7 @@ def update_address_list(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_caching_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, caching_rules_details, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2764,7 +2763,7 @@ def update_caching_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_ @cli_util.wrap_exceptions def update_captchas(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, captchas, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -2828,7 +2827,7 @@ def update_captchas(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def update_certificate(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, certificate_id, if_match, display_name, freeform_tags, defined_tags): - if isinstance(certificate_id, six.string_types) and len(certificate_id.strip()) == 0: + if isinstance(certificate_id, str) and len(certificate_id.strip()) == 0: raise click.UsageError('Parameter --certificate-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -2922,7 +2921,7 @@ def update_certificate(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_custom_protection_rule(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, custom_protection_rule_id, display_name, description, template, freeform_tags, defined_tags, if_match): - if isinstance(custom_protection_rule_id, six.string_types) and len(custom_protection_rule_id.strip()) == 0: + if isinstance(custom_protection_rule_id, str) and len(custom_protection_rule_id.strip()) == 0: raise click.UsageError('Parameter --custom-protection-rule-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags: @@ -3009,7 +3008,7 @@ def update_custom_protection_rule(ctx, from_json, force, wait_for_state, max_wai @cli_util.wrap_exceptions def update_device_fingerprint_challenge(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, is_enabled, action, failure_threshold, action_expiration_in_seconds, failure_threshold_expiration_in_seconds, max_address_count, max_address_count_expiration_in_seconds, challenge_settings, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if challenge_settings: @@ -3097,7 +3096,7 @@ def update_device_fingerprint_challenge(ctx, from_json, force, wait_for_state, m @cli_util.wrap_exceptions def update_good_bots(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, good_bots, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -3164,7 +3163,7 @@ def update_good_bots(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def update_human_interaction_challenge(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, is_enabled, action, failure_threshold, action_expiration_in_seconds, failure_threshold_expiration_in_seconds, interaction_threshold, recording_period_in_seconds, set_http_header, challenge_settings, is_nat_enabled, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if set_http_header or challenge_settings: @@ -3267,7 +3266,7 @@ def update_human_interaction_challenge(ctx, from_json, force, wait_for_state, ma @cli_util.wrap_exceptions def update_js_challenge(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, is_enabled, action, failure_threshold, action_expiration_in_seconds, set_http_header, challenge_settings, are_redirects_challenged, criteria, is_nat_enabled, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if set_http_header or challenge_settings or criteria: @@ -3394,7 +3393,7 @@ def update_js_challenge(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_policy_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, certificate_id, is_https_enabled, is_https_forced, tls_protocols, is_origin_compression_enabled, is_behind_cdn, client_address_header, is_cache_control_respected, is_response_buffering_enabled, cipher_group, load_balancing_method, websocket_path_prefixes, is_sni_enabled, health_checks, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if tls_protocols or load_balancing_method or websocket_path_prefixes or health_checks: @@ -3537,7 +3536,7 @@ def update_policy_config(ctx, from_json, force, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def update_policy_config_round_robin_load_balancing_method(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, certificate_id, is_https_enabled, is_https_forced, tls_protocols, is_origin_compression_enabled, is_behind_cdn, client_address_header, is_cache_control_respected, is_response_buffering_enabled, cipher_group, websocket_path_prefixes, is_sni_enabled, health_checks, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if tls_protocols or websocket_path_prefixes or health_checks: @@ -3683,7 +3682,7 @@ def update_policy_config_round_robin_load_balancing_method(ctx, from_json, force @cli_util.wrap_exceptions def update_policy_config_sticky_cookie_load_balancing_method(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, certificate_id, is_https_enabled, is_https_forced, tls_protocols, is_origin_compression_enabled, is_behind_cdn, client_address_header, is_cache_control_respected, is_response_buffering_enabled, cipher_group, websocket_path_prefixes, is_sni_enabled, health_checks, if_match, load_balancing_method_name, load_balancing_method_domain, load_balancing_method_expiration_time_in_seconds): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if tls_protocols or websocket_path_prefixes or health_checks: @@ -3835,7 +3834,7 @@ def update_policy_config_sticky_cookie_load_balancing_method(ctx, from_json, for @cli_util.wrap_exceptions def update_policy_config_ip_hash_load_balancing_method(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, certificate_id, is_https_enabled, is_https_forced, tls_protocols, is_origin_compression_enabled, is_behind_cdn, client_address_header, is_cache_control_respected, is_response_buffering_enabled, cipher_group, websocket_path_prefixes, is_sni_enabled, health_checks, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if tls_protocols or websocket_path_prefixes or health_checks: @@ -3941,7 +3940,7 @@ def update_policy_config_ip_hash_load_balancing_method(ctx, from_json, force, wa @cli_util.wrap_exceptions def update_protection_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, protection_rules, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -4021,7 +4020,7 @@ def update_protection_rules(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def update_protection_settings(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, block_action, block_response_code, block_error_page_message, block_error_page_code, block_error_page_description, max_argument_count, max_name_length_per_argument, max_total_name_length_of_arguments, recommendations_period_in_days, is_response_inspected, max_response_size_in_ki_b, allowed_http_methods, media_types, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if allowed_http_methods or media_types: @@ -4124,7 +4123,7 @@ def update_protection_settings(ctx, from_json, force, wait_for_state, max_wait_s @cli_util.wrap_exceptions def update_threat_feeds(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, threat_feeds, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -4197,7 +4196,7 @@ def update_threat_feeds(ctx, from_json, wait_for_state, max_wait_seconds, wait_i @cli_util.wrap_exceptions def update_waas_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, display_name, additional_domains, origins, origin_groups, policy_config, waf_config, freeform_tags, defined_tags, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if additional_domains or origins or origin_groups or policy_config or waf_config or freeform_tags or defined_tags: @@ -4285,7 +4284,7 @@ def update_waas_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, @cli_util.wrap_exceptions def update_waas_policy_custom_protection_rules(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, update_custom_protection_rules_details, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -4345,7 +4344,7 @@ def update_waas_policy_custom_protection_rules(ctx, from_json, wait_for_state, m @cli_util.wrap_exceptions def update_waf_address_rate_limiting(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, is_enabled, allowed_rate_per_address, max_delayed_count_per_address, block_response_code, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} @@ -4450,7 +4449,7 @@ def update_waf_address_rate_limiting(ctx, from_json, wait_for_state, max_wait_se @cli_util.wrap_exceptions def update_waf_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, access_rules, address_rate_limiting, captchas, device_fingerprint_challenge, good_bots, human_interaction_challenge, js_challenge, origin, caching_rules, custom_protection_rules, origin_groups, protection_rules, protection_settings, threat_feeds, whitelists, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if access_rules or address_rate_limiting or captchas or device_fingerprint_challenge or good_bots or human_interaction_challenge or js_challenge or caching_rules or custom_protection_rules or origin_groups or protection_rules or protection_settings or threat_feeds or whitelists: @@ -4567,7 +4566,7 @@ def update_waf_config(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_whitelists(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, whitelists, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/waas/src/oci_cli_waas/waas_cli_extended.py b/services/waas/src/oci_cli_waas/waas_cli_extended.py index 77b46230c..338eeaa2d 100644 --- a/services/waas/src/oci_cli_waas/waas_cli_extended.py +++ b/services/waas/src/oci_cli_waas/waas_cli_extended.py @@ -8,7 +8,6 @@ from oci_cli import cli_util from oci_cli import custom_types # noqa: F401 import sys # noqa: F401 -import six # noqa: F401 import oci # noqa: F401 from oci_cli import json_skeleton_utils from oci_cli.aliasing import CommandGroupWithAlias @@ -88,7 +87,7 @@ def update_address_list_extended(ctx, **kwargs): @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'load-balancing-method': {'module': 'waas', 'class': 'LoadBalancingMethod'}, 'websocket-path-prefixes': {'module': 'waas', 'class': 'list[string]'}, 'health-checks': {'module': 'waas', 'class': 'HealthCheck'}}) @cli_util.wrap_exceptions def update_policy_config(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, waas_policy_id, certificate_id, is_https_enabled, is_https_forced, tls_protocols, is_origin_compression_enabled, is_behind_cdn, client_address_header, is_cache_control_respected, is_response_buffering_enabled, cipher_group, load_balancing_method, websocket_path_prefixes, is_sni_enabled, health_checks, if_match): - if isinstance(waas_policy_id, six.string_types) and len(waas_policy_id.strip()) == 0: + if isinstance(waas_policy_id, str) and len(waas_policy_id.strip()) == 0: raise click.UsageError('Parameter --waas-policy-id cannot be whitespace or empty string') if not force: if tls_protocols or load_balancing_method or websocket_path_prefixes or health_checks: diff --git a/services/waf/src/oci_cli_waf/generated/waf_cli.py b/services/waf/src/oci_cli_waf/generated/waf_cli.py index 4c480e53a..cfd9ff54b 100644 --- a/services/waf/src/oci_cli_waf/generated/waf_cli.py +++ b/services/waf/src/oci_cli_waf/generated/waf_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -92,7 +91,7 @@ def network_address_list_group(): @cli_util.wrap_exceptions def change_network_address_list_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_address_list_id, compartment_id, if_match): - if isinstance(network_address_list_id, six.string_types) and len(network_address_list_id.strip()) == 0: + if isinstance(network_address_list_id, str) and len(network_address_list_id.strip()) == 0: raise click.UsageError('Parameter --network-address-list-id cannot be whitespace or empty string') kwargs = {} @@ -153,7 +152,7 @@ def change_network_address_list_compartment(ctx, from_json, wait_for_state, max_ @cli_util.wrap_exceptions def change_web_app_firewall_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_firewall_id, compartment_id, if_match): - if isinstance(web_app_firewall_id, six.string_types) and len(web_app_firewall_id.strip()) == 0: + if isinstance(web_app_firewall_id, str) and len(web_app_firewall_id.strip()) == 0: raise click.UsageError('Parameter --web-app-firewall-id cannot be whitespace or empty string') kwargs = {} @@ -214,7 +213,7 @@ def change_web_app_firewall_compartment(ctx, from_json, wait_for_state, max_wait @cli_util.wrap_exceptions def change_web_app_firewall_policy_compartment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_firewall_policy_id, compartment_id, if_match): - if isinstance(web_app_firewall_policy_id, six.string_types) and len(web_app_firewall_policy_id.strip()) == 0: + if isinstance(web_app_firewall_policy_id, str) and len(web_app_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --web-app-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -735,7 +734,7 @@ def create_web_app_firewall_policy(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def delete_network_address_list(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, network_address_list_id, if_match): - if isinstance(network_address_list_id, six.string_types) and len(network_address_list_id.strip()) == 0: + if isinstance(network_address_list_id, str) and len(network_address_list_id.strip()) == 0: raise click.UsageError('Parameter --network-address-list-id cannot be whitespace or empty string') kwargs = {} @@ -791,7 +790,7 @@ def delete_network_address_list(ctx, from_json, wait_for_state, max_wait_seconds @cli_util.wrap_exceptions def delete_web_app_firewall(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_firewall_id, if_match): - if isinstance(web_app_firewall_id, six.string_types) and len(web_app_firewall_id.strip()) == 0: + if isinstance(web_app_firewall_id, str) and len(web_app_firewall_id.strip()) == 0: raise click.UsageError('Parameter --web-app-firewall-id cannot be whitespace or empty string') kwargs = {} @@ -847,7 +846,7 @@ def delete_web_app_firewall(ctx, from_json, wait_for_state, max_wait_seconds, wa @cli_util.wrap_exceptions def delete_web_app_firewall_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_firewall_policy_id, if_match): - if isinstance(web_app_firewall_policy_id, six.string_types) and len(web_app_firewall_policy_id.strip()) == 0: + if isinstance(web_app_firewall_policy_id, str) and len(web_app_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --web-app-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -898,7 +897,7 @@ def delete_web_app_firewall_policy(ctx, from_json, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def get_network_address_list(ctx, from_json, network_address_list_id): - if isinstance(network_address_list_id, six.string_types) and len(network_address_list_id.strip()) == 0: + if isinstance(network_address_list_id, str) and len(network_address_list_id.strip()) == 0: raise click.UsageError('Parameter --network-address-list-id cannot be whitespace or empty string') kwargs = {} @@ -920,7 +919,7 @@ def get_network_address_list(ctx, from_json, network_address_list_id): @cli_util.wrap_exceptions def get_web_app_firewall(ctx, from_json, web_app_firewall_id): - if isinstance(web_app_firewall_id, six.string_types) and len(web_app_firewall_id.strip()) == 0: + if isinstance(web_app_firewall_id, str) and len(web_app_firewall_id.strip()) == 0: raise click.UsageError('Parameter --web-app-firewall-id cannot be whitespace or empty string') kwargs = {} @@ -942,7 +941,7 @@ def get_web_app_firewall(ctx, from_json, web_app_firewall_id): @cli_util.wrap_exceptions def get_web_app_firewall_policy(ctx, from_json, web_app_firewall_policy_id): - if isinstance(web_app_firewall_policy_id, six.string_types) and len(web_app_firewall_policy_id.strip()) == 0: + if isinstance(web_app_firewall_policy_id, str) and len(web_app_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --web-app-firewall-policy-id cannot be whitespace or empty string') kwargs = {} @@ -964,7 +963,7 @@ def get_web_app_firewall_policy(ctx, from_json, web_app_firewall_policy_id): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1314,7 +1313,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1365,7 +1364,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1470,7 +1469,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def update_network_address_list(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_address_list_id, type, display_name, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(network_address_list_id, six.string_types) and len(network_address_list_id.strip()) == 0: + if isinstance(network_address_list_id, str) and len(network_address_list_id.strip()) == 0: raise click.UsageError('Parameter --network-address-list-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags: @@ -1552,7 +1551,7 @@ def update_network_address_list(ctx, from_json, force, wait_for_state, max_wait_ @cli_util.wrap_exceptions def update_network_address_list_update_network_address_list_addresses_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_address_list_id, display_name, freeform_tags, defined_tags, system_tags, addresses, if_match): - if isinstance(network_address_list_id, six.string_types) and len(network_address_list_id.strip()) == 0: + if isinstance(network_address_list_id, str) and len(network_address_list_id.strip()) == 0: raise click.UsageError('Parameter --network-address-list-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags or addresses: @@ -1640,7 +1639,7 @@ def update_network_address_list_update_network_address_list_addresses_details(ct @cli_util.wrap_exceptions def update_network_address_list_update_network_address_list_vcn_addresses_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, network_address_list_id, display_name, freeform_tags, defined_tags, system_tags, vcn_addresses, if_match): - if isinstance(network_address_list_id, six.string_types) and len(network_address_list_id.strip()) == 0: + if isinstance(network_address_list_id, str) and len(network_address_list_id.strip()) == 0: raise click.UsageError('Parameter --network-address-list-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags or vcn_addresses: @@ -1726,7 +1725,7 @@ def update_network_address_list_update_network_address_list_vcn_addresses_detail @cli_util.wrap_exceptions def update_web_app_firewall(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_firewall_id, display_name, web_app_firewall_policy_id, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(web_app_firewall_id, six.string_types) and len(web_app_firewall_id.strip()) == 0: + if isinstance(web_app_firewall_id, str) and len(web_app_firewall_id.strip()) == 0: raise click.UsageError('Parameter --web-app-firewall-id cannot be whitespace or empty string') if not force: if freeform_tags or defined_tags or system_tags: @@ -1817,7 +1816,7 @@ def update_web_app_firewall(ctx, from_json, force, wait_for_state, max_wait_seco @cli_util.wrap_exceptions def update_web_app_firewall_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, web_app_firewall_policy_id, display_name, actions, request_access_control, request_rate_limiting, request_protection, response_access_control, response_protection, freeform_tags, defined_tags, system_tags, if_match): - if isinstance(web_app_firewall_policy_id, six.string_types) and len(web_app_firewall_policy_id.strip()) == 0: + if isinstance(web_app_firewall_policy_id, str) and len(web_app_firewall_policy_id.strip()) == 0: raise click.UsageError('Parameter --web-app-firewall-policy-id cannot be whitespace or empty string') if not force: if actions or request_access_control or request_rate_limiting or request_protection or response_access_control or response_protection or freeform_tags or defined_tags or system_tags: diff --git a/services/wlms/src/oci_cli_weblogic_management_service/generated/weblogicmanagementservice_cli.py b/services/wlms/src/oci_cli_weblogic_management_service/generated/weblogicmanagementservice_cli.py index 86de1e469..f3744f578 100644 --- a/services/wlms/src/oci_cli_weblogic_management_service/generated/weblogicmanagementservice_cli.py +++ b/services/wlms/src/oci_cli_weblogic_management_service/generated/weblogicmanagementservice_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util @@ -86,7 +85,7 @@ def work_request_group(): @cli_util.wrap_exceptions def change_wls_domain_compartment(ctx, from_json, wls_domain_id, compartment_id, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -118,7 +117,7 @@ def change_wls_domain_compartment(ctx, from_json, wls_domain_id, compartment_id, @cli_util.wrap_exceptions def create_agreement_record(ctx, from_json, agreement_uuid, agreement_signature, wls_domain_id, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -153,7 +152,7 @@ def create_agreement_record(ctx, from_json, agreement_uuid, agreement_signature, @cli_util.wrap_exceptions def delete_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, wls_domain_id, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -229,7 +228,7 @@ def get_agreement(ctx, from_json, ): @cli_util.wrap_exceptions def get_managed_instance(ctx, from_json, managed_instance_id): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -254,10 +253,10 @@ def get_managed_instance(ctx, from_json, managed_instance_id): @cli_util.wrap_exceptions def get_managed_instance_server(ctx, from_json, managed_instance_id, server_id): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') - if isinstance(server_id, six.string_types) and len(server_id.strip()) == 0: + if isinstance(server_id, str) and len(server_id.strip()) == 0: raise click.UsageError('Parameter --server-id cannot be whitespace or empty string') kwargs = {} @@ -280,7 +279,7 @@ def get_managed_instance_server(ctx, from_json, managed_instance_id, server_id): @cli_util.wrap_exceptions def get_wls_domain(ctx, from_json, wls_domain_id): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -303,10 +302,10 @@ def get_wls_domain(ctx, from_json, wls_domain_id): @cli_util.wrap_exceptions def get_wls_domain_credential(ctx, from_json, wls_domain_id, credential_type): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') - if isinstance(credential_type, six.string_types) and len(credential_type.strip()) == 0: + if isinstance(credential_type, str) and len(credential_type.strip()) == 0: raise click.UsageError('Parameter --credential-type cannot be whitespace or empty string') kwargs = {} @@ -332,10 +331,10 @@ def get_wls_domain_credential(ctx, from_json, wls_domain_id, credential_type): @cli_util.wrap_exceptions def get_wls_domain_server(ctx, from_json, wls_domain_id, server_id): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') - if isinstance(server_id, six.string_types) and len(server_id.strip()) == 0: + if isinstance(server_id, str) and len(server_id.strip()) == 0: raise click.UsageError('Parameter --server-id cannot be whitespace or empty string') kwargs = {} @@ -364,13 +363,13 @@ def get_wls_domain_server(ctx, from_json, wls_domain_id, server_id): @cli_util.wrap_exceptions def get_wls_domain_server_backup(ctx, from_json, wls_domain_id, server_id, backup_id): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') - if isinstance(server_id, six.string_types) and len(server_id.strip()) == 0: + if isinstance(server_id, str) and len(server_id.strip()) == 0: raise click.UsageError('Parameter --server-id cannot be whitespace or empty string') - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -400,13 +399,13 @@ def get_wls_domain_server_backup(ctx, from_json, wls_domain_id, server_id, backu @cli_util.wrap_exceptions def get_wls_domain_server_backup_content(ctx, from_json, wls_domain_id, server_id, backup_id): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') - if isinstance(server_id, six.string_types) and len(server_id.strip()) == 0: + if isinstance(server_id, str) and len(server_id.strip()) == 0: raise click.UsageError('Parameter --server-id cannot be whitespace or empty string') - if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0: + if isinstance(backup_id, str) and len(backup_id.strip()) == 0: raise click.UsageError('Parameter --backup-id cannot be whitespace or empty string') kwargs = {} @@ -430,7 +429,7 @@ def get_wls_domain_server_backup_content(ctx, from_json, wls_domain_id, server_i @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -458,7 +457,7 @@ def get_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def install_latest_patches_on_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, wls_domain_id, is_force_servers_shutdown, must_include_domains_sharing_middleware, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -528,7 +527,7 @@ def list_agreement_records(ctx, from_json, all_pages, page_size, wls_domain_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -585,7 +584,7 @@ def list_applicable_patches(ctx, from_json, all_pages, page_size, wls_domain_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -644,7 +643,7 @@ def list_managed_instance_scan_results(ctx, from_json, all_pages, page_size, man if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -708,10 +707,10 @@ def list_managed_instance_server_installed_patches(ctx, from_json, all_pages, pa if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') - if isinstance(server_id, six.string_types) and len(server_id.strip()) == 0: + if isinstance(server_id, str) and len(server_id.strip()) == 0: raise click.UsageError('Parameter --server-id cannot be whitespace or empty string') kwargs = {} @@ -772,7 +771,7 @@ def list_managed_instance_servers(ctx, from_json, all_pages, page_size, managed_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -903,7 +902,7 @@ def list_required_policies(ctx, from_json, all_pages, ): @cli_util.wrap_exceptions def list_wls_domain_credentials(ctx, from_json, all_pages, wls_domain_id): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -935,7 +934,7 @@ def list_wls_domain_scan_results(ctx, from_json, all_pages, page_size, wls_domai if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -997,10 +996,10 @@ def list_wls_domain_server_backups(ctx, from_json, all_pages, page_size, wls_dom if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') - if isinstance(server_id, six.string_types) and len(server_id.strip()) == 0: + if isinstance(server_id, str) and len(server_id.strip()) == 0: raise click.UsageError('Parameter --server-id cannot be whitespace or empty string') kwargs = {} @@ -1063,10 +1062,10 @@ def list_wls_domain_server_installed_patches(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') - if isinstance(server_id, six.string_types) and len(server_id.strip()) == 0: + if isinstance(server_id, str) and len(server_id.strip()) == 0: raise click.UsageError('Parameter --server-id cannot be whitespace or empty string') kwargs = {} @@ -1127,7 +1126,7 @@ def list_wls_domain_servers(ctx, from_json, all_pages, page_size, wls_domain_id, if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1257,7 +1256,7 @@ def list_wls_domains_sharing_middlewares(ctx, from_json, all_pages, page_size, w if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1314,7 +1313,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1371,7 +1370,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -1486,7 +1485,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, wor @cli_util.wrap_exceptions def restart_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, wls_domain_id, is_force_servers_shutdown, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1553,7 +1552,7 @@ def restart_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def restore_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, wls_domain_id, is_force_servers_shutdown, must_include_domains_sharing_middleware, servers_to_restore, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1621,7 +1620,7 @@ def restore_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_in @cli_util.wrap_exceptions def scan_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, managed_instance_id, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') kwargs = {} @@ -1676,7 +1675,7 @@ def scan_managed_instance(ctx, from_json, wait_for_state, max_wait_seconds, wait @cli_util.wrap_exceptions def scan_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, wls_domain_id, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1729,7 +1728,7 @@ def scan_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_inter @cli_util.wrap_exceptions def set_restart_order(ctx, from_json, wls_domain_id, servers, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1762,7 +1761,7 @@ def set_restart_order(ctx, from_json, wls_domain_id, servers, if_match): @cli_util.wrap_exceptions def start_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, wls_domain_id, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1818,7 +1817,7 @@ def start_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte @cli_util.wrap_exceptions def stop_wls_domain(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, wls_domain_id, is_force_servers_shutdown, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') kwargs = {} @@ -1898,7 +1897,7 @@ def summarize_resource_inventory(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def update_managed_instance(ctx, from_json, force, managed_instance_id, configuration, if_match): - if isinstance(managed_instance_id, six.string_types) and len(managed_instance_id.strip()) == 0: + if isinstance(managed_instance_id, str) and len(managed_instance_id.strip()) == 0: raise click.UsageError('Parameter --managed-instance-id cannot be whitespace or empty string') if not force: if configuration: @@ -1945,7 +1944,7 @@ def update_managed_instance(ctx, from_json, force, managed_instance_id, configur @cli_util.wrap_exceptions def update_wls_domain(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, wls_domain_id, configuration, defined_tags, freeform_tags, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') if not force: if configuration or defined_tags or freeform_tags: @@ -2014,10 +2013,10 @@ def update_wls_domain(ctx, from_json, force, wait_for_state, max_wait_seconds, w @cli_util.wrap_exceptions def update_wls_domain_credential(ctx, from_json, wls_domain_id, credential_type, strategy, user_secret_id, password_secret_id, if_match): - if isinstance(wls_domain_id, six.string_types) and len(wls_domain_id.strip()) == 0: + if isinstance(wls_domain_id, str) and len(wls_domain_id.strip()) == 0: raise click.UsageError('Parameter --wls-domain-id cannot be whitespace or empty string') - if isinstance(credential_type, six.string_types) and len(credential_type.strip()) == 0: + if isinstance(credential_type, str) and len(credential_type.strip()) == 0: raise click.UsageError('Parameter --credential-type cannot be whitespace or empty string') kwargs = {} diff --git a/services/wlms/src/oci_cli_weblogic_management_service_configuration/generated/weblogicmanagementserviceconfiguration_cli.py b/services/wlms/src/oci_cli_weblogic_management_service_configuration/generated/weblogicmanagementserviceconfiguration_cli.py index ac1cc36c7..47a7138c2 100644 --- a/services/wlms/src/oci_cli_weblogic_management_service_configuration/generated/weblogicmanagementserviceconfiguration_cli.py +++ b/services/wlms/src/oci_cli_weblogic_management_service_configuration/generated/weblogicmanagementserviceconfiguration_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli import cli_constants # noqa: F401 from oci_cli import cli_util diff --git a/services/work_requests/src/oci_cli_work_request/generated/workrequest_cli.py b/services/work_requests/src/oci_cli_work_request/generated/workrequest_cli.py index e9e54e173..856faf6b8 100644 --- a/services/work_requests/src/oci_cli_work_request/generated/workrequest_cli.py +++ b/services/work_requests/src/oci_cli_work_request/generated/workrequest_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -59,7 +58,7 @@ def work_request_group(): @cli_util.wrap_exceptions def get_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -89,7 +88,7 @@ def list_work_request_errors(ctx, from_json, all_pages, page_size, work_request_ if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -143,7 +142,7 @@ def list_work_request_logs(ctx, from_json, all_pages, page_size, work_request_id if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} diff --git a/services/zpr/src/oci_cli_zpr/generated/zpr_cli.py b/services/zpr/src/oci_cli_zpr/generated/zpr_cli.py index 7cf06b157..731d7d11a 100644 --- a/services/zpr/src/oci_cli_zpr/generated/zpr_cli.py +++ b/services/zpr/src/oci_cli_zpr/generated/zpr_cli.py @@ -6,7 +6,6 @@ from __future__ import print_function import click import oci # noqa: F401 -import six # noqa: F401 import sys # noqa: F401 from oci_cli.cli_root import cli from oci_cli import cli_constants # noqa: F401 @@ -229,7 +228,7 @@ def create_zpr_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_int @cli_util.wrap_exceptions def delete_zpr_policy(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, zpr_policy_id, if_match, opc_dry_run): - if isinstance(zpr_policy_id, six.string_types) and len(zpr_policy_id.strip()) == 0: + if isinstance(zpr_policy_id, str) and len(zpr_policy_id.strip()) == 0: raise click.UsageError('Parameter --zpr-policy-id cannot be whitespace or empty string') kwargs = {} @@ -302,7 +301,7 @@ def get_configuration(ctx, from_json, compartment_id): @cli_util.wrap_exceptions def get_zpr_configuration_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -324,7 +323,7 @@ def get_zpr_configuration_work_request(ctx, from_json, work_request_id): @cli_util.wrap_exceptions def get_zpr_policy(ctx, from_json, zpr_policy_id): - if isinstance(zpr_policy_id, six.string_types) and len(zpr_policy_id.strip()) == 0: + if isinstance(zpr_policy_id, str) and len(zpr_policy_id.strip()) == 0: raise click.UsageError('Parameter --zpr-policy-id cannot be whitespace or empty string') kwargs = {} @@ -346,7 +345,7 @@ def get_zpr_policy(ctx, from_json, zpr_policy_id): @cli_util.wrap_exceptions def get_zpr_policy_work_request(ctx, from_json, work_request_id): - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -377,7 +376,7 @@ def list_zpr_configuration_work_request_errors(ctx, from_json, all_pages, page_s if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -434,7 +433,7 @@ def list_zpr_configuration_work_request_logs(ctx, from_json, all_pages, page_siz if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -615,7 +614,7 @@ def list_zpr_policy_work_request_errors(ctx, from_json, all_pages, page_size, wo if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -672,7 +671,7 @@ def list_zpr_policy_work_request_logs(ctx, from_json, all_pages, page_size, work if all_pages and limit: raise click.UsageError('If you provide the --all option you cannot provide the --limit option') - if isinstance(work_request_id, six.string_types) and len(work_request_id.strip()) == 0: + if isinstance(work_request_id, str) and len(work_request_id.strip()) == 0: raise click.UsageError('Parameter --work-request-id cannot be whitespace or empty string') kwargs = {} @@ -796,7 +795,7 @@ def list_zpr_policy_work_requests(ctx, from_json, all_pages, page_size, compartm @cli_util.wrap_exceptions def update_zpr_policy(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, zpr_policy_id, description, statements, freeform_tags, defined_tags, if_match, opc_dry_run): - if isinstance(zpr_policy_id, six.string_types) and len(zpr_policy_id.strip()) == 0: + if isinstance(zpr_policy_id, str) and len(zpr_policy_id.strip()) == 0: raise click.UsageError('Parameter --zpr-policy-id cannot be whitespace or empty string') if not force: if statements or freeform_tags or defined_tags: diff --git a/setup.py b/setup.py index 688f7eb11..c9f8dabe9 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,6 @@ def open_relative(*path): 'jmespath==0.10.0', 'python-dateutil>=2.5.3,<3.0.0', 'pytz>=2016.10', - 'six>=1.15.0', 'terminaltables==3.1.10', 'pyOpenSSL>=17.5.0,<25.0.0', 'PyYAML>=5.4,<=6.0.2', diff --git a/src/oci_cli/aliasing/parameter_alias.py b/src/oci_cli/aliasing/parameter_alias.py index 52d6b819c..169580193 100644 --- a/src/oci_cli/aliasing/parameter_alias.py +++ b/src/oci_cli/aliasing/parameter_alias.py @@ -4,7 +4,6 @@ from copy import deepcopy import click -import six ALIASES = {} @@ -19,7 +18,7 @@ def get_aliases_for_long_parameter(long_param_name): def shim_in_aliases(command_group): remove_redundant_aliases() collision_errors = set() - for cmd_name, cmd_obj in six.iteritems(command_group.commands): + for cmd_name, cmd_obj in command_group.commands.items(): if isinstance(cmd_obj, click.Group): collision_errors.update(shim_in_aliases(cmd_obj)) elif isinstance(cmd_obj, click.Command): @@ -50,7 +49,7 @@ def add_alias_to_command_params(params): def does_option_name_already_exist(original_opts, param_name, aliases): - for param, opts in six.iteritems(original_opts): + for param, opts in original_opts.items(): if param == param_name: continue diff --git a/src/oci_cli/cli_root.py b/src/oci_cli/cli_root.py index 25294f4a3..c14c66f40 100644 --- a/src/oci_cli/cli_root.py +++ b/src/oci_cli/cli_root.py @@ -13,7 +13,6 @@ import os.path # noqa: E402 import logging # noqa: E402 from oci.util import Sentinel # noqa: E402 -import six # noqa: E402 import importlib # noqa: E402 import re # noqa: E402 from oci_cli.version import __version__ # noqa: E402 @@ -603,7 +602,7 @@ def is_top_level_help(ctx): return False top_level_command_tuples = [] - for cmd_name, cmd_obj in six.iteritems(ctx.command.commands): + for cmd_name, cmd_obj in ctx.command.commands.items(): if isinstance(cmd_obj, click.Group): top_level_command_tuples.append((cmd_name, cmd_obj)) diff --git a/src/oci_cli/cli_session.py b/src/oci_cli/cli_session.py index 859485976..1533218da 100644 --- a/src/oci_cli/cli_session.py +++ b/src/oci_cli/cli_session.py @@ -16,7 +16,6 @@ import oci import os from oci._vendor import requests -import six from shutil import copy, make_archive, rmtree import sys import tempfile @@ -289,7 +288,7 @@ def export(ctx, output_file, force): config[profile] = translate_config_filepaths_to_prefix(profile_to_export) config.write(export_config_file) - for key, value in six.iteritems(profile_to_export): + for key, value in profile_to_export.items(): if key.endswith((CONFIG_KEY_FILE_SUFFIX, TOKEN_FILE_SUFFIX)): copy(os.path.expanduser(value), temp_dir_name) @@ -357,7 +356,7 @@ def import_session(ctx, session_archive, force): os.makedirs(imported_resources_dir) # copy referenced files from archived config to imported_resources_dir - for key, value in six.iteritems(archived_profile): + for key, value in archived_profile.items(): if key.endswith((CONFIG_KEY_FILE_SUFFIX, TOKEN_FILE_SUFFIX)): # there is no nesting in the archive so the config will always reference the filename directly new_file_location = os.path.join(imported_resources_dir, value) @@ -384,7 +383,7 @@ def import_session(ctx, session_archive, force): def translate_config_filepaths_to_prefix(config, prefix=''): translated_config = {} - for key, value in six.iteritems(config): + for key, value in config.items(): if key.endswith((CONFIG_KEY_FILE_SUFFIX, TOKEN_FILE_SUFFIX)): basename = os.path.basename(value) translated_config[key] = os.path.join(prefix, basename) diff --git a/src/oci_cli/cli_util.py b/src/oci_cli/cli_util.py index 615df0418..ac4db8146 100644 --- a/src/oci_cli/cli_util.py +++ b/src/oci_cli/cli_util.py @@ -19,7 +19,6 @@ import os.path import pytz import re -import six import stat import subprocess import sys @@ -738,7 +737,7 @@ def render(data, headers, ctx, display_all_headers=False, nest_data_in_data_attr output_memory('total memory usage before printing: ') if ctx.obj['output'] == "json": - if ctx.obj['raw_output'] and isinstance(display_data, six.string_types): + if ctx.obj['raw_output'] and isinstance(display_data, str): print(display_data) else: start_format = timer() @@ -793,7 +792,7 @@ def render(data, headers, ctx, display_all_headers=False, nest_data_in_data_attr def print_table(data): table_data = [] - if isinstance(data, six.string_types): + if isinstance(data, str): # if data is just a raw string, hard code the column header to 'Column1' table_data.append(['Column1']) table_data.append([data]) @@ -802,7 +801,7 @@ def print_table(data): click.echo("Command returned empty list, no table to display.") return - if isinstance(data[0], six.string_types): + if isinstance(data[0], str): # handle strings so they dont get handled as a list below table_data = [["Column1"]] for row in data: @@ -860,7 +859,7 @@ def to_dict(obj): key only. """ # Shortcut strings so they don't count as Iterables - if isinstance(obj, six.string_types): + if isinstance(obj, str): return obj elif isinstance(obj, (datetime.datetime, datetime.time)): # always use UTC @@ -874,7 +873,7 @@ def to_dict(obj): # datetime.date doesn't have a timezone return obj.isoformat() elif isinstance(obj, abc.Mapping): - return {k: to_dict(v) for k, v in six.iteritems(obj)} + return {k: to_dict(v) for k, v in obj.items()} elif isinstance(obj, abc.Iterable): return [to_dict(v) for v in obj] # Not a string, datetime, dict, list, or model - return directly @@ -883,7 +882,7 @@ def to_dict(obj): # Collect attrs from obj according to swagger_types into a dict as_dict = {} - for key in six.iterkeys(obj.swagger_types): + for key in obj.swagger_types.keys(): value = getattr(obj, key, missing_attr) if value is not missing_attr: key = key.replace("_", "-") @@ -996,7 +995,7 @@ def parse_json_parameter(parameter_name, parameter_value, default=None, camelize # Can't parse something which isn't a string, so just return it as-is. We'd hit this flow if we had already # pre-parsed the data, such as when we provide the input via --from-json, since that already parses out the JSON - if not isinstance(parameter_value, six.string_types): + if not isinstance(parameter_value, str): return parameter_value # Try to load from a file first. If we couldn't (e.g. because the parameter didn't specify a file) then @@ -1041,7 +1040,7 @@ def parse_json_parameter(parameter_name, parameter_value, default=None, camelize # - parameter_name can be used to look up the type from the metadata of (complex) types against each command. This metadata is decorated via # @json_skeleton_utils.json_skeleton_generation_handler on each command def make_dict_keys_camel_case(original_obj, parameter_name=None, complex_parameter_type=None): - if isinstance(original_obj, six.string_types): + if isinstance(original_obj, str): return original_obj if not isinstance(original_obj, abc.Mapping) and not isinstance(original_obj, abc.Iterable): @@ -1068,7 +1067,7 @@ def make_dict_keys_camel_case(original_obj, parameter_name=None, complex_paramet camelize_keys = False new_dict = {} - for key, value in six.iteritems(original_obj): + for key, value in original_obj.items(): camelized_key = string_utils.camelize(key) @@ -1172,7 +1171,7 @@ def get_possible_subtype_based_on_payload(declared_type, module, payload): if hasattr(declared_type, 'get_subtype'): # get_subtype method checks the discriminator field on the input object to determine which type it is # it expects the keys to be camelized so thus we are passing in camelized_top_level_keys instead of just original_obj - camelized_top_level_keys = {string_utils.camelize(key): value for key, value in six.iteritems(payload)} + camelized_top_level_keys = {string_utils.camelize(key): value for key, value in payload.items()} subtype_name_of_input_data = declared_type.get_subtype(camelized_top_level_keys) subtype_of_input_data = getattr(getattr(getattr(oci, module), 'models'), subtype_name_of_input_data) return subtype_of_input_data() @@ -1223,7 +1222,7 @@ def collect_commands(command): if not hasattr(command, "commands"): yield command else: - for _, subcommand in six.iteritems(command.commands): + for _, subcommand in command.commands.items(): for descendent in collect_commands(subcommand): descendent.parent = subcommand yield descendent @@ -1232,7 +1231,7 @@ def collect_commands(command): def filter_object_headers(headers, whitelist): """Filter headers based on the whitelist.""" whitelist = [x.lower() for x in whitelist] - return {h.lower(): v for h, v in six.iteritems(headers) if h.lower() in whitelist} + return {h.lower(): v for h, v in headers.items() if h.lower() in whitelist} def help_callback(ctx, param, value): @@ -1304,7 +1303,7 @@ def serialize_key(private_key=None, public_key=None, passphrase=None): if private_key: if passphrase: - if isinstance(passphrase, six.string_types): + if isinstance(passphrase, str): passphrase = passphrase.encode("ascii") encryption_algorithm = serialization.BestAvailableEncryption(passphrase) else: @@ -1350,7 +1349,7 @@ def copy_params(extended_func): def load_file_contents(path): file_contents = None - if isinstance(path, six.string_types): + if isinstance(path, str): for prefix, function_spec in FILE_LOAD_PREFIX_MAP.items(): # Case insenstive prefix check if path.lower().startswith(prefix): @@ -1586,7 +1585,7 @@ def convert_value_from_param_type(value, param_type, param_takes_multiple): return value # Expansion only really makes sense for strings - if isinstance(value, six.string_types): + if isinstance(value, str): expanded_value = os.path.expandvars(value) else: expanded_value = value @@ -1617,7 +1616,7 @@ def convert_value_from_param_type_accepting_multiple(value, param_type): # Since our splitting into multiples relies on a string split, we can't do anything if it's # not a string - if not isinstance(value, six.string_types): + if not isinstance(value, str): if isinstance(value, abc.Iterable): return value else: @@ -1751,7 +1750,7 @@ def get_spec_name_from_command_name(command_name, link_replacements={}, generate if command_name not in update_list_of_command_names_to_spec_names: # first check if we override the codegen root command name to something else in cli_util GROUP_NAME_OVERRIDE_SUFFIX = '_root_group.command_name' - for key, value in six.iteritems(OVERRIDES): + for key, value in OVERRIDES.items(): if key.endswith(GROUP_NAME_OVERRIDE_SUFFIX): if value == command_name: # all command names from the codegen will have '-' instead of '_' so diff --git a/src/oci_cli/custom_types/cli_datetime.py b/src/oci_cli/custom_types/cli_datetime.py index bcd222bb5..8abf32907 100644 --- a/src/oci_cli/custom_types/cli_datetime.py +++ b/src/oci_cli/custom_types/cli_datetime.py @@ -5,7 +5,6 @@ import arrow import click import re -import six class CliDatetime(click.ParamType): @@ -305,7 +304,7 @@ def convert(self, value, param, ctx): if value is None: return None - if not isinstance(value, six.string_types): + if not isinstance(value, str): raise click.BadParameter('Value {} is not a valid datetime. {}'.format(value, self.VALID_DATETIME_EXCEPTION_MESSAGE)) if value.isdigit(): diff --git a/src/oci_cli/custom_types/object_storage_bulk_operation_output.py b/src/oci_cli/custom_types/object_storage_bulk_operation_output.py index 25e192aac..c65a86a7e 100644 --- a/src/oci_cli/custom_types/object_storage_bulk_operation_output.py +++ b/src/oci_cli/custom_types/object_storage_bulk_operation_output.py @@ -4,8 +4,6 @@ from .. import cli_util -import six - class BulkObjectStorageOperationOutput(object): def __init__(self): @@ -64,12 +62,12 @@ def get_output(self, output_format): elif output_format == 'table': consolidated_result = [] - for uploaded_object, result in six.iteritems(self._uploaded): + for uploaded_object, result in self._uploaded.items(): output_result = {'action': 'Uploaded', 'name': uploaded_object, 'type': 'file'} output_result.update(result) consolidated_result.append(output_result) - for uploaded_object, failure in six.iteritems(self._failures): + for uploaded_object, failure in self._failures.items(): consolidated_result.append({ 'action': 'Failed', 'name': uploaded_object, @@ -114,7 +112,7 @@ def get_output(self, output_format): 'type': 'object' }) - for downloaded_obj, failure in six.iteritems(self._failures): + for downloaded_obj, failure in self._failures.items(): consolidated_result.append({ 'action': 'Failed', 'name': downloaded_obj, @@ -151,7 +149,7 @@ def get_output(self, output_format, dry_run=False): elif output_format == 'table': consolidated_result = [] - for deleted_obj, failure in six.iteritems(self._failures): + for deleted_obj, failure in self._failures.items(): consolidated_result.append({ 'action': 'Failed', self._type: deleted_obj, diff --git a/src/oci_cli/formatting.py b/src/oci_cli/formatting.py index e197883ab..27d48eafa 100644 --- a/src/oci_cli/formatting.py +++ b/src/oci_cli/formatting.py @@ -2,7 +2,6 @@ # 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. -import six import terminaltables error_hints = { @@ -23,7 +22,7 @@ def render_config_errors(config_exception): # (key, code, hint) pieces = [ [param, code, error_hints.get((param, code), "")] - for (param, code) in six.iteritems(config_exception.errors) + for (param, code) in config_exception.errors.items() ] data = [headers] + pieces # TODO include config_file name? diff --git a/src/oci_cli/json_skeleton_utils.py b/src/oci_cli/json_skeleton_utils.py index 37733ff40..b49f2fe62 100644 --- a/src/oci_cli/json_skeleton_utils.py +++ b/src/oci_cli/json_skeleton_utils.py @@ -6,7 +6,6 @@ import functools import json import re -import six import sys from oci_cli import cli_util @@ -207,7 +206,7 @@ def generate_input_dict_for_skeleton(ctx, targeted_complex_param=None): # Complex parameters represent some sort of model type or at least something non-primitive like a list or a dict so # we'll represent them as a nested object inside the dict generated by this method - for attr_name, complex_param_entry in six.iteritems(input_params_to_complex_types): + for attr_name, complex_param_entry in input_params_to_complex_types.items(): tags_obj = get_example_object_for_tags(attr_name) if tags_obj: input_as_dict[camelize(attr_name)] = tags_obj @@ -362,7 +361,7 @@ def cli_json_input_callback(ctx, param, value): if ctx.default_map is None: ctx.default_map = {} - for key, val in six.iteritems(parsed_json): + for key, val in parsed_json.items(): # Even if parsed_json[key] represents a JSON object or an array of JSON objects, we will leave their keys as-is without # converting them to underscores. The reason for this is that the top-level keys correspond to named parameters we pass # to each command method and so we underscore their names to help map the key to the named parameter. diff --git a/src/oci_cli/raw_request_cli.py b/src/oci_cli/raw_request_cli.py index 3c83b6db2..74b2f7bd3 100644 --- a/src/oci_cli/raw_request_cli.py +++ b/src/oci_cli/raw_request_cli.py @@ -5,7 +5,6 @@ import click import json import oci -import six.moves from oci_cli.cli_root import cli from oci_cli import cli_util @@ -46,7 +45,7 @@ def _make_raw_request(ctx, target_uri, http_method, request_body, request_header raise click.UsageError('The table output format is not supported with this command') if ctx.obj['debug']: - six.moves.http_client.HTTPConnection.debuglevel = 1 + http.client.HTTPConnection.debuglevel = 1 jmespath_expression = cli_util.get_jmespath_expression_from_context(ctx) diff --git a/tests/test_cli_setup.py b/tests/test_cli_setup.py index f725bb1dd..aa141377f 100644 --- a/tests/test_cli_setup.py +++ b/tests/test_cli_setup.py @@ -15,7 +15,6 @@ from io import StringIO import os import os.path -import six import stat import subprocess import sys @@ -639,17 +638,6 @@ def subtest_instance_principal_setup_invalid_inputs(self): @util.log_test def subtest_autocomplete_deny_bash_rc_access(self): - if oci_cli.cli_util.is_windows() and six.PY2: - print( - """ - Skipping subtest_autocomplete_deny_bash_rc_access on Windows without Python 3 as the CliRunner click offers for testing seems to use a StringIO - to back stdout, which throws an error when sys.stdout.encoding is called since there is no encoding attribute on a StringIO. - - Running manually on Windows with and without Python 3 both work, just this case breaks. - """ - ) - return - # fully testing the command would edit the machine's bash_profile / bash_rc # this test rejects the prompt to edit the bash_profile but provides a basic smoke test for the command result = self.invoke( diff --git a/tests/test_config_container.py b/tests/test_config_container.py index 77fc5d0ff..fd9f04153 100644 --- a/tests/test_config_container.py +++ b/tests/test_config_container.py @@ -12,7 +12,6 @@ import logging import oci import os -import six import vcr from vcr.persisters.filesystem import FilesystemPersister @@ -318,7 +317,7 @@ def vcr_body_matcher(r1, r2, match_request_json_object_values=False): # optionally replaces all values with empty strings so that we can compare only keys def normalize_json_request_bodies_for_comparison(obj, replace_all_values): if isinstance(obj, dict): - processed = {k: normalize_json_request_bodies_for_comparison(v, replace_all_values) for k, v in six.iteritems(obj) if k not in KEYS_TO_IGNORE_COMPARING_REQUEST_BODIES} + processed = {k: normalize_json_request_bodies_for_comparison(v, replace_all_values) for k, v in obj.items() if k not in KEYS_TO_IGNORE_COMPARING_REQUEST_BODIES} return processed if isinstance(obj, list): return [normalize_json_request_bodies_for_comparison(x, replace_all_values) for x in obj] diff --git a/tests/test_json_skeleton_command_coverage.py b/tests/test_json_skeleton_command_coverage.py index fe38019f6..d5e2e3b91 100644 --- a/tests/test_json_skeleton_command_coverage.py +++ b/tests/test_json_skeleton_command_coverage.py @@ -6,7 +6,6 @@ import click import json import oci_cli -import six import random import vcr import os @@ -154,7 +153,7 @@ def process_json_input(input, tmpdir): modified_input.pop('all', None) for key in modified_input: # if input is a Multiple choice option, this will extract a single choice from the choice list. - if isinstance(modified_input[key], list) and len(modified_input[key]) == 1 and isinstance(modified_input[key][0], six.string_types): + if isinstance(modified_input[key], list) and len(modified_input[key]) == 1 and isinstance(modified_input[key][0], str): first_val = str(modified_input[key][0]) if "|" in first_val: modified_input[key][0] = get_choice_from_choices(first_val) @@ -182,7 +181,7 @@ def get_choice_from_choices(choices): def _traverse_oci_cli(command, path, failed_commands, ignored_extended_commands): if hasattr(command, "commands"): - for name, command in six.iteritems(command.commands): + for name, command in command.commands.items(): _traverse_oci_cli(command, path + [name], failed_commands, ignored_extended_commands) else: if path not in ignored_commands.IGNORED_COMMANDS and path not in ignored_extended_commands: @@ -214,7 +213,7 @@ def teardown_module(module): def reset_prompt_in_group(click_group): - for cmd_name, cmd in six.iteritems(click_group): + for cmd_name, cmd in click_group.items(): if isinstance(cmd, click.Group): reset_prompt_in_group(cmd.commands) else: diff --git a/tests/test_root_options.py b/tests/test_root_options.py index bf49c4796..4f766304e 100644 --- a/tests/test_root_options.py +++ b/tests/test_root_options.py @@ -5,7 +5,6 @@ import oci_cli import oci import os -import six.moves import traceback from mock import patch from oci_cli.cli_constants import OCI_CONFIG_REQUIRED_VARS as config_required_vars @@ -228,7 +227,7 @@ def test_operation_retries_if_no_retry_not_supplied(config_file): # # This teardown explicitly does this so that we don't get debug output in other tests (which can cause failures) def teardown_module(module): - six.moves.http_client.HTTPConnection.debuglevel = 0 + http.client.HTTPConnection.debuglevel = 0 def invoke_example_operation(runner, root_args, config_file, command_input=None): diff --git a/tests/util.py b/tests/util.py index 16cfe1c99..a1b995551 100644 --- a/tests/util.py +++ b/tests/util.py @@ -7,6 +7,7 @@ import collections.abc as abc import contextlib import functools +import io import json import os import random @@ -18,9 +19,7 @@ import oci import pytest -import six from oci.object_storage.transfer.constants import MEBIBYTE -from six import StringIO import oci_cli.cli_util from conftest import runner @@ -512,7 +511,7 @@ def _collect_commands(command, prefix=None, leaf_commands_only=False): if not leaf_commands_only: yield prefix, 0, 0 - for name, command in six.iteritems(subcommands): + for name, command in subcommands.items(): for path, params_count, req_params_count in \ _collect_commands(command, prefix + [name], leaf_commands_only=leaf_commands_only): yield path, params_count, req_params_count @@ -528,7 +527,7 @@ def collect_commands_with_given_args(command, include_args=[], match_mode='any', subcommands = getattr(command, "commands", {}) if subcommands: - for name, command in six.iteritems(subcommands): + for name, command in subcommands.items(): for path in collect_commands_with_given_args(command, include_args=include_args, match_mode=match_mode, prefix=prefix + [name]): yield path else: @@ -586,10 +585,10 @@ def check_json_key_format(json_data): """Ensure that all keys in the json data are in the correct format. The exceptions include metadata dictionaries and tags, which must reflect user input""" - if isinstance(json_data, six.string_types): + if isinstance(json_data, str): pass elif isinstance(json_data, abc.Mapping): - for key, value in six.iteritems(json_data): + for key, value in json_data.items(): if key not in SKIP_JSON_KEY_FORMAT_CHECK: assert "_" not in key assert key.islower() @@ -766,7 +765,7 @@ def vcr_mode_aware_sleep(duration): def capture(): oldout, olderr = sys.stdout, sys.stderr try: - out = [StringIO(), StringIO()] + out = [io.StringIO(), io.StringIO()] sys.stdout, sys.stderr = out yield out finally: