yellowdog-python-examples 8.1.2__tar.gz → 8.1.4__tar.gz

{yellowdog_python_examples-8.1.2/yellowdog_python_examples.egg-info → yellowdog_python_examples-8.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-python-examples
-Version: 8.1.2
+Version: 8.1.4
 Summary: Python CLI commands using the YellowDog Python SDK
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -26,7 +26,7 @@ Requires-Dist: requests
 Requires-Dist: rich==13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: toml
-Requires-Dist: yellowdog-sdk>=11.5.0
+Requires-Dist: yellowdog-sdk>=11.6.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_python_examples-8.1.2 → yellowdog_python_examples-8.1.4}/README.md

@@ -417,9 +417,9 @@ Variable substitutions are discussed in more detail below.
 
 # Variable Substitutions
 
-Variable substitutions provide a powerful mechanism for introducing variable values into TOML configuration files, and JSON/Jsonnet definitions of Work Requirements and Worker Pools. They can be included in the value of any property in any of these objects, including in values within arrays (lists), e.g., for the `arguments` property, and tables (dictionaries), e.g., the `environment` property.
+Variable substitutions provide a powerful mechanism for introducing variable values into TOML configuration files, and JSON/Jsonnet definitions. They can be included in the value of any property in any of these objects, including in values within arrays (lists), e.g., for the `arguments` property, and tables (dictionaries), e.g., the `environment` property.
 
-Variable substitutions are expressed using the `{{variable}}` notation, where the expression is replaced by the value of `variable`.
+Variable substitutions are expressed using the `{{variable}}` notation (note: no spaces between the double brackets and the variable name), where the expression is replaced by the value of `variable`.
 
 Substitutions can also be performed for non-string (number, boolean, array, and table) values using the `num:`, `bool:`, `array:`, and `table:` prefixes within the variable substitution:
 
@@ -493,7 +493,7 @@ The precedence order for setting variables is:
 4. General environment variables
 5. Variables in a `.env` file
 
-This method can also be used to override the default variables, e.g., setting `-v username="other-user"` will override the default `{{username}}` variable.
+This method can also be used to override some default variables, e.g., setting `-v username="other-user"` will override the default `{{username}}` variable.
 
 ### Nested Variables
 
@@ -547,7 +547,7 @@ name = "{{name_var:={{tag}}-{{datetime}}}}"
 
 ## Variable Substitutions in Worker Pool and Compute Requirement Specifications, and in User Data
 
-In JSON specifications for Worker Pools and Compute Requirements, variable substitutions can be used, but **they must be prefixed and postfixed by double underscores** `__`, e.g., `__{{username}}__`. This is to disambiguate client-side variable substitutions from server-side Mustache variable processing.
+In JSON/Jsonnet specifications for Worker Pools and Compute Requirements, variable substitutions **must be prefixed and postfixed by double underscores** `__`, e.g., `__{{username}}__`. This is to disambiguate client-side variable substitutions from server-side Mustache variable processing.
 
 Variable substitutions can also be used within **User Data** to be supplied to instances, for which the same prefix/postfix requirement applies, **including** for User Data supplied directly using the `userData` property in the `workerPool` section of the TOML file.
 
@@ -1693,7 +1693,7 @@ The following properties are available:
 |:------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------|:------------------------|
 | `idleNodeTimeout`       | The timeout in minutes after which an idle node will be shut down. Set this to `0` to disable the timeout.                                 | `5.0`                   |
 | `idlePoolTimeout`       | The timeout in minutes after which an idle Worker Pool will be shut down. Set this to `0` to disable the timeout.                          | `30.0`                  |
-| `imagesId`              | The image ID, Image Family ID, or Image Family name to use when booting instances.                                                         |                         |
+| `imagesId`              | The Image ID, Image Family ID, Image Family name, or Image Group name to use when booting instances.                                       |                         |
 | `instanceTags`          | The dictionary of instance tags to apply to the instances. Tag names must be lower case.                                                   |                         |
 | `maintainInstanceCount` | Only used when instantiating Compute Requirements; attempt to maintain the requested number of instances.                                  | `False`                 |
 | `maxNodes`              | The maximum number of nodes to which the Worker Pool can be scaled up.                                                                     | `1`                     |
