🧹 allow url option for custom gitlab urls (#2123)

* 🧹 allow url option for custom gitlab urls * fix capitalization of gitlab Co-authored-by: Tim Smith <tsmith84@gmail.com> * minor fixes Signed-off-by: Ivan Milchev <ivan@mondoo.com> --------- Signed-off-by: Ivan Milchev <ivan@mondoo.com> Co-authored-by: Tim Smith <tsmith84@gmail.com> Co-authored-by: Ivan Milchev <ivan@mondoo.com>
mondoohq · Oct 9, 2023 · 186149b · 186149b
1 parent d85c10c
commit 186149b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/providers/gitlab/config/config.go b/providers/gitlab/config/config.go
@@ -48,6 +48,12 @@ var Config = plugin.Provider{
  Default: "",
  Desc: "a GitLab project to scan",
  },
+ {
+ Long: "url",
+ Type: plugin.FlagType_String,
+ Default: "",
+ Desc: "custom GitLab base url",
+ },
  },
  },
  },

diff --git a/providers/gitlab/connection/connection.go b/providers/gitlab/connection/connection.go
@@ -51,7 +51,13 @@ func NewGitLabConnection(id uint32, asset *inventory.Asset, conf *inventory.Conf
  return nil, errors.New("you need to provide GitLab token e.g. via GITLAB_TOKEN env")
  }
 
- client, err := gitlab.NewClient(token)
+ var opts gitlab.ClientOptionFunc
+ url := conf.Options["url"]
+ if url != "" {
+ opts = gitlab.WithBaseURL(url)
+ }
+
+ client, err := gitlab.NewClient(token, opts)
  if err != nil {
  return nil, err
  }

diff --git a/providers/gitlab/provider/provider.go b/providers/gitlab/provider/provider.go
@@ -77,6 +77,9 @@ func (s *Service) ParseCLI(req *plugin.ParseCLIReq) (*plugin.ParseCLIRes, error)
  }
  // it's ok if no group or project is defined.
  // we will discover all the groups
+ if x, ok := flags["url"]; ok {
+ conf.Options["url"] = string(x.Value)
+ }
 
  conf.Discover = parseDiscover(flags)
  asset := inventory.Asset{