Releasing version 3.15.2

Co-authored-by: Vishwas Bhat <[email protected]>
Co-authored-by: Hamada Ibrahim <[email protected]>
Co-authored-by: Harsh Kumar <[email protected]>
Co-authored-by: Alex Le <[email protected]>
Co-authored-by: Nupur Gupta <[email protected]>
Co-authored-by: Karthik Kamath <[email protected]>

Author: 7 people

CHANGELOG.rst

@@ -6,6 +6,41 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
 
+3.15.2 - 2022-08-26
+--------------------
+
+Added
+~~~~~
+* Support for dynamic window sizing and new terminal too small error message in interactive mode
+
+  * ``oci -i``
+
+* Support for in-place upgrade in the OCVS service
+
+  * ``oci ocvs esxi-host create``
+
+* Support for customers to choose to opt for Guest VM event collection, diagnostics logs and traces in the Database service
+
+  * ``oci db system launch``
+  * ``oci db system launch-from-backup``
+  * ``oci db system launch-from-database``
+  * ``oci db system launch-from-db-system``
+  * ``oci db system update``
+  * ``oci db data-guard-association create with-new-db-system``
+
+* Support for performance-based autotuning of Block and Boot Volumes in the Block Storage service
+
+  * ``oci bv boot-volume create``
+  * ``oci bv boot-volume create-boot-volume-boot-volume-source-from-boot-volume-replica-details``
+  * ``oci bv boot-volume update``
+  * ``oci bv volume create``
+  * ``oci bv volume create-volume-volume-source-from-block-volume-replica-details``
+  * ``oci bv volume update``
+
+* Support for Single Client Access Name protocol as Data Source and for Network Security Groups in Private Access Channel in the Analytics service
+
+  * ``oci analytics analytics-instance create-private-access-channel``
+
 3.15.1 - 2022-08-23
 --------------------
 
@@ -45,7 +80,7 @@ Added
     * ``oci db maintenance-run update --target-db-server-version --target-storage-server-version``
 
 Changed
-~~~~~
+~~~~~~~
 * Optimizer service
 
   * The parameter --category-id is now optional in the below command

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

services/analytics/src/oci_cli_analytics/generated/analytics_cli.py

@@ -55,10 +55,11 @@ def esxi_host_summary_group():
 @cli_util.option('--current-sku', type=custom_types.CliCaseInsensitiveChoice(["HOUR", "MONTH", "ONE_YEAR", "THREE_YEARS"]), help=u"""The billing option currently used by the ESXi host. [ListSupportedSkus].""")
 @cli_util.option('--next-sku', type=custom_types.CliCaseInsensitiveChoice(["HOUR", "MONTH", "ONE_YEAR", "THREE_YEARS"]), help=u"""The billing option to switch to after the existing billing cycle ends. If `nextSku` is null or empty, `currentSku` continues to the next billing cycle. [ListSupportedSkus].""")
 @cli_util.option('--compute-availability-domain', help=u"""The availability domain to create the ESXi host in. If keep empty, for AD-specific SDDC, new ESXi host will be created in the same availability domain; for multi-AD SDDC, new ESXi host will be auto assigned to the next availability domain following evenly distribution strategy.""")
-@cli_util.option('--failed-esxi-host-id', help=u"""The [OCID] of the ESXi host that is failed. This is an optional parameter. If this parameter is specified, a new ESXi host will be created to replace the failed one, and the `failedEsxiHostId` field will be udpated in the newly created Esxi host.""")
+@cli_util.option('--failed-esxi-host-id', help=u"""The [OCID] of the ESXi host that is failed. This is an optional parameter. If this parameter is specified, a new ESXi host will be created to replace the failed one, and the `failedEsxiHostId` field will be updated in the newly created Esxi host.""")
 @cli_util.option('--host-shape-name', help=u"""The compute shape name of the ESXi host. [ListSupportedHostShapes].""")
 @cli_util.option('--host-ocpu-count', type=click.FLOAT, help=u"""The OCPU count of the ESXi host.""")
 @cli_util.option('--capacity-reservation-id', help=u"""The [OCID] of the Capacity Reservation.""")
