diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index a0f7cf6..699e3a9 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,14 +1,14 @@ -diff -Nur oci-cli-2.24.5/requirements.txt new/requirements.txt ---- oci-cli-2.24.5/requirements.txt 2021-05-19 01:47:14.000000000 +0200 -+++ new/requirements.txt 2021-05-20 18:19:50.801629082 +0200 +diff -Nru oci-cli-2.25.4.orig/requirements.txt oci-cli-2.25.4/requirements.txt +--- oci-cli-2.25.4.orig/requirements.txt 2021-06-22 23:53:53.000000000 +0200 ++++ oci-cli-2.25.4/requirements.txt 2021-06-29 11:03:08.743404407 +0200 @@ -2,41 +2,41 @@ # (https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format), # you may need to use the --extra-index-url option instead. -appdirs==1.4.3 -arrow==0.17.0 -+appdirs~=1.4.3 -+arrow~=0.17.0 ++appdirs>=1.4.3 ++arrow>=0.17.0 certifi cffi>=1.9.1 -click==6.7 @@ -20,7 +20,7 @@ diff -Nur oci-cli-2.24.5/requirements.txt new/requirements.txt -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.38.3 +-oci==2.40.1 -packaging==20.2 -pluggy==0.13.0 -py==1.10.0 @@ -30,31 +30,32 @@ diff -Nur oci-cli-2.24.5/requirements.txt new/requirements.txt -pyparsing==2.2.0 -pytest==3.2.3 -pytest-cov==2.5.1 -+click~=6.7 -+configparser~=4.0.2 -+coverage~=4.5.2 -+cryptography~=3.3.2 -+httpsig-cffi~=15.0.0 -+Jinja2~=2.11.3 -+jmespath~=0.10.0 -+ndg-httpsclient~=0.4.2 -+mock~=2.0.0 -+oci~=2.38.3 -+packaging~=20.2 -+pluggy~=0.13.0 -+py~=1.10.0 -+pyasn1~=0.2.3 -+pyOpenSSL~=19.1.0 -+pycparser~=2.20 -+pyparsing~=2.2.0 -+pytest~=3.2.3 -+pytest-cov~=2.5.1 - python-dateutil>=2.5.3,<3.0.0 +-python-dateutil>=2.5.3,<3.0.0 ++click>=6.7 ++configparser>=4.0.2 ++coverage>=4.5.2 ++cryptography>=3.3.2 ++httpsig-cffi>=15.0.0 ++Jinja2>=2.11.3 ++jmespath>=0.10.0 ++ndg-httpsclient>=0.4.2 ++mock>=2.0.0 ++oci>=2.40.1 ++packaging>=20.2 ++pluggy>=0.13.0 ++py>=1.10.0 ++pyasn1>=0.2.3 ++pyOpenSSL>=19.1.0 ++pycparser>=2.20 ++pyparsing>=2.2.0 ++pytest>=3.2.3 ++pytest-cov>=2.5.1 ++python-dateutil>=2.5.3 pytz>=2016.10 -requests==2.21.0 -retrying==1.3.3 -+requests~=2.21.0 -+retrying~=1.3.3 ++requests>=2.21.0 ++retrying>=1.3.3 setuptools<45 -six==1.14.0 -sphinx==1.6.4 @@ -65,54 +66,55 @@ diff -Nur oci-cli-2.24.5/requirements.txt new/requirements.txt -virtualenv==16.7.10 -pytest-xdist==1.22.2 -pytest-forked==1.0.2 --PyYAML==5.4.1 -+six~=1.14.0 -+sphinx~=1.6.4 -+sphinx-rtd-theme~=0.2.5b1 -+terminaltables~=3.1.0 -+tox~=3.23.0 -+vcrpy~=1.13.0 -+virtualenv~=16.7.10 -+pytest-xdist~=1.22.2 -+pytest-forked~=1.0.2 -+PyYAML~=5.4.1 -diff -Nur oci-cli-2.24.5/setup.py new/setup.py ---- oci-cli-2.24.5/setup.py 2021-05-19 01:47:14.000000000 +0200 -+++ new/setup.py 2021-05-20 18:19:50.801629082 +0200 +-PyYAML>=5.4,<6 ++six>=1.14.0 ++sphinx>=1.6.4 ++sphinx-rtd-theme>=0.2.5b1 ++terminaltables>=3.1.0 ++tox>=3.23.0 ++vcrpy>=1.13.0 ++virtualenv>=16.7.10 ++pytest-xdist>=1.22.2 ++pytest-forked>=1.0.2 ++PyYAML>=5.4 +diff -Nru oci-cli-2.25.4.orig/setup.py oci-cli-2.25.4/setup.py +--- oci-cli-2.25.4.orig/setup.py 2021-06-22 23:53:53.000000000 +0200 ++++ oci-cli-2.25.4/setup.py 2021-06-29 11:03:26.806320907 +0200 @@ -30,24 +30,24 @@ readme = f.read() requires = [ -- 'oci==2.38.3', +- 'oci==2.40.1', - 'arrow==0.17.0', -+ 'oci~=2.38.3', -+ 'arrow~=0.17.0', ++ 'oci>=2.40.1', ++ 'arrow>=0.17.0', 'certifi', - 'click==6.7', - 'configparser==4.0.2', -- 'cryptography==3.3.2', +- 'cryptography>=3.2.1,<=3.4.7', - 'jmespath==0.10.0', -+ 'click~=6.7', -+ 'configparser~=4.0.2', -+ 'cryptography~=3.3.2', -+ 'jmespath~=0.10.0', - 'python-dateutil>=2.5.3,<3.0.0', +- 'python-dateutil>=2.5.3,<3.0.0', ++ 'click>=6.7', ++ 'configparser>=4.0.2', ++ 'cryptography>=3.2.1', ++ 'jmespath>=0.10.0', ++ 'python-dateutil>=2.5.3', 'pytz>=2016.10', - 'retrying==1.3.3', - 'six==1.14.0', - 'terminaltables==3.1.0', - 'pyOpenSSL==19.1.0', -- 'PyYAML==5.4.1' -+ 'retrying~=1.3.3', -+ 'six~=1.14.0', -+ 'terminaltables~=3.1.0', -+ 'pyOpenSSL~=19.1.0', -+ 'PyYAML~=5.4.1' +- 'PyYAML>=5.4,<6' ++ 'retrying>=1.3.3', ++ 'six>=1.14.0', ++ 'terminaltables>=3.1.0', ++ 'pyOpenSSL>=19.1.0', ++ 'PyYAML>=5.4' ] extras = { - 'db': ['cx_Oracle==7.0'] -+ 'db': ['cx_Oracle~=7.0'] ++ 'db': ['cx_Oracle>=7.0'] } fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE") diff --git a/oci-cli-2.24.5.tar.gz b/oci-cli-2.24.5.tar.gz deleted file mode 100644 index 2c325db..0000000 --- a/oci-cli-2.24.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f1afde3a07337c7f71ba99376a9d78e76d9059443f23c70b8bb8b569037bd2d -size 1718865 diff --git a/oci-cli-2.25.4.tar.gz b/oci-cli-2.25.4.tar.gz new file mode 100644 index 0000000..3ad55b2 --- /dev/null +++ b/oci-cli-2.25.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0c3863528938ea856404fab217861de953b181b5db00cc69dab15e9f163c2c8 +size 1793538 diff --git a/oci-cli.changes b/oci-cli.changes index bf279e4..dae8467 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,14 +1,158 @@ +------------------------------------------------------------------- +Tue Jun 29 10:38:35 UTC 2021 - John Paul Adrian Glaubitz + +- Update to version 2.25.4 + * Users can authenticate the CLI with only environment variables, + a config does not need to exist + * The following environment variables need to be set, OCI_CLI_USER, OCI_CLI_TENANCY, + OCI_CLI_FINGERPRINT, OCI_CLI_KEY_FILE, OCI_CLI_REGION + * Optional variable for passphrase, OCI_CLI_PASSPHRASE + * Support for VMBM Pluggable Database feature as a part of the Database Service + * ``oci db pluggable-database`` + * Support for cross-tenancy volume clone in Block Storage service + * ``oci bv volume create --source-volume-id`` + * ``oci bv boot-volume create --source-volume-id`` + * Changed allowed versions of cryptography package to a range from 3.2.1 to 3.4.7 + * Following updates in installer scripts: + * Use dnf, if available, to install python + * Updated check for ubuntu/debian systems to use ID_LIKE/ID + instead of NAME in /etc/os-release + * oci setup bootstrap was causing a ``AttributeError: module 'oci' has no attribute 'identity'`` + - from version 2.25.3 + * Support for migrating an OKE cluster not integrated with your + VCN to a VCN-Native cluster in Container Engine + * ``oci ce cluster cluster-migrate-to-native-vcn`` + * ``oci ce cluster cluster-migrate-to-native-vcn-status`` + * Support for filtering of applications based on spark version in Data Flow service + * ``oci data-flow application list --spark-version`` + * Support for registration and management of target databases in Data Safe service. + * ``oci data-safe target-database create`` + * Support for Elastic Storage feature for Exadata Infrastructure + resources for ExaCC in Database service. + * ``oci db exadata-infrastructure create --compute-count`` + * ``oci db exadata-infrastructure update --additional-storage-count`` + * ``oci db exadata-infrastructure add --exadata-infrastructure-id`` + * New parameter --parameters-config has been added to the below commands + in Management Dashboard service + * ``oci management-dashboard dashboard create --parameters-config`` + * ``oci management-dashboard dashboard update`` + * ``oci management-dashboard saved-search create`` + * ``oci management-dashboard saved-search update`` + * PyYAML version requirement relaxed from PyYAML==5.4.1 to PyYAML>=5.4,<6 + * Default thread count for multipart upload/download using ``oci os object put | get`` is 10. + * Multipart download is now default for ``oci os object get``. + Please use ``--no-multipart`` to disable multipart download. + * Changed multipart download chunk size to maximum instead of 1Mb + * Parameter --compartment-id was existing twice in change compartment + for rove node in Rover service + * ``oci rover node change-compartment --compartment-id`` + * Issue with multipart download - progress bar was only showing 50% even + though full file was uploaded. + - from version 2.25.2 + * Support for Java Management Service + * ``oci jms`` + * Support to update iscsi Login State for a Volume Attachment in Compute service + * ``oci compute volume-attachment update --iscsi-login-state`` + * Support for 'host-name' and 'is-database-instance-level-metrics' query parameters + in Operations Insights service + * ``oci opsi database-insights summarize-database-insight-resource-capacity-trend`` + * ``oci opsi database-insights summarize-database-insight-resource-forecast-trend`` + * ``oci opsi database-insights summarize-database-insight-resource-statistics`` + * ``oci opsi database-insights summarize-database-insight-resource-usage`` + * ``oci opsi database-insights summarize-database-insight-resource-usage-trend`` + * ``oci opsi database-insights summarize-database-insight-resource-utilization-insight`` + * ``oci opsi database-insights summarize-sql-insights`` + * ``oci opsi database-insights summarize-sql-statistics`` + * ``oci opsi database-insights summarize-sql-statistics-time-series`` + * Support for listing database configurations in Operations Insights service + * ``oci opsi database-insights list-database-configurations`` + * Added support for a new type of Source called Import for use with the + Export tool in Application Migration service + * ``oci application-migration source create-source-import-source-details`` + * ``oci application-migration source update-source-import-source-details`` + - from version 2.25.1 + * Support for configuration of autonomous database KMS keys in the Database service + * ``oci db autonomous-database configure-autonomous-database-vault-key`` + * Support for creating database software images from an existing database home in the Database service + * ``oci db database-software-image create --source-db-home-id`` + * Support for creating database software images with any supported RUs in the Database service + * ``oci db database-software-image create --database-version [optional], --patch-set[optional]`` + * ``--is-desupported-version`` flag is added to take customer acknowledgment + for creating database-software images with release older than N-3 + * ``oci db database create --is-desupported-version`` + * ``oci db database create-from-backup --is-desupported-version`` + * ``oci db database create-from-database --is-desupported-version`` + * ``oci db db-home create --is-desupported-version`` + * Support for listing all NSGs associated with a given VLAN in the Networking service + * ``oci network nsg list --compartment-id [optional]`` + * Services are now dynamically imported for autocomplete, speeding up completion time + * Previous release had a bug causing some CLI commands to error with 'KeyError'. + Please see `github issue #415 `_ for more details + - from version 2.25.0 + * [Breaking] For CLI installations running on Python 3.5 or lower, warning message to upgrade + Python to v3.6+ and reinstall CLI before August 1st, 2021 will be seen. + * To disable the warning message, set environment variable ``OCI_CLI_ALLOW_PYTHON2=True`` + * O is a wrapper for oci-cli, providing an alternate interface with shortcuts to all + commands, parameters, resource IDs, and output fields. + * O can be found on `GitHub `__. + * Support for Generic Artifacts Service (``oci artifacts``) + * Support for Bastion Service (``oci bastion``) + * Support to provide visualization to view the Automatic Workload Repository (AWR) data + for external database in Database Management Service + * ``oci database-management get-awr-db-report`` + * ``oci database-management get-awr-db-sql-report`` + * ``oci database-management list-awr-db-snapshots`` + * ``oci database-management list-awr-dbs`` + * ``oci database-management summarize-awr-db-cpu-usages`` + * ``oci database-management summarize-awr-db-metrics`` + * ``oci database-management summarize-awr-db-parameter-changes`` + * ``oci database-management summarize-awr-db-parameters`` + * ``oci database-management summarize-awr-db-snapshot-ranges`` + * ``oci database-management summarize-awr-db-sysstats`` + * ``oci database-management summarize-awr-db-top-wait-events`` + * ``oci database-management summarize-awr-db-wait-event-buckets`` + * ``oci database-management summarize-awr-db-wait-events`` + * Support for VM.Standard.E3.Flex Flexible Compute Shape with customizable OCPUs + and memory for Data Science Notebooks + * ``oci data-science notebook-session create --configuration-details`` + * ``oci data-science notebook-session update --configuration-details`` + * Support for HCX Enterprise Add-on for Oracle Cloud VMware Solution + * ``oci ocvs sddc cancel-downgrade-hcx`` + * ``oci ocvs sddc downgrade-hcx`` + * ``oci ocvs sddc refresh-hcx-license-status`` + * ``oci ocvs sddc upgrade-hcx`` + * ``current-sku`` parameter in ``oci ocvs esxi-host create`` is now optional + * ``initial-sku`` parameter in ``oci ocvs sddc create`` is now optional + * Support for Secrets Read By Name as part of Secrets in Vault Service + * ``oci secrets secret-bundle get-secret-bundle-by-name`` + * Support for ``isDynamic`` field in the response for ``oci limits definition list`` + * Service modules are now dynamically imported at runtime, speeding up CLI invocations +- Refresh patches for new version + + oc_relax-python-depends.patch +- Replace %autosetup with %patch and %setup again in %prep section + + Preferred as it allows to enable and disable patches individually +- Update BuildRequires and Requires from setup.py +- Use find command to search for Python sources for sed regexp-replace + ------------------------------------------------------------------- Thu May 20 16:16:13 UTC 2021 - Ferdinand Thiessen - Update to version 2.24.5 - * Support for Object storage configuration source in the - Resource Manager service - * Support for spark-submit compatible options in the Data Flow service - * Fixed: Wait for state parameter for the following commands were - returning an error on valid states - * Fixed list commands in Artifacts service -- Refresh oc_relax-python-depends.patch + * Support for database maintenance run patchMode feature as a part + of the Database Service + * ``oci db maintenance-run`` + * PyYAML was upgraded to version 5.4.1 to address a vulnerability identified + on GitHub as CVE-2020-14343 + * Py was upgraded to version 1.10.0 to address a vulnerability identified on GitHub + as CVE-2020-29651. Py isn't used in our run-time system but as part of our + documentation build process. +- Refresh patches for new version + + oc_relax-python-depends.patch +- Replace %patch and %setup with %autosetup in %prep section +- Replace `python3 setup.py build` with %python3_build in %build section +- Replace `python3 setup.py install` with %python3_install in %install section +- Switch Source URL to use %{url} macro +- Update BuildRequires and Requires from setup.py ------------------------------------------------------------------- Fri May 14 11:21:31 UTC 2021 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index d8c4c39..5178ff8 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -28,7 +28,7 @@ %bcond_with test %endif Name: oci-cli%{psuffix} -Version: 2.24.5 +Version: 2.25.4 Release: 0 Summary: Oracle Cloud Infrastructure CLI License: Apache-2.0 @@ -44,10 +44,10 @@ BuildRequires: python3-PyYAML >= 5.4.1 BuildRequires: python3-arrow >= 0.14.7 BuildRequires: python3-certifi BuildRequires: python3-click >= 6.7 -BuildRequires: python3-cryptography >= 3.3.2 +BuildRequires: python3-cryptography >= 3.2.1 BuildRequires: python3-devel BuildRequires: python3-jmespath >= 0.9.4 -BuildRequires: python3-oci-sdk >= 2.38.3 +BuildRequires: python3-oci-sdk >= 2.40.1 BuildRequires: python3-pyOpenSSL >= 18.0.0 BuildRequires: python3-python-dateutil >= 2.5.3 BuildRequires: python3-pytz >= 2016.10 @@ -83,9 +83,9 @@ Requires: python3-PyYAML >= 5.4.1 Requires: python3-arrow >= 0.14.7 Requires: python3-certifi Requires: python3-click >= 6.7 -Requires: python3-cryptography >= 3.3.2 +Requires: python3-cryptography >= 3.2.1 Requires: python3-jmespath >= 0.10.0 -Requires: python3-oci-sdk >= 2.38.3 +Requires: python3-oci-sdk >= 2.40.1 Requires: python3-pyOpenSSL >= 18.0.0 Requires: python3-python-dateutil >= 2.5.3 Requires: python3-pytz >= 2016.10 @@ -103,10 +103,12 @@ Some of these, such as the ability to run scripts, extend the Console's functionality. %prep -%autosetup -p1 +%setup -q -n oci-cli-%{version} +%patch0 -p1 +%patch1 -p1 # Fix includes -sed -i 's/from oci._vendor //' src/oci_cli/*.py services/container_engine/src/oci_cli_container_engine/*.py services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/*.py services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/*.py services/dts/src/oci_cli_dts/*.py tests/*.py -sed -i 's/oci\._vendor\.//' src/oci_cli/*.py services/dts/src/oci_cli_dts/*.py services/container_engine/src/oci_cli_container_engine/*.py tests/*.py tests/vcr_mods/*.py +find . -name "*.py" -exec sed -i 's/from oci\._vendor //' \{\} + +find . -name "*.py" -exec sed -i 's/oci\._vendor\.//' \{\} + %build %python3_build