Merge pull request #588 from oracle/release_2022-09-13

karthik-k-kamath · web-flow · commit 6ffe3dac3901 · 2022-09-13T13:48:21.000+05:30
Releasing version 3.16.1
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
 
+3.16.1 - 2022-09-13
+--------------------
+
+Added
+~~~~~
+* Support for calling Oracle Cloud Infrastructure services in the Madrid region (``--region eu-madrid-1``)
+
+* Data Science service
+
+  * Support for new optional parameter
+
+    * ``oci data-science model create-model-artifact --if-match``
+
+  * Support for new commands
+
+    * ``oci data-science model export-model-artifact``
+    * ``oci data-science model export-model-artifact-artifact-export-details-object-storage``
+    * ``oci data-science model import-model-artifact``
+    * ``oci data-science model import-model-artifact-artifact-import-details-object-storage``
+
 3.16.0 - 2022-09-06
 --------------------
 
diff --git a/requirements.txt b/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.81.0
+oci==2.82.0
 packaging==20.2
 pluggy==0.13.0
 py==1.10.0
diff --git a/services/data_science/src/oci_cli_data_science/generated/datascience_cli.py b/services/data_science/src/oci_cli_data_science/generated/datascience_cli.py
diff --git a/services/object_storage/tests/integ/test_object_storage.py b/services/object_storage/tests/integ/test_object_storage.py
@@ -461,14 +461,22 @@ def test_create_replication_policy(vcr_fixture, runner, config_file, config_prof
     # bucket create
     result = invoke(runner, config_file, config_profile, ['bucket', 'create', '-ns', util.NAMESPACE, '--compartment-id', util.COMPARTMENT_ID, '--name', dest_bucket, '--public-access-type', 'ObjectRead'])
     validate_response(result)
-    # create policy
-    result = invoke(runner, config_file, config_profile, ['replication', 'create-replication-policy', '-ns', util.NAMESPACE, '--name', 'replication-test-policy', '-bn', source_bucket, '--destination-bucket', dest_bucket, '--destination-region', util.OS_REPLICATION_DESTINATION_REGION])
-    validate_response(result)
-    response = json.loads(result.output)
-    replication_id = response['data']['id']
-    # delete policy
-    result = invoke(runner, config_file, config_profile, ['replication', 'delete-replication-policy', '-ns', util.NAMESPACE, '--replication-id', replication_id, '--bucket-name', source_bucket, '--force'])
-    validate_response(result)
+
+    try:
+        # create policy
+        result = invoke(runner, config_file, config_profile, ['replication', 'create-replication-policy', '-ns', util.NAMESPACE, '--name', 'replication-test-policy', '-bn', source_bucket, '--destination-bucket', dest_bucket, '--destination-region', util.OS_REPLICATION_DESTINATION_REGION])
+        validate_response(result)
+        response = json.loads(result.output)
+        replication_id = response['data']['id']
+        # delete policy
+        result = invoke(runner, config_file, config_profile, ['replication', 'delete-replication-policy', '-ns', util.NAMESPACE, '--replication-id', replication_id, '--bucket-name', source_bucket, '--force'])
+        validate_response(result)
+    except Exception as ex:
+        result = invoke(runner, config_file, config_profile, ['bucket', 'delete', '-ns', util.NAMESPACE, '--name', source_bucket, '--force'])
+        validate_response(result)
+        result = invoke(runner, config_file, config_profile, ['bucket', 'delete', '-ns', util.NAMESPACE, '--name', dest_bucket, '--force'])
+        validate_response(result)
+
     # bucket delete
     result = invoke(runner, config_file, config_profile, ['bucket', 'delete', '-ns', util.NAMESPACE, '--name', source_bucket, '--force'])
     validate_response(result)
diff --git a/services/object_storage/tests/integ/test_object_storage_bulk_operations.py b/services/object_storage/tests/integ/test_object_storage_bulk_operations.py
@@ -165,16 +165,15 @@ def customer_key(request):
 
 
 @util.skip_while_rerecording
-@pytest.mark.skip('object storage tests are failing. skipping for now')
 def test_normalize_object_name_path():
-    assert '/this/is/a/path' == oci_cli_object_storage.objectstorage_cli_extended.normalize_object_name_path_for_object_storage('/this/is/a/path')
-    assert '/this/is/a/path' == oci_cli_object_storage.objectstorage_cli_extended.normalize_object_name_path_for_object_storage('/this/is/a/path', '/')
-    assert '/this/is/a/path' == oci_cli_object_storage.objectstorage_cli_extended.normalize_object_name_path_for_object_storage('\\this\\is\\a\\path', '\\')
-    assert '/this/is/a/path' == oci_cli_object_storage.objectstorage_cli_extended.normalize_object_name_path_for_object_storage('\\this/is/a\\path', '\\')
+    assert '/this/is/a/path' == oci_cli_object_storage.objectstorage_cli_extended.normalize_file_path_for_object_storage('/this/is/a/path')
+    assert '/this/is/a/path' == oci_cli_object_storage.objectstorage_cli_extended.normalize_file_path_for_object_storage('/this/is/a/path', '/')
+    assert '/this/is/a/path' == oci_cli_object_storage.objectstorage_cli_extended.normalize_file_path_for_object_storage('\\this\\is\\a\\path', '\\')
+    assert '/this/is/a/path' == oci_cli_object_storage.objectstorage_cli_extended.normalize_file_path_for_object_storage('\\this/is/a\\path', '\\')
 
-    assert 'thisisapath' == oci_cli_object_storage.objectstorage_cli_extended.normalize_object_name_path_for_object_storage('thisisapath')
-    assert 'thisisapath' == oci_cli_object_storage.objectstorage_cli_extended.normalize_object_name_path_for_object_storage('thisisapath', '/')
-    assert 'thisisapath' == oci_cli_object_storage.objectstorage_cli_extended.normalize_object_name_path_for_object_storage('thisisapath', '\\')
+    assert 'thisisapath' == oci_cli_object_storage.objectstorage_cli_extended.normalize_file_path_for_object_storage('thisisapath')
+    assert 'thisisapath' == oci_cli_object_storage.objectstorage_cli_extended.normalize_file_path_for_object_storage('thisisapath', '/')
+    assert 'thisisapath' == oci_cli_object_storage.objectstorage_cli_extended.normalize_file_path_for_object_storage('thisisapath', '\\')
 
 
 @util.skip_while_rerecording
@@ -186,8 +185,10 @@ def test_get_all_objects_in_bucket(vcr_fixture):
 
     # Ensure that content matches
     for object_name in bulk_get_object_to_content:
-        if object_name[0] == '/' or object_name[0] == '\\':
+        if object_name[0] == '/':
             file_path = os.path.join(download_folder, object_name[1:])
+        elif object_name[0:2] == '\\':
+            file_path = os.path.join(download_folder, object_name[2:])
         else:
             file_path = os.path.join(download_folder, object_name)
 
diff --git a/services/object_storage/tests/integ/test_object_storage_multipart.py b/services/object_storage/tests/integ/test_object_storage_multipart.py
@@ -79,7 +79,7 @@ def temp_bucket(runner, config_file, config_profile, object_storage_client):
 
     try:
         print("Deleting bucket")
-        result = invoke(runner, config_file, config_profile, ['bucket', 'delete', '-ns', util.NAMESPACE, '--name', bucket_name, '--force'])
+        result = invoke(runner, config_file, config_profile, ['bucket', 'delete', '-ns', util.NAMESPACE, '--name', bucket_name, '--force', '--empty'])
         validate_response(result)
     except Exception as error:
         util.print_latest_exception(error)
diff --git a/services/object_storage/tests/integ/test_object_storage_sync_download.py b/services/object_storage/tests/integ/test_object_storage_sync_download.py
@@ -810,8 +810,10 @@ def compare_file_content_to_local(file_content_map, path_to_test, files_in_scope
         if files_in_scope and object_name not in files_in_scope:
             continue
 
-        if object_name[0] == '/' or object_name[0] == '\\':
+        if object_name[0] == '/':
             file_path = os.path.join(path_to_test, object_name[1:])
+        elif object_name[0:2] == "\\":
+            file_path = os.path.join(path_to_test, object_name[2:])
         else:
             file_path = os.path.join(path_to_test, object_name)
 
@@ -832,7 +834,7 @@ def create_new_files_local(path, no_of_files_to_create, with_content=False, exte
         with open(new_file_path, 'w') as fh:
             if with_content:
                 fh.write(bulk_operation.generate_random_string(bulk_operation.CONTENT_STRING_LENGTH))
-        new_local_file_set.add(new_file_path)
+        new_local_file_set.add(new_file_path.replace(os.sep, '/'))
     return new_local_file_set
 
 
@@ -851,6 +853,7 @@ def create_new_objects_remote(client, bucket_name, no_of_files_to_create, with_c
             object_name = 'new_obj_{}.{}'.format(i, extension)
         if prefix:
             object_name = os.path.join(prefix, object_name)
+        object_name = object_name.replace(os.sep, '/')
         content = bulk_operation.generate_random_string(bulk_operation.CONTENT_STRING_LENGTH)
         client.put_object(util.NAMESPACE, bucket_name, object_name, content if with_content else '')
         new_remote_obj_set.add(object_name)
diff --git a/services/object_storage/tests/integ/test_object_storage_sync_upload.py b/services/object_storage/tests/integ/test_object_storage_sync_upload.py
@@ -200,7 +200,7 @@ def test_sync_src_include_dry_run(debug):
                                     sync_upload_bucket_name, '--src-dir', sync_upload_test_dir, '--include',
                                     file_name_to_sync, '--dry-run'], debug=debug)
     deleted_set, uploaded_set, skipped_set = parse_dry_run_result(result.output.strip().split('\n'))
-    assert uploaded_set == {os.path.join(sync_upload_test_dir, file_name_to_sync)}
+    assert uploaded_set == {(os.path.join(sync_upload_test_dir, file_name_to_sync)).replace(os.sep, '/')}
     assert deleted_set == set()
     assert skipped_set == set()
 
@@ -463,7 +463,7 @@ def test_sync_src_with_delete_and_include(object_storage_client):
                                     '--include', '*.pdf', '--include', '*.doc'], debug=debug)
     parsed_result = util.parse_json_response_from_mixed_output(result.output)
     assert parsed_result['upload-failures'] == {}
