🐛 fix: miscellaneous bug fixes

riocli/apply/resolver.py

@@ -75,7 +75,7 @@ class ResolverCache(object, metaclass=_Singleton):
         "managedservice": "^[a-zA-Z][a-zA-Z0-9_-]$"
     }
 
-    GUID_KEYS = ['guid', 'GUID', 'uuid', 'ID', 'Id', 'id']
+    GUID_KEYS = ['guid', 'GUID', 'deploymentId', 'uuid', 'ID', 'Id', 'id']
     NAME_KEYS = ['name', 'urlPrefix', 'buildName']
 
     def __init__(self, client):

riocli/device/delete.py

@@ -122,7 +122,7 @@ def delete_device(
         spinner.write('')
 
         if failed_count == 0 and success_count == len(devices):
-            spinner_text = click.style('All devices deleted successfully.', Colors.GREEN)
+            spinner_text = click.style('{} device(s) deleted successfully.'.format(len(devices)), Colors.GREEN)
             spinner_char = click.style(Symbols.SUCCESS, Colors.GREEN)
         elif success_count == 0 and failed_count == len(devices):
             spinner_text = click.style('Failed to delete devices', Colors.YELLOW)

riocli/jsonschema/schemas/deployment-schema.yaml

@@ -90,8 +90,12 @@ definitions:
         type: string
       mountPath:
         type: string
+        pattern: '^([\\/][a-z0-9\s\-_@\-^!#$%&.]*)+(\.[a-z][a-z0-9]+)?$'
       subPath:
         type: string
+        pattern: '^([\\/][a-z0-9\s\-_@\-^!#$%&.]*)+(\.[a-z][a-z0-9]+)?$'
+    additionalProperties: false
+
 
   endpointSpec:
     properties:
@@ -143,7 +147,6 @@ definitions:
                   - always
                   - onfailure
                   - never
-                default: always
               envArgs:
                 type: array
                 items:

riocli/jsonschema/schemas/secret-schema.yaml

@@ -25,6 +25,7 @@ definitions:
     properties:
       name:
         type: string
+        maxLength: 253
       guid:
         "$ref": "#/definitions/secretGUID"
       creator:

riocli/organization/select.py

@@ -62,8 +62,12 @@ def select_organization(
     if sys.stdout.isatty() and interactive:
         select_project(ctx.obj, organization=organization_guid)
     else:
+        ctx.obj.data['project_id'] = ""
+        ctx.obj.data['project_name'] = ""
         click.secho(
-            "Your organization has been set to '{}'".format(organization_name),
+            "Your organization has been set to '{}'\n"
+            "Please set your project with `rio project select PROJECT_NAME`".format(organization_name),
             fg=Colors.GREEN)
 
+
     ctx.obj.save()