replace formcontent

pivotal-cf · Jul 23, 2018 · 0512d38 · 0512d38
1 parent 0afeab6
commit 0512d38
Show file tree

Hide file tree

Showing 15 changed files with 336 additions and 353 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -8,3 +8,7 @@
 [[constraint]]
   name = "github.com/pivotal-cf/kiln"
   branch = "master"
+
+[[constraint]]
+  name = "github.com/fredwangwang/formcontent"
+  branch = "threaded"
diff --git a/commands/fakes/multipart.go b/commands/fakes/multipart.go
diff --git a/commands/import_installation.go b/commands/import_installation.go
@@ -67,17 +67,17 @@ func (ii ImportInstallation) Execute(args []string) error {
 		return fmt.Errorf("failed to insert passphrase: %s", err)
 	}
 
-	submission, err := ii.multipart.Finalize()
+	submission := ii.multipart.Finalize()
 	if err != nil {
 		return fmt.Errorf("failed to create multipart form: %s", err)
 	}
 
 	ii.logger.Printf("beginning installation import to Ops Manager")
 
 	err = ii.service.UploadInstallationAssetCollection(api.ImportInstallationInput{
-		ContentLength:   submission.Length,
 		Installation:    submission.Content,
 		ContentType:     submission.ContentType,
+		ContentLength:   submission.ContentLength,
 		PollingInterval: ii.Options.PollingInterval,
 	})
 	if err != nil {