Merge pull request #604 from oracle/release_2022-11-01

Releasing version 3.20.0

Author: lealex262

CHANGELOG.rst

@@ -6,6 +6,57 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
 
+3.20.0 - 2022-11-01
+--------------------
+
+Added
+~~~~~
+
+* Database service
+
+  * Support for Clone from backup from last available timestamp
+
+    * ``oci db autonomous-database create-from-backup-timestamp --use-latest-available-backup-time-stamp ``
+
+  * The required parameter --timestamp is now optional in the below command
+
+    * ``oci db autonomous-database create-from-backup-timestamp``
+
+  * The required parameter --display-name is now optional in the below command
+
+    * ``oci db autonomous-database-backup create``
+
+* Support for agent settings parameter for specifying third-party Qualys scanner when creating or updating a host scan recipe in the Vulnerability Scanning service
+
+  * ``oci vulnerability-scanning host scan recipe create --agent-settings ``
+  * ``oci vulnerability-scanning host scan recipe update --agent-settings ``
+
+* Support for the below commands in the Logging Analytics service
+
+  * ``oci log-analytics storage list-encryption-key-info``
+  * ``oci log-analytics storage assign-encryption-key``
+
+* Golden Gate service
+
+  * Support for Connections for Database Resources
+
+    * ``oci golden-gate connection``
+
+  * Support for the below new command
+
+    * ``oci goldengate deployment-type-collection list-deployment-types``
+
+  * Support for the parameters --assignable-connection-id, --assigned-connection-id and --supported-connection-type in the below command
+
+    * ``oci goldengate deployment list``
+
+Changed
+~~~~~~~~
+
+* [BREAKING] The command oci organizations work-request-log-entry list has been changed to oci organizations work-request-log list in the Organization service
+
+* Improved CLI error message on incorrect JSON input
+
 3.19.0 - 2022-10-25
 --------------------
 Added

requirements.txt

@@ -14,7 +14,7 @@ Jinja2==3.0.3
 jmespath==0.10.0
 ndg-httpsclient==0.4.2
 mock==2.0.0
-oci==2.86.0
+oci==2.87.0
 packaging==20.2
 pluggy==0.13.0
 py==1.10.0

services/ai_language/src/oci_cli_ai_service_language/aiservicelanguage_cli_extended.py

@@ -110,4 +110,3 @@ def language_group():
 # Add work-request error and logs messages to work-request group
 aiservicelanguage_cli.work_request_group.add_command(aiservicelanguage_cli.work_request_error_group)
 aiservicelanguage_cli.work_request_group.add_command(aiservicelanguage_cli.work_request_log_group)
-

services/database/src/oci_cli_database/generated/database_cli.py

@@ -121,4 +121,4 @@ def create_dr_plan_execution_switchover_precheck_execution_option_details_extend
         kwargs['execution_options_are_warnings_ignored'] = kwargs['warnings_ignored']
         kwargs.pop('warnings_ignored')
 
-    ctx.invoke(disasterrecovery_cli.create_dr_plan_execution_switchover_precheck_execution_option_details, **kwargs)
+    ctx.invoke(disasterrecovery_cli.create_dr_plan_execution_switchover_precheck_execution_option_details, **kwargs)

services/disaster_recovery/src/oci_cli_disaster_recovery/disasterrecovery_cli_extended.py

@@ -173,3 +173,81 @@ def update_deployment_extended(ctx, **kwargs):
 
 # oci goldengate deployment-backup cancel-deployment-backup-default-cancel-deployment-backup-details -> oci goldengate deployment-backup cancel
 cli_util.rename_command(goldengate_cli, goldengate_cli.deployment_backup_group, goldengate_cli.cancel_deployment_backup_default_cancel_deployment_backup_details, "cancel")
