oci-cli 3.63.0__py3-none-any.whl → 3.63.1__py3-none-any.whl

services/devops/src/oci_cli_devops/devops_cli_extended.py

@@ -1349,9 +1349,9 @@ devops_cli.repository_group.add_command(devops_cli.update_repository_settings)
 
 
 # Move commands under 'oci devops protected-branch-collection' -> 'oci devops protected-branch'
-cli_util.rename_command(devops_cli, devops_cli.protected_branch_collection_group, devops_cli.list_protected_branches, "list-protected-branches")
-devops_cli.devops_root_group.commands.pop(devops_cli.protected_branch_collection_group.name)
-devops_cli.protected_branch_group.add_command(devops_cli.list_protected_branches)
+# cli_util.rename_command(devops_cli, devops_cli.protected_branch_collection_group, devops_cli.list_protected_branches, "list-protected-branches")
+# devops_cli.devops_root_group.commands.pop(devops_cli.protected_branch_collection_group.name)
+# devops_cli.protected_branch_group.add_command(devops_cli.list_protected_branches)
 
 
 # Move commands under 'oci devops pull-request-collection' -> 'oci devops pull-request'
@@ -1522,11 +1522,11 @@ def summarize_project_repository_analytics(ctx, from_json, project_id, repositor
     cli_util.render_response(result, ctx)
 
 
-@cli_util.copy_params_from_generated_command(devops_cli.create_or_update_protected_branch, params_to_exclude=['protection_levels'])
-@devops_cli.protected_branch_group.command(name=cli_util.override('devops.create_or_update_protected_branch.command_name', 'create-or-update'), help=u"""Creates a restriction on a branch that prevents certain actions on it. \n[Command Reference](createOrUpdateProtectedBranch)""")
-@cli_util.option('--protection-levels', type=custom_types.CliCaseInsensitiveChoice(["READ_ONLY", "PULL_REQUEST_MERGE_ONLY"]), multiple=True, help=u"""Level of protection to add on a branch.""")
-@click.pass_context
-@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'devops', 'class': 'ProtectedBranch'})
-@cli_util.wrap_exceptions
-def create_or_update_protected_branch_extended(ctx, **kwargs):
-    ctx.invoke(devops_cli.create_or_update_protected_branch, **kwargs)
+# @cli_util.copy_params_from_generated_command(devops_cli.create_or_update_protected_branch, params_to_exclude=['protection_levels'])
+# @devops_cli.protected_branch_group.command(name=cli_util.override('devops.create_or_update_protected_branch.command_name', 'create-or-update'), help=u"""Creates a restriction on a branch that prevents certain actions on it. \n[Command Reference](createOrUpdateProtectedBranch)""")
+# @cli_util.option('--protection-levels', type=custom_types.CliCaseInsensitiveChoice(["READ_ONLY", "PULL_REQUEST_MERGE_ONLY"]), multiple=True, help=u"""Level of protection to add on a branch.""")
+# @click.pass_context
+# @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'devops', 'class': 'ProtectedBranch'})
+# @cli_util.wrap_exceptions
+# def create_or_update_protected_branch_extended(ctx, **kwargs):
+#     ctx.invoke(devops_cli.create_or_update_protected_branch, **kwargs)

services/golden_gate/src/oci_cli_golden_gate/golden_gate_cli_extended.py

