Add more fields to gitlab project and group resources

Use some of the fancy new things available in the latest SDK

Signed-off-by: Tim Smith <[email protected]>

Author: tas50

.github/actions/spelling/expect.txt

@@ -6,6 +6,7 @@ atlassian
 auditlog
 Auths
 autoaccept
+autoclose
 autoprovisioned
 backupconfiguration
 backupsetting
@@ -59,6 +60,7 @@ jira
 jsonbody
 kqueue
 labelmatchstatement
+lfs
 liveanalytics
 loggingservice
 manageddevice

providers/gitlab/resources/gitlab.go

@@ -41,7 +41,8 @@ func initGitlabGroup(runtime *plugin.Runtime, args map[string]*llx.RawData) (map
 	args["requireTwoFactorAuthentication"] = llx.BoolData(grp.RequireTwoFactorAuth)
 	args["preventForkingOutsideGroup"] = llx.BoolData(grp.PreventForkingOutsideGroup)
 	args["mentionsDisabled"] = llx.BoolData(grp.MentionsDisabled)
-	args["emailsDisabled"] = llx.BoolData(grp.EmailsDisabled)
+	args["emailsDisabled"] = llx.BoolData(!grp.EmailsEnabled)
+	args["allowedEmailDomainsList"] = llx.StringData(grp.AllowedEmailDomainsList)
 
 	return args, nil, nil
 }
@@ -77,34 +78,37 @@ func (g *mqlGitlabGroup) projects() ([]any, error) {
 
 func getGitlabProjectArgs(prj *gitlab.Project) map[string]*llx.RawData {
 	return map[string]*llx.RawData{
-		"id":                          llx.IntData(int64(prj.ID)),
-		"name":                        llx.StringData(prj.Name),
-		"fullName":                    llx.StringData(prj.NameWithNamespace),
 		"allowMergeOnSkippedPipeline": llx.BoolData(prj.AllowMergeOnSkippedPipeline),
 		"archived":                    llx.BoolData(prj.Archived),
+		"autocloseReferencedIssues":   llx.BoolData(prj.AutocloseReferencedIssues),
 		"autoDevopsEnabled":           llx.BoolData(prj.AutoDevopsEnabled),
 		"containerRegistryEnabled":    llx.BoolData(prj.ContainerRegistryEnabled),
 		"createdAt":                   llx.TimeDataPtr(prj.CreatedAt),
 		"defaultBranch":               llx.StringData(prj.DefaultBranch),
 		"description":                 llx.StringData(prj.Description),
 		"emailsDisabled":              llx.BoolData(!prj.EmailsEnabled),
+		"emptyRepo":                   llx.BoolData(prj.EmptyRepo),
+		"fullName":                    llx.StringData(prj.NameWithNamespace),
+		"groupRunnersEnabled":         llx.BoolData(prj.GroupRunnersEnabled),
+		"id":                          llx.IntData(int64(prj.ID)),
 		"issuesEnabled":               llx.BoolData(prj.IssuesEnabled),
+		"jobsEnabled":                 llx.BoolData(prj.JobsEnabled),
+		"lfsEnabled":                  llx.BoolData(prj.LFSEnabled),
 		"mergeRequestsEnabled":        llx.BoolData(prj.MergeRequestsEnabled),
 		"mirror":                      llx.BoolData(prj.Mirror),
+		"name":                        llx.StringData(prj.Name),
 		"onlyAllowMergeIfAllDiscussionsAreResolved": llx.BoolData(prj.OnlyAllowMergeIfAllDiscussionsAreResolved),
 		"onlyAllowMergeIfPipelineSucceeds":          llx.BoolData(prj.OnlyAllowMergeIfPipelineSucceeds),
 		"packagesEnabled":                           llx.BoolData(prj.PackagesEnabled),
 		"path":                                      llx.StringData(prj.Path),
+		"removeSourceBranchAfterMerge":              llx.BoolData(prj.RemoveSourceBranchAfterMerge),
 		"requirementsEnabled":                       llx.BoolData(prj.RequirementsEnabled),
 		"serviceDeskEnabled":                        llx.BoolData(prj.ServiceDeskEnabled),
+		"sharedRunnersEnabled":                      llx.BoolData(prj.SharedRunnersEnabled),
 		"snippetsEnabled":                           llx.BoolData(prj.SnippetsEnabled),
 		"visibility":                                llx.StringData(string(prj.Visibility)),
 		"webURL":                                    llx.StringData(prj.WebURL),
 		"wikiEnabled":                               llx.BoolData(prj.WikiEnabled),
-		"jobsEnabled":                               llx.BoolData(prj.JobsEnabled),
-		"emptyRepo":                                 llx.BoolData(prj.EmptyRepo),
-		"sharedRunnersEnabled":                      llx.BoolData(prj.SharedRunnersEnabled),
-		"groupRunnersEnabled":                       llx.BoolData(prj.GroupRunnersEnabled),
 	}
 }
 

providers/gitlab/resources/gitlab.lr

@@ -30,6 +30,8 @@ gitlab.group @defaults("name visibility webURL") {
   mentionsDisabled bool
   // List of all projects that belong to the group
   projects() []gitlab.project
+  // List of allowed email domains for the group
+  allowedEmailDomainsList string
 }
 
 // GitLab project
@@ -104,6 +106,12 @@ gitlab.project @defaults("fullName visibility webURL") {
   sharedRunnersEnabled bool
   // Whether the project is enabled for group runners
   groupRunnersEnabled bool
+  // Whether the merge request source brand is removed after merge
+  removeSourceBranchAfterMerge bool
+  // Whether the project has LFS enabled
+  lfsEnabled bool
+  // Whether the project has autoclose referenced issues enabled
+  autocloseReferencedIssues bool
 }
 
 // GitLab project approval rule

providers/gitlab/resources/gitlab.lr.go

@@ -4,6 +4,8 @@
 resources:
   gitlab.group:
     fields:
+      allowedEmailDomainsList:
+        min_mondoo_version: 9.0.0
       createdAt:
         min_mondoo_version: 9.0.0
       description: {}
@@ -34,6 +36,8 @@ resources:
         min_mondoo_version: 9.0.0
       autoDevopsEnabled:
         min_mondoo_version: 9.0.0
+      autocloseReferencedIssues:
+        min_mondoo_version: 9.0.0
       containerRegistryEnabled:
         min_mondoo_version: 9.0.0
       createdAt:
@@ -54,6 +58,8 @@ resources:
         min_mondoo_version: 9.0.0
       jobsEnabled:
         min_mondoo_version: 9.0.0
+      lfsEnabled:
+        min_mondoo_version: 9.0.0
       mergeMethod:
         min_mondoo_version: 9.0.0
       mergeRequestsEnabled:
@@ -74,6 +80,8 @@ resources:
         min_mondoo_version: 9.0.0
       protectedBranches:
         min_mondoo_version: 9.0.0
+      removeSourceBranchAfterMerge:
+        min_mondoo_version: 9.0.0
       requirementsEnabled:
         min_mondoo_version: 9.0.0
       serviceDeskEnabled: