Adjusted code according to recommendations from #54

Signed-off-by: Felix Reyn <[email protected]>
concourse · Oct 18, 2016 · b8981c5 · b8981c5
1 parent 7b01227
commit b8981c5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/out/models.go b/out/models.go
@@ -14,7 +14,7 @@ type Params struct {
 	File        string `json:"file"`
 	To          string `json:"to"`
 	Acl         string `json:"acl"`
-	ContentType string `json:"content-type"`
+	ContentType string `json:"content_type"`
 }
 
 type OutResponse struct {

diff --git a/out/out_command.go b/out/out_command.go
@@ -61,10 +61,7 @@ func (command *OutCommand) Run(sourceDir string, request OutRequest) (OutRespons
 		options.Acl = request.Params.Acl
 	}
 
-	if request.Params.ContentType != "" {
-		options.ContentType = request.Params.ContentType
-	}
-
+	options.ContentType = request.Params.ContentType
 	options.ServerSideEncryption = request.Source.ServerSideEncryption
 	options.KmsKeyId = request.Source.SSEKMSKeyId
 

diff --git a/scripts/test b/scripts/test
@@ -16,6 +16,4 @@ fi
 
 cd $s3_resource_dir
 
-counterfeiter -o fakes/fake_s3client.go .  S3Client
-
 ginkgo -r -p -skipPackage integration
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,4 @@ fi

		cd $s3_resource_dir

		counterfeiter -o fakes/fake_s3client.go . S3Client

		ginkgo -r -p -skipPackage integration