+@cli_util.option('--non-upgraded-esxi-host-id', help=u"""The [OCID] of the ESXi host that will be upgraded. This is an optional parameter. If this parameter is specified, an ESXi host with new version will be created to replace the original one, and the `nonUpgradedEsxiHostId` field will be updated in the newly created Esxi host.""")
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags].
 
 Example: `{\"Department\": \"Finance\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
@@ -73,7 +74,7 @@ def esxi_host_summary_group():
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'ocvp', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'ocvp', 'class': 'dict(str, dict(str, object))'}})
 @cli_util.wrap_exceptions
-def create_esxi_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sddc_id, display_name, current_sku, next_sku, compute_availability_domain, failed_esxi_host_id, host_shape_name, host_ocpu_count, capacity_reservation_id, freeform_tags, defined_tags):
+def create_esxi_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sddc_id, display_name, current_sku, next_sku, compute_availability_domain, failed_esxi_host_id, host_shape_name, host_ocpu_count, capacity_reservation_id, non_upgraded_esxi_host_id, freeform_tags, defined_tags):
 
     kwargs = {}
     kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
@@ -105,6 +106,9 @@ def create_esxi_host(ctx, from_json, wait_for_state, max_wait_seconds, wait_inte
     if capacity_reservation_id is not None:
         _details['capacityReservationId'] = capacity_reservation_id
 
+    if non_upgraded_esxi_host_id is not None:
+        _details['nonUpgradedEsxiHostId'] = non_upgraded_esxi_host_id
+
     if freeform_tags is not None:
         _details['freeformTags'] = cli_util.parse_json_parameter("freeform_tags", freeform_tags)
 

services/core/src/oci_cli_blockstorage/generated/blockstorage_cli.py

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

services/database/src/oci_cli_database/database_cli_extended.py

@@ -3,33 +3,24 @@
 # 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.
 
 from oci_cli import cli_util
-from prompt_toolkit import PromptSession
 from prompt_toolkit.document import Document
 from prompt_toolkit.completion import ThreadedCompleter
-from prompt_toolkit.styles import Style
-from interactive.oci_shell_completer import OciShellCompleter
 from interactive.bottom_toolbar import BottomToolbar
+from interactive.oci_shell_completer import OciShellCompleter
 from interactive.utils import (
-    styles_dict,
     AUTHENTICATION_PARAMS,
-    DEBUG_PARAMS,
     AUTO_PROMPT_PARAMS,
+    DEBUG_PARAMS,
     OCI_CLI_DISABLE_COLORS_ENV_VAR,
-    INTERACTIVE_COMMANDS_HISTORY_FILE_NAME,
 )
 
 from interactive.key_bindings import override_key_binding
-from interactive.commands_history import CommandsHistory
+from interactive.prompt_session import create_oci_prompt_session
 import os
 import sys
 
 
-def start_interactive_mode(ctx):
-
-    toolbar = BottomToolbar()
-    cli_interactive_history = CommandsHistory(
-        INTERACTIVE_COMMANDS_HISTORY_FILE_NAME
-    )
+def start_interactive_shell(ctx):
 
     # Getting the commands before --cli-auto-prompt, for example if the user execute oci --profile X compute instance --cli-auto-prompt,
     # then the interactive mode will begin with oci --profile X compute instance
@@ -57,30 +48,25 @@ def start_interactive_mode(ctx):
     endpoint = ctx.obj["endpoint"]
     ctx.obj["endpoint"] = None
 
-    colors_enabled = True
-    if OCI_CLI_DISABLE_COLORS_ENV_VAR in os.environ:
-        colors_enabled = False
-
-    style = Style.from_dict(styles_dict)
-    cli_command = [("class:oci", "> oci ")]
-
     # Initialize the document with the initial commands typed by the user
     document = Document(command_before_prompt, len(command_before_prompt))
     # Build the config before invoking the prompt session to raise any errors due to incorrect config
     cli_util.create_config_and_signer_based_on_click_context(ctx)
+
+    colors_enabled = True
+    if OCI_CLI_DISABLE_COLORS_ENV_VAR in os.environ:
+        colors_enabled = False
+
+    # Build Prompt
+    toolbar = BottomToolbar()
+    session = create_oci_prompt_session(colors_enabled, toolbar)
     completer = OciShellCompleter(ctx, colors_enabled, bottom_toolbar=toolbar)
     kb = override_key_binding(completer=completer, toolbar=toolbar)
     multithread_completer = ThreadedCompleter(
         completer
     )  # This is needed for oci resources suggestion to not block the user until the result comes
-    os.system("clear")  # Start from the beginning of the terminal window to avoid "window too small" error
-    session = PromptSession(
-        message=cli_command,
-        style=style if colors_enabled else None,
-        complete_while_typing=True,
-        bottom_toolbar=toolbar.show_toolbar,
-        history=cli_interactive_history,
-    )
+
+    # Get Command
     text = session.prompt(
         completer=multithread_completer, default=document, key_bindings=kb
     )
@@ -95,4 +81,6 @@ def start_interactive_mode(ctx):
         + " "
         + text if text else ""
     )
+
+    # Execute Command
     os.system(command)

services/database/src/oci_cli_database/generated/database_cli.py

@@ -0,0 +1,108 @@
+# coding: utf-8
+# 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.
+
+from prompt_toolkit import PromptSession
+from prompt_toolkit.application import get_app
+from prompt_toolkit.styles import Style
+from prompt_toolkit.layout import Dimension, FormattedTextControl, Window
+from interactive.commands_history import CommandsHistory
+from interactive.error_messages import get_error_message
+
+from interactive.utils import (
+    styles_dict,
+    INTERACTIVE_COMMANDS_HISTORY_FILE_NAME,
+)
+
+
+def create_oci_prompt_session(colors_enabled=True, bottom_toolbar=None):
+    """
+    Setup resources and create Oci Prompt Session
+    """
+
+    # Setup History
+    cli_interactive_history = CommandsHistory(
+        INTERACTIVE_COMMANDS_HISTORY_FILE_NAME
+    )
+
+    # Setup Style
+    style = Style.from_dict(styles_dict)
+    cli_command = [("class:oci", "> oci ")]
+
+    # Create Session
+    session = OciPromptSession(
+        message=cli_command,
+        style=style if colors_enabled else None,
+        complete_while_typing=True,
+        dynamic_size=True,  # Turn on dynamic sizing session
+        min_space=4,  # bottom toolbar uses 3 additional rows
+        max_space=20,  # Autocomplete menu does not show more than 16 items
+        b_toolbar=bottom_toolbar,
+        history=cli_interactive_history,
+    )
+
+    return session
+
+
+class OciPromptSession(PromptSession):
+    def __init__(
+        self,
+        b_toolbar=None,
+        dynamic_size=False,
+        min_space=0,
+        max_space=0,
+        *args,
+        **kwargs
+    ):
+        super().__init__(bottom_toolbar=b_toolbar.show_toolbar, *args, **kwargs)
+
+        # Setup Dynamic Sizing Window Variables
+        # Set to 0 or False to turn off
+        self.dynamic_size = dynamic_size
+        self.min_space = max(min_space, 0)
+        self.max_space = max(max_space, 0)
+
+        # Save Bottom Toolbar variables & functions
+        if b_toolbar:
+            self.bottom_toolbar_size = b_toolbar.size
+            self.bottom_toolbar_msg = b_toolbar.set_toolbar_text
+            self.reserve_space_for_menu = max(self.min_space - self.bottom_toolbar_size, 0)
+        else:
+            self.bottom_toolbar_size = 0
+            self.bottom_toolbar_msg = None
+            self.reserve_space_for_menu = self.min_space
+
+        # Update window too small error
+        self.layout.container.window_too_small = Window(
+            FormattedTextControl(
+                text=[("class:window-too-small", get_error_message("terminal_too_small"))]
+            )
+        )
+
+    def _get_default_buffer_control_height(self) -> Dimension:
+        """
+        Controls the Dimension height for prompt session and window_too_small error message handling
+        """
+        # Run parent's checks
+        dimension = super()._get_default_buffer_control_height()
+
+        # Compute largest possible window hieght
+        height = get_app().output.get_size().rows - 1
+        if not self.max_space:
+            max_window_size = height
+        else:
+            max_window_size = min(self.max_space, height)
+        max_window_size = max(max_window_size - self.bottom_toolbar_size, 0)
+
+        # Set Window Height
+        if self.dynamic_size and self.completer.completer.size and dimension.min:
+            dimension.min = min(self.completer.completer.size + 1, max_window_size)
+
+        # Window is too small for autocomplete menu to display
+        if self.bottom_toolbar_msg and max_window_size <= 0:
+            self.bottom_toolbar_msg(
+                get_error_message("terminal_too_small"),
+                is_error=True,
+            )
+
+        return dimension