Releasing version 2.4.8 (#12)

Author: mross22

CHANGELOG.rst

@@ -7,6 +7,31 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a
 Changelog <http://keepachangelog.com/>`__.
 
+2.4.8 - 2017-09-11
+------------------
+
+Deprecated
+~~~~~~~~~~
+* The default configuration file location has been changed from ~/.oraclebmc/config to ~/.oci/config. The old location still works if the file at the new location does not exist.
+
+Added
+~~~~~
+* Support for the Database service
+* Object Storage bulk operations (oci os object bulk-upload / bulk-download / bulk-delete)
+* Support for compartment renaming
+* Scripts to simplify install process
+* Complex input can now be provided as a file instead of having to escape JSON input at the command line. The path to the file can be provided using the file:// prefix, for example --my-complex-param file://<path>, and the following paths are supported
+
+  * Relative paths from the same directory, such as file://my-input.json and file://relative/path/to/input.json
+  * Absolute paths on Linux, macOS or Unix, such as file:///absolute/path/to/input.json
+  * Full file paths on Windows, such as file://C:\path\to\input.json
+  * Using file path expansions, for example '~/', './', and '../' is supported. On Windows, the '~/' expression expands to your user directory, stored in the %USERPROFILE% environment variable
+  * Using environment variables in paths is also supported
+
+Changed
+~~~~~~~
+* The default configuration file location is now ~/.oci/config
+
 2.4.7 - 2017-08-22
 ------------------
 

CONTRIBUTING.rst

@@ -1,4 +1,4 @@
-Contributing to the Oracle Bare Metal Cloud Services CLI
+Contributing to the Oracle Cloud Infrastructure CLI
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 *Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.*

LICENSE.txt

@@ -1,5 +1,5 @@
 include LICENSE.txt
 include README.rst
 include CHANGELOG.md
-include src/oraclebmc_cli/bin/bmcs_autocomplete.sh
+include src/oci_cli/bin/oci_autocomplete.sh
 exclude setup.cfg

MANIFEST.in

@@ -1,9 +1,9 @@
-Oracle Bare Metal Cloud Services CLI
+Oracle Cloud Infrastructure CLI
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 About
 =====
-This is the command line interface for Oracle Bare Metal Cloud Services.
+This is the command line interface for Oracle Cloud Infrastructure.
 
 The project is open source and maintained by Oracle Corp. The home page for the project is `here`__.
 
@@ -15,7 +15,7 @@ Installation
 
 ::
 
-    pip install oraclebmc-cli
+    pip install oci-cli
 
 See the `installation guide`__ for installation options and installation troubleshooting.
 
@@ -27,13 +27,13 @@ Usage
 To get help with the command line:
 ::
 
-    bmcs --help
+    oci --help
 
 or
 
 ::
 
-    bmcs -?
+    oci -h
 
 
 Examples
@@ -62,25 +62,25 @@ Changes
 =======
 See CHANGELOG__.
 
-__ https://github.com/oracle/bmcs-cli/blob/master/CHANGELOG.rst
+__ https://github.com/oracle/oci-cli/blob/master/CHANGELOG.rst
 
 
 Contributing
 ============
-bmcs-cli is an open source project. See CONTRIBUTING__ for details.
+oci-cli is an open source project. See CONTRIBUTING__ for details.
 
-Oracle gratefully acknowledges the contributions to bmcs-cli that have been made by the community.
+Oracle gratefully acknowledges the contributions to oci-cli that have been made by the community.
 
-__ https://github.com/oracle/bmcs-cli/blob/master/CONTRIBUTING.rst
+__ https://github.com/oracle/oci-cli/blob/master/CONTRIBUTING.rst
 
 
 Known Issues
 ============
 You can find information on any known issues with the CLI here__ and under the “Issues__” tab of this project's `GitHub repository`__.
 
 __ https://docs.us-phoenix-1.oraclecloud.com/Content/knownissues.htm
-__ https://github.com/oracle/bmcs-cli/issues
-__ https://github.com/oracle/bmcs-cli
+__ https://github.com/oracle/oci-cli/issues
+__ https://github.com/oracle/oci-cli
 
 
 License
@@ -91,4 +91,4 @@ This SDK and sample is dual licensed under the Universal Permissive License 1.0
 
 See LICENSE__ for more details.
 
-__ https://github.com/oracle/bmcs-cli/blob/master/LICENSE.txt
+__ https://github.com/oracle/oci-cli/blob/master/LICENSE.txt

README.rst

@@ -8,7 +8,8 @@ cryptography==1.8.2
 httpsig-cffi==15.0.0
 idna==2.5
 ndg-httpsclient==0.4.2
-oraclebmc==1.3.6
+mock==2.0.0
+oci==1.3.7
 packaging==16.8
 pluggy==0.4.0
 py==1.4.32
@@ -20,6 +21,7 @@ pytest==3.0.7
 python-dateutil==2.5.3
 pytz==2016.7
 requests==2.11.1
+retrying==1.3.3
 six==1.10.0
 terminaltables==3.1.0
 tox==2.6.0

requirements.txt

@@ -5,66 +5,70 @@ set -e
 
 # Setup
 mkdir -p scripts/temp
-NS=$BMCS_CLI_NAMESPACE
+NS=$OCI_CLI_NAMESPACE
 BUCKET=TestScriptBucket$(( ( RANDOM % 10000 )  + 1 ))
-C=$BMCS_CLI_COMPARTMENT_ID
+C=$OCI_CLI_COMPARTMENT_ID
 FILE=scripts/temp/content.txt
 EMPTY_FILE=scripts/temp/empty_file
-ARGS="--config-file $BMCS_CLI_CONFIG_FILE"
+ARGS="--config-file $OCI_CLI_CONFIG_FILE"
 
+# test that invoking with deprecated entry point 'bmcs' still works
 bmcs $ARGS os ns get
-bmcs $ARGS os bucket create -ns $NS --compartment-id $C --name $BUCKET
+oci $ARGS os ns get
+oci $ARGS os bucket create -ns $NS --compartment-id $C --name $BUCKET
 echo 'example object content!' > $FILE
-bmcs $ARGS os object put -ns $NS -bn $BUCKET --name object1 --file $FILE
+oci $ARGS os object put -ns $NS -bn $BUCKET --name object1 --file $FILE
 
 # Put an object with metadata and ensure that you get the metadata back.
-bmcs $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1":"bar1","foo2":"bar2"}'
+oci $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1":"bar1","foo2":"bar2"}'
 # Two greps since they're on different lines
-bmcs $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep foo1
-bmcs $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep bar2
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep foo1
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep bar2
 
 # Put an empty file and get it back.
 touch $EMPTY_FILE
-bmcs $ARGS os object put -ns $NS -bn $BUCKET --name object3 --file $EMPTY_FILE
-bmcs $ARGS os object get -ns $NS -bn $BUCKET --name object3 --file -
+oci $ARGS os object put -ns $NS -bn $BUCKET --name object3 --file $EMPTY_FILE
+oci $ARGS os object get -ns $NS -bn $BUCKET --name object3 --file -
 
-# Put a file from stdin and get it back
-bmcs $ARGS os object put -ns $NS -bn $BUCKET --name object4 --file - <<< "This is some object content"
-bmcs $ARGS os object get -ns $NS -bn $BUCKET --name object4 --file - | grep "This is some object content"
+# Put a file from stdin and get it back. Also check we can assign metadata when putting from stdin
+oci $ARGS os object put -ns $NS -bn $BUCKET --name object4 --metadata '{"foo1":"bar1","foo2":"bar2"}' --file - <<< "This is some object content"
+oci $ARGS os object get -ns $NS -bn $BUCKET --name object4 --file - | grep "This is some object content"
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object4 | grep foo1
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object4 | grep bar2
 
 # Try a few variations on metadata format.
-bmcs $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1":"a b c '"'d'"'","foo2": "bar2"}' --force
-bmcs $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "a b c 'd'"
-bmcs $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1": "a b c d","foo2": "A second value."}' --force
+oci $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1":"a b c '"'d'"'","foo2": "bar2"}' --force
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "a b c 'd'"
+oci $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1": "a b c d","foo2": "A second value."}' --force
 
 # Two greps since they're on different lines
-bmcs $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "a b c d"
-bmcs $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "A second value."
-bmcs $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1":"bar1","foo2":"bar 2"}' --force
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "a b c d"
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "A second value."
+oci $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1":"bar1","foo2":"bar 2"}' --force
 
 # Two greps since they're on different lines
-bmcs $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "bar1"
-bmcs $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "bar 2"
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "bar1"
+oci $ARGS os object head -ns $NS -bn $BUCKET --name object2 | grep "bar 2"
 
 # Invalid metadata format
 set +e
-bmcs $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1":"bar1","foo2"}' --force 2>&1 | grep "Parameter 'metadata' must be in JSON format."
-bmcs $ARGS os bucket create -ns $NS --compartment-id $C --name $BUCKET --metadata '{"foo1"}' 2>&1 | grep "Parameter 'metadata' must be in JSON format."
+oci $ARGS os object put -ns $NS -bn $BUCKET --name object2 --file $FILE --metadata '{"foo1":"bar1","foo2"}' --force 2>&1 | grep "Parameter 'metadata' must be in JSON format."
+oci $ARGS os bucket create -ns $NS --compartment-id $C --name $BUCKET --metadata '{"foo1"}' 2>&1 | grep "Parameter 'metadata' must be in JSON format."
 set -e
 
 # Bucket metadata
-bmcs $ARGS os bucket create -ns $NS --compartment-id $C --name ${BUCKET}_metadata --metadata '{"foo1":"bar1","foo2":"bar2"}'
+oci $ARGS os bucket create -ns $NS --compartment-id $C --name ${BUCKET}_metadata --metadata '{"foo1":"bar1","foo2":"bar2"}'
 # Two greps since they're on different lines
-bmcs $ARGS os bucket get -ns $NS --name ${BUCKET}_metadata | grep foo1
-bmcs $ARGS os bucket get -ns $NS --name ${BUCKET}_metadata | grep bar2
-bmcs $ARGS os bucket delete -ns $NS --name ${BUCKET}_metadata --force
+oci $ARGS os bucket get -ns $NS --name ${BUCKET}_metadata | grep foo1
+oci $ARGS os bucket get -ns $NS --name ${BUCKET}_metadata | grep bar2
+oci $ARGS os bucket delete -ns $NS --name ${BUCKET}_metadata --force
 
-bmcs $ARGS os object list -ns $NS -bn $BUCKET
-bmcs $ARGS os bucket list -ns $NS --compartment-id $C
-bmcs $ARGS os object delete -ns $NS -bn $BUCKET --name object1 --force
-bmcs $ARGS os object delete -ns $NS -bn $BUCKET --name object2 --force
-bmcs $ARGS os object delete -ns $NS -bn $BUCKET --name object3 --force
-bmcs $ARGS os object delete -ns $NS -bn $BUCKET --name object4 --force
-bmcs $ARGS os bucket delete -ns $NS --name $BUCKET --force
+oci $ARGS os object list -ns $NS -bn $BUCKET
+oci $ARGS os bucket list -ns $NS --compartment-id $C
+oci $ARGS os object delete -ns $NS -bn $BUCKET --name object1 --force
+oci $ARGS os object delete -ns $NS -bn $BUCKET --name object2 --force
+oci $ARGS os object delete -ns $NS -bn $BUCKET --name object3 --force
+oci $ARGS os object delete -ns $NS -bn $BUCKET --name object4 --force
+oci $ARGS os bucket delete -ns $NS --name $BUCKET --force
 
 echo "Success!"