@@ -1717,7 +1717,7 @@ The following properties are available:
 
 The `templateId` property can be directly populated with the YellowDog ID (YDID), or it can be populated with the textual name of the template, in the form `namespace/template_name`.
 
-Similarly, the `imagesId` property can be populated with the YDID of an Image Family, Image Group, Image, or a string representing the native name of a cloud provider image (e.g., an AWS AMI). It can also be populated with the textual name of an Image Family, in the form `namespace/image_family_name`.
+Similarly, the `imagesId` property can be populated with the YDID of an Image Family, Image Group, Image, or a string representing the native name of a cloud provider image (e.g., an AWS AMI). It can also be populated with an Image Family name in the form `namespace/image_family_name`, or an Image Group name in the form `namespace/image_family_name/image_group_name` or `image_family_name/image_group_name`. Optionally, a `yd/` prefix can be supplied. The CLI will aim to map the provided name into an Image Family or Group YDID.
 
 ## Automatic Properties
 
@@ -1893,7 +1893,7 @@ When a JSON Worker Pool specification is used, the following properties from the
 - `userDataFile`
 - `userDataFiles`
 
-Note that the `templateId` property can use either the YellowDog ID ('YDID') for the Compute Requirement Template, or its name. Similarly, the `imagesId` property can use either a YDID or the Image Family Name (e.g, `"yd-agent-docker"`).
+Note that the `templateId` property can use either the YellowDog ID ('YDID') for the Compute Requirement Template, or its name. Similarly, the `imagesId` property can use either a YDID or the Image Family or Image Group name (e.g, `"yd-agent-docker"`).
 
 **Properties Inherited within the `provisionedProperties` Property**
 
@@ -1990,7 +1990,7 @@ yd-remove --ids ydid:crt:D9C548:2a09093d-c74c-4bde-95d1-c576c6f03b13 ydid:imgfam
 
 ### Resource Matching
 
-Resources match on **resource names** and (where applicable) **resource namespaces** rather than on YellowDog IDs. This is done for flexibility and to allow the `yd-create` and `yd-remove` commands to be essentially stateless (i.e., we don't need to keep a local record of the YellowDog IDs of the resources created). 
+Resources match on **resource names** and (where applicable) **resource namespaces** rather than on YellowDog IDs. This is done for flexibility and to allow the `yd-create` and `yd-remove` commands to be stateless (i.e., we don't need to keep a local record of the YellowDog IDs of the resources created).
 
 However, this means that **caution is required** when updating or removing resources, since resource matching is done using **only** the **namespace/name** of the resource -- i.e., the system-generated `ydid` IDs are not used. This means that a resource with a given name could have been removed and replaced in Platform by some other means, and the resource specification(s) would still match it.
 
@@ -1998,7 +1998,7 @@ However, this means that **caution is required** when updating or removing resou
 
 The JSON specification used to define each type of resource can be found by inspecting the YellowDog Platform REST API documentation at https://docs.yellowdog.co/api.
 
-For example, to obtain the JSON schema for creating a Compute Source Template, take a look at the REST API call for adding a new Compute Source template: https://docs.yellowdog.co/api/?spec=Compute%20API#tag/compute/post/compute/templates/sources.
+For example, to obtain the JSON schema for creating a Compute Source Template, take a look at the REST API models for the Compute API: https://docs.yellowdog.ai/api?spec=Compute%20API.
 
 When using the `yd-create` and `yd-remove` commands, note that an additional property `resource` must be supplied, to identify the type of resource being specified. The `"resource"` property can take the following values:
 
@@ -2043,7 +2043,7 @@ yd-show -q ydid:cst:000000:cde265f8-0b17-4e0e-be1c-505174a620e4 --substitute-ids
 
 would generate a JSON file that can be used with `yd-create` without alteration, or which could be edited.
 
-As illustrated above, both `yd-list` and `yd-show` support the `--substitute-ids`/`-U` option. For Compute Requirement Template detailed output, this will substitute Compute Source Template IDs and Image Family IDs with their names, to make it easier to reuse the outputs. For Compute Source Templates, Image Family IDs will be substituted. (Only Image Family IDs are substituted, not Image Group or Image IDs; if these are used in CRTs/CSTs, the JSON resource output may not be reusable.)
+As illustrated above, both `yd-list` and `yd-show` support the `--substitute-ids`/`-U` option. For Compute Requirement Template detailed output, this will substitute Compute Source Template IDs and Image Family and Group IDs with their names, to make it easier to reuse the outputs. For Compute Source Templates, Image Family and Group IDs will be substituted.
 
 The `--strip-ids` option will remove any YellowDog IDs ('ydids') from the JSON output, as well as any other properties that are not required in order to use the output with `yd-create`.
 
@@ -2088,7 +2088,7 @@ Below, we'll discuss each item type with example specifications.
 
 ## Keyrings
 
-The Keyring example and schema can be found at: https://docs.yellowdog.co/api/?spec=Account%20API#tag/keyring/post/keyrings.
+The Keyring models can be found in the Account API at: https://docs.yellowdog.ai/api?spec=Account%20API.
 
 An example Keyring specification is shown below:
 
@@ -2116,7 +2116,7 @@ Note that Keyrings **cannot be updated**; they must instead be removed and recre
 
 ## Credentials
 
-The Credential example and schema can be found at: https://docs.yellowdog.co/api/?spec=Account%20API#tag/keyring/put/keyrings/%7BkeyringName%7D/credentials.
+The Credential models can be found in the Account API at: https://docs.yellowdog.ai/api?spec=Account%20API.
 
 For example, to add a single AWS credential to a Keyring, the following resource specification might be used:
 
@@ -2137,7 +2137,7 @@ To **update** a Credential, make the modifications to the resource specification
 
 ## Compute Source Templates
 
-The Compute Source Template example and schema can be found at: https://docs.yellowdog.co/api/?spec=Compute%20API#tag/compute/post/compute/templates/sources.
+The Compute Source Template models can be found in the Compute API at: https://docs.yellowdog.ai/api?spec=Compute%20API.
 
 An example Compute Source resource specification is found below:
 
@@ -2171,11 +2171,11 @@ An example Compute Source resource specification is found below:
 }
 ```
 
-In the Compute Source Template `imageId` property, an Image Family **namespace/name** may be used instead of an ID. For example: `"imageId": "yellowdog/yd-agent-docker"`. The `yd-create` command will look up the Image Family name and substitute its ID. 
+In the Compute Source Template `imageId` property, an Image Family name **namespace/family-name** or Image Group name **namespace/family-name/group-name** may be used instead of an ID. For example: `"imageId": "yellowdog/yd-agent-docker"`. The `yd-create` command will look up the Image Family name and substitute with a well-formed name or ID. A **`yd/`** prefix may also optionally be used.
 
 ## Compute Requirement Templates
 
-The Compute Requirement Template example and schema can be found at: https://docs.yellowdog.co/api/?spec=Compute%20API#tag/compute/post/compute/templates/requirements.
+The Compute Requirement Template models can be found in the Compute API at: https://docs.yellowdog.ai/api?spec=Compute%20API.
 
 An example Compute Requirement resource specification is found below, for a **static** tempate:
 
@@ -2197,7 +2197,7 @@ An example Compute Requirement resource specification is found below, for a **st
 
 Note that Compute Source Template **namespace/names** in the form `namespace/compute_source_template_name` can be used instead of their IDs: the **yd-create** command will look up the IDs and make the substitutions. The Compute Source Templates must already exist.
 
-Also, In the `imagesId` property, an Image Family **namespace/name** may be used instead of an ID. For example: `"imagesId": "yellowdog/yd-agent-docker"`. The `yd-create` command will look up the Image Family name and substitute its ID.
+Also, In the `imagesId` property, an Image Family name **namespace/family-name** or an Image Group name **namespace/family-name/group-name** may be used instead of an ID. For example: `"imagesId": "yellowdog/yd-agent-docker/latest"`. The `yd-create` command will look up the Image Family name and substitute with a well-formed name or ID. A **`yd/`** prefix may also optionally be used.
 
 A **dynamic** template example is:
 
@@ -2252,7 +2252,7 @@ A **dynamic** template example is:
 
 ## Image Families
 
-The Image Family example and schema can be found at: https://docs.yellowdog.co/api/?spec=Images%20API#tag/images/post/images/families.
+The Image Family models can be found in the Image API: https://docs.yellowdog.ai/api?spec=Images%20API.
 
 An example specification, illustrating a containment hierarchy of Image Family -> Image Group -> Image, is shown below:
 
@@ -2298,7 +2298,7 @@ Note that if the name of an Image Group or an Image is changed in the resource s
 
 ## Namespace Storage Configurations
 
-The Namespace Storage Configuration example and schema can be found at: https://docs.yellowdog.co/api/?spec=Object%20Store%20API#tag/object-store/put/objectstore/configurations.
+The Namespace Storage Configuration models can be found in the Object Store API at: https://docs.yellowdog.ai/api?spec=Object%20Store%20API.
 
 Example:
 
@@ -2315,7 +2315,7 @@ Example:
 
 ## Configured Worker Pools
 
-The Configured Worker Pool example and schema can be found at: https://docs.yellowdog.co/api/?spec=Scheduler%20API#tag/worker-pools/post/workerPools/configured.
+The Configured Worker Pool models can be found in the  Scheduler API at: https://docs.yellowdog.ai/api?spec=Scheduler%20API.
 
 Example:
 
@@ -2346,7 +2346,7 @@ Example:
 
 ## Allowances
 
-The Allowances example and schema can be found at: https://docs.yellowdog.co/api/?spec=Usage%20API#tag/allowances/post/allowances.
+The Allowance models can be found in the Usage API at: https://docs.yellowdog.ai/api?spec=Usage%20API.
 
 Example:
 ```json
@@ -2378,7 +2378,7 @@ Allowances can be **boosted** (have extra hours added to the Allowance) using th
 
 ## Attribute Definitions
 
-The Attribute Definition example and schema can be found at: https://docs.yellowdog.co/api/?spec=Compute%20API#tag/compute/post/compute/attributes/user.
+The Attribute Definition models can be found in the Compute API at: https://docs.yellowdog.ai/api?spec=Compute%20API.
 
 ### String Attribute Definitions
 
@@ -2416,7 +2416,7 @@ The `name`, `title` and `defaultRankOrder` properties are required, while the re
 
 ## Namespace Policies
 
-The Namespace Policies example and schema can be found at: (TBD).
+Example:
 
 ```json
 {
@@ -2475,7 +2475,7 @@ Example:
 
 ### Creating and Regenerating Application Keys
 
-When an Application is created its Application Key ID and Secret will be displayed (even if the `--quiet` option is used).
+When an Application is created, its Application Key ID and Secret will be displayed (even if the `--quiet` option is used).
 
 When an Application is updated, the `--regenerate-app-keys` option can be used. This will invalidate the current Application key and secret, revoke any Keyring access, and generate a new key and secret which will be displayed.
 
@@ -2539,11 +2539,11 @@ A simple usage example might be:
 yd-submit my_work_req.jsonnet
 ```
 
-The use of the filename extension `.jsonnet` will invoke Jsonnet evaluation. (Note that a temporary JSON file is created as part of Jsonnet processing, which you may see referred to in error messages: this file will have been deleted before the command exits.)
+The use of the filename extension `.jsonnet` will activate Jsonnet evaluation. (Note that a temporary JSON file is created as part of Jsonnet processing, which you may see referred to in error messages: this file will have been deleted before the command exits.)
 
 ## Jsonnet Installation
 
-Jsonnet is **not** installed by default when `yellowdog-python-examples` is installed, because the package has binary components that are not available on PyPI for all platforms. If you try to use a Jsonnet file in the absence of Jsonnet, the scripts will print an error message, and suggest an installation mechanism.
+Jsonnet is **not** installed by default when `yellowdog-python-examples` because the package has binary components that are not available on PyPI for all platforms. If you try to use a Jsonnet file in the absence of Jsonnet, the scripts will print an error message, and suggest an installation mechanism.
 
 To install Jsonnet at the same time as installing or updating the Python Examples scripts, modify the installation as follows to include the `jsonnet` option:
 
@@ -2551,7 +2551,7 @@ To install Jsonnet at the same time as installing or updating the Python Example
 pip install -U "yellowdog-python-examples[jsonnet]"
 ```
 
-To install Jsonnet separately from `yellowdog-python-examples`, try:
+To install Jsonnet separately from `yellowdog-python-examples`, use:
 
 ```shell
 pip install -U jsonnet

{yellowdog_python_examples-8.1.2 → yellowdog_python_examples-8.1.4}/requirements.txt

@@ -5,4 +5,4 @@ requests
 rich == 13.9.4
 tabulate >= 0.9.0
 toml
-yellowdog-sdk >= 11.5.0
+yellowdog-sdk >= 11.6.0

yellowdog_python_examples-8.1.4/yellowdog_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "8.1.4"

{yellowdog_python_examples-8.1.2 → yellowdog_python_examples-8.1.4}/yellowdog_cli/cancel.py

@@ -132,10 +132,7 @@ def _cancel_work_requirements_by_name_or_id(names_or_ids: List[str]):
             )
         )
         if work_requirement_summary is None:
