From 54a2d0c01fcf5d43459c816a3aea070f45aa92486a8be852fa603e9a199882a3 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Jul 2022 14:05:08 +0000 Subject: [PATCH] Accepting request 990997 from home:glaubitz:branches:Cloud:Tools - Update to version 3.11.1 * Support for 2 new global parameters to provide connection and read timeout value * ``oci --connection-timeout --read-timeout`` * Support for Container Databases (CDBs) and Pluggable Databases (PDBs) discovery in the Stack Monitoring service * ``oci stack-monitoring discovery-job create --compartment-id --discovery-details`` * Support for the Fusion Apps service * ``oci fusion-apps`` * Support for the Oracle Process Automation service * ``oci opa`` * Support for ingress routing tables to NAT Gateway and Internet Gateway in the VCN Routing service * ``oci network nat-gateway create --route-table-id`` * ``oci network nat-gateway update --route-table-id`` * ``oci network internet-gateway create --route-table-id`` * ``oci network internet-gateway update --route-table-id`` * Support for maintenance reboot due date extension on Virtual Machine instances in the core service * ``oci compute instance-maintenance-reboot get`` * ``oci compute instance update --time-maintenance-reboot-due`` * Support for Oracle Managed Access service * ``oci oma`` * Support for grapePeriod for wallet rotation feature in the Autonomous Database service * ``oci db autonomous-database-wallet rotate --grace-period`` * ``oci db autonomous-database-wallet rotate-regional-wallet --grace-period`` * Support for the Media service * ``oci media-services`` * Modified supported version for the following package: cryptography (>=3.2.1, <=37.0.2), pyOpenSSL (>=17.5.0, <=22.0.0) - from version 3.11.0 OBS-URL: https://build.opensuse.org/request/show/990997 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/oci-cli?expand=0&rev=43 --- oc_relax-python-depends.patch | 55 +++++++++++++++++++++++++++++------ oci-cli-3.10.5.tar.gz | 3 -- oci-cli-3.11.1.tar.gz | 3 ++ oci-cli.changes | 55 +++++++++++++++++++++++++++++++++++ oci-cli.spec | 6 ++-- 5 files changed, 107 insertions(+), 15 deletions(-) delete mode 100644 oci-cli-3.10.5.tar.gz create mode 100644 oci-cli-3.11.1.tar.gz diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index d4ad96a..44b0943 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,6 +1,6 @@ -diff -Nru oci-cli-3.10.5.orig/requirements.txt oci-cli-3.10.5/requirements.txt ---- oci-cli-3.10.5.orig/requirements.txt 2022-06-28 21:38:46.000000000 +0200 -+++ oci-cli-3.10.5/requirements.txt 2022-07-01 13:29:18.948566781 +0200 +diff -Nru oci-cli-3.11.1.orig/requirements.txt oci-cli-3.11.1/requirements.txt +--- oci-cli-3.11.1.orig/requirements.txt 2022-07-19 20:42:32.000000000 +0200 ++++ oci-cli-3.11.1/requirements.txt 2022-07-25 12:32:55.483644162 +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. @@ -12,18 +12,18 @@ diff -Nru oci-cli-3.10.5.orig/requirements.txt oci-cli-3.10.5/requirements.txt cffi>=1.9.1 -click==7.1.2 -coverage==4.5.2 --cryptography==3.3.2 +-cryptography>=3.2.1,<=37.0.2 -httpsig-cffi==15.0.0 -Jinja2==3.0.3 -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.73.0 +-oci==2.75.1 -packaging==20.2 -pluggy==0.13.0 -py==1.10.0 -pyasn1==0.2.3 --pyOpenSSL==19.1.0 +-pyOpenSSL>=17.5.0,<=22.0.0 -pycparser==2.20 -pyparsing==2.2.0 -pytest==3.2.3 @@ -31,18 +31,18 @@ diff -Nru oci-cli-3.10.5.orig/requirements.txt oci-cli-3.10.5/requirements.txt -python-dateutil>=2.5.3,<3.0.0 +click>=7.1.2 +coverage>=4.5.2 -+cryptography>=3.3.2 ++cryptography>=3.2.1 +httpsig-cffi>=15.0.0 +Jinja2>=3.0.3 +jmespath>=0.10.0 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.73.0 ++oci>=2.75.1 +packaging>=20.2 +pluggy>=0.13.0 +py>=1.10.0 +pyasn1>=0.2.3 -+pyOpenSSL>=19.1.0 ++pyOpenSSL>=17.5.0 +pycparser>=2.20 +pyparsing>=2.2.0 +pytest>=3.2.3 @@ -75,3 +75,40 @@ diff -Nru oci-cli-3.10.5.orig/requirements.txt oci-cli-3.10.5/requirements.txt +PyYAML>=5.4 +docutils>=0.15.2 +prompt-toolkit>=3.0.29 +diff -Nru oci-cli-3.11.1.orig/setup.py oci-cli-3.11.1/setup.py +--- oci-cli-3.11.1.orig/setup.py 2022-07-19 20:42:32.000000000 +0200 ++++ oci-cli-3.11.1/setup.py 2022-07-25 12:33:22.695846917 +0200 +@@ -29,23 +29,23 @@ + readme = f.read() + + requires = [ +- 'oci==2.75.1', ++ 'oci>=2.75.1', + 'arrow>=1.0.0', + 'certifi', +- 'click==7.1.2', +- 'cryptography>=3.2.1,<=37.0.2', +- 'jmespath==0.10.0', +- 'python-dateutil>=2.5.3,<3.0.0', ++ 'click>=7.1.2', ++ 'cryptography>=3.2.1', ++ 'jmespath>=0.10.0', ++ 'python-dateutil>=2.5.3', + 'pytz>=2016.10', + 'six>=1.15.0', +- 'terminaltables==3.1.0', +- 'pyOpenSSL>=17.5.0,<=22.0.0', +- 'PyYAML>=5.4,<6', +- 'prompt-toolkit==3.0.29' ++ 'terminaltables>=3.1.0', ++ 'pyOpenSSL>=17.5.0', ++ 'PyYAML>=5.4', ++ 'prompt-toolkit>=3.0.29' + ] + + extras = { +- 'db': ['cx_Oracle==8.3'] ++ 'db': ['cx_Oracle>=8.3'] + } + + fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE") diff --git a/oci-cli-3.10.5.tar.gz b/oci-cli-3.10.5.tar.gz deleted file mode 100644 index e7d9855..0000000 --- a/oci-cli-3.10.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dceb0e35aa6ad7f4889ff6aa21fd8875fba1774dd28313f6df558adeed7e4d11 -size 2524353 diff --git a/oci-cli-3.11.1.tar.gz b/oci-cli-3.11.1.tar.gz new file mode 100644 index 0000000..6639fdc --- /dev/null +++ b/oci-cli-3.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b48d020f4a6e0582fd1ab659d2ef8d2c7dcfecb6082740c5887136a6f837058 +size 2575730 diff --git a/oci-cli.changes b/oci-cli.changes index c3d64d5..b0e8200 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Mon Jul 25 10:36:58 UTC 2022 - John Paul Adrian Glaubitz + +- Update to version 3.11.1 + * Support for 2 new global parameters to provide connection and read timeout value + * ``oci --connection-timeout --read-timeout`` + * Support for Container Databases (CDBs) and Pluggable Databases (PDBs) discovery + in the Stack Monitoring service + * ``oci stack-monitoring discovery-job create --compartment-id --discovery-details`` + * Support for the Fusion Apps service + * ``oci fusion-apps`` + * Support for the Oracle Process Automation service + * ``oci opa`` + * Support for ingress routing tables to NAT Gateway and Internet + Gateway in the VCN Routing service + * ``oci network nat-gateway create --route-table-id`` + * ``oci network nat-gateway update --route-table-id`` + * ``oci network internet-gateway create --route-table-id`` + * ``oci network internet-gateway update --route-table-id`` + * Support for maintenance reboot due date extension on Virtual Machine + instances in the core service + * ``oci compute instance-maintenance-reboot get`` + * ``oci compute instance update --time-maintenance-reboot-due`` + * Support for Oracle Managed Access service + * ``oci oma`` + * Support for grapePeriod for wallet rotation feature in the Autonomous Database service + * ``oci db autonomous-database-wallet rotate --grace-period`` + * ``oci db autonomous-database-wallet rotate-regional-wallet --grace-period`` + * Support for the Media service + * ``oci media-services`` + * Modified supported version for the following package: + cryptography (>=3.2.1, <=37.0.2), pyOpenSSL (>=17.5.0, <=22.0.0) +- from version 3.11.0 + * Support to provide database management private endpoint ID as input to enable + DBCS databases in the Operations Insights service + * ``oci opsi database-insights create-pe-comanged-database --dbm-private-endpoint-id`` + * Support for the below new fields to create data guard association with + new db system in the Database service + * ``oci db data-guard-association create with-new-db-system --database-defined-tags + --database-freeform-tags --db-system-defined-tags --db-system-freeform-tags + --fault-domains --license-model --node-count --private-ip --time-zone`` + * Support for Native Pod Networking in Oracle Kubernetes Engine service + * ``oci ce cluster create --cluster-pod-network-options`` + * ``oci ce node-pool create --max-pods-per-node --pod-nsg-ids --pod-subnet-ids`` + * ``oci ce node-pool update --max-pods-per-node --pod-nsg-ids --pod-subnet-ids`` + * Support for Compute Instance Maintenance in the Compute service + * ``oci compute instance action --action rebootmigrate`` + * [BREAKING] The confusing flag naming for preserving data volumes created on + instance launch --preserve-data-volumes is removed in the compute service + * ``oci compute instance terminate --preserve-data-volumes`` + * Bug fixes and improvements to project_o +- Refresh patches for new version + + oc_relax-python-depends.patch +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Fri Jul 1 12:20:50 UTC 2022 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index abca9cc..e26b63e 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -28,7 +28,7 @@ %bcond_with test %endif Name: oci-cli%{psuffix} -Version: 3.10.5 +Version: 3.11.1 Release: 0 Summary: Oracle Cloud Infrastructure CLI License: Apache-2.0 @@ -46,7 +46,7 @@ BuildRequires: python3-click >= 7.1.2 BuildRequires: python3-cryptography >= 3.2.1 BuildRequires: python3-devel BuildRequires: python3-jmespath >= 0.10.0 -BuildRequires: python3-oci-sdk >= 2.73.0 +BuildRequires: python3-oci-sdk >= 2.75.1 BuildRequires: python3-pyOpenSSL >= 19.1.0 BuildRequires: python3-python-dateutil >= 2.5.3 BuildRequires: python3-pytz >= 2016.10 @@ -82,7 +82,7 @@ Requires: python3-certifi Requires: python3-click >= 7.1.2 Requires: python3-cryptography >= 3.2.1 Requires: python3-jmespath >= 0.10.0 -Requires: python3-oci-sdk >= 2.73.0 +Requires: python3-oci-sdk >= 2.75.1 Requires: python3-prompt_toolkit >= 3.0.29 Requires: python3-pyOpenSSL >= 19.1.0 Requires: python3-python-dateutil >= 2.5.3