Skip to content

Commit 99d204e

Browse files
Releasing version 3.58.1
Co-authored-by: Harsh Kumar <[email protected]>
1 parent 507e6f0 commit 99d204e

File tree

5 files changed

+26
-12
lines changed

5 files changed

+26
-12
lines changed

CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ All notable changes to this project will be documented in this file.
66

77
The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
88

9+
3.58.1 - 2025-06-10
10+
--------------------
11+
Added
12+
~~~~~
13+
* Database Service
14+
15+
* Support for new optional parameter in the Database service
16+
17+
* ``oci db database create-standby-database --opc-dry-run``
18+
919
3.58.0 - 2025-06-03
1020
--------------------
1121
Added

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Jinja2>=3.1.5; python_version >= '3.7'
1515
jmespath==0.10.0
1616
ndg-httpsclient==0.4.2
1717
mock==2.0.0
18-
oci==2.154.0
18+
oci==2.154.1
1919
packaging==20.2
2020
pluggy==0.13.0
2121
py==1.11.0

services/database_migration/src/oci_cli_database_migration/databasemigration_cli_extended.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
# limitations under the License.
2222
# coding: utf-8
2323
from __future__ import print_function
24+
25+
import os
26+
2427
import click # noqa: F401
2528
import json # noqa: F401
29+
import base64
2630
from services.database_migration.src.oci_cli_database_migration.generated import databasemigration_cli
2731
from oci_cli import cli_util # noqa: F401
2832
from oci_cli import custom_types # noqa: F401
@@ -365,7 +369,7 @@ def create_agent_extended(ctx, **kwargs):
365369
@cli_util.copy_params_from_generated_command(databasemigration_cli.create_connection_create_oracle_connection_details, params_to_exclude=[])
366370
@databasemigration_cli.connection_group.command(name=cli_util.override('database_migration.create_connection_create_oracle_connection_details.command_name', 'create-connection-create-oracle-connection-details'), help=databasemigration_cli.create_connection_create_oracle_connection_details.help)
367371
@cli_util.option('--technology-type', type=custom_types.CliCaseInsensitiveChoice(["AMAZON_RDS_ORACLE", "OCI_AUTONOMOUS_DATABASE", "ORACLE_DATABASE", "ORACLE_EXADATA"]), help="""The Oracle technology type. This value can only be specified for manual connections.""")
368-
@cli_util.option('--wallet', type=click.File('r'), help=u"""cwallet.sso fle path containing containing the TCPS/SSL certificate; base64 encoded String. Not required for source container database connections.""")
372+
@cli_util.option('--wallet', help=u"""File path to cwallet.sso containing containing the TCPS/SSL certificate.""")
369373
@cli_util.option('--sshkey-file', type=click.File('r'), help=u""" Private ssh key file.""")
370374
@click.pass_context
371375
@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'database_migration', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'database_migration', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'database_migration', 'class': 'Connection'})
@@ -381,13 +385,13 @@ def create_connection_create_oracle_connection_details_extended(ctx, **kwargs):
381385
kwargs['ssh_key'] = sshkey_file.read()
382386
kwargs.pop('sshkey_file')
383387

384-
# create_connection read --tls-wallet using --tls-wallet-file
385-
if kwargs.get('tls_wallet') and kwargs.get('tls_wallet_file'):
386-
raise cli_exceptions.RequiredValueNotInDefaultOrUserInputError('Cannot specify both --tls-wallet and --tls-wallet-file.')
387-
388-
tls_wallet_file = kwargs.get('tls_wallet_file')
389-
if tls_wallet_file:
390-
kwargs['tls_wallet'] = tls_wallet_file.read()
391-
kwargs.pop('tls_wallet_file')
388+
if 'wallet' in kwargs and kwargs.get('wallet') is not None:
389+
# if --wallet is a file, else it should be a base64 encoded string.
390+
if os.path.exists(kwargs['wallet']) and os.path.isfile(kwargs['wallet']):
391+
try:
392+
binary_wallet_file = open(kwargs['wallet'], 'rb')
393+
kwargs['wallet'] = base64.b64encode(binary_wallet_file.read()).decode('utf-8')
394+
except Exception as e:
395+
raise click.ClickException(str(e))
392396

393397
ctx.invoke(databasemigration_cli.create_connection_create_oracle_connection_details, **kwargs)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def open_relative(*path):
3030
readme = f.read()
3131

3232
requires = [
33-
'oci==2.154.0',
33+
'oci==2.154.1',
3434
'arrow>=1.0.0',
3535
'certifi>=2025.1.31',
3636
'click==8.0.4',

src/oci_cli/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
33
# 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.
44

5-
__version__ = '3.58.0'
5+
__version__ = '3.58.1'

0 commit comments

Comments
 (0)