suite-py 1.41.10__py3-none-any.whl → 1.42.1__py3-none-any.whl

suite_py/__version__.py

@@ -1,2 +1,2 @@
 # -*- encoding: utf-8 -*-
-__version__ = "1.41.10"
+__version__ = "1.42.1"

suite_py/cli.py

@@ -53,8 +53,8 @@ from suite_py.lib.tokens import Tokens
 
 # pylint: enable=wrong-import-position
 
-ALLOW_NO_GIT_SUBCOMMAND = ["login", "aggregator"]
-ALLOW_NO_HOME_SUBCOMMAND = ["login", "aggregator"]
+ALLOW_NO_GIT_SUBCOMMAND = ["check", "set-token", "login"]
+ALLOW_NO_HOME_SUBCOMMAND = ["check", "set-token", "login"]
 
 
 def fetch_latest_version() -> Optional[str]:
@@ -146,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']}"
         )
 
@@ -292,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")
@@ -373,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
@@ -451,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/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/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/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/commands/release.py

@@ -2,15 +2,11 @@
 import re
 import sys
 
-import semver
-from halo import Halo
-
 from suite_py.commands import common
 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
@@ -19,10 +15,9 @@ from suite_py.lib.handler.youtrack_handler import YoutrackHandler
 
 class Release:
     # pylint: disable=too-many-instance-attributes
-    def __init__(self, action, project, captainhook, config, tokens, flags=None):
+    def __init__(self, action, project, captainhook, config, tokens):
         self._action = action
         self._project = project
-        self._flags = flags
         self._config = config
         self._tokens = tokens
         self._changelog_handler = ChangelogHandler()
@@ -31,7 +26,6 @@ class Release:
         self._github = GithubHandler(tokens)
         self._repo = self._github.get_repo(project)
         self._git = GitHandler(project, config)
-        self._drone = DroneHandler(config, tokens, repo=project)
         self._version = VersionHandler(self._repo, self._git, self._github)
 
     @metrics.command("release")
@@ -39,23 +33,8 @@ class Release:
         self._stop_if_prod_locked()
         self._git.fetch()
 
-        if self._flags:
-            if self._flags.get("deploy", False):
-
-                countries = _parse_available_countries(self._drone)
-
-                if len(countries) == 0:
-                    logger.error(
-                        "Can't determine which countries can be deployed. Try to run `suite-py deploy` instead."
-                    )
-                    sys.exit(1)
-
         if self._action == "create":
             self._create()
-        elif self._action == "deploy":
-            self._deploy()
-        else:
-            self._rollback()
 
     def _stop_if_prod_locked(self):
         request = self._captainhook.status(self._project, "production")
@@ -70,16 +49,10 @@ class Release:
             )
             sys.exit(-1)
 
-    def _get_release(self, tag):
-        with Halo(text="Loading...", spinner="dots", color="magenta"):
-            latest_release = self._github.get_latest_release_if_exists(self._repo)
-            if latest_release and latest_release.title == tag:
-                return latest_release
-        return None
-
     def _create(self):
         latest = self._version.get_latest_version()
 
+        commits = []
         if latest != "":
             logger.info(f"The current release is {latest}")
             commits = self._github.get_commits_since_release(self._repo, latest)
