Skip to content

Commit

Permalink
Drop template-infra lorenyu/platform-cli version default
Browse files Browse the repository at this point in the history
It has been merged to `main` and tagged.
  • Loading branch information
doshitan committed Jan 14, 2025
1 parent cd00fd3 commit 53c25f8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
5 changes: 1 addition & 4 deletions nava/platform/cli/commands/infra/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@
help="Path or URL to infra template. Can be a path to a local clone of template-infra. Defaults to the template-infra repository on GitHub.",
)

# Temporarily default to using lorenyu/platform-cli as the version
# until the rollout plan for the Platform CLI is complete
# TODO: Set the default back to None once the rollout plan is complete
DEFAULT_VERSION = "lorenyu/platform-cli"
DEFAULT_VERSION: str | None = None


@app.command()
Expand Down
1 change: 0 additions & 1 deletion tests-e2e/test-local-templates
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ init_project_dir

infra_template_dir=$(mk_temp_dir)
git clone https://github.com/navapbc/template-infra.git "${infra_template_dir}"
git -C "${infra_template_dir}" checkout lorenyu/platform-cli

# TODO: add --data-file support to CLI and have as many of these
# settings in more maintainable separate file
Expand Down
10 changes: 2 additions & 8 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,8 @@ def infra_template_no_tags(
git_project.init()
git_project.commit_all("Initial commit")

# TODO: Remove fixed ref once the rollout plan is complete
template = InfraTemplateWritable(cli_context, template_dir, ref="lorenyu/platform-cli")

# Temporarily rename main to lorenyu/platform-cli since the rollout plan
# for the Platform CLI will temporarily default the --version option
# to lorenyu/platform-cli, so we want our tests to reflect that.
# TODO: Remove this once the rollout plan is complete
template.git_project.rename_branch("lorenyu/platform-cli")
template = InfraTemplateWritable(cli_context, template_dir)

return template


Expand Down

0 comments on commit 53c25f8

Please sign in to comment.