Merge pull request #24 from rcchopra/hyp-17516-v4

Bitbucket Find Function Fixed ( Synced with drone go-scm version )

Author: rcchopra

scm/driver/bitbucket/repo.go

@@ -92,11 +92,7 @@ func (s *repositoryService) Find(ctx context.Context, repo string) (*scm.Reposit
 	path := fmt.Sprintf("2.0/repositories/%s", repo)
 	out := new(repository)
 	res, err := s.client.do(ctx, "GET", path, nil, out)
-	if err != nil {
-		return nil, res, err
-	}
-	repoPerm, _, err := s.FindPerms(ctx, repo)
-	return convertRepository2(out, repoPerm), res, err
+	return convertRepository(out), res, err
 }
 
 // FindHook returns a repository hook.

scm/driver/bitbucket/repo_test.go

@@ -25,12 +25,7 @@ func TestRepositoryFind(t *testing.T) {
 		Type("application/json").
 		File("testdata/repo.json")
 
-	gock.New("https://api.bitbucket.org").
-		Get("/2.0/user/permissions/repositories").
-		MatchParam("q", `repository.full_name="atlassian/stash-example-plugin"`).
-		Reply(200).
-		Type("application/json").
-		File("testdata/perms.json")
+
 
 	client, _ := New("https://api.bitbucket.org")
 	got, _, err := client.Repositories.Find(context.Background(), "atlassian/stash-example-plugin")

scm/driver/bitbucket/testdata/repo.json.golden

@@ -2,11 +2,7 @@
     "ID": "{7dd600e6-0d9c-4801-b967-cb4cc17359ff}",
     "Namespace": "atlassian",
     "Name": "stash-example-plugin",
-    "Perm": {
-        "Pull": true,
-        "Push": true,
-        "Admin": true
-    },
+
     "Branch": "master",
     "Private": true,
     "Clone": "https://bitbucket.org/atlassian/stash-example-plugin.git",

scm/transport/proxy/proxy.go

@@ -66,9 +66,7 @@ func NewTransport(base http.RoundTripper, proxyURL string) (http.RoundTripper, e
 	if err != nil {
 		return nil, err
 	}
-
-	return &Transport{
-		Base:     base,
-		ProxyURL: parsedURL,
+	return &http.Transport{
+		Proxy: http.ProxyURL(parsedURL),
 	}, nil
 }

scm/transport/proxy/proxy_test.go

@@ -37,15 +37,28 @@ func TestNewTransport_ValidProxyURL(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Expected no error for valid proxy URL, got: %v", err)
 	}
-	
-	proxyTransport, ok := transport.(*Transport)
+
+	proxyTransport, ok := transport.(*http.Transport)
 	if !ok {
-		t.Fatal("Expected transport to be of type *Transport")
+		t.Fatal("Expected transport to be of type *http.Transport")
+	}
+
+	// Test that the proxy function is set correctly
+	if proxyTransport.Proxy == nil {
+		t.Fatal("Expected proxy function to be set")
 	}
-	
+
+	// Test the proxy function with a sample request
+	testURL, _ := url.Parse("http://example.com")
+	req := &http.Request{URL: testURL}
+	proxyURLResult, err := proxyTransport.Proxy(req)
+	if err != nil {
+		t.Fatalf("Expected no error from proxy function, got: %v", err)
+	}
+
 	expectedURL, _ := url.Parse(proxyURL)
-	if proxyTransport.ProxyURL.String() != expectedURL.String() {
-		t.Errorf("Expected proxy URL %s, got %s", expectedURL.String(), proxyTransport.ProxyURL.String())
+	if proxyURLResult.String() != expectedURL.String() {
+		t.Errorf("Expected proxy URL %s, got %s", expectedURL.String(), proxyURLResult.String())
 	}
 }