Add generated TUS protocol canary

checksum/hash_test.go

@@ -75,4 +75,3 @@ var _ = Describe("HashBase64ReadWriter", func() {
 		})
 	})
 })
-

client.go

@@ -17,7 +17,7 @@ import (
 // headed to
 func NewClient(client *http.Client, baseURL *url.URL) *Client {
 	c := &Client{
-		ProtocolVersion: "1.0.0",
+		ProtocolVersion: DefaultProtocolVersion,
 		GetRequest:      newRequest,
 		client:          client,
 		BaseURL:         baseURL,
@@ -49,7 +49,7 @@ type Client struct {
 	// BaseURL is base url the client making queries to. For example, "http://example.com/files"
 	BaseURL *url.URL
 
-	// ProtocolVersion is TUS protocol version will be used in requests. Default is "1.0.0"
+	// ProtocolVersion is TUS protocol version will be used in requests. Default is DefaultProtocolVersion.
 	ProtocolVersion string
 
 	// Server capabilities and settings. Use UpdateCapabilities to query the capabilities from a server
@@ -237,6 +237,9 @@ func (c *Client) CreateUploadWithData(u *Upload, data []byte, remoteSize int64,
 	s.ChunkSize = int64(len(data)) // Data must be uploaded in one request
 	s.uploadMethod = http.MethodPost
 	headers := map[string]string{"Upload-Length": strconv.Itoa(int(remoteSize)), "Upload-Offset": ""}
+	if headerName, value, ok := protocolUploadCompleteHeader(c.ProtocolVersion, true); ok {
+		headers[headerName] = value
+	}
 	if partial {
 		headers["Upload-Concat"] = "partial"
 	}
@@ -429,8 +432,18 @@ func (c *Client) UpdateCapabilities() (response *http.Response, err error) {
 }
 
 func (c *Client) tusRequest(ctx context.Context, req *http.Request) (response *http.Response, err error) {
-	if req.Method != http.MethodOptions && req.Header.Get("Tus-Resumable") == "" {
-		req.Header.Set("Tus-Resumable", c.ProtocolVersion)
+	if req.Method != http.MethodOptions {
+		requestHeaders, ok := protocolRequestHeaders(c.ProtocolVersion)
+		if !ok {
+			err = ErrProtocol.WithText(fmt.Sprintf("unsupported protocol version %q", c.ProtocolVersion))
+			return
+		}
+		for headerName, value := range requestHeaders {
+			if req.Header.Get(headerName) != "" {
+				continue
+			}
+			req.Header.Set(headerName, value)
+		}
 	}
 	if ctx != nil {
 		req = req.WithContext(ctx)

examples/api2-devdock-transloadit-assembly-upload/main.go

@@ -0,0 +1,90 @@
+//go:build api2devdock
+
+package main
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"time"
+
+	tusgo "github.com/bdragon300/tusgo"
+	"github.com/bdragon300/tusgo/examples/api2devdock"
+)
+
+func uploadWithTus(
+	ctx context.Context,
+	scenario map[string]interface{},
+	createResponse map[string]interface{},
+) (string, error) {
+	endpointURL, err := api2devdock.TusURL(scenario, createResponse)
+	if err != nil {
+		return "", err
+	}
+	content, err := api2devdock.ScenarioBytes(scenario)
+	if err != nil {
+		return "", err
+	}
+	if err := api2devdock.RequireFullFileChunkSize(scenario); err != nil {
+		return "", err
+	}
+	metadata, err := api2devdock.UploadMetadata(scenario, createResponse)
+	if err != nil {
+		return "", err
+	}
+
+	client := tusgo.NewClient(http.DefaultClient, endpointURL).WithContext(ctx)
+	upload := tusgo.Upload{}
+	if _, err := client.CreateUpload(&upload, int64(len(content)), false, metadata); err != nil {
+		return "", err
+	}
+	if upload.Location == "" {
+		return "", fmt.Errorf("created upload did not include a Location")
+	}
+
+	stream := tusgo.NewUploadStream(client, &upload)
+	stream.ChunkSize = tusgo.NoChunked
+	written, err := stream.Write(content)
+	if err != nil {
+		return "", err
+	}
+	if written != len(content) {
+		return "", fmt.Errorf("wrote %d bytes, expected %d", written, len(content))
+	}
+	if upload.RemoteOffset != int64(len(content)) {
+		return "", fmt.Errorf("remote offset %d, expected %d", upload.RemoteOffset, len(content))
+	}
+
+	return upload.Location, nil
+}
+
+func main() {
+	ctx, cancel := context.WithTimeout(context.Background(), 90*time.Second)
+	defer cancel()
+
+	scenario, err := api2devdock.LoadScenario(
+		"examples/api2-devdock-transloadit-assembly-upload/api2-scenario.json",
+	)
+	if err != nil {
+		api2devdock.Fail("load scenario: %v", err)
+	}
+
+	createResponse, err := api2devdock.CreateResponseFromScenario(scenario)
+	if err != nil {
+		api2devdock.Fail("read prepared create response: %v", err)
+	}
+
+	uploadURL, err := uploadWithTus(ctx, scenario, createResponse)
+	if err != nil {
+		api2devdock.Fail("upload: %v", err)
+	}
+	if err := api2devdock.WriteResult(map[string]interface{}{"uploadUrl": uploadURL}); err != nil {
+		api2devdock.Fail("write result: %v", err)
+	}
+
+	scenarioID, err := api2devdock.ScenarioID(scenario)
+	if err != nil {
+		api2devdock.Fail("read scenario id: %v", err)
+	}
+	fmt.Printf("Go TUS SDK devdock scenario %s uploaded to %s\n", scenarioID, uploadURL)
+}