Merge branch 'release/v0.16.0'

.github/workflows/golangci-lint.yml

@@ -16,4 +16,4 @@ jobs:
             - name: golangci-lint
               uses: golangci/golangci-lint-action@v2
               with:
-                  version: v1.32
+                  version: v1.45.0

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
     - repo: https://github.com/golangci/golangci-lint.git
-      rev: v1.32.1
+      rev: v1.45.2
       hooks:
           - id: golangci-lint

README.md

@@ -143,6 +143,7 @@ Available Commands:
   delete      Delete repositories.
   generate    Generate repositories.
   help        Help about any command
+  setaccess   Set access level for exisiting repositories.
   show        Show config of an assignment
   version     Print the version number of Glabs
 

cmd/setaccess.go

@@ -0,0 +1,36 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/logrusorgru/aurora/v3"
+	"github.com/obcode/glabs/config"
+	"github.com/obcode/glabs/gitlab"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(setaccessCmd)
+	setaccessCmd.Flags().StringVarP(&Level, "level", "l", "", "accesslevel (overrides config file)")
+}
+
+var (
+	setaccessCmd = &cobra.Command{
+		Use:   "setaccess course assignment [groups...|students...]",
+		Short: "Set access level for exisiting repositories.",
+		Long:  `Set access level for exisiting repositories.`,
+		Args:  cobra.MinimumNArgs(2), //nolint:gomnd
+		Run: func(cmd *cobra.Command, args []string) {
+			assignmentConfig := config.GetAssignmentConfig(args[0], args[1], args[2:]...)
+			if len(Level) > 0 {
+				assignmentConfig.SetAccessLevel(Level)
+			}
+			assignmentConfig.Show()
+			fmt.Println(aurora.Magenta("Config okay? Press 'Enter' to continue or 'Ctrl-C' to stop ..."))
+			fmt.Scanln()
+			c := gitlab.NewClient()
+			c.Setaccess(assignmentConfig)
+		},
+	}
+	Level string
+)

config/assignment.go

@@ -164,6 +164,20 @@ func description(assignmentKey string) string {
 	return description
 }
 
+func (cfg *AssignmentConfig) SetAccessLevel(level string) {
+	accesslevel := Developer
+	switch level {
+	case "guest":
+		accesslevel = Guest
+	case "reporter":
+		accesslevel = Reporter
+	case "maintainer":
+		accesslevel = Maintainer
+	}
+
+	cfg.AccessLevel = accesslevel
+}
+
 func accessLevel(assignmentKey string) AccessLevel {
 	accesslevelIdentifier := viper.GetString(assignmentKey + ".accesslevel")
 

git/clone.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-git/go-git/v5"
+	git "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
 	"github.com/logrusorgru/aurora"

git/starterrepo.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/go-git/go-git/v5"
+	git "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
 	"github.com/go-git/go-git/v5/storage/memory"

gitlab/generate.go

@@ -3,15 +3,13 @@ package gitlab
 import (
 	"fmt"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/logrusorgru/aurora"
 	"github.com/obcode/glabs/config"
 	"github.com/obcode/glabs/git"
 	"github.com/rs/zerolog/log"
 	"github.com/theckman/yacspin"
-	"github.com/xanzy/go-gitlab"
 )
 
 func (c *Client) Generate(assignmentCfg *config.AssignmentConfig) {
@@ -155,95 +153,7 @@ func (c *Client) generate(assignmentCfg *config.AssignmentConfig, assignmentGrou
 			}
 		}
 	}
-
-	for _, student := range members {
-		cfg.Suffix = aurora.Sprintf(aurora.Cyan(" ↪ adding member %s to %s as %s"),
-			aurora.Yellow(student),
-			aurora.Magenta(projectname),
-			aurora.Magenta(assignmentCfg.AccessLevel.String()),
-		)
-		spinner, err := yacspin.New(cfg)
-		if err != nil {
-			log.Debug().Err(err).Msg("cannot create spinner")
-		}
-		err = spinner.Start()
-		if err != nil {
-			log.Debug().Err(err).Msg("cannot start spinner")
-		}
-
-		userID, err := c.getUserID(student)
-		if err != nil {
-			if strings.Contains(student, "@") {
-				info, err := c.inviteByEmail(assignmentCfg, project.ID, student)
-				if err != nil {
-					spinner.StopFailMessage(fmt.Sprintf("%v", err))
-
-					err := spinner.StopFail()
-					if err != nil {
-						log.Debug().Err(err).Msg("cannot stop spinner")
-					}
-				} else {
-
-					spinner.StopMessage(aurora.Sprintf(aurora.Green(info)))
-					err = spinner.Stop()
-					if err != nil {
-						log.Debug().Err(err).Msg("cannot stop spinner")
-					}
-				}
-				continue
-			} else {
-				spinner.StopFailMessage(fmt.Sprintf("cannot get user id: %v", err))
-
-				err := spinner.StopFail()
-				if err != nil {
-					log.Debug().Err(err).Msg("cannot stop spinner")
-				}
-			}
-			continue
-		}
-
-		info, err := c.addMember(assignmentCfg, project.ID, userID)
-		if err != nil {
-			log.Debug().Err(err).
-				Int("projectID", project.ID).
-				Int("userID", userID).
-				Str("student", student).
-				Str("course", assignmentCfg.Course).
-				Str("assignment", assignmentCfg.Name).
-				Msg("error while adding member")
-
-			spinner.StopFailMessage(fmt.Sprintf("cannot add user %s: %v", student, err))
-
-			err := spinner.StopFail()
-			if err != nil {
-				log.Debug().Err(err).Msg("cannot stop spinner")
-			}
-			continue
-		}
-
-		spinner.StopMessage(aurora.Sprintf(aurora.Green(info)))
-		err = spinner.Stop()
-		if err != nil {
-			log.Debug().Err(err).Msg("cannot stop spinner")
-		}
-	}
-
-}
-
-func (c *Client) inviteByEmail(cfg *config.AssignmentConfig, projectID int, email string) (string, error) {
-
-	m := &gitlab.InvitesOptions{
-		Email:       &email,
-		AccessLevel: gitlab.AccessLevel(gitlab.AccessLevelValue(cfg.AccessLevel)),
-	}
-	resp, _, err := c.Invites.ProjectInvites(projectID, m)
-	if err != nil {
-		return "", err
-	}
-	if resp.Status != "success" {
-		return "", fmt.Errorf("inviting user %s failed with %s", email, resp.Message[email])
-	}
-	return fmt.Sprintf("successfully invited user %s", email), nil
+	c.setaccess(assignmentCfg, project, members, &cfg)
 }
 
 func (c *Client) generatePerStudent(assignmentCfg *config.AssignmentConfig, assignmentGroupID int,

gitlab/seeder.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-git/go-git/v5"
+	git "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"