Skip to content

Commit

Permalink
fix merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolai86 committed Dec 2, 2022
1 parent 4fc094d commit 2c8392a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/source-app/workflows/byoc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Here's an example:
Arguments
^^^^^^^^^

* cluster_name: The name of the cluster to be created
* cluster_id: The name of the cluster to be created

.. note:: Cluster names can only contain lowercase letters, numbers, and periodic hyphens ( - ).

Expand Down
4 changes: 2 additions & 2 deletions src/lightning_app/cli/cmd_clusters.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ def create(
lightning list clusters
To view cluster logs use:
lightning show cluster logs {cluster_name}
lightning show cluster logs {cluster_id}
To delete the cluster run:
lightning delete cluster {cluster_name}
lightning delete cluster {cluster_id}
"""
)
)
Expand Down
2 changes: 1 addition & 1 deletion src/lightning_app/cli/lightning_cli_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import click
from lightning_cloud.openapi.rest import ApiException

from lightning_app.cli.cmd_clusters import _check_cluster_name_is_valid, AWSClusterManager
from lightning_app.cli.cmd_clusters import _check_cluster_id_is_valid, AWSClusterManager
from lightning_app.cli.cmd_ssh_keys import _SSHKeyManager


Expand Down
2 changes: 1 addition & 1 deletion tests/tests_app/cli/test_cmd_clusters.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def test_delete_cluster_api(api_get: mock.MagicMock, api_delete: mock.MagicMock,
api_delete.assert_called_once_with(id="test-7", force=False)


class Test_check_cluster_name_is_valid:
class Test_check_cluster_id_is_valid:
@pytest.mark.parametrize("name", ["test-7", "0wildgoat"])
def test_valid(self, name):
assert cmd_clusters._check_cluster_id_is_valid(None, None, name)
Expand Down

0 comments on commit 2c8392a

Please sign in to comment.