@@ -815,3 +815,47 @@ def update_connection_update_microsoft_fabric_connection_details_extended(ctx, *
 
 # oci goldengate pipeline collect-pipeline-diagnostic -> oci goldengate pipeline collect-diagnostic
 cli_util.rename_command(goldengate_cli, goldengate_cli.pipeline_group, goldengate_cli.collect_pipeline_diagnostic, "collect-diagnostic")
+
+# oci goldengate connection create-connection-create-iceberg-connection-details -> oci goldengate connection create-iceberg-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.create_connection_create_iceberg_connection_details, "create-iceberg-connection")
+
+# oci goldengate connection update-connection-update-iceberg-connection-details -> oci goldengate connection update-iceberg-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.update_connection_update_iceberg_connection_details, "update-iceberg-connection")
+
+
+@cli_util.copy_params_from_generated_command(goldengate_cli.create_connection_create_amazon_s3_connection_details, params_to_exclude=['endpoint_parameterconflict', 'region_parameterconflict'])
+@goldengate_cli.connection_group.command(name=goldengate_cli.create_connection_create_amazon_s3_connection_details.name, help=goldengate_cli.create_connection_create_amazon_s3_connection_details.help)
+@cli_util.option('--connection-endpoint', help=u"""Optional Microsoft Fabric service endpoint. Default value: https://onelake.dfs.fabric.microsoft.com""")
+@cli_util.option('--connection-region', help=u"""The name of the region where the bucket is created.""")
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'golden_gate', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'golden_gate', 'class': 'dict(str, dict(str, object))'}, 'locks': {'module': 'golden_gate', 'class': 'list[AddResourceLockDetails]'}, 'nsg-ids': {'module': 'golden_gate', 'class': 'list[string]'}}, output_type={'module': 'golden_gate', 'class': 'Connection'})
+@cli_util.wrap_exceptions
+def create_connection_create_amazon_s3_connection_details_extended(ctx, **kwargs):
+
+    if 'connection_endpoint' in kwargs:
+        kwargs['endpoint_parameterconflict'] = kwargs['connection_endpoint']
+        kwargs.pop('connection_endpoint')
+    if 'connection_region' in kwargs:
+        kwargs['region_parameterconflict'] = kwargs['connection_region']
+        kwargs.pop('connection_region')
+
+    ctx.invoke(goldengate_cli.create_connection_create_amazon_s3_connection_details, **kwargs)
+
+
+@cli_util.copy_params_from_generated_command(goldengate_cli.update_connection_update_amazon_s3_connection_details, params_to_exclude=['endpoint_parameterconflict', 'region_parameterconflict'])
+@goldengate_cli.connection_group.command(name=goldengate_cli.update_connection_update_amazon_s3_connection_details.name, help=goldengate_cli.update_connection_update_amazon_s3_connection_details.help)
+@cli_util.option('--connection-endpoint', help=u"""Optional Microsoft Fabric service endpoint. Default value: https://onelake.dfs.fabric.microsoft.com""")
+@cli_util.option('--connection-region', help=u"""The name of the region where the bucket is created.""")
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'golden_gate', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'golden_gate', 'class': 'dict(str, dict(str, object))'}, 'nsg-ids': {'module': 'golden_gate', 'class': 'list[string]'}})
+@cli_util.wrap_exceptions
+def update_connection_update_amazon_s3_connection_details_extended(ctx, **kwargs):
+
+    if 'connection_endpoint' in kwargs:
+        kwargs['endpoint_parameterconflict'] = kwargs['connection_endpoint']
+        kwargs.pop('connection_endpoint')
+    if 'connection_region' in kwargs:
+        kwargs['region_parameterconflict'] = kwargs['connection_region']
+        kwargs.pop('connection_region')
+
+    ctx.invoke(goldengate_cli.update_connection_update_amazon_s3_connection_details, **kwargs)

services/management_dashboard/src/oci_cli_dashx_apis/generated/dashxapis_cli.py

