Skip to content

Commit

Permalink
vendor, internal/build: fix OpenBSD by bumping Azure libs (#17966)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
alexandervdm authored and karalabe committed Jul 23, 2019
1 parent 4f56790 commit 57d9c93
Show file tree
Hide file tree
Showing 97 changed files with 37,890 additions and 1,075 deletions.
20 changes: 16 additions & 4 deletions internal/build/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"net/url"
"os"

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

// AzureBlobstoreConfig is an authentication and configuration struct containing
Expand All @@ -45,7 +45,11 @@ func AzureBlobstoreUpload(path string, name string, config AzureBlobstoreConfig)
return nil
}
// Create an authenticated client against the Azure cloud
credential := azblob.NewSharedKeyCredential(config.Account, config.Token)
credential, err := azblob.NewSharedKeyCredential(config.Account, config.Token)
if err != nil {
return err
}

pipeline := azblob.NewPipeline(credential, azblob.PipelineOptions{})

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

// AzureBlobstoreList lists all the files contained within an azure blobstore.
func AzureBlobstoreList(config AzureBlobstoreConfig) ([]azblob.BlobItem, error) {
credential := azblob.NewSharedKeyCredential(config.Account, config.Token)
credential, err := azblob.NewSharedKeyCredential(config.Account, config.Token)
if err != nil {
return nil, err
}

pipeline := azblob.NewPipeline(credential, azblob.PipelineOptions{})

u, _ := url.Parse(fmt.Sprintf("https://%s.blob.core.windows.net", config.Account))
Expand Down Expand Up @@ -95,7 +103,11 @@ func AzureBlobstoreDelete(config AzureBlobstoreConfig, blobs []azblob.BlobItem)
return nil
}
// Create an authenticated client against the Azure cloud
credential := azblob.NewSharedKeyCredential(config.Account, config.Token)
credential, err := azblob.NewSharedKeyCredential(config.Account, config.Token)
if err != nil {
return err
}

pipeline := azblob.NewPipeline(credential, azblob.PipelineOptions{})

u, _ := url.Parse(fmt.Sprintf("https://%s.blob.core.windows.net", config.Account))
Expand Down
31 changes: 30 additions & 1 deletion vendor/github.com/Azure/azure-pipeline-go/pipeline/core.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/Azure/azure-pipeline-go/pipeline/defaultlog.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

88 changes: 74 additions & 14 deletions vendor/github.com/Azure/azure-pipeline-go/pipeline/error.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Loading

0 comments on commit 57d9c93

Please sign in to comment.