oci-cli 3.66.1__py3-none-any.whl → 3.67.0__py3-none-any.whl

services/resource_analytics/src/oci_cli_resource_analytics_instance/resource_analytics_instance_cli_extended.py

@@ -0,0 +1,40 @@
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+#
+# This software is dual-licensed to you under the Universal Permissive License
+# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+# 2.0 as shown at https://www.apache.org/licenses/LICENSE-2.0. You may choose
+# either license.
+#
+# If you elect to accept the software under the Apache License, Version 2.0,
+# the following applies:
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# coding: utf-8
+# 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.
+from services.resource_analytics.src.oci_cli_resource_analytics.generated import resource_analytics_service_cli
+from services.resource_analytics.src.oci_cli_resource_analytics_instance.generated import resourceanalyticsinstance_cli
+
+# Add list command from collection to root group
+# oci resource-analytics resource-analytics-instance list
+resourceanalyticsinstance_cli.resource_analytics_instance_group.add_command(resourceanalyticsinstance_cli.list_resource_analytics_instances)
+
+# Rearrange nested groups to be "top" level
+# oci resource-analytics resource-analytics-instance resource-analytics-instance <command>
+resourceanalyticsinstance_cli.resource_analytics_instance_root_group.commands.pop(resourceanalyticsinstance_cli.resource_analytics_instance_group.name)
+# -> oci resource-analytics resource-analytics-instance <command>
+resource_analytics_service_cli.resource_analytics_service_group.add_command(resourceanalyticsinstance_cli.resource_analytics_instance_group)
+# Re-add existing groups
+resource_analytics_service_cli.resource_analytics_service_group.add_command(resourceanalyticsinstance_cli.work_request_error_group)
+resource_analytics_service_cli.resource_analytics_service_group.add_command(resourceanalyticsinstance_cli.work_request_log_entry_group)
+resource_analytics_service_cli.resource_analytics_service_group.add_command(resourceanalyticsinstance_cli.work_request_group)

services/resource_analytics/src/oci_cli_tenancy_attachment/__init__.py

@@ -0,0 +1,4 @@
+# coding: utf-8
+# Copyright (c) 2016, 2025, 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.
+# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20241031

services/resource_analytics/src/oci_cli_tenancy_attachment/generated/__init__.py

@@ -0,0 +1,4 @@
+# coding: utf-8
+# Copyright (c) 2016, 2025, 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.
+# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20241031

services/resource_analytics/src/oci_cli_tenancy_attachment/generated/client_mappings.py

@@ -0,0 +1,14 @@
+# coding: utf-8
+# Copyright (c) 2016, 2025, 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.
+# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20241031
+
+import oci
+from oci_cli.cli_clients import CLIENT_MAP
+from oci_cli.cli_clients import MODULE_TO_TYPE_MAPPINGS
+from oci.resource_analytics import TenancyAttachmentClient
+
+MODULE_TO_TYPE_MAPPINGS["resource_analytics"] = oci.resource_analytics.models.resource_analytics_type_mapping
+if CLIENT_MAP.get("resource_analytics") is None:
+    CLIENT_MAP["resource_analytics"] = {}
+CLIENT_MAP["resource_analytics"]["tenancy_attachment"] = TenancyAttachmentClient

services/resource_analytics/src/oci_cli_tenancy_attachment/generated/tenancyattachment_cli.py

