suite-py 1.41.9__tar.gz → 1.42.0__tar.gz

{suite_py-1.41.9 → suite_py-1.42.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: suite-py
-Version: 1.41.9
+Version: 1.42.0
 Summary: 
 Author: larrywax, EugenioLaghi, michelangelomo
 Author-email: devops@prima.it
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: Click (>=7.0)
 Requires-Dist: InquirerPy (>=0.2.0)
-Requires-Dist: Jinja2 (>=2.11,<3.0.0)
+Requires-Dist: Jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: PyGithub (>=1.57)
 Requires-Dist: PyYaml (>=5.4)
 Requires-Dist: autoupgrade-prima (>=0.6)
@@ -21,12 +21,12 @@ Requires-Dist: black (>=22.6,<25.0)
 Requires-Dist: boto3 (>=1.17.84)
 Requires-Dist: cement (>=3.0)
 Requires-Dist: colorama (>=0.4.3)
-Requires-Dist: cryptography (==42.0.7)
+Requires-Dist: cryptography (==43.0.0)
 Requires-Dist: halo (>=0.0.28)
 Requires-Dist: inquirer (==3.1.4)
 Requires-Dist: itsdangerous (==2.2.0)
 Requires-Dist: keyring (>=23.9.1,<26.0.0)
-Requires-Dist: kubernetes (==29.0.0)
+Requires-Dist: kubernetes (==30.1.0)
 Requires-Dist: logzero (==1.7.0)
 Requires-Dist: markupsafe (==2.0.1)
 Requires-Dist: pptree (==3.1)

{suite_py-1.41.9 → suite_py-1.42.0}/pyproject.toml

@@ -2,12 +2,12 @@
 authors = ["larrywax, EugenioLaghi, michelangelomo <devops@prima.it>"]
 description = ""
 name = "suite-py"
-version = "1.41.9"
+version = "1.42.0"
 
 [tool.poetry.dependencies]
 Click = ">=7.0"
 InquirerPy = ">=0.2.0"
-Jinja2 = ">=2.11,<3.0.0"
+Jinja2 = ">=3.1.4,<4.0.0"
 PyGithub = ">=1.57"
 PyYaml = ">=5.4"
 autoupgrade-prima = ">=0.6"
@@ -19,7 +19,7 @@ halo = ">=0.0.28"
 inquirer = "==3.1.4"
 itsdangerous = "==2.2.0"
 keyring = ">=23.9.1,<26.0.0"
-kubernetes = "==29.0.0"
+kubernetes = "==30.1.0"
 logzero = "==1.7.0"
 markupsafe = "==2.0.1"
 pptree = "==3.1"
@@ -34,7 +34,7 @@ rich = "==13.7.1"
 semver = "^2.13.0"
 termcolor = ">=1.1.0"
 truststore = {version = ">=0.7,<0.10", python = ">=3.10"}
-cryptography = "42.0.7"
+cryptography = "43.0.0"
 
 [tool.poetry.dev-dependencies]
 

{suite_py-1.41.9 → suite_py-1.42.0}/suite_py/__version__.py

@@ -1,2 +1,2 @@
 # -*- encoding: utf-8 -*-
-__version__ = "1.41.9"
+__version__ = "1.42.0"

{suite_py-1.41.9 → suite_py-1.42.0}/suite_py/cli.py

@@ -4,12 +4,38 @@
 # for performance reasons, so turn off the lint warning
 # pylint: disable=import-outside-toplevel
 
-import os
+# We need to inject truststore code before we do any libraries
+# that might end up creating an ssl.SSlContext object
+# pylint: disable=wrong-import-position
+
 import sys
+
+
+def maybe_inject_truststore() -> None:
+    """
+    Injects the truststore package into the system ssl store, to fix verficiation certificate issues when using warp.
+    """
+    if sys.version_info >= (3, 10):
+        import truststore
+
+        truststore.inject_into_ssl()
+    else:
+        # pylint: disable-next=reimported
+        from suite_py.lib import logger
+
+        logger.warning(
+            "Your python version is older than 3.10 and doesn't support the truststore package. You might experience issues with certificate verification when connected to the warp VPN.\nPlease update to python 3.10 or newer"
+        )
+
+
+# Needs to be done before any other imports
+maybe_inject_truststore()
+
+import os
 from functools import wraps
+from importlib.metadata import PackageNotFoundError, version
 from typing import Optional
 
-from importlib.metadata import version, PackageNotFoundError
 import click
 import requests
 from autoupgrade import Package
@@ -25,22 +51,10 @@ from suite_py.lib.handler.captainhook_handler import CaptainHook
 from suite_py.lib.handler.okta_handler import Okta
 from suite_py.lib.tokens import Tokens
 
-ALLOW_NO_GIT_SUBCOMMAND = ["login", "aggregator"]
-ALLOW_NO_HOME_SUBCOMMAND = ["login", "aggregator"]
+# pylint: enable=wrong-import-position
 
-
-def maybe_inject_truststore() -> None:
-    """
-    Injects the truststore package into the system ssl store, to fix verficiation certificate issues when using warp.
-    """
-    if sys.version_info >= (3, 10):
-        import truststore
-
-        truststore.inject_into_ssl()
-    else:
-        logger.warning(
-            "Your python version is older than 3.10 and doesn't support the truststore package. You might experience issues with certificate verification when connected to the warp VPN.\nPlease update to python 3.10 or newer"
-        )
+ALLOW_NO_GIT_SUBCOMMAND = ["check", "set-token", "login"]
+ALLOW_NO_HOME_SUBCOMMAND = ["check", "set-token", "login"]
 
 
 def fetch_latest_version() -> Optional[str]:
@@ -132,12 +146,12 @@ def main(ctx, project, timeout, verbose):
     if ctx.invoked_subcommand not in ALLOW_NO_GIT_SUBCOMMAND and not git.is_repo(
         project
     ):
-        raise Exception(f"the folder {project} is not a git repo")
+        raise ClickException(f"the folder {project} is not a git repo")
 
     if ctx.invoked_subcommand not in ALLOW_NO_HOME_SUBCOMMAND and not os.path.basename(
         project
     ) in os.listdir(config.user["projects_home"]):
-        raise Exception(
+        raise ClickException(
             f"the folder {project} is not in {config.user['projects_home']}"
         )
 
@@ -243,8 +257,8 @@ def cli_unlock_project(obj, environment):
 @click.pass_obj
 @catch_exceptions
 def cli_open_pr(obj):
-    from suite_py.commands.open_pr import OpenPR
     from suite_py.commands.ask_review import AskReview
+    from suite_py.commands.open_pr import OpenPR
 
     ask_review = obj.call(AskReview)
     obj.call(OpenPR, ask_review=ask_review).run()
@@ -278,67 +292,12 @@ def release():
 @release.command(
     "create", help="Create a github release (and deploy it if GHA are used)"
 )
-@click.option(
-    "--deploy",
-    is_flag=True,
-    help="Trigger deploy with Drone CI after release creation (Github Actions based microservices will be automatically deployed on production)",
-)
-@click.pass_obj
-@catch_exceptions
-def cli_release_create(obj, deploy):
-    from suite_py.commands.release import Release
-
-    obj.call(Release, action="create", flags={"deploy": deploy}).run()
-
-
-@release.command("deploy", help="Deploy a github release with Drone CI")
 @click.pass_obj
 @catch_exceptions
-def cli_release_deploy(obj):
+def cli_release_create(obj):
     from suite_py.commands.release import Release
 
-    obj.call(Release, action="deploy").run()
-
-
-@release.command("rollback", help="Rollback a deployment")
-@click.pass_obj
-@catch_exceptions
-def cli_release_rollback(obj):
-    from suite_py.commands.release import Release
-
-    obj.call(Release, "rollback").run()
-
-
-@main.command("deploy", help="Deploy master branch in production")
-@click.pass_obj
-@catch_exceptions
-def cli_deploy(obj):
-    from suite_py.commands.deploy import Deploy
-
-    obj.call(Deploy).run()
-
-
-@main.group("docker", help="Manage docker images")
-def docker():
-    pass
-
-
-@docker.command("release", help="Release new docker image")
-@click.pass_obj
-@catch_exceptions
-def cli_docker_release(obj):
-    from suite_py.commands.docker import Docker
-
-    obj.call(Docker, action="release").run()
-
-
-@docker.command("versions", help="List all available versions of specific image")
-@click.pass_obj
-@catch_exceptions
-def cli_docker_versions(obj):
-    from suite_py.commands.docker import Docker
-
-    obj.call(Docker, action="versions").run()
+    obj.call(Release, action="create").run()
 
 
 @main.command("status", help="Current status of a project")
@@ -359,75 +318,6 @@ def cli_check(obj):
     obj.call(Check).run()
 
 
-@main.command("id", help="Get the ID of the hosts where the task is running")
-@click.argument("environment", type=click.Choice(("staging", "production")))
-@click.pass_obj
-@catch_exceptions
-def cli_id(obj, environment):
-    from suite_py.commands.id import ID
-
-    obj.call(ID, environment=environment).run()
-
-
-@main.command("ip", help="Get the IP addresses of the hosts where the task is running")
-@click.argument("environment", type=click.Choice(("staging", "production")))
-@click.pass_obj
-@catch_exceptions
-def cli_ip(obj, environment):
-    from suite_py.commands.ip import IP
-
-    obj.call(IP, environment=environment).run()
-
-
-@main.command("generator", help="Generate different files from templates")
-@click.pass_obj
-@catch_exceptions
-def cli_generator(obj):
-    from suite_py.commands.generator import Generator
-
-    obj.call(Generator).run()
-
-
-@main.group(
-    "aggregator",
-    help="Manage CNAMEs of aggregators in QA envs",
-    invoke_without_command=True,
-)
-@click.option(
-    "-l", "--list", "show_list", help="deprecated", required=False, count=True
-)
-@click.option("-c", "--change", "change", help="deprecated", required=False, count=True)
-@click.pass_context
-def aggregator(ctx, show_list, change):
-    if show_list == 1 or change == 1:
-        logger.error(
-            "suite-py aggregator [-c|-l] has been hard-deprecated. Use suite-py aggregator [list|change] instead."
-        )
-        sys.exit(0)
-
-    if ctx.invoked_subcommand is None:
-        logger.error("Missing command. Try suite-py aggregator --help for help.")
-        sys.exit(0)
-
-
-@aggregator.command("list", help="List all aggregators with the current record")
-@click.pass_obj
-@catch_exceptions
-def cli_aggregator_list(obj):
-    from suite_py.commands.aggregator import Aggregator
-
-    obj.call(Aggregator, action="list").run()
-
-
-@aggregator.command("change", help="Change aggregator record")
-@click.pass_obj
-@catch_exceptions
-def cli_aggregator_change(obj):
-    from suite_py.commands.aggregator import Aggregator
-
-    obj.call(Aggregator, action="list").run()
-
-
 @main.command("login", help="manage login against Auth0")
 @click.pass_obj
 @catch_exceptions
@@ -437,70 +327,6 @@ def login(obj):
     obj.call(Login).run()
 
 
-@main.group(
-    "secret", help="Manage secrets grants in multiple countries (aws-vault needed)"
-)
-def secret():
-    pass
-
-
-@secret.command("create", help="Create a new secret")
-@click.option("-b", "--base-profile", "base_profile", required=False)
-@click.option("-f", "--secret-file", "secret_file", required=False)
-@click.pass_obj
-@catch_exceptions
-def cli_secret_create(obj, base_profile, secret_file):
-    from suite_py.commands.secret import Secret
-
-    obj.call(
-        Secret, action="create", base_profile=base_profile, secret_file=secret_file
-    ).run()
-
-
-@secret.command("grant", help="Grant permissions to an existing secret")
-@click.option("-b", "--base-profile", "base_profile", required=False)
-@click.option("-f", "--secret-file", "secret_file", required=False)
-@click.pass_obj
-@catch_exceptions
-def cli_secret_grant(obj, base_profile, secret_file):
-    from suite_py.commands.secret import Secret
-
-    obj.call(
-        Secret, action="grant", base_profile=base_profile, secret_file=secret_file
-    ).run()
-
-
-@main.command("batch-job", help="Run batch job on kube")
-@click.argument("environment", type=click.Choice(("staging", "production")))
-@click.option(
-    "-c",
-    "--cpu",
-    "cpu_request",
-    required=True,
-    type=str,
-    help="Millicpu format. E.g: 1000m (=1CPU)",
-)
-@click.option(
-    "-m",
-    "--memory",
-    "memory_request",
-    required=True,
-    type=str,
-    help="Mebibytes or gibibyte format. E.g: 256Mi or 1Gi",
-)
-@click.pass_obj
-@catch_exceptions
-def cli_run_batch_job(obj, environment, cpu_request, memory_request):
-    from suite_py.commands.batch_job import BatchJob
-
-    obj.call(
-        BatchJob,
-        environment=environment,
-        cpu_request=cpu_request,
-        memory_request=memory_request,
-    ).run()
-
-
 @main.command("set-token", help="Create or update a service token")
 @click.pass_obj
 @catch_exceptions

{suite_py-1.41.9 → suite_py-1.42.0}/suite_py/commands/check.py

@@ -2,7 +2,6 @@
 
 from suite_py.lib import logger, metrics
 from suite_py.lib.handler import prompt_utils
-from suite_py.lib.handler.drone_handler import DroneHandler
 from suite_py.lib.handler.github_handler import GithubHandler
 from suite_py.lib.handler.youtrack_handler import YoutrackHandler
 from suite_py.lib.symbol import CHECKMARK, CROSSMARK
@@ -16,11 +15,9 @@ class Check:
         self._youtrack = YoutrackHandler(config, tokens)
         self._github = GithubHandler(tokens)
         self._captainhook = captainhook
-        self._drone = DroneHandler(config, tokens)
 
         self._checks = [
             ("Github", self._check_github),
-            ("Drone", self._check_drone),
             ("Youtrack", self._check_youtrack),
             ("CaptainHook", self._check_captainhook),
             ("AWS", self._check_aws),
@@ -52,21 +49,6 @@ class Check:
             self._invalid_or_missing_tokens.append("github")
             return "missing_token"
 
-    def _check_drone(self):
-        if self._tokens.drone:
-            try:
-                drone_user = self._drone.get_user()
-                if "message" in drone_user and drone_user["message"] == "Unauthorized":
-                    self._invalid_or_missing_tokens.append("drone")
-                    return "invalid_token"
-                return "ok"
-            except Exception:
-                logger.debug("Error connecting to drone", exc_info=True)
-                return "unreachable"
-        else:
-            self._invalid_or_missing_tokens.append("drone")
-            return "missing_token"
-
     def _check_youtrack(self):
         if self._tokens.youtrack:
             try:

{suite_py-1.41.9 → suite_py-1.42.0}/suite_py/commands/merge_pr.py

@@ -7,7 +7,6 @@ from suite_py.lib import logger, metrics
 from suite_py.lib.handler import git_handler as git
 from suite_py.lib.handler import prompt_utils
 from suite_py.lib.handler.captainhook_handler import CaptainHook
-from suite_py.lib.handler.drone_handler import DroneHandler
 from suite_py.lib.handler.git_handler import GitHandler
 from suite_py.lib.handler.github_handler import GithubHandler
 from suite_py.lib.handler.youtrack_handler import YoutrackHandler
@@ -22,7 +21,6 @@ class MergePR:
         self._captainhook = captainhook
         self._git = GitHandler(project, config)
         self._github = GithubHandler(tokens)
-        self._drone = DroneHandler(config, tokens, repo=project)
 
     @metrics.command("merge-pr")
     def run(self):
@@ -56,13 +54,6 @@ class MergePR:
 
         logger.info("Pull request merged on master!")
 
-        if self._drone.parse_yaml():
-            drone_build_number = self._drone.get_pr_build_number(merge_status.sha)
-            drone_build_url = self._drone.get_build_url(drone_build_number)
-
-            if drone_build_url:
-                logger.info(f"You can follow the build status at {drone_build_url}")
-
         self._git.fetch()
         if self._git.remote_branch_exists(branch_name):
             self._git.delete_remote_branch(branch_name)
@@ -84,9 +75,7 @@ class MergePR:
             logger.warning(
                 "There is no YouTrack issue in the branch name or the selected issue does not exist."
             )
-            logger.warning(
-                "No card updated on YouTrack and no QA turned off automatically"
-            )
+            logger.warning("No card updated on YouTrack")
 
         logger.info("All done!")
         sys.exit()

{suite_py-1.41.9 → suite_py-1.42.0}/suite_py/commands/open_pr.py

@@ -15,7 +15,6 @@ class OpenPR:
         self._ask_review = ask_review
         self._project = project
         self._config = config
-        self._tokens = tokens
         self._youtrack = YoutrackHandler(config, tokens)
         self._git = GitHandler(project, config)
         self._branch_name = self._git.current_branch_name()
@@ -25,11 +24,7 @@ class OpenPR:
     def run(self):
         if not self._git.remote_branch_exists(self._branch_name):
             logger.warning(f"No branch named {self._branch_name} found on GitHub")
-            if prompt_utils.ask_confirm(
-                "Do you want to commit all the files and push them?"
-            ):
-                self._git.add()
-                self._git.commit("Initial commit")
+            if prompt_utils.ask_confirm("Do you want to push your commits to github?"):
                 self._git.push(self._branch_name)
             else:
                 logger.error("Please, run 'git push' manually")

suite_py-1.41.9/suite_py/commands/deploy.py → suite_py-1.42.0/suite_py/commands/release.py

@@ -3,52 +3,58 @@ import re
 import sys
 
 from suite_py.commands import common
-from suite_py.commands.release import _parse_available_countries
 from suite_py.lib import logger, metrics
 from suite_py.lib.handler import git_handler as git
 from suite_py.lib.handler import prompt_utils
 from suite_py.lib.handler.changelog_handler import ChangelogHandler
-from suite_py.lib.handler.drone_handler import DroneHandler
 from suite_py.lib.handler.git_handler import GitHandler
 from suite_py.lib.handler.github_handler import GithubHandler
 from suite_py.lib.handler.version_handler import DEFAULT_VERSION, VersionHandler
 from suite_py.lib.handler.youtrack_handler import YoutrackHandler
 
 
-class Deploy:
+class Release:
     # pylint: disable=too-many-instance-attributes
-    def __init__(self, project, captainhook, config, tokens):
+    def __init__(self, action, project, captainhook, config, tokens):
+        self._action = action
         self._project = project
         self._config = config
+        self._tokens = tokens
+        self._changelog_handler = ChangelogHandler()
         self._youtrack = YoutrackHandler(config, tokens)
         self._captainhook = captainhook
-        self._changelog_handler = ChangelogHandler()
         self._github = GithubHandler(tokens)
         self._repo = self._github.get_repo(project)
         self._git = GitHandler(project, config)
-        self._drone = DroneHandler(config, tokens, repo=project)
-        self._countries = _parse_available_countries(self._drone)
         self._version = VersionHandler(self._repo, self._git, self._github)
 
-    @metrics.command("deploy")
+    @metrics.command("release")
     def run(self):
         self._stop_if_prod_locked()
-
         self._git.fetch()
 
-        if len(self._countries) > 0:
+        if self._action == "create":
+            self._create()
+
+    def _stop_if_prod_locked(self):
+        request = self._captainhook.status(self._project, "production")
+        if request.status_code != 200:
+            logger.error("Unable to determine lock status on master.")
+            sys.exit(-1)
+
+        request_object = request.json()
+        if request_object["locked"]:
             logger.error(
-                "Deploy command cannot be used on this project. Try to run `suite-py release` instead."
+                f"The project is locked in production by {request_object['by']}. Unable to continue."
             )
-            sys.exit(1)
+            sys.exit(-1)
 
-        current_version = self._version.get_latest_version()
+    def _create(self):
+        latest = self._version.get_latest_version()
 
-        if current_version != "":
-            logger.info(f"The current release is {current_version}")
-            commits = self._github.get_commits_since_release(
-                self._repo, current_version
-            )
+        if latest != "":
+            logger.info(f"The current release is {latest}")
+            commits = self._github.get_commits_since_release(self._repo, latest)
 
             _check_migrations_deploy(commits)
 
@@ -65,10 +71,10 @@ class Deploy:
             logger.info(f"\nCommits list:\n{message}\n")
 
             if not prompt_utils.ask_confirm("Do you want to continue?"):
-                sys.exit()
+                return
 
             new_version = self._version.select_new_version(
-                current_version, allow_prerelease=True, allow_custom_version=True
+                latest, allow_prerelease=True
             )
 
         else:
@@ -100,20 +106,6 @@ class Deploy:
         message = common.ask_for_release_description(message)
 
         self._create_release(new_version, message)
-        self._manage_youtrack_card(commits, new_version)
-
-    def _stop_if_prod_locked(self):
-        request = self._captainhook.status(self._project, "production")
-        if request.status_code != 200:
-            logger.error("Unable to determine lock status on master.")
-            sys.exit(-1)
-
-        request_object = request.json()
-        if request_object["locked"]:
-            logger.error(
-                f"The project is locked in production by {request_object['by']}. Unable to continue."
-            )
-            sys.exit(-1)
 
     def _create_release(self, new_version, message):
         new_release = self._repo.create_git_release(
@@ -124,17 +116,12 @@ class Deploy:
         if new_release:
             logger.info(f"The release has been created! Link: {new_release.html_url}")
 
-            build_number = self._drone.get_build_number_from_tag(new_version)
-            if build_number:
-                drone_url = self._drone.get_build_url(build_number)
-                logger.info(
-                    f"You can follow the deployment in production here: {drone_url}"
-                )
-
-    def _manage_youtrack_card(self, commits, new_version):
+    def _manage_youtrack_card(self, version, countries):
         release_state = self._config.youtrack["release_state"]
 
-        issue_ids = self._youtrack.get_issue_ids(commits)
+        release_body = self._repo.get_release(version).body
+
+        issue_ids = self._youtrack.get_ids_from_release_body(release_body)
 
         if len(issue_ids) > 0:
             update_youtrack_state = prompt_utils.ask_confirm(
@@ -146,7 +133,7 @@ class Deploy:
                 try:
                     self._youtrack.comment(
                         issue_id,
-                        f"Deploy in production of {self._project} done with the release {new_version}",
+                        f"Deploy in production of {self._project} in countries {countries} done with the release {version}",
                     )
                     if update_youtrack_state:
                         self._youtrack.update_state(issue_id, release_state)
@@ -167,7 +154,7 @@ class Deploy:
 
     def _get_repos_status_from_issue(self, issue_id):
         regex_pr = r"^PR .* -> https:\/\/github\.com\/primait\/(.*)\/pull\/([0-9]*)$"
-        regex_deploy = r"^Deploy in production of (.*) done with the release"
+        regex_deploy = r"^Deploy in production of (.*) in countries"
         comments = self._youtrack.get_comments(issue_id)
         repos_status = {}
 
@@ -188,6 +175,15 @@ class Deploy:
                     pass
         return repos_status
 
+    def _tags_drifted(self, versions):
+        for country, version in versions.items():
+            for c, v in versions.items():
+                if country == c:
+                    continue
+                if version is None or v is None or version.compare(v) != 0:
+                    return True
+        return False
+
 
 def _check_migrations_deploy(commits):
     if not commits:

{suite_py-1.41.9 → suite_py-1.42.0}/suite_py/lib/config.py

@@ -40,7 +40,6 @@ class Config:
         conf["user"].setdefault("captainhook_timeout", 30)
         conf["user"].setdefault("captainhook_url", "https://captainhook.prima.it")
         conf["user"].setdefault("use_commits_in_pr_body", False)
-        conf["user"].setdefault("delete_qa_after_merge", True)
         conf["user"].setdefault("frequent_reviewers_max_number", 5)
 
         conf["youtrack"].setdefault("add_reviewers_tags", True)

{suite_py-1.41.9 → suite_py-1.42.0}/suite_py/lib/handler/captainhook_handler.py

@@ -52,13 +52,6 @@ class CaptainHook:
     def get_users_list(self):
         return self.send_get_request("/users/all")
 
-    def aggregators(self):
-        return self.send_get_request("/cloudflare/aggregators/available")
-
-    def change_aggregator(self, aggregator, qa_address):
-        data = {"aggregator": aggregator, "qa_address": qa_address}
-        return self.send_put_request("/cloudflare/aggregators", data)
-
     def send_metrics(self, metrics):
         self.send_post_request("/suite_py/metrics/", json=metrics).raise_for_status()