Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package oci-cli for openSUSE:Factory checked
in at 2024-07-22 17:15:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/oci-cli (Old)
and /work/SRC/openSUSE:Factory/.oci-cli.new.17339 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oci-cli"
Mon Jul 22 17:15:20 2024 rev:67 rq:1188556 version:3.44.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/oci-cli/oci-cli.changes 2024-07-09
20:06:27.174081616 +0200
+++ /work/SRC/openSUSE:Factory/.oci-cli.new.17339/oci-cli.changes
2024-07-22 17:15:34.171433583 +0200
@@ -1,0 +2,13 @@
+Wed Jul 17 13:27:41 UTC 2024 - John Paul Adrian Glaubitz
<adrian.glaub...@suse.com>
+
+- Update to version 3.44.2
+ * Database Service
+ * Support for create new DB with OKV
+ * ``oci db database create --key-store-id``
+ * Support for confirm key store details are correct
+ * ``oci db key-store confirm-key-store-details-are-correct
--key-store-id``
+- Refresh patches for new version
+ * oc_relax-python-depends.patch
+- Update BuildRequires and Requires from setup.py
+
+-------------------------------------------------------------------
Old:
----
oci-cli-3.44.1.tar.gz
New:
----
oci-cli-3.44.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ oci-cli.spec ++++++
--- /var/tmp/diff_new_pack.599pIf/_old 2024-07-22 17:15:36.019507897 +0200
+++ /var/tmp/diff_new_pack.599pIf/_new 2024-07-22 17:15:36.023508058 +0200
@@ -36,7 +36,7 @@
%global _sitelibdir %{%{pythons}_sitelib}
Name: oci-cli%{psuffix}
-Version: 3.44.1
+Version: 3.44.2
Release: 0
Summary: Oracle Cloud Infrastructure CLI
License: Apache-2.0
@@ -52,7 +52,7 @@
BuildRequires: %{pythons}-cryptography >= 3.2.1
BuildRequires: %{pythons}-devel
BuildRequires: %{pythons}-jmespath >= 0.10.0
-BuildRequires: %{pythons}-oci-sdk >= 2.129.1
+BuildRequires: %{pythons}-oci-sdk >= 2.129.2
BuildRequires: %{pythons}-pip
BuildRequires: %{pythons}-pyOpenSSL >= 22.1.0
BuildRequires: %{pythons}-python-dateutil >= 2.5.3
@@ -95,7 +95,7 @@
Requires: %{pythons}-click >= 8.0.4
Requires: %{pythons}-cryptography >= 3.2.1
Requires: %{pythons}-jmespath >= 0.10.0
-Requires: %{pythons}-oci-sdk >= 2.129.1
+Requires: %{pythons}-oci-sdk >= 2.129.2
Requires: %{pythons}-prompt_toolkit >= 3.0.38
Requires: %{pythons}-pyOpenSSL >= 22.1.0
Requires: %{pythons}-python-dateutil >= 2.5.3
++++++ oc_relax-python-depends.patch ++++++
--- /var/tmp/diff_new_pack.599pIf/_old 2024-07-22 17:15:36.047509023 +0200
+++ /var/tmp/diff_new_pack.599pIf/_new 2024-07-22 17:15:36.051509184 +0200
@@ -1,6 +1,6 @@
-diff -Nru oci-cli-3.44.1.orig/requirements.txt oci-cli-3.44.1/requirements.txt
---- oci-cli-3.44.1.orig/requirements.txt 2024-07-02 15:35:28.000000000
+0200
-+++ oci-cli-3.44.1/requirements.txt 2024-07-09 08:39:24.754099775 +0200
+diff -Nru oci-cli-3.44.2.orig/requirements.txt oci-cli-3.44.2/requirements.txt
+--- oci-cli-3.44.2.orig/requirements.txt 2024-07-09 10:10:47.000000000
+0200
++++ oci-cli-3.44.2/requirements.txt 2024-07-17 15:27:22.316700780 +0200
@@ -2,48 +2,48 @@
#
(https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format),
# you may need to use the --extra-index-url option instead.
@@ -18,7 +18,7 @@
-jmespath==0.10.0
-ndg-httpsclient==0.4.2
-mock==2.0.0
--oci==2.129.1
+-oci==2.129.2
-packaging==20.2
-pluggy==0.13.0
-py==1.11.0
@@ -38,7 +38,7 @@
+jmespath>=0.10.0
+ndg-httpsclient>=0.4.2
+mock>=2.0.0
-+oci>=2.129.1
++oci>=2.129.2
+packaging>=20.2
+pluggy>=0.13.0
+py>=1.11.0
@@ -86,15 +86,15 @@
+setuptools>=59.6.0; python_version == '3.6'
# this is required because of python 3.6 requests dependency version bound
urllib3<=1.26.15
-diff -Nru oci-cli-3.44.1.orig/setup.py oci-cli-3.44.1/setup.py
---- oci-cli-3.44.1.orig/setup.py 2024-07-02 15:35:28.000000000 +0200
-+++ oci-cli-3.44.1/setup.py 2024-07-09 08:37:55.513854169 +0200
-@@ -30,20 +30,20 @@
+diff -Nru oci-cli-3.44.2.orig/setup.py oci-cli-3.44.2/setup.py
+--- oci-cli-3.44.2.orig/setup.py 2024-07-09 10:10:47.000000000 +0200
++++ oci-cli-3.44.2/setup.py 2024-07-17 15:24:28.993043047 +0200
+@@ -30,18 +30,18 @@
readme = f.read()
requires = [
-- 'oci==2.129.1',
-+ 'oci>=2.129.1',
+- 'oci==2.129.2',
++ 'oci>=2.129.2',
'arrow>=1.0.0',
'certifi',
- 'click==8.0.4',
@@ -114,9 +114,6 @@
+ 'pyOpenSSL>=17.5.0',
+ 'PyYAML>=5.4',
'prompt-toolkit>=3.0.38,<=3.0.43; python_version > "3.6"',
-- 'prompt-toolkit==3.0.29; python_version == "3.6"'
-+ 'prompt-toolkit>=3.0.29; python_version == "3.6"'
+ 'prompt-toolkit==3.0.29; python_version == "3.6"'
]
-
- extras = {
++++++ oci-cli-3.44.1.tar.gz -> oci-cli-3.44.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oci-cli-3.44.1/CHANGELOG.rst
new/oci-cli-3.44.2/CHANGELOG.rst
--- old/oci-cli-3.44.1/CHANGELOG.rst 2024-07-02 15:35:28.000000000 +0200
+++ new/oci-cli-3.44.2/CHANGELOG.rst 2024-07-09 10:10:47.000000000 +0200
@@ -6,6 +6,20 @@
The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
+3.44.2 - 2024-07-09
+-------------------
+Added
+~~~~~
+* Database Service
+
+ * Support for create new DB with OKV
+
+ * ``oci db database create --key-store-id``
+
+ * Support for confirm key store details are correct
+
+ * ``oci db key-store confirm-key-store-details-are-correct --key-store-id``
+
3.44.1 - 2024-07-02
-------------------
Added
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oci-cli-3.44.1/requirements.txt
new/oci-cli-3.44.2/requirements.txt
--- old/oci-cli-3.44.1/requirements.txt 2024-07-02 15:35:28.000000000 +0200
+++ new/oci-cli-3.44.2/requirements.txt 2024-07-09 10:10:47.000000000 +0200
@@ -14,7 +14,7 @@
jmespath==0.10.0
ndg-httpsclient==0.4.2
mock==2.0.0
-oci==2.129.1
+oci==2.129.2
packaging==20.2
pluggy==0.13.0
py==1.11.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oci-cli-3.44.1/services/database/src/oci_cli_database/generated/database_cli.py
new/oci-cli-3.44.2/services/database/src/oci_cli_database/generated/database_cli.py
---
old/oci-cli-3.44.1/services/database/src/oci_cli_database/generated/database_cli.py
2024-07-02 15:35:28.000000000 +0200
+++
new/oci-cli-3.44.2/services/database/src/oci_cli_database/generated/database_cli.py
2024-07-09 10:10:47.000000000 +0200
@@ -2785,6 +2785,69 @@
cli_util.render_response(result, ctx)
+@key_store_group.command(name=cli_util.override('db.confirm_key_store_details_are_correct.command_name',
'confirm-key-store-details-are-correct'), help=u"""This is for user to confirm
to DBaaS that the Oracle Key Valut (OKV) connection IPs, username and password
are all correct. This operation will put the Key Store back into Active state.
If details are incorrect, your OKV account may get locked after some
unsuccessful attempts to connect. \n[Command
Reference](confirmKeyStoreDetailsAreCorrect)""")
+@cli_util.option('--key-store-id', required=True, help=u"""The [OCID] of the
key store.""")
+@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"]), 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 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:
+ raise click.UsageError('Parameter --key-store-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('database', 'database', ctx)
+ result = client.confirm_key_store_details_are_correct(
+ key_store_id=key_store_id,
+ **kwargs
+ )
+ work_request_client = cli_util.build_client('work_requests',
'work_request', ctx)
+ if wait_for_state:
+
+ if hasattr(work_request_client, 'get_work_request') and
callable(getattr(work_request_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(work_request_client,
work_request_client.get_work_request(result.headers['opc-work-request-id']),
'status', wait_for_state, **wait_period_kwargs)
+ if hasattr(result, "data") and hasattr(result.data,
"resources") and len(result.data.resources) == 1:
+ entity_type = result.data.resources[0].entity_type
+ identifier = result.data.resources[0].identifier
+ get_operation = 'get_' + entity_type
+ if hasattr(client, get_operation) and
callable(getattr(client, get_operation)):
+ result = getattr(client, get_operation)(identifier)
+
+ 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)
+
+
@database_group.command(name=cli_util.override('db.convert_to_pdb.command_name',
'convert-to-pdb'), help=u"""Converts a non-container database to a pluggable
database. \n[Command Reference](convertToPdb)""")
@cli_util.option('--database-id', required=True, help=u"""The database
[OCID].""")
@cli_util.option('--action', required=True,
type=custom_types.CliCaseInsensitiveChoice(["PRECHECK", "CONVERT", "SYNC",
"SYNC_ROLLBACK"]), help=u"""The operations used to convert a non-container
database to a pluggable database. - Use `PRECHECK` to run a pre-check operation
on non-container database prior to converting it into a pluggable database. -
Use `CONVERT` to convert a non-container database into a pluggable database. -
Use `SYNC` if the non-container database was manually converted into a
pluggable database using the dbcli command-line utility. Databases may need to
be converted manually if the CONVERT action fails when converting a
non-container database using the API. - Use `SYNC_ROLLBACK` if the conversion
of a non-container database into a pluggable database was manually rolled back
using the dbcli command line utility. Conversions may need to be manually
rolled back if the CONVERT action fails when converting a non-container
database using the API.""")
@@ -9143,7 +9206,7 @@
Example: `{\"Department\": \"Finance\"}`""" +
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. For more information, see [Resource Tags].""" +
custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
-@cli_util.option('--wait-for-state',
type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETED"]),
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('--wait-for-state',
type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETED",
"NEEDS_ATTENTION"]), 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({'type-details': {'module':
'database', 'class': 'KeyStoreTypeDetails'}, 'freeform-tags': {'module':
'database', 'class': 'dict(str, string)'}, 'defined-tags': {'module':
'database', 'class': 'dict(str, dict(str, object))'}})
@@ -9209,7 +9272,7 @@
Example: `{\"Department\": \"Finance\"}`""" +
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. For more information, see [Resource Tags].""" +
custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
-@cli_util.option('--wait-for-state',
type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETED"]),
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('--wait-for-state',
type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETED",
"NEEDS_ATTENTION"]), 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':
'database', 'class': 'dict(str, string)'}, 'defined-tags': {'module':
'database', 'class': 'dict(str, dict(str, object))'},
'type-details-connection-ips': {'module': 'database', 'class': 'list[string]'}})
@@ -11338,7 +11401,7 @@
@cli_util.option('--key-store-id', required=True, help=u"""The [OCID] of the
key store.""")
@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(["ACTIVE", "DELETED"]),
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('--wait-for-state',
type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETED",
"NEEDS_ATTENTION"]), 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({})
@@ -25932,7 +25995,7 @@
@cli_util.option('--defined-tags', type=custom_types.CLI_COMPLEX_TYPE,
help=u"""Defined tags for this resource. Each key is predefined and scoped to a
namespace. For more information, see [Resource Tags].""" +
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", "DELETED"]),
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('--wait-for-state',
type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETED",
"NEEDS_ATTENTION"]), 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({'type-details': {'module':
'database', 'class': 'KeyStoreTypeDetails'}, 'freeform-tags': {'module':
'database', 'class': 'dict(str, string)'}, 'defined-tags': {'module':
'database', 'class': 'dict(str, dict(str, object))'}})
@@ -26009,7 +26072,7 @@
@cli_util.option('--defined-tags', type=custom_types.CLI_COMPLEX_TYPE,
help=u"""Defined tags for this resource. Each key is predefined and scoped to a
namespace. For more information, see [Resource Tags].""" +
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", "DELETED"]),
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('--wait-for-state',
type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "DELETED",
"NEEDS_ATTENTION"]), 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':
'database', 'class': 'dict(str, string)'}, 'defined-tags': {'module':
'database', 'class': 'dict(str, dict(str, object))'},
'type-details-connection-ips': {'module': 'database', 'class': 'list[string]'}})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oci-cli-3.44.1/services/database/tests/util/generated/command_to_api.py
new/oci-cli-3.44.2/services/database/tests/util/generated/command_to_api.py
--- old/oci-cli-3.44.1/services/database/tests/util/generated/command_to_api.py
2024-07-02 15:35:28.000000000 +0200
+++ new/oci-cli-3.44.2/services/database/tests/util/generated/command_to_api.py
2024-07-09 10:10:47.000000000 +0200
@@ -36,6 +36,7 @@
"db.complete_external_backup_job":
"oci.database.DatabaseClient.complete_external_backup_job",
"db.configure_autonomous_database_vault_key":
"oci.database.DatabaseClient.configure_autonomous_database_vault_key",
"db.configure_saas_admin_user":
"oci.database.DatabaseClient.configure_saas_admin_user",
+ "db.confirm_key_store_details_are_correct":
"oci.database.DatabaseClient.confirm_key_store_details_are_correct",
"db.convert_to_pdb": "oci.database.DatabaseClient.convert_to_pdb",
"db.convert_to_regular_pluggable_database":
"oci.database.DatabaseClient.convert_to_regular_pluggable_database",
"db.create_application_vip":
"oci.database.DatabaseClient.create_application_vip",
@@ -178,11 +179,8 @@
"db.get_exadata_infrastructure_un_allocated_resources":
"oci.database.DatabaseClient.get_exadata_infrastructure_un_allocated_resources",
"db.get_exadata_iorm_config":
"oci.database.DatabaseClient.get_exadata_iorm_config",
"db.get_exadb_vm_cluster":
"oci.database.DatabaseClient.get_exadb_vm_cluster",
-<<<<<<< HEAD
-=======
"db.get_exadb_vm_cluster_update":
"oci.database.DatabaseClient.get_exadb_vm_cluster_update",
"db.get_exadb_vm_cluster_update_history_entry":
"oci.database.DatabaseClient.get_exadb_vm_cluster_update_history_entry",
->>>>>>> a13abc2276 (Author: DEXREQ Automation <noreply+dex...@oracle.com>)
"db.get_exascale_db_storage_vault":
"oci.database.DatabaseClient.get_exascale_db_storage_vault",
"db.get_external_backup_job":
"oci.database.DatabaseClient.get_external_backup_job",
"db.get_external_container_database":
"oci.database.DatabaseClient.get_external_container_database",
@@ -252,11 +250,8 @@
"db.list_db_systems": "oci.database.DatabaseClient.list_db_systems",
"db.list_db_versions": "oci.database.DatabaseClient.list_db_versions",
"db.list_exadata_infrastructures":
"oci.database.DatabaseClient.list_exadata_infrastructures",
-<<<<<<< HEAD
-=======
"db.list_exadb_vm_cluster_update_history_entries":
"oci.database.DatabaseClient.list_exadb_vm_cluster_update_history_entries",
"db.list_exadb_vm_cluster_updates":
"oci.database.DatabaseClient.list_exadb_vm_cluster_updates",
->>>>>>> a13abc2276 (Author: DEXREQ Automation <noreply+dex...@oracle.com>)
"db.list_exadb_vm_clusters":
"oci.database.DatabaseClient.list_exadb_vm_clusters",
"db.list_exascale_db_storage_vaults":
"oci.database.DatabaseClient.list_exascale_db_storage_vaults",
"db.list_external_container_databases":
"oci.database.DatabaseClient.list_external_container_databases",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oci-cli-3.44.1/setup.py new/oci-cli-3.44.2/setup.py
--- old/oci-cli-3.44.1/setup.py 2024-07-02 15:35:28.000000000 +0200
+++ new/oci-cli-3.44.2/setup.py 2024-07-09 10:10:47.000000000 +0200
@@ -30,7 +30,7 @@
readme = f.read()
requires = [
- 'oci==2.129.1',
+ 'oci==2.129.2',
'arrow>=1.0.0',
'certifi',
'click==8.0.4',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oci-cli-3.44.1/src/oci_cli/version.py
new/oci-cli-3.44.2/src/oci_cli/version.py
--- old/oci-cli-3.44.1/src/oci_cli/version.py 2024-07-02 15:35:28.000000000
+0200
+++ new/oci-cli-3.44.2/src/oci_cli/version.py 2024-07-09 10:10:47.000000000
+0200
@@ -2,4 +2,4 @@
# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
# This software is dual-licensed to you under the Universal Permissive License
(UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0
as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either
license.
-__version__ = '3.44.1'
+__version__ = '3.44.2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oci-cli-3.44.1/tests/resources/json_ignore_command_list.txt
new/oci-cli-3.44.2/tests/resources/json_ignore_command_list.txt
--- old/oci-cli-3.44.1/tests/resources/json_ignore_command_list.txt
2024-07-02 15:35:28.000000000 +0200
+++ new/oci-cli-3.44.2/tests/resources/json_ignore_command_list.txt
2024-07-09 10:10:47.000000000 +0200
@@ -439,3 +439,4 @@
db, database-software-image, list
database-management, managed-database, list
fs, export-set, list
+db, key-store, confirm-key-store-details-are-correct
