align all ls command options (#2995)

CHANGELOG.D/2995.feature

@@ -0,0 +1 @@
+Align all `ls` command options.

CLI.md

@@ -1514,6 +1514,8 @@ neuro blob lsbucket [OPTIONS]
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
+|_\--all-orgs_|Show buckets in all orgs.|
+|_\--all-projects_|Show buckets in all projects.|
 |_--cluster CLUSTER_|Look on a specified cluster \(the current cluster by default).|
 |_\--full-uri_|Output full bucket URI.|
 |_\--long-format_|Output all info about bucket.|
@@ -2179,10 +2181,13 @@ neuro disk ls [OPTIONS]
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
+|_\--all-orgs_|Show disks in all orgs.|
+|_\--all-projects_|Show disks in all projects.|
 |_--cluster CLUSTER_|Look on a specified cluster \(the current cluster by default).|
 |_\--full-uri_|Output full disk URI.|
 |_\--long-format_|Output all info about disk.|
-|_--project PROJECT_|Look on a specified project \(all projects in current cluster by default).|
+|_--org ORG_|Look on a specified org \(the current org by default).|
+|_--project PROJECT_|Look on a specified project \(the current project by default).|
 
 
 
@@ -2282,11 +2287,14 @@ neuro image ls [OPTIONS]
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
+|_\--all-orgs_|Show images in all orgs.|
+|_\--all-projects_|Show images in all projects.|
 |_--cluster CLUSTER_|Show images on a specified cluster \(the current cluster by default).|
 |_-l_|List in long format.|
 |_\--full-uri_|Output full image URI.|
 |_\-n, --name PATTERN_|Filter out images by name regex.|
-|_--project PROJECT_|Filter out images by project \(multiple option, all projects in current cluster by default).|
+|_--org ORG_|Filter out images by org \(multiple option, the current org by default).|
+|_--project PROJECT_|Filter out images by project \(multiple option, the current project by default).|
 
 
 
@@ -2660,14 +2668,17 @@ Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
 |_\-a, --all_|Show all jobs regardless the status.|
+|_\--all-orgs_|Show jobs in all orgs.|
+|_\--all-projects_|Show jobs in all projects.|
 |_--cluster CLUSTER_|Show jobs on a specified cluster \(the current cluster by default).|
 |_\-d, --description DESCRIPTION_|Filter out jobs by description \(exact match).|
 |_--distinct_|Show only first job if names are same.|
 |_--format COLUMNS_|Output table format, see "neuro help ps\-format" for more info about the format specification. The default can be changed using the job.ps-format configuration variable documented in "neuro help user-config"|
 |_\--full-uri_|Output full image URI.|
 |_\-n, --name NAME_|Filter out jobs by name.|
+|_--org ORG_|Filter out jobs by org name \(multiple option, the current org by default).|
 |_\-o, --owner TEXT_|Filter out jobs by owner \(multiple option). Supports `ME` option to filter by the current user.|
-|_\-p, --project PROJECT_|Filter out jobs by project name \(multiple option).|
+|_\-p, --project PROJECT_|Filter out jobs by project name \(multiple option, the current project by default).|
 |_\--recent-first / --recent-last_|Show newer jobs first or last|
 |_--since DATE\_OR_TIMEDELTA_|Show jobs created after a specific date \(including). Use value of format '1d2h3m4s' to specify moment in past relatively to current time.|
 |_\-s, --status \[pending | suspended | running | succeeded | failed | cancelled]_|Filter out jobs by status \(multiple option).|
@@ -2947,8 +2958,10 @@ neuro secret ls [OPTIONS]
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
+|_\--all-orgs_|Show secrets in all orgs.|
+|_\--all-projects_|Show secrets in all projects.|
 |_--cluster CLUSTER_|Look on a specified cluster \(the current cluster by default).|
-|_\--full-uri_|Output full disk URI.|
+|_\--full-uri_|Output full secret URI.|
 |_--org ORG_|Look on a specified org \(the current org by default).|
 |_--project PROJECT_|Look on a specified project \(the current project by default).|
 
@@ -3508,11 +3521,14 @@ neuro images [OPTIONS]
 Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
+|_\--all-orgs_|Show images in all orgs.|
+|_\--all-projects_|Show images in all projects.|
 |_--cluster CLUSTER_|Show images on a specified cluster \(the current cluster by default).|
 |_-l_|List in long format.|
 |_\--full-uri_|Output full image URI.|
 |_\-n, --name PATTERN_|Filter out images by name regex.|
-|_--project PROJECT_|Filter out images by project \(multiple option, all projects in current cluster by default).|
+|_--org ORG_|Filter out images by org \(multiple option, the current org by default).|
+|_--project PROJECT_|Filter out images by project \(multiple option, the current project by default).|
 
 
 
@@ -3752,14 +3768,17 @@ Name | Description|
 |----|------------|
 |_--help_|Show this message and exit.|
 |_\-a, --all_|Show all jobs regardless the status.|
+|_\--all-orgs_|Show jobs in all orgs.|
+|_\--all-projects_|Show jobs in all projects.|
 |_--cluster CLUSTER_|Show jobs on a specified cluster \(the current cluster by default).|
 |_\-d, --description DESCRIPTION_|Filter out jobs by description \(exact match).|
 |_--distinct_|Show only first job if names are same.|
 |_--format COLUMNS_|Output table format, see "neuro help ps\-format" for more info about the format specification. The default can be changed using the job.ps-format configuration variable documented in "neuro help user-config"|
 |_\--full-uri_|Output full image URI.|
 |_\-n, --name NAME_|Filter out jobs by name.|
+|_--org ORG_|Filter out jobs by org name \(multiple option, the current org by default).|
 |_\-o, --owner TEXT_|Filter out jobs by owner \(multiple option). Supports `ME` option to filter by the current user.|
-|_\-p, --project PROJECT_|Filter out jobs by project name \(multiple option).|
+|_\-p, --project PROJECT_|Filter out jobs by project name \(multiple option, the current project by default).|
 |_\--recent-first / --recent-last_|Show newer jobs first or last|
 |_--since DATE\_OR_TIMEDELTA_|Show jobs created after a specific date \(including). Use value of format '1d2h3m4s' to specify moment in past relatively to current time.|
 |_\-s, --status \[pending | suspended | running | succeeded | failed | cancelled]_|Filter out jobs by status \(multiple option).|

neuro-cli/docs/blob.md

@@ -213,6 +213,8 @@ List buckets.
 | Name | Description |
 | :--- | :--- |
 | _--help_ | Show this message and exit. |
+| _--all-orgs_ | Show buckets in all orgs. |
+| _--all-projects_ | Show buckets in all projects. |
 | _--cluster CLUSTER_ | Look on a specified cluster \(the current cluster by default\). |
 | _--full-uri_ | Output full bucket URI. |
 | _--long-format_ | Output all info about bucket. |

neuro-cli/docs/disk.md

@@ -110,10 +110,13 @@ List disks.
 | Name | Description |
 | :--- | :--- |
 | _--help_ | Show this message and exit. |
+| _--all-orgs_ | Show disks in all orgs. |
+| _--all-projects_ | Show disks in all projects. |
 | _--cluster CLUSTER_ | Look on a specified cluster \(the current cluster by default\). |
 | _--full-uri_ | Output full disk URI. |
 | _--long-format_ | Output all info about disk. |
-| _--project PROJECT_ | Look on a specified project \(all projects in current cluster by default\). |
+| _--org ORG_ | Look on a specified org \(the current org by default\). |
+| _--project PROJECT_ | Look on a specified project \(the current project by default\). |
 
 
 

neuro-cli/docs/image.md

@@ -73,11 +73,14 @@ List images.
 | Name | Description |
 | :--- | :--- |
 | _--help_ | Show this message and exit. |
+| _--all-orgs_ | Show images in all orgs. |
+| _--all-projects_ | Show images in all projects. |
 | _--cluster CLUSTER_ | Show images on a specified cluster \(the current cluster by default\). |
 | _-l_ | List in long format. |
 | _--full-uri_ | Output full image URI. |
 | _-n, --name PATTERN_ | Filter out images by name regex. |
-| _--project PROJECT_ | Filter out images by project \(multiple option, all projects in current cluster by default\). |
+| _--org ORG_ | Filter out images by org \(multiple option, the current org by default\). |
+| _--project PROJECT_ | Filter out images by project \(multiple option, the current project by default\). |
 
 
 

neuro-cli/docs/job.md

@@ -232,14 +232,17 @@ $ neuro ps -t tag1 -t tag2
 | :--- | :--- |
 | _--help_ | Show this message and exit. |
 | _-a, --all_ | Show all jobs regardless the status. |
+| _--all-orgs_ | Show jobs in all orgs. |
+| _--all-projects_ | Show jobs in all projects. |
 | _--cluster CLUSTER_ | Show jobs on a specified cluster \(the current cluster by default\). |
 | _-d, --description DESCRIPTION_ | Filter out jobs by description \(exact match\). |
 | _--distinct_ | Show only first job if names are same. |
 | _--format COLUMNS_ | Output table format, see "neuro help ps-format" for more info about the format specification. The default can be changed using the job.ps-format configuration variable documented in "neuro help user-config" |
 | _--full-uri_ | Output full image URI. |
 | _-n, --name NAME_ | Filter out jobs by name. |
+| _--org ORG_ | Filter out jobs by org name \(multiple option, the current org by default\). |
 | _-o, --owner TEXT_ | Filter out jobs by owner \(multiple option\). Supports `ME` option to filter by the current user. |
-| _-p, --project PROJECT_ | Filter out jobs by project name \(multiple option\). |
+| _-p, --project PROJECT_ | Filter out jobs by project name \(multiple option, the current project by default\). |
 | _--recent-first / --recent-last_ | Show newer jobs first or last |
 | _--since DATE\_OR\_TIMEDELTA_ | Show jobs created after a specific date \(including\). Use value of format '1d2h3m4s' to specify moment in past relatively to current time. |
 | _-s, --status \[pending | suspended | running | succeeded | failed | cancelled\]_ | Filter out jobs by status \(multiple option\). |

neuro-cli/docs/secret.md

@@ -71,8 +71,10 @@ List secrets.
 | Name | Description |
 | :--- | :--- |
 | _--help_ | Show this message and exit. |
+| _--all-orgs_ | Show secrets in all orgs. |
+| _--all-projects_ | Show secrets in all projects. |
 | _--cluster CLUSTER_ | Look on a specified cluster \(the current cluster by default\). |
-| _--full-uri_ | Output full disk URI. |
+| _--full-uri_ | Output full secret URI. |
 | _--org ORG_ | Look on a specified org \(the current org by default\). |
 | _--project PROJECT_ | Look on a specified project \(the current project by default\). |
 

neuro-cli/docs/shortcuts.md

@@ -182,11 +182,14 @@ List images.
 | Name | Description |
 | :--- | :--- |
 | _--help_ | Show this message and exit. |
+| _--all-orgs_ | Show images in all orgs. |
+| _--all-projects_ | Show images in all projects. |
 | _--cluster CLUSTER_ | Show images on a specified cluster \(the current cluster by default\). |
 | _-l_ | List in long format. |
 | _--full-uri_ | Output full image URI. |
 | _-n, --name PATTERN_ | Filter out images by name regex. |
-| _--project PROJECT_ | Filter out images by project \(multiple option, all projects in current cluster by default\). |
+| _--org ORG_ | Filter out images by org \(multiple option, the current org by default\). |
+| _--project PROJECT_ | Filter out images by project \(multiple option, the current project by default\). |
 
 
 
@@ -453,14 +456,17 @@ $ neuro ps -t tag1 -t tag2
 | :--- | :--- |
 | _--help_ | Show this message and exit. |
 | _-a, --all_ | Show all jobs regardless the status. |
+| _--all-orgs_ | Show jobs in all orgs. |
+| _--all-projects_ | Show jobs in all projects. |
 | _--cluster CLUSTER_ | Show jobs on a specified cluster \(the current cluster by default\). |
 | _-d, --description DESCRIPTION_ | Filter out jobs by description \(exact match\). |
 | _--distinct_ | Show only first job if names are same. |
 | _--format COLUMNS_ | Output table format, see "neuro help ps-format" for more info about the format specification. The default can be changed using the job.ps-format configuration variable documented in "neuro help user-config" |
 | _--full-uri_ | Output full image URI. |
 | _-n, --name NAME_ | Filter out jobs by name. |
+| _--org ORG_ | Filter out jobs by org name \(multiple option, the current org by default\). |
 | _-o, --owner TEXT_ | Filter out jobs by owner \(multiple option\). Supports `ME` option to filter by the current user. |
-| _-p, --project PROJECT_ | Filter out jobs by project name \(multiple option\). |
+| _-p, --project PROJECT_ | Filter out jobs by project name \(multiple option, the current project by default\). |
 | _--recent-first / --recent-last_ | Show newer jobs first or last |
 | _--since DATE\_OR\_TIMEDELTA_ | Show jobs created after a specific date \(including\). Use value of format '1d2h3m4s' to specify moment in past relatively to current time. |
 | _-s, --status \[pending | suspended | running | succeeded | failed | cancelled\]_ | Filter out jobs by status \(multiple option\). |

neuro-cli/src/neuro_cli/blob_storage.py

@@ -8,6 +8,7 @@
 from yarl import URL
 
 from neuro_sdk import (
+    ORG_NAME_SENTINEL,
     Bucket,
     Client,
     FileFilter,
@@ -16,7 +17,7 @@
     ResourceNotFound,
 )
 
-from neuro_cli.click_types import (
+from .click_types import (
     BUCKET,
     BUCKET_CREDENTIAL,
     BUCKET_NAME,
@@ -25,40 +26,36 @@
     PROJECT,
     PlatformURIType,
 )
-from neuro_cli.formatters.bucket_credentials import (
+from .const import EX_OSFILE
+from .formatters.blob_storage import (
+    BaseBlobFormatter,
+    LongBlobFormatter,
+    SimpleBlobFormatter,
+)
+from .formatters.bucket_credentials import (
     BaseBucketCredentialsFormatter,
     BucketCredentialFormatter,
     BucketCredentialsFormatter,
     SimpleBucketCredentialsFormatter,
 )
-from neuro_cli.formatters.buckets import (
+from .formatters.buckets import (
     BaseBucketsFormatter,
     BucketFormatter,
     BucketsFormatter,
     SimpleBucketsFormatter,
 )
-from neuro_cli.formatters.utils import (
-    URIFormatter,
-    get_datetime_formatter,
-    uri_formatter,
-)
-from neuro_cli.parse_utils import parse_timedelta
-from neuro_cli.utils import format_size, parse_org_name
-
-from .const import EX_OSFILE
-from .formatters.blob_storage import (
-    BaseBlobFormatter,
-    LongBlobFormatter,
-    SimpleBlobFormatter,
-)
 from .formatters.storage import DeleteProgress, create_storage_progress, get_painter
+from .formatters.utils import URIFormatter, get_datetime_formatter, uri_formatter
+from .parse_utils import parse_timedelta
 from .root import Root
 from .storage import calc_filters, calc_ignore_file_names, filter_option
 from .utils import (
     argument,
     command,
+    format_size,
     group,
     option,
+    parse_org_name,
     resolve_bucket,
     resolve_bucket_credential,
 )
@@ -87,11 +84,15 @@ def blob_storage() -> None:
     type=ORG,
     help="Look on a specified org (the current org by default).",
 )
+@option("--all-orgs", is_flag=True, default=False, help="Show buckets in all orgs.")
 @option(
     "--project",
     type=PROJECT,
     help="Look on a specified project (the current project by default).",
 )
+@option(
+    "--all-projects", is_flag=True, default=False, help="Show buckets in all projects."
+)
 @option("--full-uri", is_flag=True, help="Output full bucket URI.")
 @option("--long-format", is_flag=True, help="Output all info about bucket.")
 async def lsbucket(
@@ -100,7 +101,9 @@ async def lsbucket(
     long_format: bool,
     cluster: Optional[str],
     org: Optional[str],
+    all_orgs: bool,
     project: Optional[str],
+    all_projects: bool,
 ) -> None:
     """
     List buckets.
@@ -113,7 +116,7 @@ async def lsbucket(
         else:
             uri_fmtr = uri_formatter(
                 project_name=root.client.config.project_name_or_raise,
-                cluster_name=cluster or root.client.cluster_name,
+                cluster_name=root.client.cluster_name,
                 org_name=root.client.config.org_name,
             )
         buckets_fmtr = BucketsFormatter(
@@ -122,13 +125,22 @@ async def lsbucket(
             long_format=long_format,
         )
 
-    org_name = parse_org_name(org, root)
+    if all_orgs:
+        org_name = ORG_NAME_SENTINEL
+    else:
+        org_name = parse_org_name(org, root)  # type: ignore
+
+    if all_projects:
+        project_name = None
+    else:
+        project_name = project or root.client.config.project_name_or_raise
+
     buckets = []
     with root.status("Fetching buckets") as status:
         async with root.client.buckets.list(
             cluster_name=cluster,
             org_name=org_name,
-            project_name=project or root.client.config.project_name_or_raise,
+            project_name=project_name,
         ) as it:
             async for bucket in it:
                 buckets.append(bucket)