feat: gitlab self managed support (#170)

cmd/daytona/config/const.go

@@ -27,6 +27,7 @@ func GetGitProviderList() []GitProvider {
 	return []GitProvider{
 		{"github", "GitHub", ""},
 		{"gitlab", "GitLab", ""},
+		{"gitlab-self-managed", "GitLab Self-managed", ""},
 		{"bitbucket", "Bitbucket", ""},
 	}
 }
@@ -36,6 +37,8 @@ func GetDocsLinkFromGitProvider(providerId string) string {
 	case "github":
 		return "https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic"
 	case "gitlab":
+		fallthrough
+	case "gitlab-self-managed":
 		return "https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token"
 	case "bitbucket":
 		return "https://support.atlassian.com/bitbucket-cloud/docs/create-an-app-password"

internal/util/workspace.go

@@ -84,21 +84,6 @@ func GetValidatedUrl(input string) (string, error) {
 		return "", fmt.Errorf("input is not a valid URL")
 	}
 
-	// Validate the URL's host (domain) has a proper extension
-	host := parsedURL.Host
-	if !isValidTLD(host) {
-		return "", fmt.Errorf("the URL does not have a valid TLD")
-	}
-
 	// If parsing was successful, return the fixed URL
 	return parsedURL.String(), nil
 }
-
-func isValidTLD(host string) bool {
-	// Regular expression to match common domain extensions like .com, .org, etc.
-	extensionPattern := `\.([a-zA-Z]{2,6})$`
-	regex := regexp.MustCompile(extensionPattern)
-
-	// Check if the host (domain) matches the extension pattern
-	return regex.MatchString(host)
-}

pkg/cmd/git_cred.go

@@ -50,21 +50,9 @@ var gitCredCmd = &cobra.Command{
 			log.Fatal(apiclient.HandleErrorResponse(res, err))
 		}
 
-		gitProviderId := getGitProviderIdFromHost(host)
-		if gitProviderId == "" {
-			fmt.Println("error: unable to determine git provider")
-			return
-		}
+		gitProvider := getGitProviderFromHost(host, serverConfig.GitProviders)
 
-		var gitProvider *serverapiclient.GitProvider
-		for _, provider := range serverConfig.GitProviders {
-			if *provider.Id == gitProviderId {
-				gitProvider = &provider
-				break
-			}
-		}
-
-		if gitProvider == nil {
+		if gitProvider == (serverapiclient.GitProvider{}) {
 			fmt.Println("error: git provider not found")
 			os.Exit(1)
 			return
@@ -80,16 +68,31 @@ var gitCredCmd = &cobra.Command{
 	},
 }
 
-func getGitProviderIdFromHost(url string) string {
-	if strings.Contains(url, "github.com") {
-		return "github"
-	} else if strings.Contains(url, "gitlab.com") {
-		return "gitlab"
-	} else if strings.Contains(url, "bitbucket.org") {
-		return "bitbucket"
-	} else {
-		return ""
+func getGitProviderFromHost(url string, gitProviders []serverapiclient.GitProvider) serverapiclient.GitProvider {
+	for _, gitProvider := range gitProviders {
+		if strings.Contains(url, fmt.Sprintf("%s.", *gitProvider.Id)) {
+			return gitProvider
+		}
+
+		if *gitProvider.BaseApiUrl != "" && strings.Contains(url, getHostnameFromUrl(*gitProvider.BaseApiUrl)) {
+			return gitProvider
+		}
+	}
+	return serverapiclient.GitProvider{}
+}
+
+func getHostnameFromUrl(url string) string {
+	input := url
+	input = strings.TrimPrefix(input, "https://")
+	input = strings.TrimPrefix(input, "http://")
+	input = strings.TrimPrefix(input, "www.")
+
+	// Remove everything after the first '/'
+	if slashIndex := strings.Index(input, "/"); slashIndex != -1 {
+		input = input[:slashIndex]
 	}
+
+	return input
 }
 
 func parseFromStdin() (map[string]string, error) {

pkg/cmd/gitprovider/add.go

@@ -52,7 +52,7 @@ var gitProviderAddCmd = &cobra.Command{
 		}
 
 		if gitProviderSelectView.Username == "" {
-			gitUsername, err := gitprovider.GetUsernameFromToken(gitProviderSelectView.Id, config.GetGitProviderList(), gitProviderSelectView.Token)
+			gitUsername, err := gitprovider.GetUsernameFromToken(gitProviderSelectView.Id, config.GetGitProviderList(), gitProviderSelectView.Token, gitProviderSelectView.BaseApiUrl)
 			if err != nil {
 				log.Fatal(err)
 			}
@@ -64,16 +64,18 @@ var gitProviderAddCmd = &cobra.Command{
 		for _, gitProvider := range gitProviderList {
 			if *gitProvider.Id == gitProviderSelectView.Id {
 				*gitProvider.Username = gitProviderSelectView.Username
+				*gitProvider.BaseApiUrl = gitProviderSelectView.BaseApiUrl
 				*gitProvider.Token = gitProviderSelectView.Token
 				providerExists = true
 			}
 		}
 
 		if !providerExists {
 			gitProviderList = append(serverConfig.GitProviders, serverapiclient.GitProvider{
-				Id:       &gitProviderSelectView.Id,
-				Username: &gitProviderSelectView.Username,
-				Token:    &gitProviderSelectView.Token,
+				Id:         &gitProviderSelectView.Id,
+				Username:   &gitProviderSelectView.Username,
+				BaseApiUrl: &gitProviderSelectView.BaseApiUrl,
+				Token:      &gitProviderSelectView.Token,
 			})
 		}
 

pkg/cmd/gitprovider/delete.go

@@ -18,7 +18,7 @@ import (
 
 var gitProviderDeleteCmd = &cobra.Command{
 	Use:     "delete",
-	Aliases: []string{"remove"},
+	Aliases: []string{"remove", "rm"},
 	Short:   "Unregister a Git providers",
 	Run: func(cmd *cobra.Command, args []string) {
 		apiClient, err := server.GetApiClient(nil)

pkg/cmd/workspace/create.go

@@ -249,6 +249,9 @@ func processPrompting(cmd *cobra.Command, apiClient *serverapiclient.APIClient,
 		if serverGitProvider.Token != nil {
 			gitProvider.Token = *serverGitProvider.Token
 		}
+		if serverGitProvider.BaseApiUrl != nil {
+			gitProvider.BaseApiUrl = *serverGitProvider.BaseApiUrl
+		}
 		gitProviderList = append(gitProviderList, gitProvider)
 	}
 

pkg/gitprovider/git_provider.go

@@ -81,12 +81,17 @@ func GetGitProvider(providerId string, gitProviders []types.GitProvider) GitProv
 			username: chosenProvider.Username,
 			token:    chosenProvider.Token,
 		}
+	case "gitlab-self-managed":
+		return &GitLabGitProvider{
+			token:      chosenProvider.Token,
+			baseApiUrl: chosenProvider.BaseApiUrl,
+		}
 	default:
 		return nil
 	}
 }
 
-func GetUsernameFromToken(providerId string, gitProviders []config.GitProvider, token string) (string, error) {
+func GetUsernameFromToken(providerId string, gitProviders []config.GitProvider, token string, baseApiUrl string) (string, error) {
 	var gitProvider GitProvider
 
 	switch providerId {
@@ -95,8 +100,11 @@ func GetUsernameFromToken(providerId string, gitProviders []config.GitProvider,
 			token: token,
 		}
 	case "gitlab":
+		fallthrough
+	case "gitlab-self-managed":
 		gitProvider = &GitLabGitProvider{
-			token: token,
+			token:      token,
+			baseApiUrl: baseApiUrl,
 		}
 	case "bitbucket":
 		gitProvider = &BitbucketGitProvider{

pkg/gitprovider/gitlab.go

@@ -12,7 +12,8 @@ import (
 )
 
 type GitLabGitProvider struct {
-	token string
+	token      string
+	baseApiUrl string
 }
 
 func (g *GitLabGitProvider) GetNamespaces() ([]GitNamespace, error) {
@@ -144,7 +145,14 @@ func (g *GitLabGitProvider) GetUserData() (GitUser, error) {
 }
 
 func (g *GitLabGitProvider) getApiClient() *gitlab.Client {
-	client, err := gitlab.NewClient(g.token)
+	var client *gitlab.Client
+	var err error
+
+	if g.baseApiUrl == "" {
+		client, err = gitlab.NewClient(g.token)
+	} else {
+		client, err = gitlab.NewClient(g.token, gitlab.WithBaseURL(g.baseApiUrl))
+	}
 	if err != nil {
 		log.Fatal(err)
 	}

pkg/server/api/docs/docs.go

@@ -551,6 +551,9 @@ const docTemplate = `{
         "GitProvider": {
             "type": "object",
             "properties": {
+                "baseApiUrl": {
+                    "type": "string"
+                },
                 "id": {
                     "type": "string"
                 },
@@ -587,9 +590,6 @@ const docTemplate = `{
         "Project": {
             "type": "object",
             "properties": {
-                "info": {
-                    "$ref": "#/definitions/ProjectInfo"
-                },
                 "name": {
                     "type": "string"
                 },

pkg/server/api/docs/swagger.json

@@ -548,6 +548,9 @@
         "GitProvider": {
             "type": "object",
             "properties": {
+                "baseApiUrl": {
+                    "type": "string"
+                },
                 "id": {
                     "type": "string"
                 },
@@ -584,9 +587,6 @@
         "Project": {
             "type": "object",
             "properties": {
-                "info": {
-                    "$ref": "#/definitions/ProjectInfo"
-                },
                 "name": {
                     "type": "string"
                 },

pkg/server/api/docs/swagger.yaml

@@ -22,6 +22,8 @@ definitions:
     type: object
   GitProvider:
     properties:
+      baseApiUrl:
+        type: string
       id:
         type: string
       token:
@@ -45,8 +47,6 @@ definitions:
     type: object
   Project:
     properties:
-      info:
-        $ref: '#/definitions/ProjectInfo'
       name:
         type: string
       repository:

pkg/serverapiclient/api/openapi.yaml

@@ -412,10 +412,13 @@ components:
       type: object
     GitProvider:
       example:
+        baseApiUrl: baseApiUrl
         id: id
         token: token
         username: username
       properties:
+        baseApiUrl:
+          type: string
         id:
           type: string
         token:
@@ -456,19 +459,9 @@ components:
           branch: branch
           sha: sha
           url: url
-        info:
-          providerMetadata: providerMetadata
-          isRunning: true
-          created: created
-          name: name
-          finished: finished
-          started: started
-          workspaceId: workspaceId
         target: target
         workspaceId: workspaceId
       properties:
-        info:
-          $ref: '#/components/schemas/ProjectInfo'
         name:
           type: string
         repository:
@@ -574,10 +567,12 @@ components:
         id: id
         targetsFilePath: targetsFilePath
         gitProviders:
-        - id: id
+        - baseApiUrl: baseApiUrl
+          id: id
           token: token
           username: username
-        - id: id
+        - baseApiUrl: baseApiUrl
+          id: id
           token: token
           username: username
         frps:
@@ -620,14 +615,6 @@ components:
             branch: branch
             sha: sha
             url: url
-          info:
-            providerMetadata: providerMetadata
-            isRunning: true
-            created: created
-            name: name
-            finished: finished
-            started: started
-            workspaceId: workspaceId
           target: target
           workspaceId: workspaceId
         - name: name
@@ -641,14 +628,6 @@ components:
             branch: branch
             sha: sha
             url: url
-          info:
-            providerMetadata: providerMetadata
-            isRunning: true
-            created: created
-            name: name
-            finished: finished
-            started: started
-            workspaceId: workspaceId
           target: target
           workspaceId: workspaceId
         name: name

pkg/serverapiclient/docs/GitProvider.md

@@ -4,6 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**BaseApiUrl** | Pointer to **string** |  | [optional] 
 **Id** | Pointer to **string** |  | [optional] 
 **Token** | Pointer to **string** |  | [optional] 
 **Username** | Pointer to **string** |  | [optional] 
@@ -27,6 +28,31 @@ NewGitProviderWithDefaults instantiates a new GitProvider object
 This constructor will only assign default values to properties that have it defined,
 but it doesn't guarantee that properties required by API are set
 
+### GetBaseApiUrl
+
+`func (o *GitProvider) GetBaseApiUrl() string`
+
+GetBaseApiUrl returns the BaseApiUrl field if non-nil, zero value otherwise.
+
+### GetBaseApiUrlOk
+
+`func (o *GitProvider) GetBaseApiUrlOk() (*string, bool)`
+
+GetBaseApiUrlOk returns a tuple with the BaseApiUrl field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetBaseApiUrl
+
+`func (o *GitProvider) SetBaseApiUrl(v string)`
+
+SetBaseApiUrl sets BaseApiUrl field to given value.
+
+### HasBaseApiUrl
+
+`func (o *GitProvider) HasBaseApiUrl() bool`
+
+HasBaseApiUrl returns a boolean if a field has been set.
+
 ### GetId
 
 `func (o *GitProvider) GetId() string`