@@ -495,17 +495,20 @@ def delete_management_saved_search(ctx, from_json, wait_for_state, max_wait_seco
 
 @management_dashboard_import_details_group.command(name=cli_util.override('management_dashboard.export_dashboard.command_name', 'export-dashboard'), help=u"""Exports an array of dashboards and their saved searches. Export is designed to work with importDashboard. Here's an example of how you can use CLI to export a dashboard: `$oci management-dashboard dashboard export --query data --export-dashboard-id \"{\\\"dashboardIds\\\":[\\\"ocid1.managementdashboard.oc1..dashboardId1\\\"]}\"  > dashboards.json` \n[Command Reference](exportDashboard)""")
 @cli_util.option('--export-dashboard-id', required=True, help=u"""List of dashboardIds in plain text. The syntax is '{\"dashboardIds\":[\"dashboardId1\", \"dashboardId2\", ...]}'. Escaping is needed when using in OCI CLI. For example, \"{\\\"dashboardIds\\\":[\\\"ocid1.managementdashboard.oc1..dashboardId1\\\"]}\" .""")
+@cli_util.option('--export-tags', help=u"""Indicates whether tags must be included when exporting dashboards and saved searches. If this attribute is set to true, then both defined and free-form tags are included in the response. The default is false and tag fields are empty objects in the response. If set to true, NotAuthorizedException is returned if you do not have the permission to access tags, even if you have the permission to access dashboards and saved searches.""")
 @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': 'management_dashboard', 'class': 'ManagementDashboardExportDetails'})
 @cli_util.wrap_exceptions
-def export_dashboard(ctx, from_json, export_dashboard_id):
+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:
         raise click.UsageError('Parameter --export-dashboard-id cannot be whitespace or empty string')
 
     kwargs = {}
+    if export_tags is not None:
+        kwargs['export_tags'] = export_tags
     kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
     client = cli_util.build_client('management_dashboard', 'dashx_apis', ctx)
     result = client.export_dashboard(
@@ -559,7 +562,7 @@ def get_management_saved_search(ctx, from_json, management_saved_search_id):
     cli_util.render_response(result, ctx)
 
 
-@management_dashboard_group.command(name=cli_util.override('management_dashboard.get_oob_management_dashboard.command_name', 'get-oob'), help=u"""Gets an OOB dashboard and its saved searches by ID.  Deleted or unauthorized saved searches are marked by tile's state property. \n[Command Reference](getOobManagementDashboard)""")
+@management_dashboard_group.command(name=cli_util.override('management_dashboard.get_oob_management_dashboard.command_name', 'get-oob'), help=u"""Gets an out-of-the-box dashboard and its saved searches by ID.  Deleted or unauthorized saved searches are marked by tile's state property. \n[Command Reference](getOobManagementDashboard)""")
 @cli_util.option('--management-dashboard-id', required=True, help=u"""A unique dashboard identifier.""")
 @json_skeleton_utils.get_cli_json_input_option({})
 @cli_util.help_option
@@ -581,7 +584,7 @@ def get_oob_management_dashboard(ctx, from_json, management_dashboard_id):
     cli_util.render_response(result, ctx)
 
 
-@management_saved_search_group.command(name=cli_util.override('management_dashboard.get_oob_management_saved_search.command_name', 'get-oob'), help=u"""Gets a saved search by ID. \n[Command Reference](getOobManagementSavedSearch)""")
+@management_saved_search_group.command(name=cli_util.override('management_dashboard.get_oob_management_saved_search.command_name', 'get-oob'), help=u"""Gets an out-of-the-box saved search by ID. \n[Command Reference](getOobManagementSavedSearch)""")
 @cli_util.option('--management-saved-search-id', required=True, help=u"""A unique saved search identifier.""")
 @json_skeleton_utils.get_cli_json_input_option({})
 @cli_util.help_option
@@ -608,16 +611,25 @@ def get_oob_management_saved_search(ctx, from_json, management_saved_search_id):
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{\"bar-key\": \"value\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--defined-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""")
+@cli_util.option('--override-same-name', help=u"""By default, if a resource with the same OCID exists in the target compartment, it is updated during the import process, otherwise, a new resource is created. However, if this attribute is set to true, then during the import process if a resource with the same displayName exists in the compartment, then it is updated even if the OCIDs are different. This is useful when importing the same resource multiple times. If the compartment and displayName remain the same, the resource is only updated and multiple copies of a resource are not created.""")
+@cli_util.option('--override-dashboard-compartment-ocid', help=u"""If this attribute is set, the dashboard resources are created or updated in the compartment specified by OCID. If this attribute is not set, the compartment specified in the JSON metadata is used.""")
+@cli_util.option('--override-saved-search-compartment-ocid', help=u"""If this attribute is set, the saved search resources are created or updated in the compartment specified by OCID. If this attribute is not set, the compartment specified in the JSON metadata is used.""")
 @json_skeleton_utils.get_cli_json_input_option({'dashboards': {'module': 'management_dashboard', 'class': 'list[ManagementDashboardForImportExportDetails]'}, 'freeform-tags': {'module': 'management_dashboard', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'management_dashboard', 'class': 'dict(str, dict(str, object))'}})
 @cli_util.help_option
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'dashboards': {'module': 'management_dashboard', 'class': 'list[ManagementDashboardForImportExportDetails]'}, 'freeform-tags': {'module': 'management_dashboard', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'management_dashboard', 'class': 'dict(str, dict(str, object))'}})
 @cli_util.wrap_exceptions
