Issue #65: Added support for Data Center

Author: gildas

README.md

@@ -181,6 +181,17 @@ You can also pass the `--progress` flag to display a progress bar when upload/do
 
 By default, the password or client secret is stored in the vault of the operating system (Windows Credential Manager, macOS Keychain, or Linux Secret Service). You can pass the `--no-vault` flag to disable this feature and store the password or client secret in plain text in the configuration file. This is not recommended, but can be useful for testing purposes.
 
+To connect to a Bitbucket Data Center, you can pass the `--host` flag to set the host of the Bitbucket instance (do not provide any host when connecting to bitbucket.org). For example:
+
+```bash
+bb profile create \
+  --name myprofile \
+  --host bitbucket.mycompany.com \
+  --client-id <your-client-id> \
+  --client-secret <your-client-secret> \
+  --callback-port 8080
+```
+
 Profiles support the following authentications:
 
 - [OAuth 2.0 with Authorization Code Grant](https://developer.atlassian.com/cloud/bitbucket/rest/intro/#1--authorization-code-grant--4-1-) with the `--client-id`, `--client-secret`, and `--callback-port` flags.

cmd/profile/create.go

@@ -2,6 +2,7 @@ package profile
 
 import (
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -24,6 +25,7 @@ var createCmd = &cobra.Command{
 
 var createOptions struct {
 	Profile
+	Host             string
 	DefaultWorkspace *flags.EnumFlag
 	DefaultProject   *flags.EnumFlag
 	OutputFormat     *flags.EnumFlag
@@ -45,6 +47,7 @@ func init() {
 		createCmd.Flags().StringVar(&createOptions.VaultKey, "vault-key", "bitbucket-cli", "Vault key to use for storing credentials. Default is bitbucket-cli. On Windows, the Windows Credential Manager will be used, On Linux and macOS, the system keychain will be used.")
 	}
 	createCmd.Flags().BoolVar(&createOptions.NoVault, "no-vault", false, "Do not store credentials in the vault. This will store them in plain text in the configuration file.")
+	createCmd.Flags().StringVar(&createOptions.Host, "host", "", "Host of the Bitbucket API when using Bitbucket Data Center. For Bitbucket Cloud, this should be left empty.")
 	createCmd.Flags().StringVarP(&createOptions.User, "user", "u", "", "User's name of the profile")
 	createCmd.Flags().StringVar(&createOptions.Password, "password", "", "Password of the profile")
 	createCmd.Flags().StringVar(&createOptions.ClientID, "client-id", "", "Client ID of the profile")
@@ -74,6 +77,11 @@ func init() {
 func createProcess(cmd *cobra.Command, args []string) error {
 	log := logger.Must(logger.FromContext(cmd.Context())).Child(cmd.Parent().Name(), "create")
 
+	if len(createOptions.Host) > 0 {
+		createOptions.APIRoot = &url.URL{Scheme: "https", Host: createOptions.Host, Path: "/rest/1.0"}
+	} else {
+		createOptions.APIRoot = &url.URL{Scheme: "https", Host: "api.bitbucket.org", Path: "/2.0"}
+	}
 	if len(createOptions.DefaultWorkspace.String()) > 0 {
 		createOptions.Profile.DefaultWorkspace = createOptions.DefaultWorkspace.String()
 	}

cmd/profile/profile.go

@@ -149,7 +149,11 @@ func (profile Profile) GetRow(headers []string) []string {
 	for _, header := range headers {
 		switch strings.ToLower(header) {
 		case "apiroot":
-			row = append(row, profile.APIRoot.String())
+			if profile.APIRoot != nil {
+				row = append(row, profile.APIRoot.String())
+			} else {
+				row = append(row, " ")
+			}
 		case "name":
 			row = append(row, profile.Name)
 		case "description":
@@ -209,6 +213,10 @@ func (profile *Profile) Update(other Profile) error {
 	if len(other.Name) > 0 {
 		profile.Name = other.Name
 	}
+	if other.APIRoot != nil {
+		profile.APIRoot = other.APIRoot
+	}
+
 	if len(other.Description) > 0 {
 		profile.Description = other.Description
 	}
@@ -264,6 +272,9 @@ func (profile *Profile) Validate() error {
 	if len(profile.Name) == 0 {
 		merr.Append(errors.ArgumentMissing.With("name"))
 	}
+	if profile.APIRoot == nil {
+		profile.APIRoot = &url.URL{Scheme: "https", Host: "api.bitbucket.org", Path: "/2.0"}
+	}
 	// We must have either an access token, a user, or a clientID
 	// password and clientSecret are now retrieved from the vault
 	if len(profile.AccessToken) == 0 && len(profile.ClientID) == 0 && len(profile.User) == 0 {

cmd/profile/profile_client.go

@@ -409,14 +409,12 @@ func (profile *Profile) send(context context.Context, cmd *cobra.Command, option
 		return nil, err
 	}
 
-	apiRoot := profile.APIRoot
-	if apiRoot == nil {
-		apiRoot = &url.URL{Scheme: "https", Host: "api.bitbucket.org"}
-	}
+	// We want a copy og the API Root URL because we will modify it with the path of the request
+	apiRoot := &url.URL{Scheme: profile.APIRoot.Scheme, Host: profile.APIRoot.Host, Path: profile.APIRoot.Path}
 
 	if strings.HasPrefix(uripath, "/") {
 		components := strings.Split(uripath, "?")
-		options.URL = apiRoot.JoinPath("2.0", components[0])
+		options.URL = apiRoot.JoinPath(components[0])
 		if len(components) > 1 {
 			options.URL.RawQuery = components[1]
 		}
@@ -427,7 +425,7 @@ func (profile *Profile) send(context context.Context, cmd *cobra.Command, option
 		}
 		log.Infof("Using repository %s", repositoryName)
 		components := strings.Split(uripath, "?")
-		options.URL = apiRoot.JoinPath("2.0", "repositories", repositoryName, components[0])
+		options.URL = apiRoot.JoinPath("repositories", repositoryName, components[0])
 		if len(components) > 1 {
 			options.URL.RawQuery = components[1]
 		}

cmd/profile/profiles.go

@@ -3,6 +3,7 @@ package profile
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"os"
 
 	"bitbucket.org/gildas_cherruel/bb/cmd/common"
@@ -151,6 +152,9 @@ func (profiles *profiles) Load(context context.Context) error {
 
 	// Get the secret stuff from the Windows credential manager or linux/macOS keychain if not set
 	for _, profile := range *profiles {
+		if profile.APIRoot == nil {
+			profile.APIRoot = &url.URL{Scheme: "https", Host: "api.bitbucket.org", Path: "/2.0"}
+		}
 		if len(profile.ClientID) > 0 {
 			if len(profile.ClientSecret) == 0 {
 				if credential, err := profile.GetCredentialFromVault(profile.VaultKey, profile.ClientID); err == nil {

cmd/profile/update.go

@@ -2,6 +2,7 @@ package profile
 
 import (
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -25,6 +26,7 @@ var updateCmd = &cobra.Command{
 
 var updateOptions struct {
 	Profile
+	Host             string
 	DefaultWorkspace *flags.EnumFlag
 	DefaultProject   *flags.EnumFlag
 	OutputFormat     *flags.EnumFlag
@@ -44,6 +46,7 @@ func init() {
 	if runtime.GOOS != "windows" {
 		updateCmd.Flags().StringVar(&updateOptions.VaultKey, "vault-key", "bitbucket-cli", "Vault key to use for storing credentials. Default is bitbucket-cli. On Windows, the Windows Credential Manager will be used, On Linux and macOS, the system keychain will be used.")
 	}
+	updateCmd.Flags().StringVar(&updateOptions.Host, "host", "", "Host of the Bitbucket API when using Bitbucket Data Center. For Bitbucket Cloud, this should be left empty.")
 	updateCmd.Flags().StringVarP(&updateOptions.User, "user", "u", "", "User's name of the profile")
 	updateCmd.Flags().StringVar(&updateOptions.Password, "password", "", "Password of the profile")
 	updateCmd.Flags().StringVar(&updateOptions.ClientID, "client-id", "", "Client ID of the profile")
@@ -70,6 +73,11 @@ func init() {
 func updateProcess(cmd *cobra.Command, args []string) error {
 	log := logger.Must(logger.FromContext(cmd.Context())).Child(cmd.Parent().Name(), "update")
 
+	if len(updateOptions.Host) > 0 {
+		updateOptions.APIRoot = &url.URL{Scheme: "https", Host: updateOptions.Host, Path: "/rest/1.0"}
+	} else {
+		updateOptions.APIRoot = &url.URL{Scheme: "https", Host: "api.bitbucket.org", Path: "/2.0"}
+	}
 	if len(updateOptions.DefaultWorkspace.String()) > 0 {
 		updateOptions.Profile.DefaultWorkspace = updateOptions.DefaultWorkspace.String()
 	}