+
+
+# oci goldengate connection create-connection-create-golden-gate-connection-details -> oci goldengate connection create-goldengate-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.create_connection_create_golden_gate_connection_details, "create-goldengate-connection")
+
+
+# oci goldengate connection create-connection-create-kafka-connection-details -> oci goldengate connection create-kafka-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.create_connection_create_kafka_connection_details, "create-kafka-connection")
+
+
+# oci goldengate connection create-connection-create-mysql-connection-details -> oci goldengate connection create-mysql-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.create_connection_create_mysql_connection_details, "create-mysql-connection")
+
+
+# oci goldengate connection create-connection-create-oci-object-storage-connection-details -> oci goldengate connection create-object-storage-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.create_connection_create_oci_object_storage_connection_details, "create-object-storage-connection")
+
+
+# oci goldengate connection create-connection-create-oracle-connection-details -> oci goldengate connection create-oracle-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.create_connection_create_oracle_connection_details, "create-oracle-connection")
+
+
+# oci goldengate connection update-connection-update-golden-gate-connection-details -> oci goldengate connection update-goldengate-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.update_connection_update_golden_gate_connection_details, "update-goldengate-connection")
+
+
+# oci goldengate connection update-connection-update-kafka-connection-details -> oci goldengate connection update-kafka-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.update_connection_update_kafka_connection_details, "update-kafka-connection")
+
+
+# oci goldengate connection update-connection-update-mysql-connection-details -> oci goldengate connection update-mysql-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.update_connection_update_mysql_connection_details, "update-mysql-connection")
+
+
+# oci goldengate connection update-connection-update-oci-object-storage-connection-details -> oci goldengate connection update-object-storage-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.update_connection_update_oci_object_storage_connection_details, "update-object-storage-connection")
+
+
+# oci goldengate connection update-connection-update-oracle-connection-details -> oci goldengate connection update-oracle-connection
+cli_util.rename_command(goldengate_cli, goldengate_cli.connection_group, goldengate_cli.update_connection_update_oracle_connection_details, "update-oracle-connection")
+
+
+# Remove create from oci goldengate connection
+goldengate_cli.connection_group.commands.pop(goldengate_cli.create_connection.name)
+
+
+# Remove update from oci goldengate connection
+goldengate_cli.connection_group.commands.pop(goldengate_cli.update_connection.name)
+
+
+@cli_util.copy_params_from_generated_command(goldengate_cli.create_connection_create_oci_object_storage_connection_details, params_to_exclude=['region_parameterconflict'])
+@goldengate_cli.connection_group.command(name=goldengate_cli.create_connection_create_oci_object_storage_connection_details.name, help=goldengate_cli.create_connection_create_oci_object_storage_connection_details.help)
+@cli_util.option('--os-region', help=u"""The name of the region. e.g.: us-ashburn-1""")
+@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]'}}, output_type={'module': 'golden_gate', 'class': 'Connection'})
+@cli_util.wrap_exceptions
+def create_connection_create_oci_object_storage_connection_details_extended(ctx, **kwargs):
+
+    if 'os_region' in kwargs:
+        kwargs['region_parameterconflict'] = kwargs['os_region']
+        kwargs.pop('os_region')
+
+    ctx.invoke(goldengate_cli.create_connection_create_oci_object_storage_connection_details, **kwargs)
+
+
+@cli_util.copy_params_from_generated_command(goldengate_cli.update_connection_update_oci_object_storage_connection_details, params_to_exclude=['region_parameterconflict'])
+@goldengate_cli.connection_group.command(name=goldengate_cli.update_connection_update_oci_object_storage_connection_details.name, help=goldengate_cli.update_connection_update_oci_object_storage_connection_details.help)
+@cli_util.option('--os-region', help=u"""The name of the region. e.g.: us-ashburn-1""")
+@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_oci_object_storage_connection_details_extended(ctx, **kwargs):
+
+    if 'os_region' in kwargs:
+        kwargs['region_parameterconflict'] = kwargs['os_region']
+        kwargs.pop('os_region')
+
+    ctx.invoke(goldengate_cli.update_connection_update_oci_object_storage_connection_details, **kwargs)

services/golden_gate/src/oci_cli_golden_gate/generated/goldengate_cli.py

@@ -384,6 +384,65 @@ def append_lookup_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_in
     cli_util.render_response(result, ctx)
 
 
