Releasing version 3.18.1

Releasing version 3.18.1

Author: mandyht

CHANGELOG.rst

@@ -6,6 +6,39 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
 
+3.18.1 - 2022-10-04
+--------------------
+Added
+~~~~~~~~
+
+* Bastion support for target host identification and enabled SOCKS support for dynamic port forwarding sessions
+
+  * ``oci bastion``
+
+* Operations Insights service
+
+  * Support for creating Enterprise Manager-based Windows host targets for ``--platform-type``
+
+    * ``oci opsi host-insights list --platform-type``
+
+  * Support for creating Management Agent Cloud Service-based Windows and Solaris hosts targets for ``--platform-type``
+
+    * ``oci opsi host-insights list --platform-type``
+
+  * Support for Host Top Process allowing users to locate top processes running at a particular point in time
+
+    * ``oci opsi host-insights summarize-top-processes-usage --compartment-id --id --resource-metric --timestamp --analysis-time-interval``
+
+  * Support for Host Top Process allowing users to filter by a single process in order to trend this process over time
+
+    * ``oci opsi host-insights summarize-top-processes-usage --compartment-id --id --resource-metric --timestamp --analysis-time-interval``
+    
+* Cloud-Bridge Service
+
+  * Support for check to require ``--vcenter-endpoint`` and ``--discovery-credentials`` parameters if asset source is VMWARE for ``--type``
+
+    * ``oci cloud-bridge discovery asset-source create --type VMWARE``
+
 3.18.0 - 2022-09-27
 --------------------
 

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.84.0
+oci==2.85.0
 packaging==20.2
 pluggy==0.13.0
 py==1.10.0

services/bastion/src/oci_cli_bastion/generated/bastion_cli.py

