From f9e71a1ce1d1a13829982a3078b0e679953a3a8367a7b19dfd3549715d0bf7a8 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 9 Jan 2020 22:38:28 +0000 Subject: [PATCH] Accepting request 762190 from home:glaubitz:branches:Cloud:Tools - Update to version 2.7.0 + Support for Oracle Cloud Infrastructure API Gateway service * ``oci apigateway`` + Boot volumes support for cross-region backups in Block Volume Service * ``oci bv boot-volume-backup copy`` * ``oci bv boot-volume-backup list --source-boot-volume-backup-id`` + Support for managing TSIG Key resources in the DNS service. * ``oci dns tsig-key`` + Support for referencing TSIG Key resources by OCID within Zone resources in the DNS service. * ``oci dns zone create --external-masters`` * ``oci dns zone update --external-masters`` + Removed Identity Cloud service(idcs) access token requirement for Container Engine delete operation. Also, support secondary idcs stripe for Container Engine creation. * ``oci oce oce-instance delete`` * ``oci oce oce-instance create --identity-stripe`` + Support to resize compute virtual machine instance to a different shape in Compute Service. * ``oci compute instance update --id [--shape ]`` + Support for OS Management Service. * ``oci os-management`` + Improve nodepool creation, specify the image of the nodes by the image OCID in the Container Engine Service. * ``oci ce node-pool create --node-image-id`` + Add management configuration for oracle-cloud-agent in Compute Service * ``oci compute instance launch --agent-config`` + Support for Marketplace Service. * ``oci marketplace`` + Allow customers to bring their own keys to Key Management Service. * ``oci kms management get-wrapping-key`` * ``oci kms management import-key`` * ``oci kms management import-key-version`` OBS-URL: https://build.opensuse.org/request/show/762190 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/oci-cli?expand=0&rev=3 --- _multibuild | 3 + oc_relax-python-depends.patch | 33 ++++++----- oci-cli.changes | 107 ++++++++++++++++++++++++++++++++++ oci-cli.spec | 62 ++++++++++++-------- v2.6.10.tar.gz | 3 - v2.7.0.tar.gz | 3 + 6 files changed, 167 insertions(+), 44 deletions(-) create mode 100644 _multibuild delete mode 100644 v2.6.10.tar.gz create mode 100644 v2.7.0.tar.gz diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..6996b96 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index 3efe8e4..b0172f1 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,6 +1,6 @@ -diff -Nru oci-cli-2.6.10.orig/requirements.txt oci-cli-2.6.10/requirements.txt ---- oci-cli-2.6.10.orig/requirements.txt 2019-10-29 21:42:32.000000000 +0100 -+++ oci-cli-2.6.10/requirements.txt 2019-11-04 15:40:31.292795606 +0100 +diff -Nru oci-cli-2.7.0.orig/requirements.txt oci-cli-2.7.0/requirements.txt +--- oci-cli-2.7.0.orig/requirements.txt 2019-12-17 23:36:23.000000000 +0100 ++++ oci-cli-2.7.0/requirements.txt 2020-01-09 13:48:34.711288988 +0100 @@ -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. @@ -16,17 +16,12 @@ diff -Nru oci-cli-2.6.10.orig/requirements.txt oci-cli-2.6.10/requirements.txt -coverage==4.5.1 -cryptography==2.4.2 -httpsig-cffi==15.0.0 -+click>=6.7 -+configparser>=3.5.0 -+coverage>=4.5.1 -+cryptography>=2.4.2 -+httpsig-cffi>=15.0.0 - idna>=2.5,<2.7 +-idna>=2.5,<2.7 -Jinja2==2.10.1 -jmespath==0.9.3 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.6.2 +-oci==2.8.0 -packaging==16.8 -pluggy==0.4.0 -py==1.4.33 @@ -50,11 +45,17 @@ diff -Nru oci-cli-2.6.10.orig/requirements.txt oci-cli-2.6.10/requirements.txt -pytest-xdist==1.22.2 -pytest-forked==1.0.2 -PyYAML==5.1.2 ++click>=6.7 ++configparser>=3.5.0 ++coverage>=4.5.1 ++cryptography>=2.4.2 ++httpsig-cffi>=15.0.0 ++idna>=2.5 +Jinja2>=2.10.1 +jmespath>=0.9.3 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.6.2 ++oci>=2.8.0 +packaging>=16.8 +pluggy>=0.4.0 +py>=1.4.33 @@ -78,16 +79,16 @@ diff -Nru oci-cli-2.6.10.orig/requirements.txt oci-cli-2.6.10/requirements.txt +pytest-xdist>=1.22.2 +pytest-forked>=1.0.2 +PyYAML>=5.1.2 -diff -Nru oci-cli-2.6.10.orig/setup.py oci-cli-2.6.10/setup.py ---- oci-cli-2.6.10.orig/setup.py 2019-10-29 21:42:32.000000000 +0100 -+++ oci-cli-2.6.10/setup.py 2019-11-04 15:41:30.808951702 +0100 +diff -Nru oci-cli-2.7.0.orig/setup.py oci-cli-2.7.0/setup.py +--- oci-cli-2.7.0.orig/setup.py 2019-12-17 23:36:23.000000000 +0100 ++++ oci-cli-2.7.0/setup.py 2020-01-09 13:47:58.415544372 +0100 @@ -29,25 +29,25 @@ readme = f.read() requires = [ -- 'oci==2.6.2', +- 'oci==2.8.0', - 'arrow==0.10.0', -+ 'oci>=2.6.2', ++ 'oci>=2.8.0', + 'arrow>=0.10.0', 'certifi', - 'click==6.7', diff --git a/oci-cli.changes b/oci-cli.changes index f35307b..d415c2b 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,110 @@ +------------------------------------------------------------------- +Thu Jan 9 12:58:19 UTC 2020 - John Paul Adrian Glaubitz + +- Update to version 2.7.0 + + Support for Oracle Cloud Infrastructure API Gateway service + * ``oci apigateway`` + + Boot volumes support for cross-region backups in Block Volume Service + * ``oci bv boot-volume-backup copy`` + * ``oci bv boot-volume-backup list --source-boot-volume-backup-id`` + + Support for managing TSIG Key resources in the DNS service. + * ``oci dns tsig-key`` + + Support for referencing TSIG Key resources by OCID within Zone resources in the DNS service. + * ``oci dns zone create --external-masters`` + * ``oci dns zone update --external-masters`` + + Removed Identity Cloud service(idcs) access token requirement for Container Engine delete + operation. Also, support secondary idcs stripe for Container Engine creation. + * ``oci oce oce-instance delete`` + * ``oci oce oce-instance create --identity-stripe`` + + Support to resize compute virtual machine instance to a different shape in Compute Service. + * ``oci compute instance update --id [--shape ]`` + + Support for OS Management Service. + * ``oci os-management`` + + Improve nodepool creation, specify the image of the nodes by the + image OCID in the Container Engine Service. + * ``oci ce node-pool create --node-image-id`` + + Add management configuration for oracle-cloud-agent in Compute Service + * ``oci compute instance launch --agent-config`` + + Support for Marketplace Service. + * ``oci marketplace`` + + Allow customers to bring their own keys to Key Management Service. + * ``oci kms management get-wrapping-key`` + * ``oci kms management import-key`` + * ``oci kms management import-key-version`` + + Allow customers to create and use new vault with "DEFAULT" as type in Key Management Service + * ``oci kms management key-version cancel-key-version-deletion --key-id, --key-version-id`` + * ``oci kms management key-version schedule-key-version-deletion + --key-id, --key-version-id, --time-of-deletion`` + + [Breaking] Removed support for v1 auth tokens (1.0.0) in + kubeconfig files in Container Engine Service. + * ``oci ce cluster create-kubeconfig --token-version`` + + Enable updating a stream pool name and modified existing commands in Streaming Service. + * ``oci streaming admin stream list --compartment-id`` (required to optional) + + [Breaking] oci streaming admin stream-pool list --compartment-id (optional to required) + * ``oci streaming admin stream-pool update --name`` (new param added) +- from version 2.6.15 + + Support for Stream Pools and Connect Harness + * ``oci streaming admin connect-harness`` + * ``oci streaming admin stream-pool`` + + Support for recovering the compartment from DELETED state to ACTIVE state. + * ``oci iam compartment recover`` + + Support for multi-attach feature for block storage. + * ``oci compute volume-attachment attach --is-shareable`` + * ``oci compute volume-attachment attach-iscsi-volume --is-shareable`` + * ``oci compute volume-attachment attach-paravirtualized-volume --is-shareable`` + + New parameters added to oci os object put command. + * ``oci os object put --cache-control --content-disposition`` + + Improved retry strategy for multipart uploads. + + Modified stream create to make compartment ID optional and include stream pool id parameter + * ``oci streaming admin stream create --compartment-id, --stream-pool-id`` + * ``oci streaming admin stream list --stream-pool-id`` + * ``oci streaming admin stream update --stream-pool-id`` +- from version 2.6.14 + + Get the OCPUs info of an exadata infrastructure instance for ATP-D + * ``oci db exadata-infrastructure get-compute-units --autonomous-exadata-infrastructure-id`` + + Added timeMaintenanceBegin & timeMaintenanceEnd to autonomous database api response + + Inline help text has been removed, --help will still work as normal +- from version 2.6.13 + + Support for Autonomous Database to create and update with whitelisted ips. + * ``oci db autonomous-database create --whitelisted-ips`` + * ``oci db autonomous-database update --whitelisted-ips`` + + Support for Four Byte ASN support for Fast-Connect. + + Ability to choose fault domains when creating instance pools. + * ``oci compute-management instance-pool create`` + + Broken links in help documents. +- from version 2.6.12 + + Support to register and deregister an autonomous data warehouse, or + autonomous transaction processing, database with Data Safe. + * ``oci db autonomous-database data-safe register --autonomous-database-id `` + * ``oci db autonomous-database data-safe deregister --autonomous-database-id `` + + Add capability to redirect an input HTTP/HTTPS request URI to a different URI in Load Balancer service. + * ``oci lb rule-set create --items`` + + Console access to APEX and SQL Dev features for Create and Update ATP/ADW in the Database service + + Support for Volume Performance Units for Block Volumes in Block Storage service. + * ``oci bv boot-volume create --vpus-per-gb`` + * ``oci bv boot-volume update --vpus-per-gb`` + + Support for specifying compartment for OKE options APIs + * ``oci ce cluster-options get --compartment-id`` + * ``oci ce node-pool-options get --compartment-id`` + + Support for HTTP raw requests + * ``oci raw-request`` + + Deprecation warning message for python 2. This can be turned-off + by setting the environment variable SUPPRESS_PYTHON2_WARNING. + + Removed deprecated bmcs entry point for CLI. Now only oci is supported. +- from version 2.6.11 + + Support for Analytics Service (oci analytics) + + Support for Oracle Integration Service (oci integration) + + Support for adding optional parameter to IPSecconnection in Core Service. + * ``oci network ip-sec-connection update --ike-version`` + + Support for GetStackTfState API as part of Resource Manager service. + * ``oci resource-manager stack get-stack-tf-state --file, --stack-id`` +- Move testsuite into separate multibuild package oci-cli-test to + reduce the number of packages in BuildRequires +- Refresh patches for new version + + oc_relax-python-depends.patch +- Remove bmcs binary from %files section, it was dropped upstream +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Tue Nov 5 12:57:00 UTC 2019 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index da01808..90f3fda 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -14,8 +14,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif + Name: oci-cli -Version: 2.6.10 +Version: 2.7.0 Release: 0 License: Apache-2.0 Summary: Oracle Cloud Infrastructure CLI @@ -26,45 +35,47 @@ Patch0: oc_relax-python-depends.patch Patch1: oc_name-defaults_file-parameter.patch BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-appdirs >= 1.4.3 BuildRequires: python3-arrow >= 0.10.0 BuildRequires: python3-certifi -BuildRequires: python3-cffi >= 1.9.1 BuildRequires: python3-click >= 6.7 BuildRequires: python3-configparser >= 3.5.0 -BuildRequires: python3-coverage >= 4.5.1 BuildRequires: python3-cryptography >= 2.4.2 -BuildRequires: python3-httpsig_cffi >= 15.0.0 -BuildRequires: python3-idna >= 2.5 -BuildRequires: python3-Jinja2 >= 2.10.1 -BuildRequires: python3-PyJWT BuildRequires: python3-jmespath >= 0.9.3 +BuildRequires: python3-python-dateutil >= 2.7.3 +BuildRequires: python3-pytz >= 2016.10 +BuildRequires: python3-retrying >= 1.3.3 +BuildRequires: python3-six >= 1.11.0 +BuildRequires: python3-terminaltables >= 3.1.0 +BuildRequires: python3-idna >= 2.5 +BuildRequires: python3-PyJWT +BuildRequires: python3-pyOpenSSL >= 18.0.0 +BuildRequires: python3-PyYAML >= 5.1.2 +BuildRequires: python3-oci-sdk >= 2.8.0 +%if %{with test} +BuildRequires: python3-appdirs >= 1.4.3 +BuildRequires: python3-cffi >= 1.9.1 +BuildRequires: python3-coverage >= 4.5.1 +BuildRequires: python3-httpsig_cffi >= 15.0.0 +BuildRequires: python3-Jinja2 >= 2.10.1 BuildRequires: python3-mock >= 2.0.0 BuildRequires: python3-ndg-httpsclient >= 0.4.2 -BuildRequires: python3-oci-sdk >= 2.6.2 +BuildRequires: python3-Sphinx >= 1.6.4 +BuildRequires: python3-sphinx_rtd_theme >= 0.2.5 BuildRequires: python3-packaging >= 16.8 BuildRequires: python3-pluggy >= 0.4.0 BuildRequires: python3-py >= 1.4.33 BuildRequires: python3-pyasn1 >= 0.2.3 -BuildRequires: python3-pyOpenSSL >= 18.0.0 BuildRequires: python3-pycparser >= 2.17 BuildRequires: python3-pyparsing >= 2.2.0 -BuildRequires: python3-python-dateutil >= 2.7.3 BuildRequires: python3-pytest >= 3.2.3 BuildRequires: python3-pytest-cov >= 2.5.1 BuildRequires: python3-pytest-forked >= 1.0.2 BuildRequires: python3-pytest-xdist >= 1.22.2 -BuildRequires: python3-pytz >= 2016.10 -BuildRequires: python3-PyYAML >= 5.1.2 BuildRequires: python3-requests >= 2.21.0 -BuildRequires: python3-retrying >= 1.3.3 -BuildRequires: python3-six >= 1.11.0 -BuildRequires: python3-Sphinx >= 1.6.4 -BuildRequires: python3-sphinx_rtd_theme >= 0.2.5 -BuildRequires: python3-terminaltables >= 3.1.0 BuildRequires: python3-tox >= 2.9.1 BuildRequires: python3-vcrpy >= 1.13.0 BuildRequires: python3-virtualenv >= 15.1.0 +%endif BuildRequires: fdupes Requires: python3-arrow >= 0.10.0 Requires: python3-certifi @@ -74,7 +85,7 @@ Requires: python3-cryptography >= 2.4.2 Requires: python3-httpsig_cffi >= 15.0.0 Requires: python3-idna >= 2.5 Requires: python3-jmespath >= 0.9.3 -Requires: python3-oci-sdk >= 2.6.2 +Requires: python3-oci-sdk >= 2.8.0 Requires: python3-pyOpenSSL >= 18.0.0 Requires: python3-python-dateutil >= 2.7.3 Requires: python3-pytz >= 2016.10 @@ -102,12 +113,14 @@ sed -i 's/oci\._vendor\.//' src/oci_cli/*.py services/dts/src/oci_cli_dts/*.py s %build python3 setup.py build -# Disable testsuite as it currently requires an OCI account +# The testsuite currently requires an OCI account # https://github.com/oracle/oci-cli/issues/187 -#%%check -#export PYTHONDONTWRITEBYTECODE=1 -#export PYTHONPATH=%{buildroot}%{python3_sitelib} -#py.test -s tests/unit +%check +%if %{with test} +export PYTHONDONTWRITEBYTECODE=1 +export PYTHONPATH=%{buildroot}%{python3_sitelib} +py.test -s tests/unit +%endif %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} @@ -116,7 +129,6 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scrip %files %doc CHANGELOG.rst README.rst %license LICENSE.txt -%{_bindir}/bmcs %{_bindir}/oci %{_bindir}/create_backup_from_onprem %{python3_sitelib}/* diff --git a/v2.6.10.tar.gz b/v2.6.10.tar.gz deleted file mode 100644 index 597e9d5..0000000 --- a/v2.6.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6feb8b087fc3be7d784243100ecc860a2f156d9bc039392af8962ce659c7e43 -size 1215096 diff --git a/v2.7.0.tar.gz b/v2.7.0.tar.gz new file mode 100644 index 0000000..233654a --- /dev/null +++ b/v2.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:582697f77af28134a8a83b35704041be8e5e465980b95d51e25f09600958b6c4 +size 903223