Privatebb (gabrie30#186)

Author: gabrie30

.github/workflows/go.yml

@@ -9,42 +9,41 @@ jobs:
       matrix:
         os: [macos-latest, ubuntu-latest]
     steps:
-    - name: Set up Go 1.16
+    - name: Set up Go 1.17
       uses: actions/setup-go@v1
       with:
-        go-version: 1.16
+        go-version: 1.17
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v1
     - name: Test
       run: go test -v ./...
-    - name: Get dependencies
-      run: |
-        go get -v -t -d ./...
     - name: Build
       run: go build -v -o ghorg .
     - name: Run GitHub Integration Tests
       run: scripts/github_integration_tests.sh
       env:
         GITHUB_TOKEN: ${{ secrets.GHORG_GITHUB_TOKEN }}
+    - name: Run Bitbucket Integration Tests
+      run: scripts/bitbucket_integration_tests.sh
+      env:
+        BITBUCKET_TOKEN: ${{ secrets.GHORG_BITBUCKET_APP_PASSWORD }}
+        BITBUCKET_USERNAME: ${{ secrets.GHORG_BITBUCKET_USERNAME }}
   build_and_test_windows:
     name: Build and Test Windows
     runs-on: windows-latest
     steps:
     - name: Set up Go 1.16
       uses: actions/setup-go@v1
       with:
-        go-version: 1.16
+        go-version: 1.17
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v1
     - name: Set configuration file
       run: |
         mkdir C:\Users\runneradmin\.config\ghorg
         copy sample-conf.yaml C:\Users\runneradmin\.config\ghorg\conf.yaml
-    - name: Get dependencies
-      run: |
-        go get -v -t -d ./...
     - name: Build
       run: env GOOS=windows GOARCH=386 go build -v -o ghorg.exe .
     - name: Test
@@ -53,3 +52,8 @@ jobs:
       run: scripts/windows_github_integration_tests.bat
       env:
         GITHUB_TOKEN: ${{ secrets.GHORG_GITHUB_TOKEN }}
+    - name: Run Bitbucket Integration Tests
+      run: scripts/bitbucket_integration_tests.sh
+      env:
+        BITBUCKET_TOKEN: ${{ secrets.GHORG_BITBUCKET_APP_PASSWORD }}
+        BITBUCKET_USERNAME: ${{ secrets.GHORG_BITBUCKET_USERNAME }}

CHANGELOG.md

@@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+
+
+## [1.7.9] - unreleased
+### Added
+- Bitbucket base url support
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
 ## [1.7.8] - 2/14/22
 ### Added
 ### Changed

cmd/version.go

@@ -11,6 +11,6 @@ var versionCmd = &cobra.Command{
 	Short: "Print the version number of Ghorg",
 	Long:  `All software has versions. This is Ghorg's`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("v1.7.8")
+		fmt.Println("v1.7.9")
 	},
 }

scm/bitbucket.go

@@ -1,6 +1,8 @@
 package scm
 
 import (
+	"net/url"
+
 	"os"
 
 	"github.com/gabrie30/ghorg/colorlog"
@@ -26,22 +28,22 @@ func (_ Bitbucket) GetType() string {
 
 // GetOrgRepos gets org repos
 func (c Bitbucket) GetOrgRepos(targetOrg string) ([]Repo, error) {
-	resp, err := c.Teams.Repositories(targetOrg)
+	resp, err := c.Repositories.ListForAccount(&bitbucket.RepositoriesOptions{Owner: targetOrg})
 	if err != nil {
 		return []Repo{}, err
 	}
 
-	return c.filter(resp)
+	return c.filter(resp.Items)
 }
 
 // GetUserRepos gets user repos from bitbucket
 func (c Bitbucket) GetUserRepos(targetUser string) ([]Repo, error) {
-	resp, err := c.Users.Repositories(targetUser)
+	resp, err := c.Repositories.ListForAccount(&bitbucket.RepositoriesOptions{Owner: targetUser})
 	if err != nil {
 		return []Repo{}, err
 	}
 
-	return c.filter(resp)
+	return c.filter(resp.Items)
 }
 
 // NewClient create new bitbucket scm client
@@ -56,16 +58,20 @@ func (_ Bitbucket) NewClient() (Client, error) {
 	} else {
 		c = bitbucket.NewBasicAuth(user, password)
 	}
+
+	if os.Getenv("GHORG_SCM_BASE_URL") != "" {
+		u, _ := url.Parse(os.Getenv("GHORG_SCM_BASE_URL"))
+		c.SetApiBaseURL(*u)
+	}
+
 	return Bitbucket{c}, nil
 }
 
-func (_ Bitbucket) filter(resp interface{}) (repoData []Repo, err error) {
+func (_ Bitbucket) filter(resp []bitbucket.Repository) (repoData []Repo, err error) {
 	cloneData := []Repo{}
-	values := resp.(map[string]interface{})["values"].([]interface{})
 
-	for _, a := range values {
-		clone := a.(map[string]interface{})
-		links := clone["links"].(map[string]interface{})["clone"].([]interface{})
+	for _, a := range resp {
+		links := a.Links["clone"].([]interface{})
 		for _, l := range links {
 			link := l.(map[string]interface{})["href"]
 			linkType := l.(map[string]interface{})["name"]
@@ -75,23 +81,10 @@ func (_ Bitbucket) filter(resp interface{}) (repoData []Repo, err error) {
 			}
 
 			r := Repo{}
-			r.Name = clone["name"].(string)
-
-			if os.Getenv("GHORG_BRANCH") == "" {
-				var defaultBranch string
-				if clone["mainbranch"] == nil {
-					defaultBranch = "master"
-				} else {
-					defaultBranch = clone["mainbranch"].(map[string]interface{})["name"].(string)
-				}
-
-				r.CloneBranch = defaultBranch
-			} else {
-				r.CloneBranch = os.Getenv("GHORG_BRANCH")
-			}
+			r.Name = a.Name
 
 			if os.Getenv("GHORG_BRANCH") == "" {
-				r.CloneBranch = "master"
+				r.CloneBranch = a.Mainbranch.Name
 			} else {
 				r.CloneBranch = os.Getenv("GHORG_BRANCH")
 			}

scripts/bitbucket_integration_tests.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -euo pipefail
+
+echo "Running BitBucket Integration Tests"
+
+cp ./ghorg /usr/local/bin
+
+BITBUCKET_WORKSPACE=ghorg
+
+ghorg version
+
+# clone an org with no config file
+ghorg clone $BITBUCKET_WORKSPACE --token="${BITBUCKET_TOKEN}" --bitbucket-username="${BITBUCKET_USERNAME}" --scm=bitbucket --base-url="https://api.bitbucket.org/2.0"
+
+if [ -e "${HOME}"/ghorg/$BITBUCKET_WORKSPACE ]
+then
+    echo "Pass: bitbucket org clone using no configuration file"
+else
+    echo "Fail: bitbucket org clone using no configuration file"
+    exit 1
+fi
+
+# clone an org with no config file to a specific path
+ghorg clone $BITBUCKET_WORKSPACE --token="${BITBUCKET_TOKEN}" --bitbucket-username="${BITBUCKET_USERNAME}" --path=/tmp --output-dir=testing_output_dir --scm=bitbucket --base-url="https://api.bitbucket.org/2.0"
+
+if [ -e /tmp/testing_output_dir ]
+then
+    echo "Pass: bitbucket org clone, commandline flags take overwrite conf.yaml"
+else
+    echo "Fail: bitbucket org clone, commandline flags take overwrite conf.yaml"
+    exit 1
+fi