oci-utils 0.14.0-3

Author: guidotijskens

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: oci-utils
-Version: 0.14.1
+Version: 0.14.0
 Summary: Oracle Cloud Infrastructure utilities
 Home-page: http://github.com/oracle/oci-utils/
 Author: Laszlo Peter

bin/oci-attached-volumes

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
+
+# utility verifies if instance principal authentication with OCI is
+# configured correctly to create a working oci session.
+
+_PY3=/usr/bin/python3
+_PY_CMD=oci_attached_volumes_main.py
+s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
+
+exec ${_PY3}  ${s_dir}/${_PY_CMD} "$@"
+

bin/oci-network-config

@@ -178,7 +178,7 @@ then
     cmd_line="$cmd_line --ip-address=${PRIVATE_IP}"
   fi
 # else
-#  echo "_GT_ ${COMMAND} handled elsewhere"
+#  echo "${COMMAND} handled elsewhere"
 fi
 
 if [ ${EXCLUDED_ITEMS[${COMMAND}]+_} ] &&  [ -n "${EXCLUDED_ITEMS[${COMMAND}]}" ]

buildrpm/oci-utils.spec

@@ -1,6 +1,6 @@
 Name: oci-utils
 Version: 0.14.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Url: http://cloud.oracle.com/iaas
 Summary: Oracle Cloud Infrastructure utilities
 License: UPL
@@ -206,6 +206,11 @@ rm -rf %{buildroot}
 /opt/oci-utils/tests/__init__*
 
 %changelog
+* Thu Sep 22 2022 Guido Tijskens <guido.tijskens@oracle.com> -- 0.14.0-3
+- LINUX-11440/LINUX-12246 iscsi does not fall back to scanning if authentication succeeds but get instance data fails
+- added oci-attached-volumes, collects data on volumes, via OCI if priviliges in place, via scan otherwise.
+- LINUX-12907 sudo oci-network-config --show missing spaces between values
+
 * Mon Sep 5 2022 Guido Tijskens <guido.tijskens@oracle.com> -- 0.14.0-2
 - LINUX-12761/OLUEK-6199 ocid leaves lots of connections in CLOSE_WAIT state
 

data/oci-migrate-conf.yaml

@@ -294,9 +294,9 @@ ol_os_oci_region_bash :
     - '#!/bin/bash'
     - unset http_proxy
     - unset https_proxy
-    - CURL=$(which curl)
-    - JQ=$(which jq)
-    - CUT=$(which cut)
+    - CURL=$(command -v curl)
+    - JQ=$(command -v jq)
+    - CUT=$(command -v cut)
     - METADATAURL="http://169.254.169.254"
     - OCIREGION=$(${CURL} -sfm 5 ${METADATAURL}/opc/v1/instance/ | ${JQ} -r '.region' | ${CUT} -d '-' -f 2)
     - echo '-'$OCIREGION > /etc/yum/vars/ociregion
@@ -313,9 +313,9 @@ ubuntu_os_snapd_bash:
     - '#!/bin/bash'
     - SNAPD='snapd'
     - snaplist=_XXXX_
-    - SNAP=$(which snap)
-    - SYSCTL=$(which systemctl)
-    - LOGGER=$(which logger)
+    - SNAP=$(command -v snap)
+    - SYSCTL=$(command -v systemctl)
+    - LOGGER=$(command -v logger)
     - ${SYSCTL} enable ${SNAPD}
     - ${SYSCTL} start ${SNAPD}
     - snapdstatus=$(${SYSCTL} status ${SNAPD})
@@ -338,8 +338,8 @@ reinitialise_cloud_init_script : /usr/local/bin/reinitialise_cloud_init.sh
 reinitialise_cloud_init:
     - '#!/bin/bash'
     - CLOUDINIT='cloud-init'
-    - RM=$(which rm)
-    - SYSTEMCTL=$(which systemctl)
+    - RM=$(command -v rm)
+    - SYSTEMCTL=$(command -v systemctl)
     - VARLIBCLOUD='/var/lib/cloud/'
     - VARLOGCLOUD='/var/log/cloud'
     - ${RM} -rf "${VARLIBCLOUD}*"

lib/oci_utils/__init__.py

@@ -159,9 +159,7 @@ def is_root_user():
     -------
         bool: True if root, False otherwise.
     """
-    if os.geteuid() != 0:
-        return False
-    return True
+    return bool(os.getuid() == 0)
 
 
 def get_os_release_data():