Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitignore modified and app name passed #404

Merged
merged 11 commits into from
Nov 8, 2024
2 changes: 2 additions & 0 deletions backend/src/zango/api/platform/tenancy/v1/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ def put(self, request, *args, **kwargs):
"--prod_branch",
self.get_branch(new_git_config, "prod", "main"),
"--initialize",
"--app_name",
obj.name,
],
standalone_mode=False,
)
Expand Down
16 changes: 12 additions & 4 deletions backend/src/zango/cli/git_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def is_valid_app_directory(directory):


def update_settings_with_git_repo_url(
app_directory, git_repo_url, dev_branch, staging_branch, prod_branch
app_name, app_directory, git_repo_url, dev_branch, staging_branch, prod_branch
):
"""
Update the 'git_repo_url' in the TenantMode.extra_config field.
Expand Down Expand Up @@ -50,7 +50,6 @@ def update_settings_with_git_repo_url(
settings = json.load(settings_file)

# Update git_repo_url in settings
app_name = settings.get("app_name", "")
tenant_obj = TenantModel.objects.get(name=app_name)
git_config = {}
if tenant_obj.extra_config:
Expand Down Expand Up @@ -106,13 +105,15 @@ def update_settings_with_git_repo_url(
@click.option(
"--initialize", is_flag=True, default=False, help="Initialize the repository"
)
@click.option("--app_name", prompt=True, required=True, help="App Name")
def git_setup(
app_directory,
git_repo_url,
dev_branch,
staging_branch,
prod_branch,
initialize,
app_name,
):
"""
Initialize a git repository in the specified app directory and add the given remote repository URL.
Expand All @@ -133,7 +134,7 @@ def git_setup(
try:
if initialize:
os.system(f"rm -rf {app_directory}/.git")
os.system("rm -rf .gitignore")
os.system(f"rm -rf {app_directory}/.gitignore")
# Initialize git repository
repo = git.Repo.init(app_directory)

Expand All @@ -144,6 +145,8 @@ def git_setup(
gitignore_file.write("*.pyc\n")
gitignore_file.write("__pycache__/\n")
gitignore_file.write(".DS_Store\n")
gitignore_file.write("node_modules/\n")
gitignore_file.write("*.parcel-cache\n")

# Create README.md
with open(os.path.join(app_directory, "README.md"), "w") as readme_file:
Expand Down Expand Up @@ -171,7 +174,12 @@ def git_setup(
)

update_settings_with_git_repo_url(
app_directory, git_repo_url, dev_branch, staging_branch, prod_branch
app_name,
app_directory,
git_repo_url,
dev_branch,
staging_branch,
prod_branch,
)

click.echo(f"Git setup completed in {app_directory}")
Expand Down