@@ -0,0 +1,298 @@
+# coding: utf-8
+# Copyright (c) 2016, 2025, 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.
+# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20241031
+
+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
+from oci_cli import json_skeleton_utils
+from oci_cli import custom_types  # noqa: F401
+from oci_cli.aliasing import CommandGroupWithAlias
+from services.resource_analytics.src.oci_cli_resource_analytics.generated import resource_analytics_service_cli
+
+
+@click.command(cli_util.override('tenancy_attachment.tenancy_attachment_root_group.command_name', 'tenancy-attachment'), cls=CommandGroupWithAlias, help=cli_util.override('tenancy_attachment.tenancy_attachment_root_group.help', """Use the Resource Analytics API to manage Resource Analytics Instances."""), short_help=cli_util.override('tenancy_attachment.tenancy_attachment_root_group.short_help', """Resource Analytics API"""))
+@cli_util.help_option_group
+def tenancy_attachment_root_group():
+    pass
+
+
+@click.command(cli_util.override('tenancy_attachment.tenancy_attachment_collection_group.command_name', 'tenancy-attachment-collection'), cls=CommandGroupWithAlias, help="""Results of a TenancyAttachment search. Contains both TenancyAttachmentSummary items and other information, such as metadata.""")
+@cli_util.help_option_group
+def tenancy_attachment_collection_group():
+    pass
+
+
+@click.command(cli_util.override('tenancy_attachment.tenancy_attachment_group.command_name', 'tenancy-attachment'), cls=CommandGroupWithAlias, help="""A TenancyAttachment is a customers' tenancy attached to a ResourceAnalyticsInstance. Attached tenancies will be included in analytics collection.
+
+To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized, talk to an administrator. If you're an administrator who needs to write policies to give users access, see [Getting Started with Policies].""")
+@cli_util.help_option_group
+def tenancy_attachment_group():
+    pass
+
+
+resource_analytics_service_cli.resource_analytics_service_group.add_command(tenancy_attachment_root_group)
+tenancy_attachment_root_group.add_command(tenancy_attachment_collection_group)
+tenancy_attachment_root_group.add_command(tenancy_attachment_group)
+
+
+@tenancy_attachment_group.command(name=cli_util.override('tenancy_attachment.create_tenancy_attachment.command_name', 'create'), help=u"""Creates a TenancyAttachment. \n[Command Reference](createTenancyAttachment)""")
+@cli_util.option('--resource-analytics-instance-id', required=True, help=u"""The [OCID] of the ResourceAnalyticsInstance associated with this TenancyAttachment.""")
+@cli_util.option('--tenancy-id', required=True, help=u"""The [OCID] of the tenancy associated with this TenancyAttachment.""")
+@cli_util.option('--description', help=u"""A description of the tenancy.""")
+@cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "IN_PROGRESS", "WAITING", "NEEDS_ATTENTION", "FAILED", "SUCCEEDED", "CANCELING", "CANCELED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""")
+@cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""")
+@cli_util.option('--wait-interval-seconds', type=click.INT, help="""Check every --wait-interval-seconds to see whether the work request has reached the state defined by --wait-for-state. Defaults to 30 seconds.""")
+@json_skeleton_utils.get_cli_json_input_option({})
+@cli_util.help_option
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'resource_analytics', 'class': 'TenancyAttachment'})
+@cli_util.wrap_exceptions
+def create_tenancy_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, resource_analytics_instance_id, tenancy_id, description):
+
+    kwargs = {}
+    kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
+
+    _details = {}
+    _details['resourceAnalyticsInstanceId'] = resource_analytics_instance_id
+    _details['tenancyId'] = tenancy_id
+
+    if description is not None:
+        _details['description'] = description
+
+    client = cli_util.build_client('resource_analytics', 'tenancy_attachment', ctx)
+    result = client.create_tenancy_attachment(
+        create_tenancy_attachment_details=_details,
+        **kwargs
+    )
+    if wait_for_state:
+
+        if hasattr(client, 'get_work_request') and callable(getattr(client, 'get_work_request')):
+            try:
+                wait_period_kwargs = {}
+                if max_wait_seconds is not None:
+                    wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
+                if wait_interval_seconds is not None:
+                    wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
+                if 'opc-work-request-id' not in result.headers:
+                    click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state')
+                    cli_util.render_response(result, ctx)
+                    return
+
+                click.echo('Action completed. Waiting until the work request has entered state: {}'.format(wait_for_state), file=sys.stderr)
+                result = oci.wait_until(client, client.get_work_request(result.headers['opc-work-request-id']), 'status', wait_for_state, **wait_period_kwargs)
+            except oci.exceptions.MaximumWaitTimeExceeded as e:
+                # If we fail, we should show an error, but we should still provide the information to the customer
+                click.echo('Failed to wait until the work request entered the specified state. Outputting last known resource state', file=sys.stderr)
+                cli_util.render_response(result, ctx)
+                sys.exit(2)
+            except Exception:
+                click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state', file=sys.stderr)
+                cli_util.render_response(result, ctx)
+                raise
+        else:
+            click.echo('Unable to wait for the work request to enter the specified state', file=sys.stderr)
+    cli_util.render_response(result, ctx)
+
+
+@tenancy_attachment_group.command(name=cli_util.override('tenancy_attachment.delete_tenancy_attachment.command_name', 'delete'), help=u"""Deletes a TenancyAttachment. \n[Command Reference](deleteTenancyAttachment)""")
+@cli_util.option('--tenancy-attachment-id', required=True, help=u"""The [OCID] of the TenancyAttachment.""")
+@cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""")
+@cli_util.confirm_delete_option
+@cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "IN_PROGRESS", "WAITING", "NEEDS_ATTENTION", "FAILED", "SUCCEEDED", "CANCELING", "CANCELED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""")
+@cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""")
+@cli_util.option('--wait-interval-seconds', type=click.INT, help="""Check every --wait-interval-seconds to see whether the work request has reached the state defined by --wait-for-state. Defaults to 30 seconds.""")
+@json_skeleton_utils.get_cli_json_input_option({})
+@cli_util.help_option
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={})
+@cli_util.wrap_exceptions
+def delete_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:
+        raise click.UsageError('Parameter --tenancy-attachment-id cannot be whitespace or empty string')
+
+    kwargs = {}
+    if if_match is not None:
+        kwargs['if_match'] = if_match
+    kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
+    client = cli_util.build_client('resource_analytics', 'tenancy_attachment', ctx)
+    result = client.delete_tenancy_attachment(
+        tenancy_attachment_id=tenancy_attachment_id,
+        **kwargs
+    )
+    if wait_for_state:
+
+        if hasattr(client, 'get_work_request') and callable(getattr(client, 'get_work_request')):
+            try:
+                wait_period_kwargs = {}
+                if max_wait_seconds is not None:
+                    wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
+                if wait_interval_seconds is not None:
+                    wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
+                if 'opc-work-request-id' not in result.headers:
+                    click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state')
+                    cli_util.render_response(result, ctx)
+                    return
+
+                click.echo('Action completed. Waiting until the work request has entered state: {}'.format(wait_for_state), file=sys.stderr)
+                result = oci.wait_until(client, client.get_work_request(result.headers['opc-work-request-id']), 'status', wait_for_state, **wait_period_kwargs)
+            except oci.exceptions.MaximumWaitTimeExceeded as e:
+                # If we fail, we should show an error, but we should still provide the information to the customer
+                click.echo('Failed to wait until the work request entered the specified state. Please retrieve the work request to find its current state', file=sys.stderr)
+                cli_util.render_response(result, ctx)
+                sys.exit(2)
+            except Exception:
+                click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state', file=sys.stderr)
+                cli_util.render_response(result, ctx)
+                raise
+        else:
+            click.echo('Unable to wait for the work request to enter the specified state', file=sys.stderr)
+    cli_util.render_response(result, ctx)
+
+
+@tenancy_attachment_group.command(name=cli_util.override('tenancy_attachment.get_tenancy_attachment.command_name', 'get'), help=u"""Gets information about a TenancyAttachment. \n[Command Reference](getTenancyAttachment)""")
+@cli_util.option('--tenancy-attachment-id', required=True, help=u"""The [OCID] of the TenancyAttachment.""")
+@json_skeleton_utils.get_cli_json_input_option({})
+@cli_util.help_option
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'resource_analytics', 'class': 'TenancyAttachment'})
+@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:
+        raise click.UsageError('Parameter --tenancy-attachment-id cannot be whitespace or empty string')
+
+    kwargs = {}
+    kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
+    client = cli_util.build_client('resource_analytics', 'tenancy_attachment', ctx)
+    result = client.get_tenancy_attachment(
+        tenancy_attachment_id=tenancy_attachment_id,
+        **kwargs
+    )
+    cli_util.render_response(result, ctx)
+
+
+@tenancy_attachment_collection_group.command(name=cli_util.override('tenancy_attachment.list_tenancy_attachments.command_name', 'list'), help=u"""Gets a list of TenancyAttachments. \n[Command Reference](listTenancyAttachments)""")
+@cli_util.option('--resource-analytics-instance-id', help=u"""The [OCID] of a ResourceAnalyticsInstance.""")
+@cli_util.option('--lifecycle-state', type=custom_types.CliCaseInsensitiveChoice(["CREATING", "UPDATING", "ACTIVE", "NEEDS_ATTENTION", "DELETING", "DELETED", "FAILED"]), help=u"""A filter to return only resources that match the given lifecycle state. The state value is case-insensitive.""")
+@cli_util.option('--id', help=u"""The [OCID] of the TenancyAttachment.""")
+@cli_util.option('--limit', type=click.INT, help=u"""For list pagination. The maximum number of results per page, or items to return in a paginated \"List\" call. For important details about how pagination works, see [List Pagination].""")
+@cli_util.option('--page', help=u"""For list pagination. The value of the opc-next-page response header from the previous \"List\" call. For important details about how pagination works, see [List Pagination].""")
+@cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either ascending (`ASC`) or descending (`DESC`).""")
+@cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["TIME_CREATED", "DESCRIPTION"]), help=u"""The field to sort by. You can provide only one sort order. Default order for `TIME_CREATED` is descending. Default order for `DESCRIPTION` is ascending.""")
+@cli_util.option('--all', 'all_pages', is_flag=True, help="""Fetches all pages of results. If you provide this option, then you cannot provide the --limit option.""")
+@cli_util.option('--page-size', type=click.INT, help="""When fetching results, the number of results to fetch per call. Only valid when used with --all or --limit, and ignored otherwise.""")
+@json_skeleton_utils.get_cli_json_input_option({})
+@cli_util.help_option
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'resource_analytics', 'class': 'TenancyAttachmentCollection'})
+@cli_util.wrap_exceptions
+def list_tenancy_attachments(ctx, from_json, all_pages, page_size, resource_analytics_instance_id, lifecycle_state, id, limit, page, sort_order, sort_by):
+
+    if all_pages and limit:
+        raise click.UsageError('If you provide the --all option you cannot provide the --limit option')
+
+    kwargs = {}
+    if resource_analytics_instance_id is not None:
+        kwargs['resource_analytics_instance_id'] = resource_analytics_instance_id
+    if lifecycle_state is not None:
+        kwargs['lifecycle_state'] = lifecycle_state
+    if id is not None:
+        kwargs['id'] = id
+    if limit is not None:
+        kwargs['limit'] = limit
+    if page is not None:
+        kwargs['page'] = page
+    if sort_order is not None:
+        kwargs['sort_order'] = sort_order
+    if sort_by is not None:
+        kwargs['sort_by'] = sort_by
+    kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
+    client = cli_util.build_client('resource_analytics', 'tenancy_attachment', ctx)
+    if all_pages:
+        if page_size:
+            kwargs['limit'] = page_size
+
+        result = cli_util.list_call_get_all_results(
+            client.list_tenancy_attachments,
+            **kwargs
+        )
+    elif limit is not None:
+        result = cli_util.list_call_get_up_to_limit(
+            client.list_tenancy_attachments,
+            limit,
+            page_size,
+            **kwargs
+        )
+    else:
+        result = client.list_tenancy_attachments(
+            **kwargs
+        )
+    cli_util.render_response(result, ctx)
+
+
+@tenancy_attachment_group.command(name=cli_util.override('tenancy_attachment.update_tenancy_attachment.command_name', 'update'), help=u"""Updates a TenancyAttachment. \n[Command Reference](updateTenancyAttachment)""")
+@cli_util.option('--tenancy-attachment-id', required=True, help=u"""The [OCID] of the TenancyAttachment.""")
+@cli_util.option('--description', required=True, help=u"""A description of the tenancy.""")
+@cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""")
+@cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "IN_PROGRESS", "WAITING", "NEEDS_ATTENTION", "FAILED", "SUCCEEDED", "CANCELING", "CANCELED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""")
+@cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""")
+@cli_util.option('--wait-interval-seconds', type=click.INT, help="""Check every --wait-interval-seconds to see whether the work request has reached the state defined by --wait-for-state. Defaults to 30 seconds.""")
+@json_skeleton_utils.get_cli_json_input_option({})
+@cli_util.help_option
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={})
+@cli_util.wrap_exceptions
+def update_tenancy_attachment(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, tenancy_attachment_id, description, if_match):
+
+    if isinstance(tenancy_attachment_id, six.string_types) and len(tenancy_attachment_id.strip()) == 0:
+        raise click.UsageError('Parameter --tenancy-attachment-id cannot be whitespace or empty string')
+
+    kwargs = {}
+    if if_match is not None:
+        kwargs['if_match'] = if_match
+    kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
+
+    _details = {}
+    _details['description'] = description
+
+    client = cli_util.build_client('resource_analytics', 'tenancy_attachment', ctx)
+    result = client.update_tenancy_attachment(
+        tenancy_attachment_id=tenancy_attachment_id,
+        update_tenancy_attachment_details=_details,
+        **kwargs
+    )
+    if wait_for_state:
+
+        if hasattr(client, 'get_work_request') and callable(getattr(client, 'get_work_request')):
+            try:
+                wait_period_kwargs = {}
+                if max_wait_seconds is not None:
+                    wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
+                if wait_interval_seconds is not None:
+                    wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
+                if 'opc-work-request-id' not in result.headers:
+                    click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state')
+                    cli_util.render_response(result, ctx)
+                    return
+
+                click.echo('Action completed. Waiting until the work request has entered state: {}'.format(wait_for_state), file=sys.stderr)
+                result = oci.wait_until(client, client.get_work_request(result.headers['opc-work-request-id']), 'status', wait_for_state, **wait_period_kwargs)
+            except oci.exceptions.MaximumWaitTimeExceeded as e:
+                # If we fail, we should show an error, but we should still provide the information to the customer
+                click.echo('Failed to wait until the work request entered the specified state. Outputting last known resource state', file=sys.stderr)
+                cli_util.render_response(result, ctx)
+                sys.exit(2)
+            except Exception:
+                click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state', file=sys.stderr)
+                cli_util.render_response(result, ctx)
+                raise
+        else:
+            click.echo('Unable to wait for the work request to enter the specified state', file=sys.stderr)
+    cli_util.render_response(result, ctx)

services/resource_analytics/src/oci_cli_tenancy_attachment/tenancy_attachment_cli_extended.py

@@ -0,0 +1,39 @@
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+#
+# This software is dual-licensed to you under the Universal Permissive License
+# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+# 2.0 as shown at https://www.apache.org/licenses/LICENSE-2.0. You may choose
+# either license.
+#
+# If you elect to accept the software under the Apache License, Version 2.0,
+# the following applies:
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# coding: utf-8
+# 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.
+from services.resource_analytics.src.oci_cli_resource_analytics.generated import resource_analytics_service_cli
+from services.resource_analytics.src.oci_cli_tenancy_attachment.generated import tenancyattachment_cli
+
+# Remove collection group
+# oci resource-analytics tenancy-attachment tenancy-attachment-collection
+tenancyattachment_cli.tenancy_attachment_root_group.commands.pop(tenancyattachment_cli.tenancy_attachment_collection_group.name)
+# Add list command from collection to root group
+# oci resource-analytics tenancy-attachment list
+tenancyattachment_cli.tenancy_attachment_group.add_command(tenancyattachment_cli.list_tenancy_attachments)
+
+# Rearrange nested groups to be "top" level
+# oci resource-analytics tenancy-attachment tenancy-attachment <command>
+tenancyattachment_cli.tenancy_attachment_root_group.commands.pop(tenancyattachment_cli.tenancy_attachment_group.name)
+# -> oci resource-analytics tenancy-attachment <command>
+resource_analytics_service_cli.resource_analytics_service_group.add_command(tenancyattachment_cli.tenancy_attachment_group)

services/resource_analytics/tests/__init__.py

@@ -0,0 +1,4 @@
+# coding: utf-8
+# Copyright (c) 2016, 2025, 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.
+# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20241031