-    assert set(parsed_result['uploaded-objects']) == set([f[len(sync_upload_test_dir):].strip('/') for f in l_file_set_1.union(l_file_set_2)])
+    assert set(parsed_result['uploaded-objects']) == set([(f[len(sync_upload_test_dir):].replace(os.sep, '/')).strip('/') for f in l_file_set_1.union(l_file_set_2)])
     assert parsed_result['skipped-objects'] == []
     assert set(parsed_result['deleted-objects']) == r_obj_set_1
 
@@ -645,7 +645,7 @@ def test_sync_src_with_delete_include_and_prefix(object_storage_client, debug):
                                    debug=debug)
     parsed_result = util.parse_json_response_from_mixed_output(result.output)
     assert parsed_result['upload-failures'] == {}
-    assert set(parsed_result['uploaded-objects']) == set([os.path.join(_prefix, f[len(sync_upload_test_dir):].strip('/')) for f in l_file_set_1.union(l_file_set_2)])
+    assert set(parsed_result['uploaded-objects']) == set([(os.path.join(_prefix, f[len(sync_upload_test_dir):].replace(os.sep, '/').strip('/'))) for f in l_file_set_1.union(l_file_set_2)])
     assert parsed_result['skipped-objects'] == []
     assert set(parsed_result['deleted-objects']) == r_obj_set_1
     cleanup_files_from_local(l_file_set_1.union(l_file_set_2))
