Moved to go-utils v2 in devportalservice (#254)

* Moved to go-utils v2 in devportalservice

Author: lpusok

devportalservice/devportalservice.go

@@ -12,8 +12,8 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/bitrise-io/go-utils/fileutil"
-	"github.com/bitrise-io/go-utils/log"
+	"github.com/bitrise-io/go-utils/v2/fileutil"
+	"github.com/bitrise-io/go-utils/v2/log"
 )
 
 const appleDeveloperConnectionPath = "apple_developer_portal_data.json"
@@ -70,19 +70,21 @@ type AppleDeveloperConnectionProvider interface {
 
 // BitriseClient implements AppleDeveloperConnectionProvider through the Bitrise.io API.
 type BitriseClient struct {
-	httpClient              httpClient
-	buildURL, buildAPIToken string
+	log         log.Logger
+	filemanager fileutil.FileManager
+	httpClient  httpClient
 
-	readBytesFromFile func(pth string) ([]byte, error)
+	buildURL, buildAPIToken string
 }
 
 // NewBitriseClient creates a new instance of BitriseClient.
-func NewBitriseClient(client httpClient, buildURL, buildAPIToken string) *BitriseClient {
+func NewBitriseClient(logger log.Logger, filemanager fileutil.FileManager, client httpClient, buildURL, buildAPIToken string) *BitriseClient {
 	return &BitriseClient{
-		httpClient:        client,
-		buildURL:          buildURL,
-		buildAPIToken:     buildAPIToken,
-		readBytesFromFile: fileutil.ReadBytesFromFile,
+		log:           logger,
+		filemanager:   filemanager,
+		httpClient:    client,
+		buildURL:      buildURL,
+		buildAPIToken: buildAPIToken,
 	}
 }
 
@@ -98,6 +100,15 @@ func privateKeyWithHeader(privateKey string) string {
 	)
 }
 
+func (c *BitriseClient) readBytesFromFile(filepath string) ([]byte, error) {
+	reader, err := c.filemanager.OpenReaderIfExists(filepath)
+	if err != nil {
+		return []byte{}, err
+	}
+
+	return io.ReadAll(reader)
+}
+
 // GetAppleDeveloperConnection fetches the Bitrise.io Apple Developer connection.
 func (c *BitriseClient) GetAppleDeveloperConnection() (*AppleDeveloperConnection, error) {
 	var rawCreds []byte
@@ -163,7 +174,7 @@ func (c *BitriseClient) download() ([]byte, error) {
 	// The client must close the response body when finished with it
 	defer func() {
 		if cerr := resp.Body.Close(); cerr != nil {
-			log.Warnf("Failed to close response body: %s", cerr)
+			c.log.Warnf("Failed to close response body: %s", cerr)
 		}
 	}()
 

devportalservice/devportalservice_test.go

@@ -6,68 +6,69 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/bitrise-io/go-utils/v2/log"
 	"github.com/stretchr/testify/require"
 )
 
 func TestGetAppleDeveloperConnection(t *testing.T) {
 	tests := []struct {
 		name string
 
-		response *http.Response
-		err      error
+		responseContent string
+		err             error
 
 		want    *AppleDeveloperConnection
 		wantErr bool
 	}{
 		{
-			name: "No Apple Developer Connection set for the build",
-			response: &http.Response{
-				StatusCode: 200,
-				Body:       io.NopCloser(strings.NewReader("{}")),
-			},
-			want:    &AppleDeveloperConnection{},
-			wantErr: false,
+			name:            "No Apple Developer Connection set for the build",
+			responseContent: "{}",
+			want:            &AppleDeveloperConnection{},
+			wantErr:         false,
 		},
 		{
-			name: "No Apple Developer Connection set for the build, test devices available",
-			response: &http.Response{
-				StatusCode: 200,
-				Body:       io.NopCloser(strings.NewReader(testDevicesResponseBody)),
-			},
-			want:    &testConnectionOnlyDevices,
-			wantErr: false,
+			name:            "No Apple Developer Connection set for the build, test devices available",
+			responseContent: testDevicesResponseBody,
+			want:            &testConnectionOnlyDevices,
+			wantErr:         false,
 		},
 		{
-			name: "Apple ID-based Apple Developer Connection set for the build",
-			response: &http.Response{
-				StatusCode: 200,
-				Body:       io.NopCloser(strings.NewReader(testAppleIDConnectionResponseBody)),
-			},
-			want:    &testConnectionWithAppleIDConnection,
-			wantErr: false,
+			name:            "Apple ID-based Apple Developer Connection set for the build",
+			responseContent: testAppleIDConnectionResponseBody,
+			want:            &testConnectionWithAppleIDConnection,
+			wantErr:         false,
 		},
 		{
-			name: "API key Apple Developer Connection set for the build",
-			response: &http.Response{
-				StatusCode: 200,
-				Body:       io.NopCloser(strings.NewReader(testAPIKeyConnectionResponseBody)),
-			},
-			want:    &testConnectionWithAPIKeyConnection,
-			wantErr: false,
+			name:            "API key Apple Developer Connection set for the build",
+			responseContent: testAPIKeyConnectionResponseBody,
+			want:            &testConnectionWithAPIKeyConnection,
+			wantErr:         false,
 		},
 		{
-			name: "Apple ID-based and API key Apple Developer Connection set for the build, test device available",
-			response: &http.Response{
-				StatusCode: 200,
-				Body:       io.NopCloser(strings.NewReader(testAppleIDAndAPIKeyConnectionResponseBody)),
-			},
-			want:    &testConnectionWithAppleIDAndAPIKeyConnection,
-			wantErr: false,
+			name:            "Apple ID-based and API key Apple Developer Connection set for the build, test device available",
+			responseContent: testAppleIDAndAPIKeyConnectionResponseBody,
+			want:            &testConnectionWithAppleIDAndAPIKeyConnection,
+			wantErr:         false,
 		},
 	}
+
+	logger := log.NewLogger()
 	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := NewBitriseClient(newMockHTTPClient(tt.response, nil), "dummy url", "dummy token")
+		t.Run(tt.name+"_http", func(t *testing.T) {
+			response :=
+				&http.Response{
+					StatusCode: 200,
+					Body:       io.NopCloser(strings.NewReader(tt.responseContent)),
+				}
+
+			c := NewBitriseClient(logger, nil, newMockHTTPClient(response, nil), "dummy url", "dummy token")
+			got, err := c.GetAppleDeveloperConnection()
+			require.NoError(t, err)
+			require.Equal(t, tt.want, got)
+		})
+
+		t.Run(tt.name+"_file", func(t *testing.T) {
+			c := NewBitriseClient(logger, newMockFileReader(tt.responseContent), nil, "file://dummy url", "dummy token")
 			got, err := c.GetAppleDeveloperConnection()
 			require.NoError(t, err)
 			require.Equal(t, tt.want, got)
@@ -104,9 +105,11 @@ func TestFastlaneLoginSession(t *testing.T) {
 			wantErr: false,
 		},
 	}
+
+	logger := log.NewLogger()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewBitriseClient(newMockHTTPClient(tt.response, nil), "dummy url", "dummy token")
+			c := NewBitriseClient(logger, nil, newMockHTTPClient(tt.response, nil), "dummy url", "dummy token")
 			conn, err := c.GetAppleDeveloperConnection()
 			require.NoError(t, err)
 

devportalservice/mock_filemanager.go

@@ -0,0 +1,59 @@
+package devportalservice
+
+import (
+	"io"
+	"os"
+	"strings"
+
+	"github.com/bitrise-io/go-utils/v2/fileutil"
+)
+
+type mockFileReader struct {
+	contents string
+}
+
+func newMockFileReader(contents string) fileutil.FileManager {
+	return &mockFileReader{
+		contents: contents,
+	}
+}
+
+// Open ...
+func (r *mockFileReader) Open(path string) (*os.File, error) {
+	panic("not implemented")
+}
+
+// OpenReaderIfExists ...
+func (r *mockFileReader) OpenReaderIfExists(path string) (io.Reader, error) {
+	return io.NopCloser(strings.NewReader(r.contents)), nil
+}
+
+// ReadDirEntryNames ...
+func (r *mockFileReader) ReadDirEntryNames(path string) ([]string, error) {
+	panic("not implemented")
+}
+
+// Remove ...
+func (r *mockFileReader) Remove(path string) error {
+	panic("not implemented")
+}
+
+// RemoveAll ...
+func (r *mockFileReader) RemoveAll(path string) error {
+	panic("not implemented")
+}
+
+// Write ...
+func (r *mockFileReader) Write(path string, value string, perm os.FileMode) error {
+	panic("not implemented")
+}
+
+// WriteBytes ...
+func (r *mockFileReader) WriteBytes(path string, value []byte) error {
+	panic("not implemented")
+}
+
+// FileSizeInBytes ...
+func (r *mockFileReader) FileSizeInBytes(pth string) (int64, error) {
+	panic("not implemented")
+}