Merge branch 'main' into labels_comments

cmd/cli/app/repo/repo_register.go

@@ -283,6 +283,12 @@ func registerSelectedRepos(
 }
 
 func printRepoRegistrationStatus(cmd *cobra.Command, results []*minderv1.RegisterRepoResult) {
+	// If there were no results, print a message and return
+	if len(results) == 0 {
+		cmd.Println("No repositories registered")
+		return
+	}
+
 	t := table.New(table.Simple, layouts.Default, []string{"Repository", "Status", "Message"})
 	for _, result := range results {
 		// in the case of a malformed response, skip over it to avoid segfaulting

internal/controlplane/handlers_repositories.go

@@ -87,7 +87,7 @@ func (s *Server) RegisterRepository(
 
 	newRepo, err := s.repos.CreateRepository(ctx, client, provider, projectID, githubRepo.GetOwner(), githubRepo.GetName())
 	if err != nil {
-		if errors.Is(err, ghrepo.ErrPrivateRepoForbidden) {
+		if errors.Is(err, ghrepo.ErrPrivateRepoForbidden) || errors.Is(err, ghrepo.ErrArchivedRepoForbidden) {
 			return nil, util.UserVisibleError(codes.InvalidArgument, err.Error())
 		}
 		return nil, util.UserVisibleError(codes.Internal, "unable to register repository: %v", err)

internal/controlplane/handlers_repositories_test.go

@@ -80,6 +80,13 @@ func TestServer_RegisterRepository(t *testing.T) {
 			RepoServiceSetup: newRepoService(withFailedCreate(ghrepo.ErrPrivateRepoForbidden)),
 			ExpectedError:    "private repos cannot be registered in this project",
 		},
+		{
+			Name:             "Repo creation fails repo is archived, and archived repos are not allowed",
+			RepoOwner:        repoOwner,
+			RepoName:         repoName,
+			RepoServiceSetup: newRepoService(withFailedCreate(ghrepo.ErrArchivedRepoForbidden)),
+			ExpectedError:    "archived repos cannot be registered in this project",
+		},
 		{
 			Name:             "Repo creation on unexpected error",
 			RepoOwner:        repoOwner,

internal/providers/github/common/common.go

@@ -25,6 +25,10 @@ import (
 func ConvertRepositories(repos []*gogithub.Repository) []*minderv1.Repository {
 	var converted []*minderv1.Repository
 	for _, repo := range repos {
+		// Skip archived repositories
+		if repo.Archived != nil && *repo.Archived {
+			continue
+		}
 		converted = append(converted, ConvertRepository(repo))
 	}
 	return converted

internal/repositories/github/service.go

@@ -79,6 +79,9 @@ var (
 	// attempt to register a private repo in a project which does not allow
 	// private repos
 	ErrPrivateRepoForbidden = errors.New("private repos cannot be registered in this project")
+	// ErrArchivedRepoForbidden is returned when creation fails due to an
+	// attempt to register an archived repo
+	ErrArchivedRepoForbidden = errors.New("archived repos cannot be registered in this project")
 )
 
 type repositoryService struct {
@@ -114,6 +117,11 @@ func (r *repositoryService) CreateRepository(
 		return nil, fmt.Errorf("error retrieving repo from github: %w", err)
 	}
 
+	// skip if this is an archived repo
+	if githubRepo.GetArchived() {
+		return nil, ErrArchivedRepoForbidden
+	}
+
 	// skip if this is a private repo, and private repos are not enabled
 	if githubRepo.GetPrivate() && !features.ProjectAllowsPrivateRepos(ctx, r.store, projectID) {
 		return nil, ErrPrivateRepoForbidden