Releasing version 3.30.0

Releasing version 3.30.0

Author: NupurGupta3101

CHANGELOG.rst

@@ -6,6 +6,43 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
 
+3.30.0 - 2023-07-25
+--------------------
+Added
+~~~~~
+* Goldengate Service
+
+  * Support for Automatic Backup Download
+
+    * ``oci golden-gate deployment-backup copy --bucket-name --namespace-name``
+
+* Budgets Service
+
+  * Support for creating single use (non-recurring) budgets
+
+    * ``oci budgets budget create``
+    * ``oci budgets budget update``
+
+* AI Document Service
+
+  * Support for composing two or more Document Service custom key value models into one single model.
+
+    * ``oci ai-document model create``
+
+* Core Service
+
+  * Support for Custom hostname
+
+    * ``oci compute-management instance-pool create``
+    * ``oci compute-management instance-pool update``
+
+Changed
+~~~~~~~
+* [BREAKING] Subscriptions and AssignedSubscription resources are now polymorphic in Organizations service
+
+    * ``oci organizations subscription list --entity-version``
+    * ``oci organizations assigned-subscription list --entity-version``
+
 3.29.4 - 2023-07-18
 --------------------
 Added

images/animation.png

@@ -14,7 +14,7 @@ Jinja2==3.0.3
 jmespath==0.10.0
 ndg-httpsclient==0.4.2
 mock==2.0.0
-oci==2.107.0
+oci==2.108.0
 packaging==20.2
 pluggy==0.13.0
 py==1.10.0

requirements.txt

@@ -38,11 +38,22 @@ robotics     VM.Standard.E2.1    1.0   RUNNING
 
 **Important:** `oci` must *installed* and *configured*.  `o` does not replace `oci`, but helps you *use* `oci`.
 
+#### Linux or Mac
 To install, get **``o``** from github, place it in your PATH (perhaps in the same place as ``oci``), and make it executable.  Use these commands to download ``o`` and install it next to ``oci``.
 ```
 o_src=https://raw.githubusercontent.com/oracle/oci-cli/master/scripts/examples/project_o/o
 where=$(which oci) && to=${where%ci} && curl -so $to $o_src && chmod +x $to
 ```
