Verified Commit 24f1d2fd authored by Adrian DC's avatar Adrian DC
Browse files

fix(entrypoint, gitlab): resolve existing project name recursive checks 

Signed-off-by: default avatarAdrian DC <radian.dc@gmail.com>
parent 97457347

src/cli/entrypoint.py

+8 −3
Changes for src/cli/entrypoint.py: 8 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -854,7 +854,9 @@ class Entrypoint: 
                    output_namespace.full_path,

                    output_project.path_with_namespace,

                ) for output_project in output_gitlab.namespace_projects(

                    criteria_output_namespace)

                    criteria_output_namespace,

                    include_subgroups=True,

                )

        ]:

            output_exists = True

            project = output_gitlab.project(
@@ -867,8 +869,11 @@ class Entrypoint: 


        # Ignore existing names

        if not output_exists and output_gitlab and output_project_path in [

                output_project.name for output_project in

                output_gitlab.namespace_projects(criteria_output_namespace)

                output_project.name

                for output_project in output_gitlab.namespace_projects(

                    f'{output_gitlab_namespace}{output_subnamespace}',

                    include_subgroups=False,

                )

        ]:

            print(f'{Colors.RED}   - Already existing project name in GitLab output: '

                  f'{Colors.CYAN}{output_project_path}'

src/features/gitlab.py

+2 −1
Changes for src/features/gitlab.py: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ class GitLabFeature: 
    def namespace_projects(

        self,

        criteria: str,

        include_subgroups: bool,

    ) -> Any:



        # Acquire namespace
@@ -607,7 +608,7 @@ class GitLabFeature: 
        # Get group projects

        return self.group(criteria, optional=self.__dry_run).projects.list(

            get_all=True,

            include_subgroups=True,

            include_subgroups=include_subgroups,

        )



    # Project