diff --git a/oc_name-defaults_file-parameter.patch b/oc_name-defaults_file-parameter.patch new file mode 100644 index 0000000..b397615 --- /dev/null +++ b/oc_name-defaults_file-parameter.patch @@ -0,0 +1,12 @@ +diff -Nru oci-cli-2.6.10.orig/src/oci_cli/cli_root.py oci-cli-2.6.10/src/oci_cli/cli_root.py +--- oci-cli-2.6.10.orig/src/oci_cli/cli_root.py 2019-10-29 21:42:32.000000000 +0100 ++++ oci-cli-2.6.10/src/oci_cli/cli_root.py 2019-11-05 13:48:54.066905418 +0100 +@@ -219,7 +219,7 @@ + @click.option('--profile', + default=Sentinel(DEFAULT_PROFILE), show_default=False, + help='The profile in the config file to load. This profile will also be used to locate any default parameter values which have been specified in the OCI CLI-specific configuration file. [default: DEFAULT]') +-@click.option('--cli-rc-file', '--defaults-file', ++@click.option('--cli-rc-file', '--defaults-file', 'defaults_file', + default=cli_constants.CLI_RC_DEFAULT_LOCATION, show_default=True, + is_eager=True, callback=eager_load_cli_rc_file, + help='The path to the OCI CLI-specific configuration file, containing parameter default values and other configuration information such as command aliases and predefined queries. The --defaults-file option is deprecated and you should use the --cli-rc-file option instead.') diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index fe54987..3efe8e4 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,7 +1,7 @@ -diff -Nru oci-cli-2.6.2.orig/requirements.txt oci-cli-2.6.2/requirements.txt ---- oci-cli-2.6.2.orig/requirements.txt 2019-08-27 20:15:09.000000000 +0200 -+++ oci-cli-2.6.2/requirements.txt 2019-08-28 12:15:50.515766252 +0200 -@@ -2,40 +2,39 @@ +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 +@@ -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,12 +16,17 @@ diff -Nru oci-cli-2.6.2.orig/requirements.txt oci-cli-2.6.2/requirements.txt -coverage==4.5.1 -cryptography==2.4.2 -httpsig-cffi==15.0.0 --idna>=2.5,<2.7 ++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 -Jinja2==2.10.1 -jmespath==0.9.3 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.3.2 +-oci==2.6.2 -packaging==16.8 -pluggy==0.4.0 -py==1.4.33 @@ -43,17 +48,13 @@ diff -Nru oci-cli-2.6.2.orig/requirements.txt oci-cli-2.6.2/requirements.txt -vcrpy==1.13.0 -virtualenv==15.1.0 -pytest-xdist==1.22.2 --PyYAML==3.13 -+click>=6.7 -+coverage>=4.5.1 -+cryptography>=2.4.2 -+httpsig-cffi>=15.0.0 -+idna>=2.5 +-pytest-forked==1.0.2 +-PyYAML==5.1.2 +Jinja2>=2.10.1 +jmespath>=0.9.3 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.3.2 ++oci>=2.6.2 +packaging>=16.8 +pluggy>=0.4.0 +py>=1.4.33 @@ -75,17 +76,18 @@ diff -Nru oci-cli-2.6.2.orig/requirements.txt oci-cli-2.6.2/requirements.txt +vcrpy>=1.13.0 +virtualenv>=15.1.0 +pytest-xdist>=1.22.2 -+PyYAML>=3.13 -diff -Nru oci-cli-2.6.2.orig/setup.py oci-cli-2.6.2/setup.py ---- oci-cli-2.6.2.orig/setup.py 2019-08-27 20:15:09.000000000 +0200 -+++ oci-cli-2.6.2/setup.py 2019-08-28 12:15:43.071745771 +0200 -@@ -29,25 +29,24 @@ ++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 +@@ -29,25 +29,25 @@ readme = f.read() requires = [ -- 'oci==2.3.2', +- 'oci==2.6.2', - 'arrow==0.10.0', -+ 'oci>=2.3.2', ++ 'oci>=2.6.2', + 'arrow>=0.10.0', 'certifi', - 'click==6.7', @@ -99,8 +101,9 @@ diff -Nru oci-cli-2.6.2.orig/setup.py oci-cli-2.6.2/setup.py - 'terminaltables==3.1.0', - 'idna>=2.5,<2.7', - 'pyOpenSSL==18.0.0', -- 'PyYAML==3.13' +- 'PyYAML==5.1.2' + 'click>=6.7', ++ 'configparser>=3.5.0', + 'cryptography>=2.4.2', + 'jmespath>=0.9.3', + 'python-dateutil>=2.7.3', @@ -110,7 +113,7 @@ diff -Nru oci-cli-2.6.2.orig/setup.py oci-cli-2.6.2/setup.py + 'terminaltables>=3.1.0', + 'idna>=2.5', + 'pyOpenSSL>=18.0.0', -+ 'PyYAML>=3.13' ++ 'PyYAML>=5.1.2' ] extras = { diff --git a/oci-cli.changes b/oci-cli.changes index e8a510f..f35307b 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,215 @@ +------------------------------------------------------------------- +Tue Nov 5 12:57:00 UTC 2019 - John Paul Adrian Glaubitz + +- Update to version 2.6.10 + + Support for retrieving metadata for Autonomous Wallet, both regional and + instance, as well as requesting rotation of Autonomous Wallets, both + regional instance. Generate wallet now allows for specifying the wallet + type to download, All or Single. + + ``oci db autonomous-database get-metadata --id `` + + ``oci db autonomous-database get-regional-wallet-metadata`` + + ``oci db autonomous-database-wallet rotate --should-rotate true + --id `` + + ``oci db autonomous-database-wallet rotate-regional-wallet --should-rotate true`` + + ``oci db autonomous-database generate-wallet --generate-type ALL`` + + ``oci db autonomous-database generate-wallet --generate-type SINGLE`` + + Support for adding and removing image shape compatibility entries + * ``oci compute image-shape-compatibility-entry add`` + * ``oci compute image-shape-compatibility-entry remove`` + + Support for managing redirects (e.g. create, update, delete, get list) + * ``oci waas http-redirect change-compartment --compartment-id, --http-redirect-id`` + * ``oci waas http-redirect create --compartment-id, --domain, --target, + --defined-tags, --display-name, --freeform-tags, --response-code`` + * ``oci waas http-redirect delete --http-redirect-id, --force`` + * ``oci waas http-redirect get --http-redirect-id`` + * ``oci waas http-redirect list --compartment-id, --all-pages, --display-name, + --id, --time-created-greater-than-or-equal-to, --time-created-less-than`` + * ``oci waas http-redirect update --http-redirect-id, --defined-tags, + --display-name, --force, --freeform-tags, --response-code, --target`` + + Support for migrating Dyn HTTP Redirect Service to OCI DNS + * ``oci dns zone migrate-from-dynect`` + + ``oci setup oci-cli-rc`` will try to create the directory for the + oci_cli_rc file, if it does not exist. + + Added validation check for thread count ``--parallel-upload-count`` and + also improved error message when threads are exhausted. + + Upload parts in ``oci os object put`` now correctly limited to 10000 parts + + Updated help messages for the overwrite and no-overwrite + flags in object storage operations + * ``oci os object bulk-upload --overwrite --no-overwrite`` + * ``oci os object put --overwrite --no-overwrite`` + + Using ``oci os object bulk-download`` correctly prints out downloaded + objects in a new line instead of overwriting the same line + + Problem with ``oci setup`` when there were spaces + in a user's profile name on Windows. + + Data Transfer Service - Fix the broken output string for + showing progress during command + * ``oci dts nfs-dataset seal`` + + Data Transfer Service - Provide help string to monitor + progress after running the command + * ``oci dts nfs-dataset seal`` + + Typo in the install README +- from version 2.6.9 + + Support for Digital Assistant service + * ``oci oda`` + + Includes the ``opc-workrequest-id`` in the response header + of 3 APIs belonging to Instance Pools + + Support for the following environment variables for CLI: + * OCI_CLI_PROFILE + * OCI_CLI_REGION + * OCI_CLI_USER + * OCI_CLI_FINGERPRINT + * OCI_CLI_KEY_FILE + * OCI_CLI_TENANCY + * OCI_CLI_ENDPOINT + * OCI_CLI_CONFIG_FILE + * OCI_CLI_RC_FILE + * OCI_CLI_CERT_BUNDLE + * OCI_CLI_AUTH + * OCI_CLI_DELEGATION_TOKEN_FILE + * OCI_CLI_SECURITY_TOKEN_FILE + + Fix Json output format for ``oci audit event list`` with streaming enabled + and when output is null. (`Issue 204 `__) + + Fix User can update database with backup-destination. + * ``oci db database update --backup-destination`` + + Fix CLI Installation issue if the installation path contains ``oci_cli`` + + Fix Windows issue where there is a local account and network account with the + same username causing permission problems during ``oci setup bootstrap``. + + Fix Windows issue where profile created by ``New-Item -Path $Profile -Type File`` + can not be updated for autocomplete by the CLI installer. + + Fix CLI pytest failures caused by unpinned dependency (pytest-forked v1.0.2) of + a pinned dependent package (pytest-xdist) getting updated to a new incompatible + version (pytest-forked v1.1.1) +- from version 2.6.8 + + Support for Health Checks API regional behavior changed to support OCI Monitoring + integration and DNS Traffic Management dependencies (``oci health-checks``) + * ``oci health-checks ping-monitor list --home-region`` + * ``oci health-checks http-monitor list --home-region`` + + Support for create/update/delete/list new custom scheduled backup policies. + Customers will be able to determine the frequency of the backup, time of day, + type of backup and time to retain the backup. Policies will be assigned to volumes + the same as the current predefined policies. + * ``oci bv volume-backup-policy create`` + * ``oci bv volume-backup-policy update`` + * ``oci bv volume-backup-policy delete`` + + Support for specifying network type when launching VM instances by introducing + launch-options option in the compute service + * ``oci compute instance launch --launch-options`` + + Adding entitlements request and show capabilities to Data + Transfer Service (``oci dts``) + + CLI options for DTS Appliance Request and Update have been updated to conform + with old CLI version (``oci dts appliance request`` and ``oci dts + appliance update-shipping-address``) + + Object storage bulk upload verify checksum now works when in FIPS mode. + * ``oci os object bulk-upload --verify-checksum`` +- from version 2.6.7 + + Support for tag definition validators in the Tag object used by get, list, + create, and update tag. Currently the only tag validator is the Enum validator. + + Improvement to provisioning time for launching VMDB instance in DBaaS. + * ``oci db system launch --storage-management`` + * ``oci db system launch-from-backup --storage-managament`` + + Support for migrating zones from Dyn Managed DNS to OCI Public DNS. + * ``oci dns zone migrate-from-dynect`` + + Support for resource principal authorization type, ``--auth resource_principal``. + + New field added to Tag Default object ``isRequired`` to designate that + a value must be provided for the tag upon resource creation. + + New API ``assembleEffectiveTagSet`` added to conveniently get all + tags that must be applied to a resource in a given compartment. + + Add new API to list work requests for tagging, as well as APIs to + list logs and errors for those work requests. + * ``oci iam tagging-work-request get`` + * ``oci iam tagging-work-request list`` + * ``oci iam tagging-work-request-error list`` + * ``oci iam tagging-work-request-log list`` + + Support for change of compartments for DRG in the Networking Service + * ``oci network drg change-compartment --compartment-id, --drg-id`` + + Support for Oracle Linux 8. + + Support for multiple ``--wait-for-state`` parameters. You can specify multiple + ``--wait-for-state`` parameters for any supporting command and it will return + on the first seen state. For example, ``--wait-for-state AVAILABLE + --wait-for-state FAILED`` will return on whichever lifecycle state is observed first. + + Updates the API endpoint URL for Oracle Functions to be of the form ``*.oci.oraclecorp.com``. +- from version 2.6.6 + + ``--verify-checksum`` option for the following commands: ``oci os object put`` + and ``oci os object bulk-upload``. This option will print a message indicating + whether the checksum for the uploaded file matches the local file. Sample + message: 'md5 checksum matches [Local: AikPDj8xbhaUNKeS956p1A==]' + + Support for re-encrypting a bucket. + * ``oci os bucket reencrypt --namespace-name --bucket-name`` + + Support for enabling/disabling bucket level events. + * ``oci os bucket create --object-events-enabled`` + * ``oci os bucket update --object-events-enabled`` + + Improve Autonomous Database to change the whitelist ips feature. + * ``oci db autonomous-database update --whitelisted-ips`` + + Support for Autonomous Database to create with the whitelist ips feature. + * ``oci db autonomous-database create --whitelisted-ips`` + + Default CreateKubeconfig so it uses token version 2.0.0 + * ``oci ce cluster create-kubeconfig`` + + ``oci session authenticate`` was not correctly redirecting to + the correct URL for government regions +- from version 2.6.5 + + Support for backup destination(nfs, zdlra) as a part of database backup + service for its create, read, update and delete operations. + * ``oci db backup-destination create-nfs-details`` + * ``oci db backup-destination get`` + * ``oci db backup-destination update`` + * ``oci db backup-destination delete`` + + Support for backup destination in create and update database. + * ``oci db database create --backup-destination`` + * ``oci db database create --backup-destination`` + + Support for managing Exadata Infrastructure resources at Customer Cloud. + * ``oci db exadata-infrastructure`` + + Supports for managing VM Cluster Network resources at Customer Cloud. + * ``oci db vm-cluster-network`` + + Support for managing VM Cluster resources at Customer Cloud. + * ``oci db vm-cluster`` + + Support for getting a list of supported GI versions for VM Cluster. + * ``oci db gi-version`` + + Support for creating new databases on VM Cluster. + * ``oci db database create`` + + Support for listing databases within a VM Cluster instead of a Db System. + * ``oci db database list --vm-cluster-id`` + + Support for getting a list of database nodes in the specified VM Cluster. + * ``oci db node list --vm-cluster-id`` + + Support for ``create-import-tf-state-job`` command in Resource Manager. + + Separated ``resource-manager job create`` into operation-specific commands. + * ``oci resource-manager job create-plan-job`` + * ``oci resource-manager job create-apply-job`` + * ``oci resource-manager job create-destroy-job`` + * ``oci resource-manager job create-import-tf-state-job`` + * ``oci resource-manager job resource-manager job create`` is now deprecated. +- from version 2.6.4 + + Support for CreateKubeconfig token version 2.0.0. + * ``oci ce cluster generate-token`` + + Support creating and updating node pool using regional subnets. + * ``oci ce node-pool create --size --placement-configs`` + * ``oci ce node-pool update --size --placement-configs`` + + Support for using KMS to encrypt Kubernetes secret. + * ``oci ce cluster create --kms-key-id`` + + Support for user to specify a two hour window when the auto-backup would + kick in. Default is anytime. Example values are SLOT_ONE, SLOT_TWO. + * ``oci db database create --auto-backup-window`` + * ``oci db database update --auto-backup-window`` + + Support for specifying ``nsgIds`` parameter for ``LaunchAutonomousDbSystemDetails`` + and ``UpdateAutonomousDbSystemDetails`` + * ``oci db autonomous-exadata-infrastructure launch --nsg-ids`` + * ``oci db autonomous-exadata-infrastructure update --nsg-ids`` + + Support for Oracle Content and Experience service. + * ``oci oce`` + + New read-only `system-tags` parameter for Load Balancer object. + + Outdated doc link. (`Pull Request `__) + + Downloads that fail when ``oci os object --bulk-download`` when object names ended with a '/'. +- from version 2.6.3 + + Support for Cluster Networks as part of the Compute Management Service + * ``oci compute-management cluster-network`` + + Made session token file permissions restricted to the file owner only. + + CVE-2017-18342 - In PyYAML before 4.1, the yaml.load() API could execute arbitrary + code. In other words, yaml.safe_load is not used. +- Add patch to fix compatibility with python-Click >= 7.0 + + oc_name-defaults_file-parameter.patch +- Refresh patches for new version + + oc_relax-python-depends.patch +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Wed Aug 28 10:20:57 UTC 2019 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index 6c5a5e2..da01808 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ Name: oci-cli -Version: 2.6.2 +Version: 2.6.10 Release: 0 License: Apache-2.0 Summary: Oracle Cloud Infrastructure CLI @@ -23,6 +23,7 @@ Url: https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/cl Group: Development/Languages/Python Source: https://github.com/oracle/oci-cli/archive/v%{version}.tar.gz 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 @@ -30,6 +31,7 @@ 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 @@ -39,7 +41,7 @@ BuildRequires: python3-PyJWT BuildRequires: python3-jmespath >= 0.9.3 BuildRequires: python3-mock >= 2.0.0 BuildRequires: python3-ndg-httpsclient >= 0.4.2 -BuildRequires: python3-oci-sdk >= 2.2.14 +BuildRequires: python3-oci-sdk >= 2.6.2 BuildRequires: python3-packaging >= 16.8 BuildRequires: python3-pluggy >= 0.4.0 BuildRequires: python3-py >= 1.4.33 @@ -50,9 +52,10 @@ 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 >= 3.13 +BuildRequires: python3-PyYAML >= 5.1.2 BuildRequires: python3-requests >= 2.21.0 BuildRequires: python3-retrying >= 1.3.3 BuildRequires: python3-six >= 1.11.0 @@ -66,17 +69,19 @@ BuildRequires: fdupes Requires: python3-arrow >= 0.10.0 Requires: python3-certifi Requires: python3-click >= 6.7 +Requires: python3-configparser >= 3.5.0 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.1.5 +Requires: python3-oci-sdk >= 2.6.2 Requires: python3-pyOpenSSL >= 18.0.0 Requires: python3-python-dateutil >= 2.7.3 Requires: python3-pytz >= 2016.10 Requires: python3-retrying >= 1.3.3 Requires: python3-six >= 1.11.0 Requires: python3-terminaltables >= 3.1.0 +Requires: python3-PyYAML >= 5.1.2 BuildArch: noarch %description @@ -89,9 +94,10 @@ functionality. %prep %setup -q -n oci-cli-%{version} %patch0 -p1 +%patch1 -p1 # Fix includes -sed -i 's/from oci._vendor //' src/oci_cli/*.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 tests/*.py tests/vcr_mods/*.py +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 %build python3 setup.py build diff --git a/v2.6.10.tar.gz b/v2.6.10.tar.gz new file mode 100644 index 0000000..597e9d5 --- /dev/null +++ b/v2.6.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6feb8b087fc3be7d784243100ecc860a2f156d9bc039392af8962ce659c7e43 +size 1215096 diff --git a/v2.6.2.tar.gz b/v2.6.2.tar.gz deleted file mode 100644 index e133954..0000000 --- a/v2.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:548b26fbf18c77daee22b05b3a53939de17f6f2a888317ae59073b0187617b09 -size 1114082