Skip to content

Commit 57d9c93

Browse files
alexandervdmkaralabe
authored andcommitted
vendor, internal/build: fix OpenBSD by bumping Azure libs (#17966)
* bump azure-storage-blob-go dependency to 0.3.0 release * update azure-storage-blob-go module import path * fix multiple return values on azblob.NewSharedKeyCredential * vendor: bump Azure libs to latest from upstream
1 parent 4f56790 commit 57d9c93

File tree

97 files changed

+37890
-1075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+37890
-1075
lines changed

internal/build/azure.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"net/url"
2323
"os"
2424

25-
"github.com/Azure/azure-storage-blob-go/2018-03-28/azblob"
25+
"github.com/Azure/azure-storage-blob-go/azblob"
2626
)
2727

2828
// AzureBlobstoreConfig is an authentication and configuration struct containing
@@ -45,7 +45,11 @@ func AzureBlobstoreUpload(path string, name string, config AzureBlobstoreConfig)
4545
return nil
4646
}
4747
// Create an authenticated client against the Azure cloud
48-
credential := azblob.NewSharedKeyCredential(config.Account, config.Token)
48+
credential, err := azblob.NewSharedKeyCredential(config.Account, config.Token)
49+
if err != nil {
50+
return err
51+
}
52+
4953
pipeline := azblob.NewPipeline(credential, azblob.PipelineOptions{})
5054

5155
u, _ := url.Parse(fmt.Sprintf("https://%s.blob.core.windows.net", config.Account))
@@ -67,7 +71,11 @@ func AzureBlobstoreUpload(path string, name string, config AzureBlobstoreConfig)
6771

6872
// AzureBlobstoreList lists all the files contained within an azure blobstore.
6973
func AzureBlobstoreList(config AzureBlobstoreConfig) ([]azblob.BlobItem, error) {
70-
credential := azblob.NewSharedKeyCredential(config.Account, config.Token)
74+
credential, err := azblob.NewSharedKeyCredential(config.Account, config.Token)
75+
if err != nil {
76+
return nil, err
77+
}
78+
7179
pipeline := azblob.NewPipeline(credential, azblob.PipelineOptions{})
7280

7381
u, _ := url.Parse(fmt.Sprintf("https://%s.blob.core.windows.net", config.Account))
@@ -95,7 +103,11 @@ func AzureBlobstoreDelete(config AzureBlobstoreConfig, blobs []azblob.BlobItem)
95103
return nil
96104
}
97105
// Create an authenticated client against the Azure cloud
98-
credential := azblob.NewSharedKeyCredential(config.Account, config.Token)
106+
credential, err := azblob.NewSharedKeyCredential(config.Account, config.Token)
107+
if err != nil {
108+
return err
109+
}
110+
99111
pipeline := azblob.NewPipeline(credential, azblob.PipelineOptions{})
100112

101113
u, _ := url.Parse(fmt.Sprintf("https://%s.blob.core.windows.net", config.Account))

vendor/github.com/Azure/azure-pipeline-go/pipeline/core.go

Lines changed: 30 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-pipeline-go/pipeline/defaultlog.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-pipeline-go/pipeline/defaultlog_syslog.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-pipeline-go/pipeline/defaultlog_windows.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-pipeline-go/pipeline/error.go

Lines changed: 74 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-pipeline-go/pipeline/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-storage-blob-go/2018-03-28/azblob/version.go

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)