+
+#### CloudShell
+The Linux install above will work, but it installs `o` in a place that is overwritten when CloudShell is updated.  This will install `o` into your $HOME, which is preserved during CloudShell updates:
+```
+mkdir -p $HOME/bin $HOME/.oci
+o_src=https://raw.githubusercontent.com/oracle/oci-cli/master/scripts/examples/project_o/o
+to=$HOME/bin/o && curl -so $to $o_src && chmod +x $to
+echo 'PATH=$HOME/bin:$PATH' >> $HOME/.bashrc
+```
+
 #### Windows
 **`o`** version 1.6 and later runs in Windows PowerShell or Command shell, but installation not automated.  To try it, use this curl command to get **`o`**.  Then copy it to somewhere in your PATH.
 ```

scripts/examples/project_o/README.md

@@ -22,7 +22,7 @@ if (sys.platform != "win32"):
 import errno
 import datetime
 VERSION = "1.9"
-UPDATED = "2023-07-05"
+UPDATED = "2023-07-18"
 
 # ==============================================================================
 # Global variables
@@ -449,6 +449,10 @@ def get_new_ocids_from_returned_items(items):
             region_list = [{'key': i['region-key'], 'name': i['region-name']} for i in items]
         else:
             region_list = items
+        # Add existing regions to new region list
+        if 'regionlist' in ocid:
+            newkeys = [r['key'] for r in region_list]
+            region_list.extend([r for r in ocid['regionlist']['data'] if r['key'] not in newkeys])
         return {'regionlist': {
                 'type': 'regionlist',
                 'alias': 'regionlist',
@@ -543,11 +547,8 @@ def get_new_ocids_from_returned_items(items):
                              'access-uri']))})
             if 'created-by' in item and '/' in item['created-by']:
                 collected[ID]['created-by'] = item['created-by'].split('/')[1]
-            if 'time-created' in item:
+            if 'time-created' in item and item['time-created']:
                 collected[ID]['time-created'] = item['time-created'][:19]
-            # Retain access-uri.
-            if type == 'par' and ID in ocid and 'access-uri' in ocid[ID]:
-                collected[ID]['access-uri'] = ocid[ID]['access-uri']
     except BaseException:
         print(bold('Unable to collect ocids of type ' + type
               + '. Please provide this data with your problem report:\n')
@@ -1005,7 +1006,7 @@ def value_parameter(option, value):
 
     # Special help with structured-search --search-query "where compartmentId = ocid"
     if option == '--query-text':
-        match = re.findall(r"(\b[cl]\w*) *!*= *('*\"*[-_/\w]+'*\"*)", value, flags=re.IGNORECASE)
+        match = re.findall(r"(\b[cl]\w*) *!*= *('*\"*[-_./\w]+'*\"*)", value, flags=re.IGNORECASE)
         for (m, spec) in match:
             if m.lower() == 'compartmentid'[:len(m)]:
                 if m.lower() != 'compartmentid':
@@ -1163,9 +1164,8 @@ def show_column_headers(out_fields, sep, reg=False):
         return
     if sep == '|':
         for k in out_fields:
-            # print(bold(column[k]['format'].format(k)), end=' ', file=sys.stderr)
             try:
-                if reg and k == 'id' and user_out_spec == default_out_spec:
+                if reg and k == 'id' and user_out_spec.startswith(default_out_spec):
                     print(bold(' reg'), end=' ', file=sys.stderr)
                 print(bold(column[k]['format'].format(k.split(".")[-1])),
                       end=' ', file=sys.stderr)
@@ -1242,8 +1242,14 @@ def show_item(item, fields, sep, reg=False):
             else:
                 out.append(value)
         else:
-            if reg and field == 'id' and sep == '|' and user_out_spec == default_out_spec and 'ocid' in value:
-                out.append(' ' + (value.split('.')[3]))
+            if reg and field == 'id' and sep == '|' and user_out_spec.startswith(default_out_spec) and 'ocid' in value:
+                rk = value.split('.')[3]
+                if len(rk) == 3:
+                    rk = rk.upper()
+                elif len(rk) > 3 and 'regionlist' in ocid:
+                    rkl = [r['key'] for r in ocid['regionlist']['data'] if r['name'] == rk]
+                    rk = rkl[0] if rkl else '   '
+                out.append(' ' + rk)
             out.append(column[field]['format'].format(re.sub(r'[{}\'[\]\n]', '', value)[
                        column[field]['offset']:]))
 

scripts/examples/project_o/o

@@ -79,4 +79,4 @@ Checksums
 -----------
 install.sh   eff201279e7198101e8cbbe4cea2ca559732f3cd502e145354d7477d2a4621ce
 install.ps1   8dba598ded1718cfa2e52ca8785ece31d0b573868eaec9ad2af535d43797a70c
-install.py   f0552ebe32fe1345dae8c260f75f54cbdea7380f2a140b1686081528d4398705
+install.py   9d2714cad813a47e725a644a74621f29093c4e82ec9db149a09aa4d731e74e83

scripts/install/README.rst

@@ -343,13 +343,13 @@ def change_project_compartment(ctx, from_json, project_id, compartment_id, if_ma
 @model_group.command(name=cli_util.override('ai_document.create_model.command_name', 'create'), help=u"""Create a new model. \n[Command Reference](createModel)""")
 @cli_util.option('--model-type', required=True, help=u"""The type of the Document model.""")
 @cli_util.option('--compartment-id', required=True, help=u"""The compartment identifier.""")
-@cli_util.option('--training-dataset', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--project-id', required=True, help=u"""The [OCID] of the project that contains the model.""")
 @cli_util.option('--display-name', help=u"""A human-friendly name for the model, which can be changed.""")
 @cli_util.option('--description', help=u"""An optional description of the model.""")
 @cli_util.option('--model-version', help=u"""The model version""")
 @cli_util.option('--is-quick-mode', type=click.BOOL, help=u"""Set to true when experimenting with a new model type or dataset, so the model training is quick, with a predefined low number of passes through the training data.""")
 @cli_util.option('--max-training-time-in-hours', help=u"""The maximum model training time in hours, expressed as a decimal fraction.""")
+@cli_util.option('--training-dataset', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--testing-dataset', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--validation-dataset', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--component-models', type=custom_types.CLI_COMPLEX_TYPE, help=u"""The [OCID] list of active custom Key Value models that need to be composed.
@@ -366,15 +366,14 @@ def change_project_compartment(ctx, from_json, project_id, compartment_id, if_ma
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'training-dataset': {'module': 'ai_document', 'class': 'Dataset'}, 'testing-dataset': {'module': 'ai_document', 'class': 'Dataset'}, 'validation-dataset': {'module': 'ai_document', 'class': 'Dataset'}, 'component-models': {'module': 'ai_document', 'class': 'list[ComponentModel]'}, 'freeform-tags': {'module': 'ai_document', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'ai_document', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'ai_document', 'class': 'Model'})
 @cli_util.wrap_exceptions
-def create_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_type, compartment_id, training_dataset, project_id, display_name, description, model_version, is_quick_mode, max_training_time_in_hours, testing_dataset, validation_dataset, component_models, alias_name, freeform_tags, defined_tags):
+def create_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, model_type, compartment_id, project_id, display_name, description, model_version, is_quick_mode, max_training_time_in_hours, training_dataset, testing_dataset, validation_dataset, component_models, alias_name, freeform_tags, defined_tags):
 
     kwargs = {}
     kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
 
     _details = {}
     _details['modelType'] = model_type
     _details['compartmentId'] = compartment_id
-    _details['trainingDataset'] = cli_util.parse_json_parameter("training_dataset", training_dataset)
     _details['projectId'] = project_id
 
     if display_name is not None:
@@ -392,6 +391,9 @@ def create_model(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval
     if max_training_time_in_hours is not None:
         _details['maxTrainingTimeInHours'] = max_training_time_in_hours
 
+    if training_dataset is not None:
+        _details['trainingDataset'] = cli_util.parse_json_parameter("training_dataset", training_dataset)
+
     if testing_dataset is not None:
         _details['testingDataset'] = cli_util.parse_json_parameter("testing_dataset", testing_dataset)