Adding content type for azureblobstorage output (#50)

P1llus · web-flow · commit 7ae23560e53c · 2023-01-25T13:23:50.000+01:00
* Adding content type for azureblobstorage

* update changelog and go mod

* go mod tidy
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Removed
 
+## [0.9.1]
+
+### Changed
+
+- Modified azureblobstorage output to use correct content type header: [#50](https://github.com/elastic/stream/pull/50)
+
 ## [0.9.0]
 
 ### Added
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	cloud.google.com/go/pubsub v1.25.1
 	cloud.google.com/go/storage v1.28.0
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.5.1
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1
 	github.com/Shopify/sarama v1.36.0
 	github.com/elastic/go-concert v0.2.0
 	github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f
diff --git a/go.sum b/go.sum
@@ -49,8 +49,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.4/go.mod h1:uGG2W01BaETf0Ozp+Q
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 h1:QkAcEIAKbNL4KoFr4SathZPhDhF4mVwpBMFlYjyAqy8=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.1 h1:XUNQ4mw+zJmaA2KXzP9JlQiecy1SI+Eog7xVkPiqIbg=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.1/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.5.1 h1:BMTdr+ib5ljLa9MxTJK8x/Ds0MbBb4MfuW5BL0zMJnI=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.5.1/go.mod h1:c6WvOhtmjNUWbLfOG1qxM/q0SPvQNSVJvolm+C52dIU=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 h1:YvQv9Mz6T8oR5ypQOL6erY0Z5t71ak1uHV4QFokCOZk=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1/go.mod h1:c6WvOhtmjNUWbLfOG1qxM/q0SPvQNSVJvolm+C52dIU=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 h1:BWe8a+f/t+7KY7zH2mqygeUD0t8hNFXe08p1Pb3/jKE=
diff --git a/pkg/output/azureblobstorage/azure_blob_storage.go b/pkg/output/azureblobstorage/azure_blob_storage.go
@@ -11,6 +11,7 @@ import (
 	"github.com/elastic/stream/pkg/output"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
+	blobalias "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"
 )
 
 func init() {
@@ -47,7 +48,13 @@ func (*Output) Close() error {
 }
 
 func (o *Output) Write(b []byte) (int, error) {
-	_, err := o.client.UploadBuffer(context.Background(), o.opts.AzureBlobStorageOptions.Container, o.opts.AzureBlobStorageOptions.Blob, b, nil)
+	cType := "application/json"
+	options := azblob.UploadBufferOptions{
+		HTTPHeaders: &blobalias.HTTPHeaders{
+			BlobContentType: &cType,
+		},
+	}
+	_, err := o.client.UploadBuffer(context.Background(), o.opts.AzureBlobStorageOptions.Container, o.opts.AzureBlobStorageOptions.Blob, b, &options)
 	if err != nil {
 		return 0, fmt.Errorf("failed to upload file to blob: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"github.com/elastic/stream/pkg/output"`
`12`	`12`
`13`	`13`	`"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"`
	`14`	`+ blobalias "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"`
`14`	`15`	`)`
`15`	`16`
`16`	`17`	`func init() {`
`@@ -47,7 +48,13 @@ func (*Output) Close() error {`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`func (o *Output) Write(b []byte) (int, error) {`
`50`		`- _, err := o.client.UploadBuffer(context.Background(), o.opts.AzureBlobStorageOptions.Container, o.opts.AzureBlobStorageOptions.Blob, b, nil)`
	`51`	`+ cType := "application/json"`
	`52`	`+ options := azblob.UploadBufferOptions{`
	`53`	`+ HTTPHeaders: &blobalias.HTTPHeaders{`
	`54`	`+ BlobContentType: &cType,`
	`55`	`+ },`
	`56`	`+ }`
	`57`	`+ _, err := o.client.UploadBuffer(context.Background(), o.opts.AzureBlobStorageOptions.Container, o.opts.AzureBlobStorageOptions.Blob, b, &options)`
`51`	`58`	`if err != nil {`
`52`	`59`	`return 0, fmt.Errorf("failed to upload file to blob: %w", err)`
`53`	`60`	`}`