@@ -709,7 +709,7 @@ def test_sync_src_with_delete_exclude_and_prefix(object_storage_client, debug):
                                    debug=debug)
     parsed_result = util.parse_json_response_from_mixed_output(result.output)
     assert parsed_result['upload-failures'] == {}
-    assert set(parsed_result['uploaded-objects']) == set([os.path.join(_prefix, o) for o in sync_local_object_content.keys()])
+    assert set(parsed_result['uploaded-objects']) == set([(os.path.join(_prefix, o).replace(os.sep, '/')) for o in sync_local_object_content.keys()])
     assert parsed_result['skipped-objects'] == []
     assert set(parsed_result['deleted-objects']) == r_obj_set_2
     cleanup_files_from_local(l_file_set_1.union(l_file_set_2))
@@ -764,6 +764,8 @@ def test_sync_src_with_no_follow_symlinks_file(debug):
 
     # create the symlink
     create_symlink(file_to_create_a_symlink_of, symlink_fp)
+    symlink_fp = symlink_fp.replace(os.sep, '/')
+    symlink_pref = symlink_pref.replace(os.sep, '/')
 
     # validate the output from dry-run first
     result = bulk_operation.invoke(['os', 'object', 'sync', '--namespace', util.NAMESPACE, '--bucket-name',
@@ -798,6 +800,8 @@ def test_sync_src_with_no_follow_symlinks_dir(debug):
 
     # create the symlink
     create_symlink(dir_to_create_a_symlink_of, symlink_fp, is_directory=True)
+    symlink_fp = symlink_fp.replace(os.sep, '/')
+    symlink_pref = symlink_pref.replace(os.sep, '/')
 
     # validate the output from dry-run first
     result = bulk_operation.invoke(['os', 'object', 'sync', '--namespace', util.NAMESPACE, '--bucket-name',
@@ -831,7 +835,8 @@ def test_sync_src_with_follow_symlinks_file(object_storage_client, debug):
     symlink_fp = os.path.join(sync_upload_test_dir, symlink_pref)
 
     create_symlink(file_to_create_a_symlink_of, symlink_fp)
-
+    symlink_fp = symlink_fp.replace(os.sep, '/')
+    symlink_pref = symlink_pref.replace(os.sep, '/')
     # validate the output from dry-run first
     result = bulk_operation.invoke(['os', 'object', 'sync', '--namespace', util.NAMESPACE, '--bucket-name',
                                     sync_upload_bucket_name, '--src-dir', sync_upload_test_dir,
@@ -870,6 +875,9 @@ def test_sync_src_with_follow_symlinks_dir(object_storage_client, debug):
 
     # create the symlink
     create_symlink(dir_to_create_a_symlink_of, symlink_fp, is_directory=True)
+    symlink_fp = symlink_fp.replace(os.sep, '/')
+    symlink_pref = symlink_pref.replace(os.sep, '/')
+    dir_to_create_a_symlink_of = dir_to_create_a_symlink_of.replace(os.sep, '/')
 
     # validate the output from dry-run first
     result = bulk_operation.invoke(['os', 'object', 'sync', '--namespace', util.NAMESPACE, '--bucket-name',
@@ -895,7 +903,7 @@ def test_sync_src_with_follow_symlinks_dir(object_storage_client, debug):
             assert o[len(symlink_pref):].strip('/') in dir_content_with_symlink
     assert parsed_result['skipped-objects'] == []
     compare_file_content_to_remote(object_storage_client,
-                                   {os.path.join(symlink_pref, k): v for k, v in dir_content_with_symlink.items()},
+                                   {(os.path.join(symlink_pref, k)).replace(os.sep, '/'): v for k, v in dir_content_with_symlink.items()},
                                    prefix_to_test=symlink_pref)
     os.unlink(symlink_fp)
 
@@ -926,10 +934,10 @@ def create_symlink(src_path_abs, symlink_fp, is_directory=False):
     # If the path doesn't match the link would be broken
     os.symlink(
         os.path.relpath(
-            src_path_abs,
+            src_path_abs.replace('/', os.sep),
             os.path.dirname(symlink_fp)
-        ),
-        symlink_fp,
+        ).replace('/', os.sep),
+        symlink_fp.replace('/', os.sep),
         target_is_directory=is_directory)
 
 
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@ def open_relative(*path):
     readme = f.read()
 
 requires = [
-    'oci==2.81.0',
+    'oci==2.82.0',
     'arrow>=1.0.0',
     'certifi',
     'click==7.1.2',
diff --git a/src/oci_cli/cli_root.py b/src/oci_cli/cli_root.py
@@ -44,6 +44,61 @@
 
 OCI_CLI_AUTH_CHOICES = [cli_constants.OCI_CLI_AUTH_API_KEY, cli_constants.OCI_CLI_AUTH_INSTANCE_PRINCIPAL, cli_constants.OCI_CLI_AUTH_SESSION_TOKEN, cli_constants.OCI_CLI_AUTH_INSTANCE_OBO_USER, cli_constants.OCI_CLI_AUTH_RESOURCE_PRINCIPAL]
 
+GENERATE_PARAM_JSON_HELP = """Complex input, such as arrays and objects, are passed in JSON format.
+
+When passed the name of an option which takes complex input, this will print out example JSON of what needs to be passed to that option.
+Example::
+    oci compute instance launch --generate_param_json_input_r agent-config > example.json
+
+    cat example.json
+Output::
+
+    {
+      "areAllPluginsDisabled": true,
+      "isManagementDisabled": true,
+      "isMonitoringDisabled": true,
+      "pluginsConfig": [
+        {
+          "desiredState": "string",
+          "name": "string"
+        },
+        {
+          "desiredState": "string",
+          "name": "string"
+        }
+      ]
+    }
+
+Edit the example.json file with correct values and use it as below ::
+
+    oci compute instance launch --agent-config file://example.json
+
+"""
+GENERATE_FULL_COMMAND_JSON_HELP = """Prints out a JSON document which represents all possible options that can be provided to this command.
+
+This JSON document can be saved to a file, modified with the appropriate option values, and then passed back via the --from-json option. This provides an alternative to typing options out on the command line.
+Example::
+    oci os bucket get --generate_full_command_json_input_r  > example.json
+    cat example.json
+Output::
+
+    {
+      "bucketName": "string",
+      "fields": [
+        "approximateCount|approximateSize|autoTiering"
+      ],
+      "ifMatch": "string",
+      "ifNoneMatch": "string",
+      "name": "string",
+      "namespace": "string",
+      "namespaceName": "string"
+    }
+
+Edit the example.json file with correct values and use it as below ::
+
+    oci os bucket get --from-json file://example.json
+"""
+
 
 def eager_load_cli_rc_file(ctx, param, value):
     expanded_rc_default_location = os.path.expandvars(os.path.expanduser(cli_constants.CLI_RC_DEFAULT_LOCATION))
@@ -326,12 +381,8 @@ def find_latest_release_version(ctx, param, value):
 @click.option('--raw-output', is_flag=True, help='If the output of a given query is a single string value, this will return the string without surrounding quotes')
 @click.option('--auth', type=click.Choice(choices=OCI_CLI_AUTH_CHOICES), help='The type of auth to use for the API request. By default the API key in your config file will be used.  This value can also be provided in the {auth_env_var} environment variable.'.format(auth_env_var=cli_constants.OCI_CLI_AUTH_ENV_VAR))
 @click.option('--auth-purpose', help='The The auth purpose which can be used in conjunction with --auth.')
-@click.option('--generate-full-command-json-input', is_flag=True, is_eager=True, help="""Prints out a JSON document which represents all possible options that can be provided to this command.
-
-This JSON document can be saved to a file, modified with the appropriate option values, and then passed back via the --from-json option. This provides an alternative to typing options out on the command line.""")
-@click.option('--generate-param-json-input', is_eager=True, help="""Complex input, such as arrays and objects, are passed in JSON format.
-
-When passed the name of an option which takes complex input, this will print out example JSON of what needs to be passed to that option.""")
+@click.option('--generate-full-command-json-input', is_flag=True, is_eager=True, help=GENERATE_FULL_COMMAND_JSON_HELP)
+@click.option('--generate-param-json-input', is_eager=True, help=GENERATE_PARAM_JSON_HELP)
 @click.option('--no-retry', is_flag=True, help='Disable retry logic for calls to services.')
 @click.option('--max-retries', type=click.INT, help='Maximum number of retry calls to be made to the service. For most commands, 5 attempts will be made. For operations with binary bodies, retries are disabled')
 @click.option('-d', '--debug', is_flag=True, help='Show additional debug information.')
diff --git a/src/oci_cli/version.py b/src/oci_cli/version.py
@@ -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.16.0'
+__version__ = '3.16.1'