-            print_error(
-                f"Work Requirement '{name_or_id}' not found in "
-                f"namespace '{CONFIG_COMMON.namespace}'"
-            )
+            print_error(f"Work Requirement '{name_or_id}' not found")
             continue
 
         if work_requirement_summary.status not in [

{yellowdog_python_examples-8.1.2 → yellowdog_python_examples-8.1.4}/yellowdog_cli/create.py

@@ -50,10 +50,10 @@ from yellowdog_cli.utils.entity_utils import (
     clear_application_caches,
     clear_compute_source_template_cache,
     clear_group_caches,
-    clear_image_family_search_cache,
+    clear_image_caches,
     find_compute_requirement_template_id_by_name,
     find_compute_source_template_id_by_name,
-    find_image_family_reference_by_name,
+    find_image_name_or_id,
     get_application_groups,
     get_application_id_by_name,
     get_group_id_by_name,
@@ -130,7 +130,9 @@ from yellowdog_cli.utils.wrapper import ARGS_PARSER, CLIENT, CONFIG_COMMON, main
 from yellowdog_cli.utils.ydid_utils import YDIDType, get_ydid_type
 
 CLEAR_CST_CACHE: bool = False  # Track whether the CST cache needs to be cleared
-CLEAR_IMAGE_FAMILY_CACHE: bool = False  # Track whether the IF cache needs to be cleared
+CLEAR_IMAGE_FAMILY_CACHE: bool = (
+    False  # Track whether the image caches need to be cleared
+)
 
 
 @main_wrapper
@@ -233,7 +235,7 @@ def create_compute_source_template(resource: Dict):
     # Allow image families (etc.) to be referenced by name rather than ID
     global CLEAR_IMAGE_FAMILY_CACHE
     if CLEAR_IMAGE_FAMILY_CACHE:  # Update the IF cache if required
-        clear_image_family_search_cache()
+        clear_image_caches()
         CLEAR_IMAGE_FAMILY_CACHE = False
 
     # Google CSTs use property name 'image' instead of 'imageId'
@@ -244,17 +246,14 @@ def create_compute_source_template(resource: Dict):
         else PROP_IMAGE
     )
 
-    image_id = source.get(image_property_name)
-    if get_ydid_type(image_id) not in [
-        YDIDType.IMAGE_FAMILY,
-        YDIDType.IMAGE_GROUP,
-        YDIDType.IMAGE,
-    ]:
-        image_family_id = find_image_family_reference_by_name(
-            client=CLIENT, image_family_name=image_id
-        )
-        if image_family_id is not None:
-            source[image_property_name] = image_family_id
+    image_id = find_image_name_or_id(
+        client=CLIENT,
+        image_name_or_id=source.get(image_property_name),
+        always_return_id=False,
+        report_substitutions=True,
+    )
+    if image_id is not None:
+        source[image_property_name] = image_id
 
     if ARGS_PARSER.dry_run:
         resource[PROP_SOURCE] = source
@@ -322,31 +321,26 @@ def create_compute_requirement_template(resource: Dict):
     # Allow image families to be referenced by name rather than ID
     global CLEAR_IMAGE_FAMILY_CACHE
     if CLEAR_IMAGE_FAMILY_CACHE:  # Update the IF cache if required
-        clear_compute_source_template_cache()
+        clear_image_caches()
         CLEAR_IMAGE_FAMILY_CACHE = False
 
-    def _get_images_id(image_str: str, context: Dict, key: str) -> int:
+    def _get_images_id(image_str: str, context: Dict, key: str):
         """
-        Helper function to match an image family name into an ID.
+        Helper function to resolve an image ID.
         """
-        if get_ydid_type(image_str) not in [
-            YDIDType.IMAGE_FAMILY,
-            YDIDType.IMAGE_GROUP,
-            YDIDType.IMAGE,
-        ]:
-            image_family_id = find_image_family_reference_by_name(
-                client=CLIENT, image_family_name=image_str
-            )
-            if image_family_id is not None:
-                context[key] = image_family_id
-                return 1
-        return 0
+        images_id_ = find_image_name_or_id(
+            client=CLIENT,
+            image_name_or_id=image_str,
+            always_return_id=False,
+            report_substitutions=True,
+        )
+        if images_id_ is not None:
+            context[key] = images_id_
 
     # Prepend the namespace when searching for existing templates
     name = f"{namespace}{NAMESPACE_PREFIX_SEPARATOR}{name}"
 
     source_template_substitutions = 0
-    source_image_id_substitutions = 0
 
     # Dynamic templates don't have 'sources'; return '[]'
     for source in resource.get(PROP_SOURCES, []):
@@ -365,16 +359,12 @@ def create_compute_requirement_template(resource: Dict):
 
         source_image_id = source.get(PROP_IMAGE_ID)
         if source_image_id is not None:
-            source_image_id_substitutions += _get_images_id(
-                source_image_id, source, PROP_IMAGE_ID
-            )
+            _get_images_id(source_image_id, source, PROP_IMAGE_ID)
 
     if source_template_substitutions > 0:
         print_log(
             f"Replaced {source_template_substitutions} Compute Source Template name(s) with ID(s)"
         )
-    if source_image_id_substitutions > 0:
-        print_log(f"Replaced {source_image_id_substitutions} Image name(s) with ID(s)")
 
     images_id = resource.get(PROP_IMAGES_ID)
     if images_id is not None:
@@ -549,7 +539,7 @@ def create_image_family(resource):
             # This will create the Image Family and all of its constituent
             # Image Group/Image resources
             image_family = _create_image_family(image_family, fq_name)
-            print_log(f"Created Machine Image Family '{fq_name}' ('{image_family.id}')")
+            print_log(f"Created Machine Image Family '{fq_name}' ({image_family.id})")
             if ARGS_PARSER.quiet:
                 print(image_family.id)
         else:

{yellowdog_python_examples-8.1.2 → yellowdog_python_examples-8.1.4}/yellowdog_cli/finish.py

@@ -114,10 +114,7 @@ def _finish_work_requirements_by_name_or_id(names_or_ids: List[str]):
             )
         )
         if work_requirement_summary is None:
