diff --git a/_multibuild b/_multibuild
deleted file mode 100644
index 6996b96..0000000
--- a/_multibuild
+++ /dev/null
@@ -1,3 +0,0 @@
-
- test
-
diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch
index 5888f8e..797d646 100644
--- a/oc_relax-python-depends.patch
+++ b/oc_relax-python-depends.patch
@@ -1,6 +1,6 @@
-diff -Nru oci-cli-2.10.4.orig/requirements.txt oci-cli-2.10.4/requirements.txt
---- oci-cli-2.10.4.orig/requirements.txt 2020-05-19 23:09:21.000000000 +0200
-+++ oci-cli-2.10.4/requirements.txt 2020-06-02 13:25:25.674988127 +0200
+diff -Nru oci-cli-2.12.2.orig/requirements.txt oci-cli-2.12.2/requirements.txt
+--- oci-cli-2.12.2.orig/requirements.txt 2020-07-08 03:48:28.000000000 +0200
++++ oci-cli-2.12.2/requirements.txt 2020-07-14 15:58:45.873672771 +0200
@@ -2,41 +2,40 @@
# (https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format),
# you may need to use the --extra-index-url option instead.
@@ -16,12 +16,16 @@ diff -Nru oci-cli-2.10.4.orig/requirements.txt oci-cli-2.10.4/requirements.txt
-coverage==4.5.2
-cryptography==2.8
-httpsig-cffi==15.0.0
--idna>=2.5,<2.7
++click>=6.7
++coverage>=4.5.2
++cryptography>=2.8
++httpsig-cffi>=15.0.0
+ idna>=2.5,<2.7
-Jinja2==2.10.1
-jmespath==0.9.4
-ndg-httpsclient==0.4.2
-mock==2.0.0
--oci==2.14.3
+-oci==2.17.2
-packaging==16.8
-pluggy==0.4.0
-py==1.4.33
@@ -31,17 +35,11 @@ diff -Nru oci-cli-2.10.4.orig/requirements.txt oci-cli-2.10.4/requirements.txt
-pyparsing==2.2.0
-pytest==3.2.3
-pytest-cov==2.5.1
--python-dateutil>=2.5.3,<3.0.0
-+click>=6.7
-+coverage>=4.5.2
-+cryptography>=2.8
-+httpsig-cffi>=15.0.0
-+idna>=2.5
+Jinja2>=2.10.1
+jmespath>=0.9.4
+ndg-httpsclient>=0.4.2
+mock>=2.0.0
-+oci>=2.14.3
++oci>=2.17.2
+packaging>=16.8
+pluggy>=0.4.0
+py>=1.4.33
@@ -51,7 +49,7 @@ diff -Nru oci-cli-2.10.4.orig/requirements.txt oci-cli-2.10.4/requirements.txt
+pyparsing>=2.2.0
+pytest>=3.2.3
+pytest-cov>=2.5.1
-+python-dateutil>=2.5.3
+ python-dateutil>=2.5.3,<3.0.0
pytz>=2016.10
-requests==2.21.0
-retrying==1.3.3
@@ -77,16 +75,16 @@ diff -Nru oci-cli-2.10.4.orig/requirements.txt oci-cli-2.10.4/requirements.txt
+pytest-xdist>=1.22.2
+pytest-forked>=1.0.2
+PyYAML>=5.1.2
-diff -Nru oci-cli-2.10.4.orig/setup.py oci-cli-2.10.4/setup.py
---- oci-cli-2.10.4.orig/setup.py 2020-05-19 23:09:21.000000000 +0200
-+++ oci-cli-2.10.4/setup.py 2020-06-02 13:25:16.302924755 +0200
+diff -Nru oci-cli-2.12.2.orig/setup.py oci-cli-2.12.2/setup.py
+--- oci-cli-2.12.2.orig/setup.py 2020-07-08 03:48:28.000000000 +0200
++++ oci-cli-2.12.2/setup.py 2020-07-14 15:58:28.465513573 +0200
@@ -30,25 +30,24 @@
readme = f.read()
requires = [
-- 'oci==2.14.3',
+- 'oci==2.17.2',
- 'arrow==0.14.7',
-+ 'oci>=2.14.3',
++ 'oci>=2.17.2',
+ 'arrow>=0.14.7',
'certifi',
- 'click==6.7',
@@ -101,13 +99,12 @@ diff -Nru oci-cli-2.10.4.orig/setup.py oci-cli-2.10.4/setup.py
- 'retrying==1.3.3',
- 'six==1.14.0',
- 'terminaltables==3.1.0',
-- 'idna>=2.5,<2.7',
-- 'pyOpenSSL==18.0.0',
-- 'PyYAML==5.1.2'
+ 'retrying>=1.3.3',
+ 'six>=1.14.0',
+ 'terminaltables>=3.1.0',
-+ 'idna>=2.5',
+ 'idna>=2.5,<2.7',
+- 'pyOpenSSL==18.0.0',
+- 'PyYAML==5.1.2'
+ 'pyOpenSSL>=18.0.0',
+ 'PyYAML>=5.1.2'
]
diff --git a/oci-cli.changes b/oci-cli.changes
index 807d085..8b17638 100644
--- a/oci-cli.changes
+++ b/oci-cli.changes
@@ -1,3 +1,151 @@
+-------------------------------------------------------------------
+Tue Jul 14 14:06:29 UTC 2020 - John Paul Adrian Glaubitz
+
+- Update to version 2.12.2
+ + Support for Autonomous DataWarehouse and Autonomous Transaction Processing features to
+ allow switching from Non PE to PE (and vice versa) for existing databases as a part of
+ the Database Service for Autonomous Databases
+ * ``oci db autonomous-database update --private-endpoint-label ``
+ * ``oci db autonomous-database update --subnet-id ``
+ + Support for private endpoint (ingress) and public endpoint whitelisting in Analytics Service
+ * ``oci analytics analytics-instance create --network-endpoint-details``
+ * ``oci analytics analytics-instance change-network-endpoint --network-endpoint-details``
+ + Support for re-encrypting an object in the Object Storage Service, by introducing a command
+ line option to specify a new encryption key.
+ * ``oci os object reencrypt``
+ + Support to register and deregister autonomous dedicated databases with Datasafe
+ * ``oci db autonomous-database data-safe register``
+ * ``oci db autonomous-database data-safe deregister``
+- from version 2.12.1
+ + Support for Usage API service
+ * ``oci usage``
+ + Support for Oracle Cloud VMware Solution service
+ * ``oci ocvs``
+ + Support for one-off patches in Database service
+ * ``oci db database patch --one-off-patches``
+ + Support for Vlan features as part of support Layer 2 Virtual Networking
+ * ``oci network vlan``
+ * ``oci network private-ip list --vlan-id``
+ * ``oci network vnic assign-private-ip --vlan-id``
+ * ``oci compute instance attach-vnic --vlan-id``
+ + Validator parameter added for updating tags in Identity service
+ * ``oci iam tag update --validator``
+ + Improve Create Instance Configuration to include the latest AttachVolumeDetails
+ properties in the Compute Management service
+ * ``oci compute-management instance-configuration create --instance-details``
+- from version 2.12.0
+ + Tagging support when creating database and db-home in the Database Service
+ * ``oci db database create --defined-tags, --freeform-tags``
+ * ``oci db database create-from-backup --defined-tags, --freeform-tags``
+ * ``oci db database create-from-database --defined-tags, --freeform-tags``
+ * ``oci db db-home create --defined-tags, --freeform-tags``
+ + Support for Data Integration Service
+ * ``oci data-integration``
+ + Support for managing Autonomous VM Cluster resources at Customer Cloud.
+ * ``oci db autonomous-vm-cluster``
+ + Support for backups on Autonomous Databases at Customer Cloud.
+ * ``oci db autonomous-container-database create --db-unique-name``
+ * ``oci db backup-destination create-nfs-details --local-mount-point-path, --mount-type-details``
+ * ``oci db backup-destination update --nfs-mount-type, --nfs-server, --nfs-server-export``
+ + Support for a dependency archive zip file to be specified for use by
+ an application for data flow service.
+ * ``oci data-flow application create --archive-uri``
+ + Support for accessing data assets via private endpoint in the Data Catalog service
+ * ``oci data-catalog catalog-private-endpoint``
+ * ``oci data-catalog catalog attach``
+ * ``oci data-catalog catalog detach``
+ + Support to get passphrase of export job
+ * ``oci dts export get-passphrase --job-id``
+ + New parameter added to the following command
+ * ``oci dts physical-appliance initialize-authentication --export-job-id``
+ + Parameters --appliance-label and --job-id are now optional for the following command
+ * ``oci dts physical-appliance initialize-authentication``
+ + [BREAKING] for the Data Catalog service, the following parameters have been restricted to specific values.
+ * ``lifecycle_state, wait-for-state, job_type, harvest_status, workflow_status, schedule_type``
+- from version 2.11.1
+ + Support creating a new database from another database for the Database service
+ * ``oci db database create-from-database --point-in-time-recovery-timestamp``
+ + Support for the new DNS format of the Data Transfer service
+ + Support for Schedule-based Autoscaling via a new policy type (scheduled)
+ in the Autoscaling service
+ + Support for enabling/disabling individual policies in the Autoscaling service
+ * ``oci autoscaling policy update --is-enabled``
+ + Support for filtering lists by name, lifecycle state and sorting by value, order for
+ compartments, dynamic group, group, identity provider, network sources, policy, user
+ in the Identity Service
+ * ``oci iam compartment list --name --lifecycle-state --sort-by --sort-order``
+ * ``oci iam dynamic-group list --name --lifecycle-state --sort-by --sort-order``
+ * ``oci iam group list --name --lifecycle-state --sort-by --sort-order``
+ * ``oci iam identity-provider list --name --lifecycle-state --sort-by --sort-order``
+ * ``oci iam network-sources list --name --lifecycle-state --sort-by --sort-order``
+ * ``oci iam policy list --name --lifecycle-state --sort-by --sort-order``
+ * ``oci iam user list --name --lifecycle-state --sort-by --sort-order``
+ + Support for filtering lists by name and lifecycle state for identity provider group in the Identity Service
+ * ``oci iam identity-provider-group list --name --lifecycle-state``
+ + Added DB version field in Autonomous Container Database summary response for the Database service
+ * ``oci db autonomous-database``
+ + DTS service endpoint is updated to ``https://datatransfer.{region}.oci.{secondLevelDomain}``
+ + Bug fix in appliance-status update in ``oci dts export configure-physical-appliance``
+- from version 2.11.0
+ + Support for enabling File Server capability for an Integration Instance
+ * ``oci integration integration-instance create --is-file-server-enabled``
+ * ``oci integration integration-instance update --is-file-server-enabled``
+ + Support for deleting non empty tag namespace and bulk deleting tags
+ * ``oci iam tag bulk-delete``
+ * ``oci iam tag-namespace cascade-delete``
+ + Support bulk actions in Compartment Explorer
+ * ``oci iam compartment bulk-move-resources``
+ * ``oci iam compartment bulk-delete-resources``
+ + Support get, list commands for DB Patch for given DB Home
+ * ``oci db patch list-db-home --db-home-id``
+ * ``oci db patch get-db-home --db-home-id``
+ + Support get, list commands for DB Patch for given VM Cluster
+ * ``oci db patch list-vm-cluster --vm-cluster-id``
+ * ``oci db patch get-vm-cluster --vm-cluster-id``
+ + Support get, list commands for DB Patch History for given DB Home
+ * ``oci db patch-history list-db-home --db-home-id``
+ * ``oci db patch-history get-db-home --db-home-id``
+ + Support get, list commands for DB Patch History for given VM Cluster
+ * ``oci db patch-history list-vm-cluster --vm-cluster-id``
+ * ``oci db patch-history get-vm-cluster --vm-cluster-id``
+ + Support specifying a Patch Id and Patch Action when patching a VM Cluster.
+ * ``oci db vm-cluster update --patch-id --patch-action``
+ + New parameter --include-root to include root compartment
+ * ``oci iam compartment list --include-root``
+ + New entry in the User-Agent for CloudShell to differentiate between
+ requests coming from CLI and CloudShell
+ + The fields defindedTags and freeformTags of backupPolicy Complex Object in
+ MySQL Service were invalid in the JSON output
+ * ``oci mysql db-system create --generate-full-command-json-input``
+ + [BREAKING] Lifecycle state "OFFLINE" was removed and new state "DISCONNECTED" was added.
+ * ``oci db exadata-infrastructure activate --wait-for-state``
+ * ``oci db exadata-infrastructure create --wait-for-state``
+ * ``oci db exadata-infrastructure delete --wait-for-state``
+ * ``oci db exadata-infrastructure list --wait-for-state``
+ * ``oci db exadata-infrastructure update --wait-for-state``
+ + Man page outputs for --help reformatted to line break on complete words
+ * ``--verify-native-dependencies`` option within install.py script is removed.
+- from version 2.10.5
+ + Support for Identity Provider
+ * ``oci iam identity-provider create``
+ * ``oci iam identity-provider list``
+ * ``oci iam identity-provider get``
+ * ``oci iam identity-provider delete``
+ * ``oci iam identity-provider update``
+ + Support for getting image id of Image Listing Package in Marketplace Service
+ * ``oci marketplace package get``
+ + Data Transfer Service
+ * ``oci dts physical-appliance finalize``
+ - Validates upload_user_config file and returns explicit config error message if invalid
+ * ``oci dts export create``
+ - Prevents export job create if bucket type is Archive
+ + Marketplace API updated to ignore signature parameter and mark it as deprecated
+ * ``oci marketplace accepted-agreement delete --signature``
+- Disable -test flavor as running the testsuite currently requires an OCI account
+- Refresh patches for new version
+ + oc_relax-python-depends.patch
+- Update BuildRequires and Requires from setup.py
+
-------------------------------------------------------------------
Tue Jun 2 17:22:21 UTC 2020 - John Paul Adrian Glaubitz
diff --git a/oci-cli.spec b/oci-cli.spec
index ed996bd..cccc129 100644
--- a/oci-cli.spec
+++ b/oci-cli.spec
@@ -15,7 +15,9 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
+# The testsuite currently requires an OCI account, see:
+# https://github.com/oracle/oci-cli/issues/187,
+# so we're not building the test flavor.
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
%define psuffix -test
@@ -25,7 +27,7 @@
%bcond_with test
%endif
Name: oci-cli
-Version: 2.10.4
+Version: 2.12.2
Release: 0
Summary: Oracle Cloud Infrastructure CLI
License: Apache-2.0
@@ -44,7 +46,7 @@ BuildRequires: python3-cryptography >= 2.8
BuildRequires: python3-devel
BuildRequires: python3-idna >= 2.5
BuildRequires: python3-jmespath >= 0.9.4
-BuildRequires: python3-oci-sdk >= 2.14.3
+BuildRequires: python3-oci-sdk >= 2.17.2
BuildRequires: python3-pyOpenSSL >= 18.0.0
BuildRequires: python3-python-dateutil >= 2.5.3
BuildRequires: python3-pytz >= 2016.10
@@ -83,7 +85,7 @@ Requires: python3-click >= 6.7
Requires: python3-cryptography >= 2.8
Requires: python3-idna >= 2.5
Requires: python3-jmespath >= 0.9.4
-Requires: python3-oci-sdk >= 2.14.3
+Requires: python3-oci-sdk >= 2.17.2
Requires: python3-pyOpenSSL >= 18.0.0
Requires: python3-python-dateutil >= 2.5.3
Requires: python3-pytz >= 2016.10
@@ -111,8 +113,6 @@ sed -i 's/oci\._vendor\.//' src/oci_cli/*.py services/dts/src/oci_cli_dts/*.py s
%build
python3 setup.py build
-# The testsuite currently requires an OCI account
-# https://github.com/oracle/oci-cli/issues/187
%check
%if %{with test}
export PYTHONDONTWRITEBYTECODE=1
diff --git a/v2.10.4.tar.gz b/v2.10.4.tar.gz
deleted file mode 100644
index 4848dd5..0000000
--- a/v2.10.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:755b0b2cb3078c986bb870f982ab35e94ab6b3838a4420f3f51b875262faf75f
-size 1096248
diff --git a/v2.12.2.tar.gz b/v2.12.2.tar.gz
new file mode 100644
index 0000000..6dc263b
--- /dev/null
+++ b/v2.12.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:deded37b0aae30dbf80bff41e3b8475fa0babfdb7a33309edd8c8ef65cd65a02
+size 1166003