From aae6466594feb951664ae04cec2e682f7d82daa6 Mon Sep 17 00:00:00 2001 From: NupurGupta3101 Date: Wed, 10 Jan 2024 17:30:49 +0000 Subject: [PATCH] Releasing version 3.37.3 Co-authored-by: Hamada Ibrahim Co-authored-by: Harsh Kumar Co-authored-by: Kanvi Pasricha Co-authored-by: Alex Le Co-authored-by: Karthik Kamath Co-authored-by: Mandy Tsai Co-authored-by: Pankaj Joshi Co-authored-by: Anup Singh --- CHANGELOG.rst | 7 +++++++ requirements.txt | 2 +- setup.py | 2 +- src/oci_cli/cli_constants.py | 1 - src/oci_cli/cli_root.py | 2 +- src/oci_cli/cli_util.py | 6 ------ src/oci_cli/version.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5244bf408..ac0b82a38 100644 --- a/CHANGELOG.rst +++ b/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 `__. +3.37.3 - 2024-01-10 +-------------------- +Fixed +~~~~~ +* Reverted YubiKey authentication + + 3.37.2 - 2024-01-09 -------------------- Added diff --git a/requirements.txt b/requirements.txt index c89c13be7..b08f32659 100644 --- 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.118.1 +oci==2.118.2 packaging==20.2 pluggy==0.13.0 py==1.11.0 diff --git a/setup.py b/setup.py index 88a79b994..9a70e3a8e 100644 --- a/setup.py +++ b/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', diff --git a/src/oci_cli/cli_constants.py b/src/oci_cli/cli_constants.py index 506bc41d7..153e0a163 100644 --- a/src/oci_cli/cli_constants.py +++ b/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' diff --git a/src/oci_cli/cli_root.py b/src/oci_cli/cli_root.py index abb891e69..718c96fcf 100644 --- a/src/oci_cli/cli_root.py +++ b/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' diff --git a/src/oci_cli/cli_util.py b/src/oci_cli/cli_util.py index 75c09e3b5..2f5befafa 100644 --- a/src/oci_cli/cli_util.py +++ b/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: diff --git a/src/oci_cli/version.py b/src/oci_cli/version.py index 948476509..2bf2ee52c 100644 --- 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.37.2' +__version__ = '3.37.3'