Skip to content

Commit eca92b1

Browse files
authored
Merge pull request #99 from oracle/release_2019-01-24
Releasing version 2.1.5
2 parents b5a6515 + 57d38ab commit eca92b1

File tree

9 files changed

+65
-22
lines changed

9 files changed

+65
-22
lines changed

CHANGELOG.rst

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
Change Log
2-
~~~~~~~~~~
2+
~~~~~~~~~~
33
All notable changes to this project will be documented in this file.
44

55
The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
66

7+
====================
8+
2.1.5 - 2019-01-24
9+
====================
10+
11+
Added
12+
-----
13+
* Support for renaming databases during restore-from-backup operations in the Database service
14+
* Support for calling Oracle Cloud Infrastructure services in the ca-toronto-1 region
15+
16+
Fixed
17+
-----
18+
* KmsCryptoClient and KmsManagementClient updated to make service_endpoint required
19+
720
====================
821
2.1.4 - 2019-01-10
922
====================

src/oci/_vendor/urllib3/contrib/pyopenssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def idna_encode(name):
168168
that we can't just safely call `idna.encode`: it can explode for
169169
wildcard names. This avoids that problem.
170170
"""
171-
import idna
171+
from oci._vendor import idna
172172

173173
for prefix in [u'*.', u'.']:
174174
if name.startswith(prefix):

src/oci/database/models/create_database_from_backup_details.py

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,29 @@ def __init__(self, **kwargs):
2929
The value to assign to the admin_password property of this CreateDatabaseFromBackupDetails.
3030
:type admin_password: str
3131
32+
:param db_name:
33+
The value to assign to the db_name property of this CreateDatabaseFromBackupDetails.
34+
:type db_name: str
35+
3236
"""
3337
self.swagger_types = {
3438
'backup_id': 'str',
3539
'backup_tde_password': 'str',
36-
'admin_password': 'str'
40+
'admin_password': 'str',
41+
'db_name': 'str'
3742
}
3843

3944
self.attribute_map = {
4045
'backup_id': 'backupId',
4146
'backup_tde_password': 'backupTDEPassword',
42-
'admin_password': 'adminPassword'
47+
'admin_password': 'adminPassword',
48+
'db_name': 'dbName'
4349
}
4450

4551
self._backup_id = None
4652
self._backup_tde_password = None
4753
self._admin_password = None
54+
self._db_name = None
4855

4956
@property
5057
def backup_id(self):
@@ -122,6 +129,30 @@ def admin_password(self, admin_password):
122129
"""
123130
self._admin_password = admin_password
124131

132+
@property
133+
def db_name(self):
134+
"""
135+
Gets the db_name of this CreateDatabaseFromBackupDetails.
136+
The display name of the database to be created from the backup. It must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted.
137+
138+
139+
:return: The db_name of this CreateDatabaseFromBackupDetails.
140+
:rtype: str
141+
"""
142+
return self._db_name
143+
144+
@db_name.setter
145+
def db_name(self, db_name):
146+
"""
147+
Sets the db_name of this CreateDatabaseFromBackupDetails.
148+
The display name of the database to be created from the backup. It must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted.
149+
150+
151+
:param db_name: The db_name of this CreateDatabaseFromBackupDetails.
152+
:type: str
153+
"""
154+
self._db_name = db_name
155+
125156
def __repr__(self):
126157
return formatted_flat_dict(self)
127158

src/oci/key_management/kms_crypto_client.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class KmsCryptoClient(object):
2020
API for managing and performing operations with keys and vaults.
2121
"""
2222