-            print_error(
-                f"Work Requirement '{name_or_id}' not found in "
-                f"namespace '{CONFIG_COMMON.namespace}'"
-            )
+            print_error(f"Work Requirement '{name_or_id}' not found")
             continue
 
         if work_requirement_summary.status not in [

{yellowdog_python_examples-8.1.2 → yellowdog_python_examples-8.1.4}/yellowdog_cli/instantiate.py

@@ -30,7 +30,7 @@ from yellowdog_cli.utils.printing import (
     print_yd_object,
 )
 from yellowdog_cli.utils.provision_utils import (
-    get_image_family_id,
+    get_image_id,
     get_template_id,
     get_user_data_property,
 )
@@ -92,8 +92,8 @@ def main():
 
     # Allow use of IF name instead of ID
     if CONFIG_WP.images_id is not None:
-        CONFIG_WP.images_id = get_image_family_id(
-            client=CLIENT, image_family_id_or_name=CONFIG_WP.images_id
+        CONFIG_WP.images_id = get_image_id(
+            client=CLIENT, image_name_or_id=CONFIG_WP.images_id
         )
 
     if not ARGS_PARSER.report:
@@ -303,8 +303,8 @@ def _create_compute_requirement_from_json(
 
     # Allow use of IF name instead of ID
     if cr_data.get("imagesId") is not None:
-        cr_data["imagesId"] = get_image_family_id(
-            client=CLIENT, image_family_id_or_name=cr_data["imagesId"]
+        cr_data["imagesId"] = get_image_id(
+            client=CLIENT, image_name_or_id=cr_data["imagesId"]
         )
 
     if ARGS_PARSER.dry_run:

{yellowdog_python_examples-8.1.2 → yellowdog_python_examples-8.1.4}/yellowdog_cli/provision.py

@@ -47,7 +47,7 @@ from yellowdog_cli.utils.property_names import (
     WORKER_TAG,
 )
 from yellowdog_cli.utils.provision_utils import (
-    get_image_family_id,
+    get_image_id,
     get_template_id,
     get_user_data_property,
 )
@@ -170,7 +170,7 @@ def create_worker_pool_from_json(wp_json_file: str) -> None:
 
         # Allow Image Family name to be used instead of ID
         if reqt_template_usage.get(IMAGES_ID) is not None:
-            reqt_template_usage[IMAGES_ID] = get_image_family_id(
+            reqt_template_usage[IMAGES_ID] = get_image_id(
                 CLIENT, reqt_template_usage[IMAGES_ID]
             )
 
@@ -289,8 +289,8 @@ def create_worker_pool_from_toml():
 
     # Allow the Image Family name to be used instead of ID
     if CONFIG_WP.images_id is not None:
-        CONFIG_WP.images_id = get_image_family_id(
-            client=CLIENT, image_family_id_or_name=CONFIG_WP.images_id
+        CONFIG_WP.images_id = get_image_id(
+            client=CLIENT, image_name_or_id=CONFIG_WP.images_id
         )
 
     node_boot_timeout = (

{yellowdog_python_examples-8.1.2 → yellowdog_python_examples-8.1.4}/yellowdog_cli/remove.py

@@ -207,17 +207,17 @@ def remove_keyring(resource: Dict):
         print_error(f"Expected property to be defined ({e})")
         return
 
-    if not confirmed(f"Delete Keyring '{name}'?"):
+    if not confirmed(f"Remove Keyring '{name}'?"):
         return
 
     try:
         CLIENT.keyring_client.delete_keyring_by_name(name)
-        print_log(f"Deleted Keyring '{name}'")
+        print_log(f"Removed Keyring '{name}'")
     except HTTPError as e:
         if e.response.status_code == 404:
-            print_error(f"Keyring '{name}' not found")
+            print_error(f"Cannot find Keyring '{name}'")
         else:
-            print_error(f"Unable to delete Keyring '{name}': {e}")
+            print_error(f"Unable to remove Keyring '{name}': {e}")
 
 
 def remove_credential(resource: Dict):
@@ -246,7 +246,7 @@ def remove_credential(resource: Dict):
     except HTTPError as e:
         if e.response.status_code == 404:
             print_error(
-                f"Keyring '{keyring_name}' not found (possibly already deleted,"
+                f"Cannot find Keyring '{keyring_name}'(possibly already deleted,"
                 " including its credentials?)"
             )
         else:
@@ -275,7 +275,7 @@ def remove_image_family(resource: Dict):
         )
     except HTTPError as e:
         if e.response.status_code == 404:
-            print_error(f"Machine Image Family '{fq_name}' not found")
+            print_error(f"Cannot find Machine Image Family '{fq_name}'")
             return
         else:
             raise e
@@ -285,9 +285,9 @@ def remove_image_family(resource: Dict):
 
     try:
         CLIENT.images_client.delete_image_family(image_family)
-        print_log(f"Deleted Image Family '{fq_name}' ('{image_family.id}')")
+        print_log(f"Removed Image Family '{fq_name}' ({image_family.id})")
     except Exception as e:
-        print_error(f"Unable to delete Image Family '{fq_name}': {e}")
+        print_error(f"Unable to remove Image Family '{fq_name}': {e}")
 
 
 def remove_namespace_configuration(resource: Dict):
@@ -304,7 +304,7 @@ def remove_namespace_configuration(resource: Dict):
         CLIENT.object_store_client.get_namespace_storage_configurations()
     )
     if namespace not in [x.namespace for x in namespaces]:
-        print_error(f"Namespace Storage Configuration '{namespace}' not found")
+        print_error(f"Cannot find Namespace Storage Configuration '{namespace}'")
         return
 
     if not confirmed(f"Remove Namespace Storage Configuration '{namespace}'?"):
@@ -428,7 +428,7 @@ def remove_resource_by_id(resource_id: str):
                         CLIENT.keyring_client.delete_keyring_by_name(keyring.name)
                         print_log(f"Removed Keyring {resource_id}")
                         return
-                raise Exception(f"Keyring {resource_id} not found")
+                raise Exception(f"Cannot find Keyring {resource_id}")
 
         elif get_ydid_type(resource_id) == YDIDType.WORKER_POOL:
             if confirmed(f"Shut down Worker Pool {resource_id}?"):
@@ -497,7 +497,7 @@ def remove_namespace_policy(resource: Dict):
             return
     except Exception:
         # Assume it's not found ... 404 from API
-        print_error(f"Namespace Policy '{namespace}' not found")
+        print_error(f"Cannot find Namespace Policy '{namespace}'")
         return
 
     if not confirmed(f"Remove Namespace Policy '{namespace}'?"):
@@ -522,7 +522,7 @@ def remove_group(resource: Dict):
 
     group_id = get_group_id_by_name(CLIENT, group_name)
     if group_id is None:
-        print_warning(f"Group '{group_name}' not found")
+        print_warning(f"Cannot find Group '{group_name}'")
         return
 
     if not confirmed(f"Remove Group '{group_name}' ({group_id})?"):
@@ -533,7 +533,7 @@ def remove_group(resource: Dict):
         print_log(f"Removed Group '{group_name}' ({group_id})")
         clear_group_caches()
     except Exception as e:
-        print_error(f"Unable to delete Group '{group_name}' ({group_id}): {e}")
+        print_error(f"Unable to remove Group '{group_name}' ({group_id}): {e}")
 
 
 def remove_application(resource: Dict):
@@ -548,7 +548,7 @@ def remove_application(resource: Dict):
 
     app_id = get_application_id_by_name(CLIENT, app_name)
     if app_id is None:
-        print_warning(f"Application '{app_name}' not found")
+        print_warning(f"Cannot find Application '{app_name}'")
         return
 
     if not confirmed(f"Remove Application '{app_name}' ({app_id})?"):
@@ -574,7 +574,7 @@ def remove_namespace(resource: Dict):
 
     namespace_id = get_namespace_id_by_name(CLIENT, name)
     if namespace_id is None:
-        print_warning(f"Namespace '{name}' not found")
+        print_warning(f"Cannot find Namespace '{name}'")
         return
 
     if not confirmed(f"Remove Namespace '{name}'?"):