Releasing version 2.4.32 (#84)

CHANGELOG.rst

@@ -6,6 +6,24 @@ 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.32 - 2018-09-06
+---------------------
+Added
+~~~~~~~~
+* Support for updating user custom metadata on an instance in the Compute service after the instance has launched
+
+  * (``oci compute instance update --instance-id --metadata --extended-metadata``)
+
+* Ability to increase size of boot and block volumes during creation (from clone or restore from backup) in the Block Storage Service.
+
+  * (``oci bv boot-volume create --size-in-gbs``)
+  * (``oci bv volume create --size-in-gbs``)
+
+Changed
+~~~~~~~~
+* Updated the Description of Database API to include new character set.
+* The default License Type for Autonomous DataWarehouse and Autonomous Transaction Processing will be Bring Your Own License.
+
 2.4.31 - 2018-08-23
 ---------------------
 Added

requirements.txt

@@ -12,7 +12,7 @@ Jinja2==2.9.6
 jmespath==0.9.3
 ndg-httpsclient==0.4.2
 mock==2.0.0
-oci==2.0.2
+oci==2.0.3
 packaging==16.8
 pluggy==0.4.0
 py==1.4.33

setup.py

@@ -28,7 +28,7 @@ def open_relative(*path):
     readme = f.read()
 
 requires = [
-    'oci==2.0.2',
+    'oci==2.0.3',
     'arrow==0.10.0',
     'certifi',
     'click==6.7',

src/oci_cli/bin/OciTabExpansion.ps1

@@ -153,7 +153,7 @@ $ociCommandsToLongParams = @{
     'bv backup get' = 'from-json help volume-backup-id'
     'bv backup list' = 'all compartment-id display-name from-json help lifecycle-state limit page page-size sort-by sort-order volume-id'
     'bv backup update' = 'defined-tags display-name force freeform-tags from-json help if-match max-wait-seconds volume-backup-id wait-for-state wait-interval-seconds'
-    'bv boot-volume create' = 'availability-domain backup-policy-id boot-volume-backup-id compartment-id defined-tags display-name freeform-tags from-json help max-wait-seconds source-boot-volume-id wait-for-state wait-interval-seconds'
+    'bv boot-volume create' = 'availability-domain backup-policy-id boot-volume-backup-id compartment-id defined-tags display-name freeform-tags from-json help max-wait-seconds size-in-gbs source-boot-volume-id wait-for-state wait-interval-seconds'
     'bv boot-volume delete' = 'boot-volume-id force from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
     'bv boot-volume get' = 'boot-volume-id from-json help'
     'bv boot-volume list' = 'all availability-domain compartment-id from-json help limit page page-size volume-group-id'
@@ -230,7 +230,7 @@ $ociCommandsToLongParams = @{
     'compute instance list' = 'all availability-domain compartment-id display-name from-json help lifecycle-state limit page page-size sort-by sort-order'
     'compute instance list-vnics' = 'all from-json help instance-id limit page page-size'
     'compute instance terminate' = 'force from-json help if-match instance-id max-wait-seconds preserve-boot-volume wait-for-state wait-interval-seconds'
-    'compute instance update' = 'defined-tags display-name force freeform-tags from-json help if-match instance-id max-wait-seconds wait-for-state wait-interval-seconds'
+    'compute instance update' = 'defined-tags display-name extended-metadata force freeform-tags from-json help if-match instance-id max-wait-seconds metadata wait-for-state wait-interval-seconds'
     'compute instance-console-connection create' = 'defined-tags freeform-tags from-json help instance-id max-wait-seconds ssh-public-key-file wait-for-state wait-interval-seconds'
     'compute instance-console-connection delete' = 'force from-json help if-match instance-console-connection-id max-wait-seconds wait-for-state wait-interval-seconds'
     'compute instance-console-connection get' = 'from-json help instance-console-connection-id'

src/oci_cli/cli_util.py

@@ -59,34 +59,25 @@
 
 
 OVERRIDES = {
-    "audit_root_group.help": "Audit Service",
     "audit_event_group.command_name": "event",
     "configuration_group.command_name": "config",
     "list_events.command_name": "list",
     "blockstorage_root_group.command_name": "bv",
-    "blockstorage_root_group.help": "Block Volume Service",
     "compute_root_group.command_name": "compute",
-    "compute_root_group.help": "Compute Service",
     "ce_root_group.command_name": "ce",
-    "db_root_group.help": "Database Service",
     "db_root_group.command_name": "db",
     "db_node_group.command_name": "node",
     "db_system_group.command_name": "system",
     "db_system_shape_group.command_name": "system-shape",
     "db_version_group.command_name": "version",
-    "dns_root_group.help": "DNS Zone Management Service",
-    "email_root_group.help": "Email Delivery Service",
-    "fs_root_group.help": "File Storage Service",
     "get_console_history_content.command_name": "get-content",
     "get_db_system_patch.command_name": "by-db-system",
     "get_db_system_patch_history_entry.command_name": "by-db-system",
     "get_namespace_metadata.command_name": "get-metadata",
     "get_windows_instance_initial_credentials.command_name": "get-windows-initial-creds",
-    "iam_root_group.help": "Identity and Access Management Service",
     "instance_action.command_name": "action",
     "list_db_system_patches.command_name": "by-db-system",
     "list_db_system_patch_history_entries.command_name": "by-db-system",
-    "lb_root_group.help": "Load Balancing Service",
     "load_balancer_policy_group.command_name": "policy",
     "load_balancer_protocol_group.command_name": "protocol",
     "load_balancer_shape_group.command_name": "shape",
@@ -96,20 +87,31 @@
     "list_policies.command_name": "list",
     "list_work_request_logs.command_name": "list",
     "namespace_group.command_name": "ns",
-    "os_root_group.help": "Object Storage Service",
     "patch_history_entry_group.command_name": "patch-history",
     "preauthenticated_request_group.command_name": "preauth-request",
     "update_namespace_metadata.command_name": "update-metadata",
     "virtual_network_root_group.command_name": "network",
-    "virtual_network_root_group.help": "Networking Service",
-    "compute_management_group.command_name": "compute-management",
-    "compute_management_group.help": "Compute Management Service",
     "volume_backup_group.command_name": "backup",
     "resource_summary_collection_group.command_name": "resource",
     "search_resources_structured_search_details.command_name": "structured-search",
     "search_resources_free_text_search_details.command_name": "free-text-search"
 }
 
+ROOT_COMMAND_HELP_OVERRIDES = {
+    "compute_root_group.help": "Compute Service CLI",
+    "compute_root_group.short_help": "Compute Service",
+    "compute_management_root_group.help": "Compute Management Service CLI",
+    "compute_management_root_group.short_help": "Compute Management Service",
+    "blockstorage_root_group.help": "Block Volume Service CLI",
+    "blockstorage_root_group.short_help": "Block Volume Service",
+    "compute_root_group.help": "Compute Service CLI",
+    "compute_root_group.short_help": "Compute Service",
+    "os_root_group.help": "Object Storage Service CLI",
+    "os_root_group.short_help": "Object Storage Service",
+    "virtual_network_root_group.help": "Networking Service CLI",
+    "virtual_network_root_group.short_help": "Networking Service",
+    "email_root_group.help": "Email Delivery Service CLI",
+}
 
 DNS_OVERRIDES = {
     "get_domain_records.command_name": "get",
@@ -126,6 +128,7 @@
 
 
 OVERRIDES.update(DNS_OVERRIDES)
+OVERRIDES.update(ROOT_COMMAND_HELP_OVERRIDES)
 
 
 GENERIC_JSON_FORMAT_HELP = """This must be provided in JSON format. See API reference for additional help."""
@@ -142,6 +145,18 @@
 
 
 def override(key, default):
+    # special case for root command help
+    # - the short help is used in the `oci --help` output, and is the spec title so we remove 'API'
+    #  - the regular help is used in the command help `oci bv --help` and is the spec description so we
+    #    replace 'API' with 'CLI' since the description may be a full sentence
+    # note: this is simply meant to cover as many places as possible automatically, if there are descriptions
+    # that don't work well, we should add them to the manual overrides
+    if 'API' in default:
+        if key.endswith('_root_group.help'):
+            default = default.replace('API', 'CLI').strip()
+        elif key.endswith('_root_group.short_help'):
+            default = default.replace('API', '').strip()
+
     return OVERRIDES.get(key, default)
 
 

src/oci_cli/core_cli_extended.py

@@ -807,8 +807,7 @@ def create_instance_console_connection(ctx, from_json, instance_id, ssh_public_k
 
 This is optional when cloning a volume as the newly created volume will be created in the same Availability Domain as its source. This is required when creating an empty volume or restoring a volume from a backup.""", append=False)
 cli_util.update_param_help(blockstorage_cli.create_volume, 'compartment_id', """The OCID of the compartment that contains the volume. This is optional when cloning a volume or restoring a volume from a backup. If it is not supplied then the volume will be created in the same compartment as the source. This is requied when creating an empty volume.""", append=False)
-cli_util.update_param_help(blockstorage_cli.create_volume, 'size_in_gbs', """This option cannot be supplied when cloning a volume or restoring a volume from a backup""", append=True)
-cli_util.update_param_help(blockstorage_cli.create_volume, 'size_in_mbs', """[DEPRECATED] The size of the volume in MBs. The value must be a multiple of 1024. This field is deprecated. Use --size-in-gbs instead. This option cannot be supplied when cloning a volume or restoring a volume from a backup""", append=False)
+cli_util.update_param_help(blockstorage_cli.create_volume, 'size_in_mbs', """[DEPRECATED] The size of the volume in MBs. The value must be a multiple of 1024. This field is deprecated. Use --size-in-gbs instead.""", append=False)
 
 
 @cli_util.copy_params_from_generated_command(blockstorage_cli.create_volume, params_to_exclude=['source_details', 'volume_backup_id', 'availability_domain', 'compartment_id'])
@@ -836,10 +835,7 @@ def create_volume_extended(ctx, **kwargs):
     if not kwargs['source_volume_id'] and not kwargs['volume_backup_id'] and not kwargs['compartment_id']:
         raise click.UsageError('A compartment ID must be specified when creating an empty volume')
 
-    if (kwargs['volume_backup_id'] or kwargs['source_volume_id']) and (kwargs['size_in_gbs'] or kwargs['size_in_mbs']):
-        raise click.UsageError('You cannot specify a size when cloning a volume or restoring a volume from a backup')
-
-    if (kwargs['size_in_mbs'] and kwargs['size_in_gbs']):
+    if kwargs['size_in_mbs'] and kwargs['size_in_gbs']:
         raise click.UsageError('You cannot specify both --size-in-mbs and --size-in-gbs')
 
     client = cli_util.build_client('blockstorage', ctx)
@@ -877,7 +873,7 @@ def create_volume_extended(ctx, **kwargs):
     ctx.invoke(blockstorage_cli.create_volume, **kwargs)
 
 
-@cli_util.copy_params_from_generated_command(blockstorage_cli.create_boot_volume, params_to_exclude=['source_details', 'size_in_gbs', 'availability_domain', 'compartment_id'])
+@cli_util.copy_params_from_generated_command(blockstorage_cli.create_boot_volume, params_to_exclude=['source_details', 'availability_domain', 'compartment_id'])
 @blockstorage_cli.boot_volume_group.command(name=cli_util.override('create_boot_volume.command_name', 'create'), help="""Creates a new boot volume in the specified compartment from an existing boot volume or a boot volume backup. For general information about boot volumes, see [Boot Volumes]. You may optionally specify a *display name* for the volume, which is simply a friendly name or description. It does not have to be unique, and you can change it. Avoid entering confidential information.""")
 @cli_util.option('--availability-domain', help="""The Availability Domain of the boot volume. Example: `Uocm:PHX-AD-1`.
 

src/oci_cli/database_cli_extended.py

@@ -15,7 +15,7 @@
 @cli_util.copy_params_from_generated_command(database_cli.launch_db_system_launch_db_system_details, params_to_exclude=['db_home', 'ssh_public_keys'])
 @database_cli.db_system_group.command(name='launch', help=database_cli.launch_db_system_launch_db_system_details.help)
 @cli_util.option('--admin-password', required=True, help="""A strong password for SYS, SYSTEM, and PDB Admin. The password must be at least nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The special characters must be _, #, or -.""")
-@cli_util.option('--character-set', help="""The character set for the database. The default is AL32UTF8. Allowed values are: AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS.""")
+@cli_util.option('--character-set', help="""The character set for the database. The default is AL32UTF8. Allowed values are: AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS.""")
 @cli_util.option('--db-name', required=True, help="""The database name. It must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted.""")
 @cli_util.option('--db-version', required=True, help="""A valid Oracle database version. To get a list of supported versions, use the command 'oci db version list'.""")
 @cli_util.option('--db-workload', help="""Database workload type. Allowed values are: OLTP, DSS""")
@@ -113,7 +113,7 @@ def launch_db_system_backup_extended(ctx, **kwargs):
 @cli_util.copy_params_from_generated_command(database_cli.create_db_home, params_to_exclude=['database', 'display_name', 'db_version'])
 @database_cli.database_group.command(name='create', help="""Creates a new database in the given DB System.""")
 @cli_util.option('--admin-password', required=True, help="""A strong password for SYS, SYSTEM, and PDB Admin. The password must be at least nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The special characters must be _, #, or -.""")
-@cli_util.option('--character-set', help="""The character set for the database. The default is AL32UTF8. Allowed values are: AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS.""")
+@cli_util.option('--character-set', help="""The character set for the database. The default is AL32UTF8. Allowed values are: AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS.""")
 @cli_util.option('--db-name', required=True, help="""The database name. It must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted.""")
 @cli_util.option('--db-workload', help="""Database workload type. Allowed values are: OLTP, DSS""")
 @cli_util.option('--ncharacter-set', help="""National character set for the database. The default is AL16UTF16. Allowed values are: AL16UTF16 or UTF8.""")

src/oci_cli/generated/audit_cli.py

@@ -14,7 +14,7 @@
 from ..aliasing import CommandGroupWithAlias
 
 
-@cli.command(cli_util.override('audit_root_group.command_name', 'audit'), cls=CommandGroupWithAlias, help=cli_util.override('audit_root_group.help', """API for the Audit Service. You can use this API for queries, but not bulk-export operations."""))
+@cli.command(cli_util.override('audit_root_group.command_name', 'audit'), cls=CommandGroupWithAlias, help=cli_util.override('audit_root_group.help', """API for the Audit Service. You can use this API for queries, but not bulk-export operations."""), short_help=cli_util.override('audit_root_group.short_help', """Audit API"""))
 @cli_util.help_option_group
 def audit_root_group():
     pass