23-
def __init__(self, config, **kwargs):
23+
def __init__(self, config, service_endpoint, **kwargs):
2424
"""
2525
Creates a new service client
2626
@@ -29,10 +29,8 @@ def __init__(self, config, **kwargs):
2929
The :py:meth:`~oci.config.from_file` method can be used to load configuration from a file. Alternatively, a ``dict`` can be passed. You can validate_config
3030
the dict using :py:meth:`~oci.config.validate_config`
3131
32-
:param str service_endpoint: (optional)
33-
The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``. If this keyword argument is
34-
not provided then it will be derived using the region in the config parameter. You should only provide this keyword argument if you have an explicit
35-
need to specify a service endpoint.
32+
:param str service_endpoint:
33+
The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``.
3634
3735
:param timeout: (optional)
3836
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
@@ -71,7 +69,7 @@ def __init__(self, config, **kwargs):
7169

7270
base_client_init_kwargs = {
7371
'regional_client': False,
74-
'service_endpoint': kwargs.get('service_endpoint'),
72+
'service_endpoint': service_endpoint,
7573
'timeout': kwargs.get('timeout'),
7674
'base_path': '/20180608',
7775
'skip_deserialization': kwargs.get('skip_deserialization', False)

src/oci/key_management/kms_management_client.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class KmsManagementClient(object):
2020
API for managing and performing operations with keys and vaults.
2121
"""
2222

23-
def __init__(self, config, **kwargs):
23+
def __init__(self, config, service_endpoint, **kwargs):
2424
"""
2525
Creates a new service client
2626
@@ -29,10 +29,8 @@ def __init__(self, config, **kwargs):
2929
The :py:meth:`~oci.config.from_file` method can be used to load configuration from a file. Alternatively, a ``dict`` can be passed. You can validate_config
3030
the dict using :py:meth:`~oci.config.validate_config`
3131
32-
:param str service_endpoint: (optional)
33-
The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``. If this keyword argument is
34-
not provided then it will be derived using the region in the config parameter. You should only provide this keyword argument if you have an explicit
35-
need to specify a service endpoint.
32+
:param str service_endpoint:
33+
The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``.
3634
3735
:param timeout: (optional)
3836
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
@@ -71,7 +69,7 @@ def __init__(self, config, **kwargs):
7169

7270
base_client_init_kwargs = {
7371
'regional_client': False,
74-
'service_endpoint': kwargs.get('service_endpoint'),
72+
'service_endpoint': service_endpoint,
7573
'timeout': kwargs.get('timeout'),
7674
'base_path': '/20180608',
7775
'skip_deserialization': kwargs.get('skip_deserialization', False)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# coding: utf-8
22
# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
33

4-
# noqa: W391, W292
4+
# noqa: W391, W292
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# coding: utf-8
22
# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
33

4-
# noqa: W391, W292
4+
# noqa: W391, W292

src/oci/regions.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
'phx': 'us-phoenix-1',
88
'iad': 'us-ashburn-1',
99
'fra': 'eu-frankfurt-1',
10-
'lhr': 'uk-london-1'
10+
'lhr': 'uk-london-1',
11+
'yyz': 'ca-toronto-1'
1112
}
1213
REGION_REALMS = {
1314
'us-phoenix-1': 'oc1',
1415
'us-ashburn-1': 'oc1',
1516
'eu-frankfurt-1': 'oc1',
16-
'uk-london-1': 'oc1'
17+
'uk-london-1': 'oc1',
18+
'ca-toronto-1': 'oc1'
1719
}
1820
REALMS = {
1921
'oc1': 'oraclecloud.com'
@@ -22,7 +24,8 @@
2224
"us-phoenix-1",
2325
"us-ashburn-1",
2426
"eu-frankfurt-1",
25-
"uk-london-1"
27+
"uk-london-1",
28+
"ca-toronto-1"
2629
]
2730
SERVICE_ENDPOINTS = service_endpoints.SERVICE_ENDPOINTS
2831
SERVICE_ENDPOINTS['auth'] = 'https://auth.{domain}'

src/oci/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# coding: utf-8
22
# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
33

4-
__version__ = "2.1.4"
4+
__version__ = "2.1.5"

0 commit comments

Comments
 (0)