@@ -99,7 +72,7 @@ class Release:
             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(
                 latest, allow_prerelease=True
@@ -132,183 +105,19 @@ class Release:
                 message = f"{latest_entry}\n\n# Commits\n\n{message}"
 
         message = common.ask_for_release_description(message)
+        sha = commits[0].commit.sha if len(commits) > 0 else ""
+        self._create_release(new_version, message, sha)
 
-        self._create_release(new_version, message)
-
-        if "deploy" in self._flags and self._flags["deploy"]:
-            self._deploy(new_version)
-
-    def _deploy(self, version=""):
-        countries = _parse_available_countries(self._drone)
-        if len(countries) > 1:
-            while True:
-                countries = prompt_utils.ask_multiple_choices(
-                    "Which countries do you want to deploy to?",
-                    countries,
-                )
-                if countries:
-                    break
-                logger.warning(
-                    "You didn't select any country, press SPACEBAR to select countries to deploy to, then press ENTER to confirm!"
-                )
-
-        versions = {}
-
-        for country in countries:
-            versions[country] = {}
-            versions[country] = self._get_current_version(country)
-
-        if self._tags_drifted(versions):
-            logger.warning(
-                "NOTE: one or more countries runs older tags or tag hasn't been found."
-            )
-
-        if not version:
-            releases = self._extract_releases(versions)
-            if len(releases) == 0:
-                logger.error(f"No new release found for project {self._project}!")
-                sys.exit(0)
-
-            version = prompt_utils.ask_choices(
-                "Which version do you want to deploy?",
-                [{"name": f"{r.title}", "value": r.title} for r in releases],
-            )
-
-        if not prompt_utils.ask_confirm(
-            f"You're about to deploy {self._project} release {version} in {countries}, do you confirm?",
-            default=False,
-        ):
-            sys.exit(0)
-
-        self._start_deploy(version, countries)
-        self._manage_youtrack_card(version, countries)
-
-    def _rollback(self):
-        countries = _parse_available_countries(self._drone)
-        country = prompt_utils.ask_choices(
-            "Which country do you want to rollback?",
-            countries,
-        )
-
-        if not country:
-            logger.error("You must select at least one country!")
-            self._rollback()
-            return
-
-        current = self._get_current_version(country)
-        releases = self._get_releases_before(current)
-        if not releases:
-            logger.error(f"No previous releases found for project {self._project}!")
-            sys.exit(-1)
-        version = prompt_utils.ask_choices(
-            "Which version do you want to roll back to?",
-            [{"name": f"{r.tag_name}", "value": r.tag_name} for r in releases],
-        )
-
-        if not prompt_utils.ask_confirm(
-            f"You're about to roll back {self._project} to version {version} in {country}, do you confirm?",
-            default=False,
-        ):
-            sys.exit(0)
-
-        self._start_deploy(version, [country], rollback=True)
-
-    def _get_current_version(self, country):
-        try:
-            logger.info("Retrieving latest version, this may take some time...")
-            # get latest 10 tags
-            tags = self._github.get_tags(self._project)
-            #  exclude tags that don't match semver notation
-            semver_tags = [t for t in tags if semver.VersionInfo.isvalid(t.name)][0:9]
-
-            builds = []
-            for tag in semver_tags:
-                for b in self._drone.get_builds_from_tag(tag.name):
-                    if (
-                        b["event"] == "promote"
-                        and b["status"] == "success"
-                        and b["deploy_to"] == f"deploy-{country}-production"
-                        and "params" in b
-                        and "DRONE_TAG" in b["params"]
-                    ):
-                        builds.append(b)
-
-            if not builds:
-                raise Exception(
-                    "Perhaps there were not any successful builds for latest 10 tags?"
-                )
-
-            # get latest build using build number as key
-            current_build = max(builds, key=lambda x: x["number"])
-
-            if not current_build:
-                logger.error(
-                    f"Unable to determine current version for country {country}"
-                )
-                sys.exit(255)
-
-            v = semver.VersionInfo.parse(current_build["params"]["DRONE_TAG"])
-            logger.info(f"Current version for country {country}: {v}")
-
-            return v
-        except Exception as e:
-            logger.error(
-                f"An error has occurred retrieving current version during rollback. {e}\nPlease ask #team-platform-operations for help."
-            )
-            sys.exit(255)
-
-    def _create_release(self, new_version, message):
+    def _create_release(self, new_version, message, commit):
         new_release = self._repo.create_git_release(
             new_version,
             new_version,
             self._youtrack.replace_card_names_with_md_links(message),
+            target_commitish=commit,
         )
         if new_release:
             logger.info(f"The release has been created! Link: {new_release.html_url}")
 
-            if self._drone.parse_yaml():
-                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 build status here: {drone_url}")
-
-    def _start_deploy(self, version, countries, rollback=False):
-        for country in countries:
-            if rollback:
-                promotion = self._drone.promote_production(
-                    version,
-                    f"deploy-{country}-production",
-                    f"DRONE_TAG={version}&ROLLBACK=true",
-                )
-            else:
-                promotion = self._drone.promote_production(
-                    version,
-                    f"deploy-{country}-production",
-                    f"DRONE_TAG={version}",
-                )
-
-            if "number" not in promotion:
-                logger.warning(f"Unable to promote drone build. Response: {promotion}")
-                return
-
-            logger.info("Drone build started successfully!")
-            logger.info(
-                f"You can follow the build status here: {self._drone.get_build_url(promotion['number'])}"
-            )
-
-            if rollback:
-                self._post_rollback()
-
-    def _get_releases_since(self, threshold):
-        releases = self._repo.get_releases().get_page(0)
-
-        return [rel for rel in releases if threshold.compare(rel.tag_name) == -1][0:4]
-
-    def _get_releases_before(self, threshold):
-        releases = self._repo.get_releases().get_page(0)
-
-        return [rel for rel in releases if threshold.compare(rel.tag_name) == 1][0:4]
-
     def _manage_youtrack_card(self, version, countries):
         release_state = self._config.youtrack["release_state"]
 
@@ -368,16 +177,6 @@ class Release:
                     pass
         return repos_status
 
-    def _post_rollback(self):
-        logger.warning("--- !!!! ---")
-        logger.warning("Remember to revert git commit(s) if needed!")
-
-        if prompt_utils.ask_confirm(
-            "Do you want to lock production?",
-            default=True,
-        ):
-            self._captainhook.lock_project(self._project, "production")
-
     def _tags_drifted(self, versions):
         for country, version in versions.items():
             for c, v in versions.items():
@@ -387,31 +186,6 @@ class Release:
                     return True
         return False
 
-    def _extract_releases(self, versions):
-        r = []
-        for _, version in versions.items():
-            releases = None
-            if version:
-                releases = self._get_releases_since(version)
-            else:
-                releases = self._get_releases_since(
-                    semver.VersionInfo.parse("0.1.0")
-                )  # default
-
-            if releases:
-                # check if releases already exist in the list, if not: append
-                if not self._is_release_duplicated(r, releases):
-                    r = r + releases
-
-        return r
-
-    def _is_release_duplicated(self, current, releases):
-        for c in current:
-            for rel in releases:
-                if c.title == rel.title:
-                    return True
-        return False
-
 
 def _check_migrations_deploy(commits):
     if not commits:
@@ -429,21 +203,3 @@ def _check_migrations_deploy(commits):
             "Are you sure you want to continue?", default=False
         ):
             sys.exit()
-
-
-def _parse_available_countries(drone):
-    pipelines = drone.parse_yaml()
-
-    if pipelines is None:
-        logger.error("The file .drone.yml was not found. Unable to continue.")
-        sys.exit(1)
-
-    countries = []
-    REGEX = re.compile(r"deploy-([a-z]+)-.*")
-    for pipeline in pipelines:
-        if "name" in pipeline:
-            c = REGEX.findall(pipeline["name"])
-            if len(c) > 0 and c[0] is not None and c[0] not in countries:
-                countries.append(c[0])
-
-    return countries

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)