gcp-platforms-auto 0.6.4__tar.gz → 0.7.0__tar.gz

{gcp_platforms_auto-0.6.4 → gcp_platforms_auto-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gcp_platforms_auto
-Version: 0.6.4
+Version: 0.7.0
 Summary: A brief description of your package
 Author-email: ofir4858 <ofirshasha10@gmail.com>
 License: MIT

{gcp_platforms_auto-0.6.4 → gcp_platforms_auto-0.7.0}/gcp_platforms_auto/git.py

@@ -2,7 +2,7 @@ import logging
 import time
 import jwt
 import google.cloud.logging
-from git import Repo, NoSuchPathError
+from git import Repo, NoSuchPathError, GitCommandError
 from pathlib import Path
 import requests
 
@@ -58,6 +58,10 @@ def get_repo(path_of_git_repo, branch="main", path_to_local_repo="/tmp/repo"):
     except NoSuchPathError:
         logger.error("Repository path does not exist. Cloning fresh repository.")
         return Repo.clone_from(path_of_git_repo, str(path_to_local_repo), branch=branch)
+    except GitCommandError as e:
+        logger.error(f"Error pulling repo (command error), trying again")
+        time.sleep(5)
+        get_repo(path_of_git_repo, branch, path_to_local_repo)
     except Exception as e:
         logger.exception(f"Error accessing repo: {str(e)}")
         raise e
@@ -83,11 +87,15 @@ def git_push(repo, commit_message, files_to_push=None, branch="main"):
                 logger.info(f"Git push info: No update {info.summary}")
 
         logger.info("Successfully pushed changes to Git.")
+    except GitCommandError as e:
+        logger.error(f"Error pushing to Git (command error), trying again")
+        time.sleep(5)
+        git_push(repo, commit_message, files_to_push, branch)
     except Exception as e:
         logger.exception(f"Error pushing to Git: {str(e)}")
         raise e
 
-def create_repo(org, repo, token, github_enterprise="github.com"):
+def create_repo(org, repo, token, github_enterprise="github.com", branches=None):
     try:
         logger.info("Creating repository...")
         is_github_cloud = github_enterprise is "github.com"
@@ -115,6 +123,25 @@ def create_repo(org, repo, token, github_enterprise="github.com"):
             logger.error(f"Failed to create repository: {res.status_code} {res.text}")
             res.raise_for_status()
 
+        if branches:
+            main_ref_url = f"{api_base}/repos/{org}/{repo}/git/refs/heads/main"
+            res = requests.get(main_ref_url, headers=headers)
+            res.raise_for_status()
+            sha = res.json()["object"]["sha"]
+
+            for br in branches:
+                if br == "main":
+                    continue
+                ref_url = f"{api_base}/repos/{org}/{repo}/git/refs"
+                data = {"ref": f"refs/heads/{br}", "sha": sha}
+                r = requests.post(ref_url, headers=headers, json=data)
+                if r.status_code == 201:
+                    logger.info(f"Created branch {br}")
+                elif r.status_code == 422 and "Reference already exists" in r.text:
+                    logger.warning(f"Branch {br} already exists, skipping")
+                else:
+                    logger.error(f"Failed to create branch {br}: {r.status_code} {r.text}")
+
     except Exception as e:
         logger.exception(f"Error creating repository: {str(e)}")
         raise e

{gcp_platforms_auto-0.6.4 → gcp_platforms_auto-0.7.0}/gcp_platforms_auto.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gcp_platforms_auto
-Version: 0.6.4
+Version: 0.7.0
 Summary: A brief description of your package
 Author-email: ofir4858 <ofirshasha10@gmail.com>
 License: MIT

{gcp_platforms_auto-0.6.4 → gcp_platforms_auto-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gcp_platforms_auto"
-version = "0.6.4"
+version = "0.7.0"
 description = "A brief description of your package"
 readme = "README.md"
 authors = [