Skip to content

Releasing version 2.1.5 #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
Change Log
~~~~~~~~~~
~~~~~~~~~~
All notable changes to this project will be documented in this file.

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

====================
2.1.5 - 2019-01-24
====================

Added
-----
* Support for renaming databases during restore-from-backup operations in the Database service
* Support for calling Oracle Cloud Infrastructure services in the ca-toronto-1 region

Fixed
-----
* KmsCryptoClient and KmsManagementClient updated to make service_endpoint required

====================
2.1.4 - 2019-01-10
====================
Expand Down
2 changes: 1 addition & 1 deletion src/oci/_vendor/urllib3/contrib/pyopenssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def idna_encode(name):
that we can't just safely call `idna.encode`: it can explode for
wildcard names. This avoids that problem.
"""
import idna
from oci._vendor import idna

for prefix in [u'*.', u'.']:
if name.startswith(prefix):
Expand Down
35 changes: 33 additions & 2 deletions src/oci/database/models/create_database_from_backup_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,29 @@ def __init__(self, **kwargs):
The value to assign to the admin_password property of this CreateDatabaseFromBackupDetails.
:type admin_password: str

:param db_name:
The value to assign to the db_name property of this CreateDatabaseFromBackupDetails.
:type db_name: str

"""
self.swagger_types = {
'backup_id': 'str',
'backup_tde_password': 'str',
'admin_password': 'str'
'admin_password': 'str',
'db_name': 'str'
}

self.attribute_map = {
'backup_id': 'backupId',
'backup_tde_password': 'backupTDEPassword',
'admin_password': 'adminPassword'
'admin_password': 'adminPassword',
'db_name': 'dbName'
}

self._backup_id = None
self._backup_tde_password = None
self._admin_password = None
self._db_name = None

@property
def backup_id(self):
Expand Down Expand Up @@ -122,6 +129,30 @@ def admin_password(self, admin_password):
"""
self._admin_password = admin_password

@property
def db_name(self):
"""
Gets the db_name of this CreateDatabaseFromBackupDetails.
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.


:return: The db_name of this CreateDatabaseFromBackupDetails.
:rtype: str
"""
return self._db_name

@db_name.setter
def db_name(self, db_name):
"""
Sets the db_name of this CreateDatabaseFromBackupDetails.
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.


:param db_name: The db_name of this CreateDatabaseFromBackupDetails.
:type: str
"""
self._db_name = db_name

def __repr__(self):
return formatted_flat_dict(self)

Expand Down
10 changes: 4 additions & 6 deletions src/oci/key_management/kms_crypto_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class KmsCryptoClient(object):
API for managing and performing operations with keys and vaults.
"""

def __init__(self, config, **kwargs):
def __init__(self, config, service_endpoint, **kwargs):
"""
Creates a new service client

Expand All @@ -29,10 +29,8 @@ def __init__(self, config, **kwargs):
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
the dict using :py:meth:`~oci.config.validate_config`

:param str service_endpoint: (optional)
The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``. If this keyword argument is
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
need to specify a service endpoint.
:param str service_endpoint:
The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
Expand Down Expand Up @@ -71,7 +69,7 @@ def __init__(self, config, **kwargs):

base_client_init_kwargs = {
'regional_client': False,
'service_endpoint': kwargs.get('service_endpoint'),
'service_endpoint': service_endpoint,
'timeout': kwargs.get('timeout'),
'base_path': '/20180608',
'skip_deserialization': kwargs.get('skip_deserialization', False)
Expand Down
10 changes: 4 additions & 6 deletions src/oci/key_management/kms_management_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class KmsManagementClient(object):
API for managing and performing operations with keys and vaults.
"""

def __init__(self, config, **kwargs):
def __init__(self, config, service_endpoint, **kwargs):
"""
Creates a new service client

Expand All @@ -29,10 +29,8 @@ def __init__(self, config, **kwargs):
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
the dict using :py:meth:`~oci.config.validate_config`

:param str service_endpoint: (optional)
The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``. If this keyword argument is
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
need to specify a service endpoint.
:param str service_endpoint:
The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
Expand Down Expand Up @@ -71,7 +69,7 @@ def __init__(self, config, **kwargs):

base_client_init_kwargs = {
'regional_client': False,
'service_endpoint': kwargs.get('service_endpoint'),
'service_endpoint': service_endpoint,
'timeout': kwargs.get('timeout'),
'base_path': '/20180608',
'skip_deserialization': kwargs.get('skip_deserialization', False)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/object_storage/transfer/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# coding: utf-8
# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.

# noqa: W391, W292
# noqa: W391, W292
2 changes: 1 addition & 1 deletion src/oci/object_storage/transfer/internal/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# coding: utf-8
# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.

# noqa: W391, W292
# noqa: W391, W292
9 changes: 6 additions & 3 deletions src/oci/regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
'phx': 'us-phoenix-1',
'iad': 'us-ashburn-1',
'fra': 'eu-frankfurt-1',
'lhr': 'uk-london-1'
'lhr': 'uk-london-1',
'yyz': 'ca-toronto-1'
}
REGION_REALMS = {
'us-phoenix-1': 'oc1',
'us-ashburn-1': 'oc1',
'eu-frankfurt-1': 'oc1',
'uk-london-1': 'oc1'
'uk-london-1': 'oc1',
'ca-toronto-1': 'oc1'
}
REALMS = {
'oc1': 'oraclecloud.com'
Expand All @@ -22,7 +24,8 @@
"us-phoenix-1",
"us-ashburn-1",
"eu-frankfurt-1",
"uk-london-1"
"uk-london-1",
"ca-toronto-1"
]
SERVICE_ENDPOINTS = service_endpoints.SERVICE_ENDPOINTS
SERVICE_ENDPOINTS['auth'] = 'https://auth.{domain}'
Expand Down
2 changes: 1 addition & 1 deletion src/oci/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# coding: utf-8
# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.

__version__ = "2.1.4"
__version__ = "2.1.5"