+@storage_group.command(name=cli_util.override('log_analytics.assign_encryption_key.command_name', 'assign-encryption-key'), help=u"""This API submits a work request to assign customer encryption key. \n[Command Reference](assignEncryptionKey)""")
+@cli_util.option('--namespace-name', required=True, help=u"""The Logging Analytics namespace used for the request.""")
+@cli_util.option('--key-id', required=True, help=u"""This is the key OCID for encryption key.""")
+@cli_util.option('--key-type', required=True, type=custom_types.CliCaseInsensitiveChoice(["ACTIVE_DATA", "ARCHIVAL_DATA", "ALL"]), help=u"""This is the type of data to be encrypted. It can be either active or archival.""")
+@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", "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 to see if it 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 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:
+        raise click.UsageError('Parameter --namespace-name 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['keyId'] = key_id
+    _details['keyType'] = key_type
+
+    client = cli_util.build_client('log_analytics', 'log_analytics', ctx)
+    result = client.assign_encryption_key(
+        namespace_name=namespace_name,
+        assign_encryption_key_details=_details,
+        **kwargs
+    )
+    if wait_for_state:
+
+        if hasattr(client, 'get_storage_work_request') and callable(getattr(client, 'get_storage_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
+
+                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_storage_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)
+
+
 @log_analytics_label_group.command(name=cli_util.override('log_analytics.batch_get_basic_info.command_name', 'batch-get-basic-info'), help=u"""Lists basic information about a specified set of labels in batch. \n[Command Reference](batchGetBasicInfo)""")
 @cli_util.option('--namespace-name', required=True, help=u"""The Logging Analytics namespace used for the request.""")
 @cli_util.option('--is-include-deleted', required=True, type=click.BOOL, help=u"""A flag specifying whether or not to include information on deleted labels.""")
@@ -4312,6 +4371,29 @@ def list_config_work_requests(ctx, from_json, all_pages, page_size, namespace_na
     cli_util.render_response(result, ctx)
 
 
+@storage_group.command(name=cli_util.override('log_analytics.list_encryption_key_info.command_name', 'list-encryption-key-info'), help=u"""This API returns the list of customer owned encryption key info. \n[Command Reference](listEncryptionKeyInfo)""")
+@cli_util.option('--namespace-name', required=True, help=u"""The Logging Analytics namespace used for the request.""")
+@cli_util.option('--all', 'all_pages', is_flag=True, help="""Fetches all pages of results.""")
+@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': 'log_analytics', 'class': 'EncryptionKeyInfoCollection'})
+@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:
+        raise click.UsageError('Parameter --namespace-name 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('log_analytics', 'log_analytics', ctx)
+    result = client.list_encryption_key_info(
+        namespace_name=namespace_name,
+        **kwargs
+    )
+    cli_util.render_response(result, ctx)
+
+
 @log_analytics_entity_group.command(name=cli_util.override('log_analytics.list_entity_associations.command_name', 'list-entity-associations'), help=u"""Return a list of log analytics entities associated with input source log analytics entity. \n[Command Reference](listEntityAssociations)""")
 @cli_util.option('--namespace-name', required=True, help=u"""The Logging Analytics namespace used for the request.""")
 @cli_util.option('--log-analytics-entity-id', required=True, help=u"""The log analytics entity OCID.""")
@@ -6526,7 +6608,7 @@ def list_storage_work_request_errors(ctx, from_json, all_pages, page_size, compa
 @cli_util.option('--page', help=u"""The page token representing the page at which to start retrieving results. This is usually retrieved from a previous list call.""")
 @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(["timeAccepted", "timeExpires", "timeFinished"]), help=u"""This is the query parameter of which field to sort by. Only one sort order may be provided. Default order for timeAccepted is descending. If no value is specified timeAccepted is default.""")
-@cli_util.option('--operation-type', type=custom_types.CliCaseInsensitiveChoice(["OFFBOARD_TENANCY", "PURGE_STORAGE_DATA", "RECALL_ARCHIVED_STORAGE_DATA", "RELEASE_RECALLED_STORAGE_DATA", "ARCHIVE_STORAGE_DATA", "CLEANUP_ARCHIVAL_STORAGE_DATA"]), help=u"""The is the work request type query parameter""")
+@cli_util.option('--operation-type', type=custom_types.CliCaseInsensitiveChoice(["OFFBOARD_TENANCY", "PURGE_STORAGE_DATA", "RECALL_ARCHIVED_STORAGE_DATA", "RELEASE_RECALLED_STORAGE_DATA", "ARCHIVE_STORAGE_DATA", "CLEANUP_ARCHIVAL_STORAGE_DATA", "ENCRYPT_ACTIVE_DATA", "ENCRYPT_ARCHIVAL_DATA"]), help=u"""The is the work request type query parameter""")
 @cli_util.option('--status', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "CANCELED", "FAILED", "IN_PROGRESS", "SUCCEEDED"]), help=u"""The is the work request status query parameter""")
 @cli_util.option('--time-started', type=custom_types.CLI_DATETIME, help=u"""The is the query parameter of when the processing of work request was started""" + custom_types.CLI_DATETIME.VALID_DATETIME_CLI_HELP_MESSAGE)
 @cli_util.option('--time-finished', type=custom_types.CLI_DATETIME, help=u"""The is the query parameter of when the processing of work request was finished""" + custom_types.CLI_DATETIME.VALID_DATETIME_CLI_HELP_MESSAGE)