Keep unsupported transfer adapter check

Author: harryzcy

modules/lfs/http_client.go

@@ -27,8 +27,8 @@ var ErrUnexpectedEOF = errors.New("unexpected EOF in response")
 type HTTPClient struct {
 	client        *http.Client
 	endpoint      string
-	transfers     []string
-	activeAdapter TransferAdapter
+	transfers     map[string]TransferAdapter
+	transferNames []string
 }
 
 // BatchSize returns the preferred size of batchs to process
@@ -49,10 +49,12 @@ func newHTTPClient(endpoint *url.URL, httpTransport *http.Transport) *HTTPClient
 
 	basic := &BasicTransferAdapter{hc}
 	client := &HTTPClient{
-		client:        hc,
-		endpoint:      strings.TrimSuffix(endpoint.String(), "/"),
-		transfers:     []string{basic.Name()},
-		activeAdapter: basic,
+		client:   hc,
+		endpoint: strings.TrimSuffix(endpoint.String(), "/"),
+		transfers: map[string]TransferAdapter{
+			basic.Name(): basic,
+		},
+		transferNames: []string{basic.Name()},
 	}
 
 	return client
@@ -63,7 +65,7 @@ func (c *HTTPClient) batch(ctx context.Context, operation string, objects []Poin
 
 	url := fmt.Sprintf("%s/objects/batch", c.endpoint)
 
-	request := &BatchRequest{operation, c.transfers, nil, objects}
+	request := &BatchRequest{operation, c.transferNames, nil, objects}
 	payload := new(bytes.Buffer)
 	err := json.NewEncoder(payload).Encode(request)
 	if err != nil {
@@ -121,6 +123,11 @@ func (c *HTTPClient) performOperation(ctx context.Context, objects []Pointer, dc
 		return err
 	}
 
+	transferAdapter, ok := c.transfers[result.Transfer]
+	if !ok {
+		return fmt.Errorf("TransferAdapter not found: %s", result.Transfer)
+	}
+
 	for _, object := range result.Objects {
 		if object.Error != nil {
 			objectError := errors.New(object.Error.Message)
@@ -154,15 +161,15 @@ func (c *HTTPClient) performOperation(ctx context.Context, objects []Pointer, dc
 				return err
 			}
 
-			err = c.activeAdapter.Upload(ctx, link, object.Pointer, content)
+			err = transferAdapter.Upload(ctx, link, object.Pointer, content)
 
 			if err != nil {
 				return err
 			}
 
 			link, ok = object.Actions["verify"]
 			if ok {
-				if err := c.activeAdapter.Verify(ctx, link, object.Pointer); err != nil {
+				if err := transferAdapter.Verify(ctx, link, object.Pointer); err != nil {
 					return err
 				}
 			}
@@ -173,7 +180,7 @@ func (c *HTTPClient) performOperation(ctx context.Context, objects []Pointer, dc
 				return errors.New("missing action 'download'")
 			}
 
-			content, err := c.activeAdapter.Download(ctx, link)
+			content, err := transferAdapter.Download(ctx, link)
 			if err != nil {
 				return err
 			}

modules/lfs/http_client_test.go

@@ -195,31 +195,36 @@ func TestHTTPClientDownload(t *testing.T) {
 			expectederror: "",
 		},
 		// case 4
+		{
+			endpoint:      "https://unknown-transfer-adapter.io",
+			expectederror: "TransferAdapter not found: ",
+		},
+		// case 5
 		{
 			endpoint:      "https://error-in-response-objects.io",
 			expectederror: "Object not found",
 		},
-		// case 5
+		// case 6
 		{
 			endpoint:      "https://empty-actions-map.io",
 			expectederror: "missing action 'download'",
 		},
-		// case 6
+		// case 7
 		{
 			endpoint:      "https://download-actions-map.io",
 			expectederror: "",
 		},
-		// case 7
+		// case 8
 		{
 			endpoint:      "https://upload-actions-map.io",
 			expectederror: "missing action 'download'",
 		},
-		// case 8
+		// case 9
 		{
 			endpoint:      "https://verify-actions-map.io",
 			expectederror: "missing action 'download'",
 		},
-		// case 9
+		// case 10
 		{
 			endpoint:      "https://unknown-actions-map.io",
 			expectederror: "missing action 'download'",
@@ -228,10 +233,12 @@ func TestHTTPClientDownload(t *testing.T) {
 
 	for n, c := range cases {
 		client := &HTTPClient{
-			client:        hc,
-			endpoint:      c.endpoint,
-			transfers:     []string{"dummy"},
-			activeAdapter: dummy,
+			client:   hc,
+			endpoint: c.endpoint,
+			transfers: map[string]TransferAdapter{
+				"dummy": dummy,
+			},
+			transferNames: []string{"dummy"},
 		}
 
 		err := client.Download(context.Background(), []Pointer{p}, func(p Pointer, content io.ReadCloser, objectError error) error {
@@ -297,31 +304,36 @@ func TestHTTPClientUpload(t *testing.T) {
 			expectederror: "",
 		},
 		// case 4
+		{
+			endpoint:      "https://unknown-transfer-adapter.io",
+			expectederror: "TransferAdapter not found: ",
+		},
+		// case 5
 		{
 			endpoint:      "https://error-in-response-objects.io",
 			expectederror: "Object not found",
 		},
-		// case 5
+		// case 6
 		{
 			endpoint:      "https://empty-actions-map.io",
 			expectederror: "",
 		},
-		// case 6
+		// case 7
 		{
 			endpoint:      "https://download-actions-map.io",
 			expectederror: "missing action 'upload'",
 		},
-		// case 7
+		// case 8
 		{
 			endpoint:      "https://upload-actions-map.io",
 			expectederror: "",
 		},
-		// case 8
+		// case 9
 		{
 			endpoint:      "https://verify-actions-map.io",
 			expectederror: "missing action 'upload'",
 		},
-		// case 9
+		// case 10
 		{
 			endpoint:      "https://unknown-actions-map.io",
 			expectederror: "missing action 'upload'",
@@ -330,10 +342,12 @@ func TestHTTPClientUpload(t *testing.T) {
 
 	for n, c := range cases {
 		client := &HTTPClient{
-			client:        hc,
-			endpoint:      c.endpoint,
-			transfers:     []string{"dummy"},
-			activeAdapter: dummy,
+			client:   hc,
+			endpoint: c.endpoint,
+			transfers: map[string]TransferAdapter{
+				"dummy": dummy,
+			},
+			transferNames: []string{"dummy"},
 		}
 
 		err := client.Upload(context.Background(), []Pointer{p}, func(p Pointer, objectError error) (io.ReadCloser, error) {