-def import_dashboard(ctx, from_json, dashboards, freeform_tags, defined_tags, if_match):
+def import_dashboard(ctx, from_json, dashboards, freeform_tags, defined_tags, if_match, override_same_name, override_dashboard_compartment_ocid, override_saved_search_compartment_ocid):
 
     kwargs = {}
     if if_match is not None:
         kwargs['if_match'] = if_match
+    if override_same_name is not None:
+        kwargs['override_same_name'] = override_same_name
+    if override_dashboard_compartment_ocid is not None:
+        kwargs['override_dashboard_compartment_ocid'] = override_dashboard_compartment_ocid
+    if override_saved_search_compartment_ocid is not None:
+        kwargs['override_saved_search_compartment_ocid'] = override_saved_search_compartment_ocid
     kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
 
     _details = {}
@@ -751,7 +763,7 @@ def list_management_saved_searches(ctx, from_json, all_pages, page_size, compart
     cli_util.render_response(result, ctx)
 
 
-@management_dashboard_group.command(name=cli_util.override('management_dashboard.list_oob_management_dashboards.command_name', 'list-oob'), help=u"""Gets the list of OOB dashboards with pagination.  Returned properties are the summary. \n[Command Reference](listOobManagementDashboards)""")
+@management_dashboard_group.command(name=cli_util.override('management_dashboard.list_oob_management_dashboards.command_name', 'list-oob'), help=u"""Gets the list of out-of-the-box dashboards with pagination. Returned properties are the summary. \n[Command Reference](listOobManagementDashboards)""")
 @cli_util.option('--compartment-id', required=True, help=u"""The ID of the compartment in which to list resources.""")
 @cli_util.option('--display-name', help=u"""A filter to return only resources that match the entire display name given.""")
 @cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return.""")
@@ -808,7 +820,7 @@ def list_oob_management_dashboards(ctx, from_json, all_pages, page_size, compart
     cli_util.render_response(result, ctx)
 
 
-@management_saved_search_group.command(name=cli_util.override('management_dashboard.list_oob_management_saved_searches.command_name', 'list-oob'), help=u"""Gets the list of out-of-box saved searches in a compartment with pagination.  Returned properties are the summary. \n[Command Reference](listOobManagementSavedSearches)""")
+@management_saved_search_group.command(name=cli_util.override('management_dashboard.list_oob_management_saved_searches.command_name', 'list-oob'), help=u"""Gets the list of out-of-the-box saved searches in a compartment with pagination.  Returned properties are the summary. \n[Command Reference](listOobManagementSavedSearches)""")
 @cli_util.option('--compartment-id', required=True, help=u"""The ID of the compartment in which to list resources.""")
 @cli_util.option('--display-name', help=u"""A filter to return only resources that match the entire display name given.""")
 @cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return.""")

services/psql/src/oci_cli_postgresql/generated/postgresql_cli.py