@@ -87,6 +87,10 @@ def create_asset_source(ctx, from_json, wait_for_state, max_wait_seconds, wait_i
     if system_tags is not None:
         _details['systemTags'] = cli_util.parse_json_parameter("system_tags", system_tags)
 
+    if type.lower() == 'vmware':
+        if discovery_credentials is None or vcenter_endpoint is None:
+            raise click.UsageError('If parameter --type is VMWARE, then parameters --discovery-credentials and --vcenter-endpoint must be provided')
+
     client = cli_util.build_client('cloud_bridge', 'discovery', ctx)
     result = client.create_asset_source(
         create_asset_source_details=_details,

services/cloud_bridge/src/oci_cli_discovery/discovery_cli_extended.py

@@ -29,7 +29,7 @@ def open_relative(*path):
     readme = f.read()
 
 requires = [
-    'oci==2.84.0',
+    'oci==2.85.0',
     'arrow>=1.0.0',
     'certifi',
     'click==7.1.2',

services/opsi/src/oci_cli_operations_insights/generated/operationsinsights_cli.py

@@ -102,6 +102,22 @@
 
 OCI_CLI_IN_INTERACTIVE_MODE = "OCI_CLI_IN_INTERACTIVE_MODE"
 
+OCI_CLI_CLOUD_SHELL = "OCI_CLI_CLOUD_SHELL"
+
+OCI_CLI_CONTAINER_IMAGE = "IMAGE_VERSION"
+
+ADDITIONAL_USER_AGENT = "additional_user_agent"
+
+ORACLE_PYTHON_VER = "Oracle-PythonCLI/{}"
+
+OCI_CLI_INTERACTIVE_USER_AGENT = " Oracle-Interactive "
+
+OCI_CLI_INTERACTIVE_CLOUDSHELL_USER_AGENT = " Oracle-Interactive-CloudShell "
+
+OCI_CLI_CONTAINER_IMAGE_USER_AGENT = " Oracle-Container-Image "
+
+OCI_CLI_INTERACTIVE_CONTAINER_IMAGE_USER_AGENT = " Oracle-Interactive-Container-Image "
+
 logger = logging.getLogger("{}".format(__name__))
 logger.addHandler(logging.NullHandler())
 logger.setLevel(logging.DEBUG)
@@ -366,9 +382,19 @@ def create_config_and_signer_based_on_click_context(ctx):
                 sys.exit(0)
             else:
                 sys.exit(1)
-        client_config["additional_user_agent"] = 'Oracle-PythonCLI/{}'.format(__version__)
+        client_config[ADDITIONAL_USER_AGENT] = ORACLE_PYTHON_VER.format(__version__)
         if OCI_CLI_IN_INTERACTIVE_MODE in os.environ:
-            client_config["additional_user_agent"] += " Oracle-Interactive "
+            client_config[ADDITIONAL_USER_AGENT] += OCI_CLI_INTERACTIVE_USER_AGENT
+
+            if OCI_CLI_CLOUD_SHELL in os.environ:
+                client_config[ADDITIONAL_USER_AGENT] += OCI_CLI_INTERACTIVE_CLOUDSHELL_USER_AGENT
+
+            if OCI_CLI_CONTAINER_IMAGE in os.environ:
+                client_config[ADDITIONAL_USER_AGENT] += OCI_CLI_INTERACTIVE_CONTAINER_IMAGE_USER_AGENT
+
+        if OCI_CLI_CONTAINER_IMAGE in os.environ:
+            client_config[ADDITIONAL_USER_AGENT] += OCI_CLI_CONTAINER_IMAGE_USER_AGENT
+
         if ctx.obj['debug']:
             client_config["log_requests"] = True
 
@@ -467,7 +493,7 @@ def build_raw_requests_session(ctx):
         session = requests.Session()
         session.auth = signer
         session.headers['opc-request-id'] = ctx.obj['request_id']
-        session.headers['user-agent'] = oci.base_client.build_user_agent(extra=client_config['additional_user_agent'])
+        session.headers['user-agent'] = oci.base_client.build_user_agent(extra=client_config[ADDITIONAL_USER_AGENT])
         set_request_session_properties_from_context(session, ctx)
 
         return session
@@ -594,9 +620,18 @@ def build_config(command_args):
             if command_args['debug']:
                 logger.debug("%s: Environment Variable", cli_constants.OCI_CONFIG_ENV_VARS[env])
 
-    client_config["additional_user_agent"] = 'Oracle-PythonCLI/{}'.format(__version__)
+    client_config[ADDITIONAL_USER_AGENT] = ORACLE_PYTHON_VER.format(__version__)
     if OCI_CLI_IN_INTERACTIVE_MODE in os.environ:
-        client_config["additional_user_agent"] += " Oracle-Interactive "
+        client_config[ADDITIONAL_USER_AGENT] += OCI_CLI_INTERACTIVE_USER_AGENT
+
+        if OCI_CLI_CLOUD_SHELL in os.environ:
+            client_config[ADDITIONAL_USER_AGENT] += OCI_CLI_INTERACTIVE_CLOUDSHELL_USER_AGENT
+
+        if OCI_CLI_CONTAINER_IMAGE in os.environ:
+            client_config[ADDITIONAL_USER_AGENT] += OCI_CLI_INTERACTIVE_CONTAINER_IMAGE_USER_AGENT
+
+    if OCI_CLI_CONTAINER_IMAGE in os.environ:
+        client_config[ADDITIONAL_USER_AGENT] += OCI_CLI_CONTAINER_IMAGE_USER_AGENT
 
     if command_args['region']:
         client_config["region"] = command_args['region']

setup.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.18.0'
+__version__ = '3.18.1'

src/oci_cli/cli_util.py

@@ -3,6 +3,7 @@
 # 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.
 
 import unittest
+from click.testing import CliRunner
 from interactive.oci_shell_completer import OciShellCompleter
 from oci_cli.cli_root import cli
 from . import utils
@@ -12,6 +13,19 @@
 
 class TestAutoPrompt(unittest.TestCase):
 
+    def test_cli_interactive_import(self):
+        # This funciton tests importing interactive mode
+        from interactive.cli_interactive import start_interactive_shell
+        _ = start_interactive_shell
+
+    def test_cli_interactive_call(self):
+        # This funciton tests calling interactive mode
+        try:
+            runner = CliRunner()
+            result = runner.invoke(cli, ['-i'])
+        except Exception:
+            self.fail('Failed to run cli with interactive parameters')
+
     def test_root_command_suggestion(self):
         # This function is to test the commands suggestions on the root level
         ctx = utils.set_up_context(cli)