Need .zip for GCP cloudbuild railpack (#1362)

Author: KevyVo

src/pkg/cli/compose/context.go

@@ -74,10 +74,17 @@ defang.exe
 .defang`
 )
 
-type ArchiveType string
+type ArchiveType struct {
+	MimeType  MimeType
+	Extension string
+}
+
+type MimeType string
 
-const ArchiveTypeZip ArchiveType = "application/zip"
-const ArchiveTypeGzip ArchiveType = "application/gzip"
+var (
+	ArchiveTypeZip  = ArchiveType{MimeType: "application/zip", Extension: ".zip"}
+	ArchiveTypeGzip = ArchiveType{MimeType: "application/gzip", Extension: ".tar.gz"}
+)
 
 type WriterFactory interface {
 	CreateHeader(info fs.FileInfo, slashPath string) (io.Writer, error)
@@ -226,14 +233,19 @@ func getRemoteBuildContext(ctx context.Context, provider client.Provider, projec
 
 func uploadArchive(ctx context.Context, provider client.Provider, project string, body io.Reader, contentType ArchiveType, digest string) (string, error) {
 	// Upload the archive to the fabric controller storage;; TODO: use a streaming API
+	if contentType.MimeType == ArchiveTypeZip.MimeType {
+		digest = digest + ArchiveTypeZip.Extension
+	} else {
+		digest = digest + ArchiveTypeGzip.Extension
+	}
 	ureq := &defangv1.UploadURLRequest{Digest: digest, Project: project}
 	res, err := provider.CreateUploadURL(ctx, ureq)
 	if err != nil {
 		return "", err
 	}
 
 	// Do an HTTP PUT to the generated URL
-	resp, err := http.Put(ctx, res.Url, string(contentType), body)
+	resp, err := http.Put(ctx, res.Url, string(contentType.MimeType), body)
 	if err != nil {
 		return "", err
 	}

src/pkg/cli/compose/context_test.go

@@ -49,41 +49,72 @@ func TestUploadArchive(t *testing.T) {
 		if !strings.HasPrefix(r.URL.Path, path) {
 			t.Errorf("Expected prefix %v, got %v", path, r.URL.Path)
 		}
-		if !(r.Header.Get("Content-Type") == string(ArchiveTypeGzip) || r.Header.Get("Content-Type") == string(ArchiveTypeZip)) {
+		if !(r.Header.Get("Content-Type") == string(ArchiveTypeGzip.MimeType) || r.Header.Get("Content-Type") == string(ArchiveTypeZip.MimeType)) {
 			t.Errorf("Expected Content-Type: application/gzip or application/zip, got %v", r.Header.Get("Content-Type"))
 		}
 		w.WriteHeader(200)
 	}))
 	defer server.Close()
 
-	t.Run("upload with digest", func(t *testing.T) {
+	t.Run("upload tar with digest", func(t *testing.T) {
 		url, err := uploadArchive(context.Background(), client.MockProvider{UploadUrl: server.URL + path}, "testproj", &bytes.Buffer{}, ArchiveTypeGzip, digest)
 		if err != nil {
 			t.Fatalf("uploadArchive() failed: %v", err)
 		}
-		const expectedPath = path + digest
+		var expectedPath = path + digest + ArchiveTypeGzip.Extension
 		if url != server.URL+expectedPath {
 			t.Errorf("Expected %v, got %v", server.URL+expectedPath, url)
 		}
+	})
 
-		t.Run("upload with zip", func(t *testing.T) {
-			url, err := uploadArchive(context.Background(), client.MockProvider{UploadUrl: server.URL + path}, "testproj", &bytes.Buffer{}, ArchiveTypeZip, "")
-			if err != nil {
-				t.Fatalf("uploadContent() failed: %v", err)
-			}
-			if url != server.URL+path {
-				t.Errorf("Expected %v, got %v", server.URL+path, url)
-			}
-		})
+	t.Run("upload zip with digest", func(t *testing.T) {
+		url, err := uploadArchive(context.Background(), client.MockProvider{UploadUrl: server.URL + path}, "testproj", &bytes.Buffer{}, ArchiveTypeZip, digest)
+		if err != nil {
+			t.Fatalf("uploadArchive() failed: %v", err)
+		}
+		var expectedPath = path + digest + ArchiveTypeZip.Extension
+		if url != server.URL+expectedPath {
+			t.Errorf("Expected %v, got %v", server.URL+expectedPath, url)
+		}
+	})
+
+	t.Run("upload with zip", func(t *testing.T) {
+		url, err := uploadArchive(context.Background(), client.MockProvider{UploadUrl: server.URL + path}, "testproj", &bytes.Buffer{}, ArchiveTypeZip, "")
+		if err != nil {
+			t.Fatalf("uploadContent() failed: %v", err)
+		}
+		if url != server.URL+path+ArchiveTypeZip.Extension {
+			t.Errorf("Expected %v, got %v", server.URL+path+ArchiveTypeZip.Extension, url)
+		}
+	})
+
+	t.Run("upload with tar", func(t *testing.T) {
+		url, err := uploadArchive(context.Background(), client.MockProvider{UploadUrl: server.URL + path}, "testproj", &bytes.Buffer{}, ArchiveTypeGzip, "")
+		if err != nil {
+			t.Fatalf("uploadContent() failed: %v", err)
+		}
+		if url != server.URL+path+ArchiveTypeGzip.Extension {
+			t.Errorf("Expected %v, got %v", server.URL+path+ArchiveTypeGzip.Extension, url)
+		}
 	})
 
-	t.Run("force upload without digest", func(t *testing.T) {
+	t.Run("force upload tar without digest", func(t *testing.T) {
 		url, err := uploadArchive(context.Background(), client.MockProvider{UploadUrl: server.URL + path}, "testproj", &bytes.Buffer{}, ArchiveTypeGzip, "")
 		if err != nil {
 			t.Fatalf("uploadArchive() failed: %v", err)
 		}
-		if url != server.URL+path {
-			t.Errorf("Expected %v, got %v", server.URL+path, url)
+		if url != server.URL+path+ArchiveTypeGzip.Extension {
+			t.Errorf("Expected %v, got %v", server.URL+path+ArchiveTypeGzip.Extension, url)
+		}
+	})
+
+	t.Run("force upload zip without digest", func(t *testing.T) {
+		url, err := uploadArchive(context.Background(), client.MockProvider{UploadUrl: server.URL + path}, "testproj", &bytes.Buffer{}, ArchiveTypeZip, "")
+		if err != nil {
+			t.Fatalf("uploadArchive() failed: %v", err)
+		}
+		if url != server.URL+path+ArchiveTypeZip.Extension {
+			t.Errorf("Expected %v, got %v", server.URL+path+ArchiveTypeZip.Extension, url)
 		}
 	})
 }