Merge pull request #740 from oracle/release_2024-01-11

Releasing version 3.37.3

Author: NiviPari

CHANGELOG.rst

@@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
 
+3.37.3 - 2024-01-10
+--------------------
+Fixed
+~~~~~
+* Reverted YubiKey authentication
+
+
 3.37.2 - 2024-01-09
 --------------------
 Added

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.118.1
+oci==2.118.2
 packaging==20.2
 pluggy==0.13.0
 py==1.11.0

setup.py

@@ -30,7 +30,7 @@ def open_relative(*path):
     readme = f.read()
 
 requires = [
-    'oci==2.118.1',
+    'oci==2.118.2',
     'arrow>=1.0.0',
     'certifi',
     'click==8.0.4',

src/oci_cli/cli_constants.py

@@ -18,7 +18,6 @@
 OCI_CLI_AUTH_RESOURCE_PRINCIPAL = 'resource_principal'
 OCI_CLI_AUTH_INSTANCE_OBO_USER = 'instance_obo_user'
 OCI_CLI_AUTH_API_KEY = 'api_key'
-OCI_CLI_AUTH_YUBIKEY = 'yubi_key'
 OCI_CLI_AUTH_SESSION_TOKEN = 'security_token'
 OCI_CLI_UPST_TOKEN_MAX_TTL = '60'
 OCI_CLI_UPST_TOKEN_MIN_TTL = '5'

src/oci_cli/cli_root.py

@@ -43,7 +43,7 @@
 # important security information.
 logging.basicConfig(level=logging.WARN)
 
-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, cli_constants.OCI_CLI_AUTH_YUBIKEY]
+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]
 
 OCI_HELP = 'Oracle Cloud Infrastructure command line interface'
 

src/oci_cli/cli_util.py

@@ -353,7 +353,6 @@ def create_config_and_signer_based_on_click_context(ctx):
     resource_principal_auth = 'auth' in ctx.obj and ctx.obj['auth'] == cli_constants.OCI_CLI_AUTH_RESOURCE_PRINCIPAL
     session_token_auth = 'auth' in ctx.obj and ctx.obj['auth'] == cli_constants.OCI_CLI_AUTH_SESSION_TOKEN
     delegation_token_auth = 'auth' in ctx.obj and ctx.obj['auth'] == cli_constants.OCI_CLI_AUTH_INSTANCE_OBO_USER
-    yubikey_auth = 'auth' in ctx.obj and ctx.obj['auth'] == cli_constants.OCI_CLI_AUTH_YUBIKEY
 
     signer = None
     kwargs = {}
@@ -425,11 +424,6 @@ def create_config_and_signer_based_on_click_context(ctx):
         if ctx.obj['debug']:
             logger.debug("auth: resource_principal")
         signer = oci.auth.signers.resource_principals_signer.get_resource_principals_signer()
-    elif yubikey_auth:
-        if ctx.obj['debug']:
-            logger.debug("auth: yubi_key")
-        yk_pin = oci.auth.signers.YubikeyRequestSigner.get_yubikey_pin()
-        signer = oci.auth.signers.YubikeyRequestSigner.get_yubikey_signer(client_config, yk_pin)
     kwargs['signer'] = signer
 
     try:

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.37.2'
+__version__ = '3.37.3'