@@ -413,9 +413,11 @@ def create_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva
 @cli_util.option('--display-name', required=True, help=u"""A user-friendly display name for the configuration. Avoid entering confidential information.""")
 @cli_util.option('--compartment-id', required=True, help=u"""The [OCID] of the compartment that contains the configuration.""")
 @cli_util.option('--db-version', required=True, help=u"""Version of the PostgreSQL database.""")
-@cli_util.option('--shape', required=True, help=u"""The name of the shape for the configuration. Example: `VM.Standard.E4.Flex`""")
 @cli_util.option('--db-configuration-overrides', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--description', help=u"""Details about the configuration set.""")
+@cli_util.option('--shape', help=u"""The name of the shape for the configuration.
+
+For multi-shape enabled configurations, it is set to PostgreSQL.X86 or similar. Please use compatibleShapes property to set the list of supported shapes.""")
 @cli_util.option('--is-flexible', type=click.BOOL, help=u"""Whether the configuration supports flexible shapes.""")
 @cli_util.option('--instance-ocpu-count', type=click.INT, help=u"""CPU core count.
 
@@ -423,18 +425,19 @@ Skip or set it's value to 0 if configuration is for a flexible shape.""")
 @cli_util.option('--instance-memory-size-in-gbs', type=click.INT, help=u"""Memory size in gigabytes with 1GB increment.
 
 Skip or set it's value to 0 if configuration is for a flexible shape.""")
+@cli_util.option('--compatible-shapes', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Indicates the collection of compatible shapes for this configuration.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{\"bar-key\": \"value\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--defined-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--system-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""System tags for this resource. Each key is predefined and scoped to a namespace. Example: `{\"orcl-cloud\": {\"free-tier-retained\": \"true\"}}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETING", "DELETED", "FAILED"]), multiple=True, help="""This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle 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 resource to reach the lifecycle 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 resource has reached the lifecycle state defined by --wait-for-state. Defaults to 30 seconds.""")
-@json_skeleton_utils.get_cli_json_input_option({'db-configuration-overrides': {'module': 'psql', 'class': 'DbConfigurationOverrideCollection'}, 'freeform-tags': {'module': 'psql', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}, 'system-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}})
+@json_skeleton_utils.get_cli_json_input_option({'compatible-shapes': {'module': 'psql', 'class': 'list[string]'}, 'db-configuration-overrides': {'module': 'psql', 'class': 'DbConfigurationOverrideCollection'}, 'freeform-tags': {'module': 'psql', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}, 'system-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}})
 @cli_util.help_option
 @click.pass_context
-@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'db-configuration-overrides': {'module': 'psql', 'class': 'DbConfigurationOverrideCollection'}, 'freeform-tags': {'module': 'psql', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}, 'system-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'psql', 'class': 'Configuration'})
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'compatible-shapes': {'module': 'psql', 'class': 'list[string]'}, 'db-configuration-overrides': {'module': 'psql', 'class': 'DbConfigurationOverrideCollection'}, 'freeform-tags': {'module': 'psql', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}, 'system-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'psql', 'class': 'Configuration'})
 @cli_util.wrap_exceptions
-def create_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, display_name, compartment_id, db_version, shape, db_configuration_overrides, description, is_flexible, instance_ocpu_count, instance_memory_size_in_gbs, freeform_tags, defined_tags, system_tags):
+def create_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, display_name, compartment_id, db_version, db_configuration_overrides, description, shape, is_flexible, instance_ocpu_count, instance_memory_size_in_gbs, compatible_shapes, freeform_tags, defined_tags, system_tags):
 
     kwargs = {}
     kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
@@ -443,12 +446,14 @@ def create_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_
     _details['displayName'] = display_name
     _details['compartmentId'] = compartment_id
     _details['dbVersion'] = db_version
-    _details['shape'] = shape
     _details['dbConfigurationOverrides'] = cli_util.parse_json_parameter("db_configuration_overrides", db_configuration_overrides)
 
     if description is not None:
         _details['description'] = description
 
+    if shape is not None:
+        _details['shape'] = shape
+
     if is_flexible is not None:
         _details['isFlexible'] = is_flexible
 
@@ -458,6 +463,9 @@ def create_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_
     if instance_memory_size_in_gbs is not None:
         _details['instanceMemorySizeInGBs'] = instance_memory_size_in_gbs
 
+    if compatible_shapes is not None:
+        _details['compatibleShapes'] = cli_util.parse_json_parameter("compatible_shapes", compatible_shapes)
+
     if freeform_tags is not None:
         _details['freeformTags'] = cli_util.parse_json_parameter("freeform_tags", freeform_tags)
 
@@ -1434,8 +1442,10 @@ def list_backups(ctx, from_json, all_pages, page_size, compartment_id, time_star
 @cli_util.option('--config-type', type=custom_types.CliCaseInsensitiveChoice(["DEFAULT", "CUSTOM", "COPIED"]), help=u"""A filter to return only resources if their `configType` matches the given `configType`.""")
 @cli_util.option('--display-name', help=u"""A filter to return only resources that match the entire display name given.""")
 @cli_util.option('--db-version', help=u"""Version of the PostgreSQL database, such as 14.9.""")
-@cli_util.option('--shape', help=u"""The name of the shape for the configuration. Example: `VM.Standard.E4.Flex`""")
+@cli_util.option('--shape', help=u"""The compute name of the shape for the configuration.""")
 @cli_util.option('--configuration-id', help=u"""A unique identifier for the configuration.""")
+@cli_util.option('--instance-ocpu-count', type=click.INT, help=u"""The instance ocpu count for the configuration.""")
+@cli_util.option('--instance-memory-size-in-gbs', type=click.INT, help=u"""The instance memory size in GBs for the configuration.""")
 @cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return.""")
 @cli_util.option('--page', help=u"""A token representing the position at which to start retrieving results. This must come from the `opc-next-page` header field of a previous response.""")
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either 'ASC' or 'DESC'.""")
@@ -1447,7 +1457,7 @@ def list_backups(ctx, from_json, all_pages, page_size, compartment_id, time_star
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'psql', 'class': 'ConfigurationCollection'})
 @cli_util.wrap_exceptions
-def list_configurations(ctx, from_json, all_pages, page_size, compartment_id, lifecycle_state, config_type, display_name, db_version, shape, configuration_id, limit, page, sort_order, sort_by):
+def list_configurations(ctx, from_json, all_pages, page_size, compartment_id, lifecycle_state, config_type, display_name, db_version, shape, configuration_id, instance_ocpu_count, instance_memory_size_in_gbs, 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')
@@ -1467,6 +1477,10 @@ def list_configurations(ctx, from_json, all_pages, page_size, compartment_id, li
         kwargs['shape'] = shape
     if configuration_id is not None:
         kwargs['configuration_id'] = configuration_id
+    if instance_ocpu_count is not None:
+        kwargs['instance_ocpu_count'] = instance_ocpu_count
+    if instance_memory_size_in_gbs is not None:
+        kwargs['instance_memory_size_in_gbs'] = instance_memory_size_in_gbs
     if limit is not None:
         kwargs['limit'] = limit
     if page is not None:
@@ -1565,7 +1579,9 @@ def list_db_systems(ctx, from_json, all_pages, page_size, compartment_id, lifecy
 @cli_util.option('--lifecycle-state', type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETING", "DELETED", "FAILED"]), help=u"""A filter to return only resources if their `lifecycleState` matches the given `lifecycleState`.""")
 @cli_util.option('--display-name', help=u"""A filter to return only resources that match the entire display name given.""")
 @cli_util.option('--db-version', help=u"""Version of the PostgreSQL database, such as 14.9.""")
-@cli_util.option('--shape', help=u"""The name of the shape for the configuration. Example: `VM.Standard.E4.Flex`""")
+@cli_util.option('--shape', help=u"""The compute name of the shape for the configuration.""")
+@cli_util.option('--instance-ocpu-count', type=click.INT, help=u"""The instance ocpu count for the configuration.""")
+@cli_util.option('--instance-memory-size-in-gbs', type=click.INT, help=u"""The instance memory size in GBs for the configuration.""")
 @cli_util.option('--configuration-id', help=u"""A unique identifier for the configuration.""")
 @cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return.""")
 @cli_util.option('--page', help=u"""A token representing the position at which to start retrieving results. This must come from the `opc-next-page` header field of a previous response.""")
@@ -1578,7 +1594,7 @@ def list_db_systems(ctx, from_json, all_pages, page_size, compartment_id, lifecy
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'psql', 'class': 'DefaultConfigurationCollection'})
 @cli_util.wrap_exceptions
-def list_default_configurations(ctx, from_json, all_pages, page_size, lifecycle_state, display_name, db_version, shape, configuration_id, limit, page, sort_order, sort_by):
+def list_default_configurations(ctx, from_json, all_pages, page_size, lifecycle_state, display_name, db_version, shape, instance_ocpu_count, instance_memory_size_in_gbs, configuration_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')
@@ -1592,6 +1608,10 @@ def list_default_configurations(ctx, from_json, all_pages, page_size, lifecycle_
         kwargs['db_version'] = db_version
     if shape is not None:
         kwargs['shape'] = shape
+    if instance_ocpu_count is not None:
+        kwargs['instance_ocpu_count'] = instance_ocpu_count
+    if instance_memory_size_in_gbs is not None:
+        kwargs['instance_memory_size_in_gbs'] = instance_memory_size_in_gbs
     if configuration_id is not None:
         kwargs['configuration_id'] = configuration_id
     if limit is not None:
@@ -2328,23 +2348,24 @@ def update_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_
 @cli_util.option('--description', help=u"""Details about the configuration set.""")
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{\"bar-key\": \"value\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--defined-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
+@cli_util.option('--compatible-shapes', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Indicates the collection of compatible shapes for this configuration.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""")
 @cli_util.option('--force', help="""Perform update without prompting for confirmation.""", is_flag=True)
 @cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETING", "DELETED", "FAILED"]), multiple=True, help="""This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle 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 resource to reach the lifecycle 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 resource has reached the lifecycle state defined by --wait-for-state. Defaults to 30 seconds.""")
-@json_skeleton_utils.get_cli_json_input_option({'freeform-tags': {'module': 'psql', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}})
+@json_skeleton_utils.get_cli_json_input_option({'freeform-tags': {'module': 'psql', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}, 'compatible-shapes': {'module': 'psql', 'class': 'list[string]'}})
 @cli_util.help_option
 @click.pass_context
-@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'psql', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'psql', 'class': 'Configuration'})
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'psql', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'psql', 'class': 'dict(str, dict(str, object))'}, 'compatible-shapes': {'module': 'psql', 'class': 'list[string]'}}, output_type={'module': 'psql', 'class': 'Configuration'})
 @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, if_match):
+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:
         raise click.UsageError('Parameter --configuration-id cannot be whitespace or empty string')
     if not force:
-        if freeform_tags or defined_tags:
-            if not click.confirm("WARNING: Updates to freeform-tags and defined-tags will replace any existing values. Are you sure you want to continue?"):
+        if freeform_tags or defined_tags or compatible_shapes:
+            if not click.confirm("WARNING: Updates to freeform-tags and defined-tags and compatible-shapes will replace any existing values. Are you sure you want to continue?"):
                 ctx.abort()
 
     kwargs = {}
@@ -2366,6 +2387,9 @@ def update_configuration(ctx, from_json, force, wait_for_state, max_wait_seconds
     if defined_tags is not None:
         _details['definedTags'] = cli_util.parse_json_parameter("defined_tags", defined_tags)
 
+    if compatible_shapes is not None:
+        _details['compatibleShapes'] = cli_util.parse_json_parameter("compatible_shapes", compatible_shapes)
+
     client = cli_util.build_client('psql', 'postgresql', ctx)
     result = client.update_configuration(
         configuration_id=configuration_id,