diff --git a/CHANGELOG.md b/CHANGELOG.md index da82c6c599fe..98e79b903a04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,17 @@ FEATURES: IMPROVEMENTS: + * cli/revoke: Add `-self` option to allow revoking the currently active token + [GH-2596] * secret/pki: Add `no_store` option that allows certificates to be issued without being stored. This removes the ability to look up and/or add to a CRL but helps with scaling to very large numbers of certificates. [GH-2565] + * storage/etcd3: Add `discovery_srv` option to query for SRV records to find + servers [GH-2521] * storage/s3: Support `max_parallel` option to limit concurrent outstanding requests [GH-2466] * storage/s3: Use pooled transport for http client [GH-2481] - * storage/etcd3: Add `discovery_srv` option to query for SRV records to find - servers [GH-2521] + * storage/swift: Allow domain values for V3 authentication [GH-2554] BUG FIXES: diff --git a/builtin/logical/cassandra/util.go b/builtin/logical/cassandra/util.go index 7ec310a284c9..ef3d1ee2ed64 100644 --- a/builtin/logical/cassandra/util.go +++ b/builtin/logical/cassandra/util.go @@ -76,7 +76,7 @@ func createSession(cfg *sessionConfig, s logical.Storage) (*gocql.Session, error } clusterConfig.SslOpts = &gocql.SslOptions{ - Config: *tlsConfig, + Config: tlsConfig, } } diff --git a/command/token_revoke.go b/command/token_revoke.go index a308e634213c..6e4105d0f20f 100644 --- a/command/token_revoke.go +++ b/command/token_revoke.go @@ -15,8 +15,11 @@ type TokenRevokeCommand struct { func (c *TokenRevokeCommand) Run(args []string) int { var mode string var accessor bool + var self bool + var token string flags := c.Meta.FlagSet("token-revoke", meta.FlagSetDefault) flags.BoolVar(&accessor, "accessor", false, "") + flags.BoolVar(&self, "self", false, "") flags.StringVar(&mode, "mode", "", "") flags.Usage = func() { c.Ui.Error(c.Help()) } if err := flags.Parse(args); err != nil { @@ -24,15 +27,21 @@ func (c *TokenRevokeCommand) Run(args []string) int { } args = flags.Args() - if len(args) != 1 { + switch { + case len(args) == 1 && !self: + token = args[0] + case len(args) != 0 && self: + flags.Usage() + c.Ui.Error(fmt.Sprintf( + "\ntoken-revoke expects no arguments when revoking self")) + return 1 + case len(args) != 1 && !self: flags.Usage() c.Ui.Error(fmt.Sprintf( - "\ntoken-revoke expects one argument")) + "\ntoken-revoke expects one argument or the 'self' flag")) return 1 } - token := args[0] - client, err := c.Client() if err != nil { c.Ui.Error(fmt.Sprintf( @@ -43,14 +52,22 @@ func (c *TokenRevokeCommand) Run(args []string) int { var fn func(string) error // Handle all 6 possible combinations switch { - case !accessor && mode == "": + case !accessor && self && mode == "": + fn = client.Auth().Token().RevokeSelf + case !accessor && !self && mode == "": fn = client.Auth().Token().RevokeTree - case !accessor && mode == "orphan": + case !accessor && !self && mode == "orphan": fn = client.Auth().Token().RevokeOrphan - case !accessor && mode == "path": + case !accessor && !self && mode == "path": fn = client.Sys().RevokePrefix - case accessor && mode == "": + case accessor && !self && mode == "": fn = client.Auth().Token().RevokeAccessor + case accessor && self: + c.Ui.Error("token-revoke cannot be run on self when 'accessor' flag is set") + return 1 + case self && mode != "": + c.Ui.Error("token-revoke cannot be run on self when 'mode' flag is set") + return 1 case accessor && mode == "orphan": c.Ui.Error("token-revoke cannot be run for 'orphan' mode when 'accessor' flag is set") return 1 @@ -110,6 +127,8 @@ Token Options: via '/auth/token/lookup-accessor/' endpoint. Accessor is used when there is no access to token ID. + -self A boolean flag, if set, the operation is performed on the currently + authenticated token i.e. lookup-self. -mode=value The type of revocation to do. See the documentation above for more information. diff --git a/physical/azure.go b/physical/azure.go index b12315f2ca38..4d5083e71411 100644 --- a/physical/azure.go +++ b/physical/azure.go @@ -12,7 +12,7 @@ import ( log "github.com/mgutz/logxi/v1" - "github.com/Azure/azure-sdk-for-go/storage" + "github.com/Azure/azure-storage-go" "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" ) @@ -59,12 +59,23 @@ func newAzureBackend(conf map[string]string, logger log.Logger) (Backend, error) } client, err := storage.NewBasicClient(accountName, accountKey) - if err != nil { - return nil, fmt.Errorf("Failed to create Azure client: %v", err) + return nil, fmt.Errorf("failed to create Azure client: %v", err) } - client.GetBlobService().CreateContainerIfNotExists(container, storage.ContainerAccessTypePrivate) + contObj := client.GetBlobService().GetContainerReference(container) + created, err := contObj.CreateIfNotExists() + if err != nil { + return nil, fmt.Errorf("failed to upsert container: %v", err) + } + if created { + err = contObj.SetPermissions(storage.ContainerPermissions{ + AccessType: storage.ContainerAccessTypePrivate, + }, 0, "") + if err != nil { + return nil, fmt.Errorf("failed to set permissions on newly-created container: %v", err) + } + } maxParStr, ok := conf["max_parallel"] var maxParInt int @@ -156,7 +167,8 @@ func (a *AzureBackend) List(prefix string) ([]string, error) { a.permitPool.Acquire() defer a.permitPool.Release() - list, err := a.client.ListBlobs(a.container, storage.ListBlobsParameters{Prefix: prefix}) + contObj := a.client.GetContainerReference(a.container) + list, err := contObj.ListBlobs(storage.ListBlobsParameters{Prefix: prefix}) if err != nil { // Break early. diff --git a/physical/azure_test.go b/physical/azure_test.go index 18f23cfa3ccf..135e6587ef72 100644 --- a/physical/azure_test.go +++ b/physical/azure_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/vault/helper/logformat" log "github.com/mgutz/logxi/v1" - "github.com/Azure/azure-sdk-for-go/storage" + "github.com/Azure/azure-storage-go" ) func TestAzureBackend(t *testing.T) { @@ -35,7 +35,8 @@ func TestAzureBackend(t *testing.T) { }) defer func() { - cleanupClient.GetBlobService().DeleteContainerIfExists(container) + contObj := cleanupClient.GetBlobService().GetContainerReference(container) + contObj.DeleteIfExists() }() if err != nil { diff --git a/physical/swift.go b/physical/swift.go index b3940c69d252..0ed4fe61cf6a 100644 --- a/physical/swift.go +++ b/physical/swift.go @@ -58,17 +58,36 @@ func newSwiftBackend(conf map[string]string, logger log.Logger) (Backend, error) return nil, fmt.Errorf("missing container") } } - tenant := os.Getenv("OS_TENANT_NAME") - if tenant == "" { - tenant = conf["tenant"] + project := os.Getenv("OS_PROJECT_NAME") + if project == "" { + project = conf["project"] + + if project == "" { + // Check for KeyStone naming prior to V3 + project := os.Getenv("OS_TENANT_NAME") + if project == "" { + project = conf["tenant"] + } + } + } + + domain := os.Getenv("OS_USER_DOMAIN_NAME") + if domain == "" { + domain = conf["domain"] + } + projectDomain := os.Getenv("OS_PROJECT_DOMAIN_NAME") + if projectDomain == "" { + projectDomain = conf["project-domain"] } c := swift.Connection{ - UserName: username, - ApiKey: password, - AuthUrl: authUrl, - Tenant: tenant, - Transport: cleanhttp.DefaultPooledTransport(), + Domain: domain, + UserName: username, + ApiKey: password, + AuthUrl: authUrl, + Tenant: project, + TenantDomain: projectDomain, + Transport: cleanhttp.DefaultPooledTransport(), } err := c.Authenticate() diff --git a/physical/swift_test.go b/physical/swift_test.go index e56acaee2519..2da37f043e1d 100644 --- a/physical/swift_test.go +++ b/physical/swift_test.go @@ -21,17 +21,21 @@ func TestSwiftBackend(t *testing.T) { username := os.Getenv("OS_USERNAME") password := os.Getenv("OS_PASSWORD") authUrl := os.Getenv("OS_AUTH_URL") - tenant := os.Getenv("OS_TENANT_NAME") + project := os.Getenv("OS_PROJECT_NAME") + domain := os.Getenv("OS_USER_DOMAIN_NAME") + projectDomain := os.Getenv("OS_PROJECT_DOMAIN_NAME") ts := time.Now().UnixNano() container := fmt.Sprintf("vault-test-%d", ts) cleaner := swift.Connection{ - UserName: username, - ApiKey: password, - AuthUrl: authUrl, - Tenant: tenant, - Transport: cleanhttp.DefaultPooledTransport(), + Domain: domain, + UserName: username, + ApiKey: password, + AuthUrl: authUrl, + Tenant: project, + TenantDomain: projectDomain, + Transport: cleanhttp.DefaultPooledTransport(), } err := cleaner.Authenticate() @@ -63,11 +67,13 @@ func TestSwiftBackend(t *testing.T) { logger := logformat.NewVaultLogger(log.LevelTrace) b, err := NewBackend("swift", logger, map[string]string{ - "username": username, - "password": password, - "container": container, - "auth_url": authUrl, - "tenant": tenant, + "username": username, + "password": password, + "container": container, + "auth_url": authUrl, + "project": project, + "domain": domain, + "project-domain": projectDomain, }) if err != nil { t.Fatalf("err: %s", err) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/LICENSE b/vendor/github.com/Azure/azure-sdk-for-go/LICENSE deleted file mode 100644 index af39a91e7033..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2016 Microsoft Corporation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/github.com/Azure/azure-storage-go/LICENSE b/vendor/github.com/Azure/azure-storage-go/LICENSE new file mode 100644 index 000000000000..4b1ad51b2f0e --- /dev/null +++ b/vendor/github.com/Azure/azure-storage-go/LICENSE @@ -0,0 +1,21 @@ + MIT License + + Copyright (c) Microsoft Corporation. All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE diff --git a/vendor/github.com/Azure/azure-storage-go/README.md b/vendor/github.com/Azure/azure-storage-go/README.md new file mode 100644 index 000000000000..f4af7bf399c4 --- /dev/null +++ b/vendor/github.com/Azure/azure-storage-go/README.md @@ -0,0 +1,10 @@ +# Azure Storage SDK for Go +[![GoDoc](https://godoc.org/github.com/Azure/azure-storage-go?status.svg)](https://godoc.org/github.com/Azure/azure-storage-go) [![Build Status](https://travis-ci.org/Azure/azure-storage-go.svg?branch=master)](https://travis-ci.org/Azure/azure-storage-go) [![Go Report Card](https://goreportcard.com/badge/github.com/Azure/azure-storage-go)](https://goreportcard.com/report/github.com/Azure/azure-storage-go) + +The `github.com/Azure/azure-sdk-for-go/storage` package is used to perform operations in Azure Storage Service. To manage your storage accounts (Azure Resource Manager / ARM), use the [github.com/Azure/azure-sdk-for-go/arm/storage](../arm/storage) package. For your classic storage accounts (Azure Service Management / ASM), use [github.com/Azure/azure-sdk-for-go/management/storageservice](../management/storageservice) package. + +This package includes support for [Azure Storage Emulator](https://azure.microsoft.com/documentation/articles/storage-use-emulator/) + +# Contributing + +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/authorization.go b/vendor/github.com/Azure/azure-storage-go/authorization.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/authorization.go rename to vendor/github.com/Azure/azure-storage-go/authorization.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go b/vendor/github.com/Azure/azure-storage-go/blob.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go rename to vendor/github.com/Azure/azure-storage-go/blob.go index 6b332ea41eeb..636efc662d69 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go +++ b/vendor/github.com/Azure/azure-storage-go/blob.go @@ -157,7 +157,7 @@ const ( // Maximum sizes (per REST API) for various concepts const ( - MaxBlobBlockSize = 4 * 1024 * 1024 + MaxBlobBlockSize = 100 * 1024 * 1024 MaxBlobPageSize = 4 * 1024 * 1024 ) @@ -645,7 +645,7 @@ func (b BlobStorageClient) CreateBlockBlob(container, name string) error { // reader. Size must be the number of bytes read from reader. To // create an empty blob, use size==0 and reader==nil. // -// The API rejects requests with size > 64 MiB (but this limit is not +// The API rejects requests with size > 256 MiB (but this limit is not // checked by the SDK). To write a larger blob, use CreateBlockBlob, // PutBlock, and PutBlockList. // @@ -673,7 +673,7 @@ func (b BlobStorageClient) CreateBlockBlobFromReader(container, name string, siz // PutBlock saves the given data chunk to the specified block blob with // given ID. // -// The API rejects chunks larger than 4 MiB (but this limit is not +// The API rejects chunks larger than 100 MB (but this limit is not // checked by the SDK). // // See https://msdn.microsoft.com/en-us/library/azure/dd135726.aspx @@ -685,7 +685,7 @@ func (b BlobStorageClient) PutBlock(container, name, blockID string, chunk []byt // the block blob with given ID. It is an alternative to PutBlocks where data // comes as stream but the length is known in advance. // -// The API rejects requests with size > 4 MiB (but this limit is not +// The API rejects requests with size > 100 MB (but this limit is not // checked by the SDK). // // See https://msdn.microsoft.com/en-us/library/azure/dd135726.aspx diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/blobserviceclient.go b/vendor/github.com/Azure/azure-storage-go/blobserviceclient.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/blobserviceclient.go rename to vendor/github.com/Azure/azure-storage-go/blobserviceclient.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go b/vendor/github.com/Azure/azure-storage-go/client.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/client.go rename to vendor/github.com/Azure/azure-storage-go/client.go index e42082d4f6bc..9ddbf08aee56 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go +++ b/vendor/github.com/Azure/azure-storage-go/client.go @@ -26,7 +26,7 @@ const ( // DefaultAPIVersion is the Azure Storage API version string used when a // basic client is created. - DefaultAPIVersion = "2015-04-05" + DefaultAPIVersion = "2016-05-31" defaultUseHTTPS = true diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go b/vendor/github.com/Azure/azure-storage-go/container.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/container.go rename to vendor/github.com/Azure/azure-storage-go/container.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/directory.go b/vendor/github.com/Azure/azure-storage-go/directory.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/directory.go rename to vendor/github.com/Azure/azure-storage-go/directory.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/file.go b/vendor/github.com/Azure/azure-storage-go/file.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/file.go rename to vendor/github.com/Azure/azure-storage-go/file.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/fileserviceclient.go b/vendor/github.com/Azure/azure-storage-go/fileserviceclient.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/fileserviceclient.go rename to vendor/github.com/Azure/azure-storage-go/fileserviceclient.go diff --git a/vendor/github.com/Azure/azure-storage-go/glide.lock b/vendor/github.com/Azure/azure-storage-go/glide.lock new file mode 100644 index 000000000000..5d3ce83618a8 --- /dev/null +++ b/vendor/github.com/Azure/azure-storage-go/glide.lock @@ -0,0 +1,14 @@ +hash: a97c0c90fe4d23bbd8e5745431f633e75530bb611131b786d76b8e1763bce85e +updated: 2017-02-23T09:58:57.3701584-08:00 +imports: +- name: github.com/Azure/go-autorest + version: ec5f4903f77ed9927ac95b19ab8e44ada64c1356 + subpackages: + - autorest/azure + - autorest + - autorest/date +- name: github.com/dgrijalva/jwt-go + version: 2268707a8f0843315e2004ee4f1d021dc08baedf +testImports: +- name: gopkg.in/check.v1 + version: 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec diff --git a/vendor/github.com/Azure/azure-storage-go/glide.yaml b/vendor/github.com/Azure/azure-storage-go/glide.yaml new file mode 100644 index 000000000000..e6783b77410b --- /dev/null +++ b/vendor/github.com/Azure/azure-storage-go/glide.yaml @@ -0,0 +1,4 @@ +package: github.com/Azure/azure-sdk-for-go-storage +import: [] +testImport: +- package: gopkg.in/check.v1 diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/queue.go b/vendor/github.com/Azure/azure-storage-go/queue.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/queue.go rename to vendor/github.com/Azure/azure-storage-go/queue.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/queueserviceclient.go b/vendor/github.com/Azure/azure-storage-go/queueserviceclient.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/queueserviceclient.go rename to vendor/github.com/Azure/azure-storage-go/queueserviceclient.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/share.go b/vendor/github.com/Azure/azure-storage-go/share.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/share.go rename to vendor/github.com/Azure/azure-storage-go/share.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/storagepolicy.go b/vendor/github.com/Azure/azure-storage-go/storagepolicy.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/storagepolicy.go rename to vendor/github.com/Azure/azure-storage-go/storagepolicy.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/storageservice.go b/vendor/github.com/Azure/azure-storage-go/storageservice.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/storageservice.go rename to vendor/github.com/Azure/azure-storage-go/storageservice.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/table.go b/vendor/github.com/Azure/azure-storage-go/table.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/table.go rename to vendor/github.com/Azure/azure-storage-go/table.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/table_entities.go b/vendor/github.com/Azure/azure-storage-go/table_entities.go similarity index 93% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/table_entities.go rename to vendor/github.com/Azure/azure-storage-go/table_entities.go index 1758d9f3eb21..36413a0cffd1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/table_entities.go +++ b/vendor/github.com/Azure/azure-storage-go/table_entities.go @@ -124,11 +124,12 @@ func (c *TableServiceClient) QueryTableEntities(tableName AzureTable, previousCo // The function fails if there is an entity with the same // PartitionKey and RowKey in the table. func (c *TableServiceClient) InsertEntity(table AzureTable, entity TableEntity) error { - if sc, err := c.execTable(table, entity, false, http.MethodPost); err != nil { - return checkRespCode(sc, []int{http.StatusCreated}) + sc, err := c.execTable(table, entity, false, http.MethodPost) + if err != nil { + return err } - return nil + return checkRespCode(sc, []int{http.StatusCreated}) } func (c *TableServiceClient) execTable(table AzureTable, entity TableEntity, specifyKeysInURL bool, method string) (int, error) { @@ -162,10 +163,12 @@ func (c *TableServiceClient) execTable(table AzureTable, entity TableEntity, spe // one passed as parameter. The function fails if there is no entity // with the same PartitionKey and RowKey in the table. func (c *TableServiceClient) UpdateEntity(table AzureTable, entity TableEntity) error { - if sc, err := c.execTable(table, entity, true, http.MethodPut); err != nil { - return checkRespCode(sc, []int{http.StatusNoContent}) + sc, err := c.execTable(table, entity, true, http.MethodPut) + if err != nil { + return err } - return nil + + return checkRespCode(sc, []int{http.StatusNoContent}) } // MergeEntity merges the contents of an entity with the @@ -173,10 +176,12 @@ func (c *TableServiceClient) UpdateEntity(table AzureTable, entity TableEntity) // The function fails if there is no entity // with the same PartitionKey and RowKey in the table. func (c *TableServiceClient) MergeEntity(table AzureTable, entity TableEntity) error { - if sc, err := c.execTable(table, entity, true, "MERGE"); err != nil { - return checkRespCode(sc, []int{http.StatusNoContent}) + sc, err := c.execTable(table, entity, true, "MERGE") + if err != nil { + return err } - return nil + + return checkRespCode(sc, []int{http.StatusNoContent}) } // DeleteEntityWithoutCheck deletes the entity matching by @@ -219,19 +224,23 @@ func (c *TableServiceClient) DeleteEntity(table AzureTable, entity TableEntity, // InsertOrReplaceEntity inserts an entity in the specified table // or replaced the existing one. func (c *TableServiceClient) InsertOrReplaceEntity(table AzureTable, entity TableEntity) error { - if sc, err := c.execTable(table, entity, true, http.MethodPut); err != nil { - return checkRespCode(sc, []int{http.StatusNoContent}) + sc, err := c.execTable(table, entity, true, http.MethodPut) + if err != nil { + return err } - return nil + + return checkRespCode(sc, []int{http.StatusNoContent}) } // InsertOrMergeEntity inserts an entity in the specified table // or merges the existing one. func (c *TableServiceClient) InsertOrMergeEntity(table AzureTable, entity TableEntity) error { - if sc, err := c.execTable(table, entity, true, "MERGE"); err != nil { - return checkRespCode(sc, []int{http.StatusNoContent}) + sc, err := c.execTable(table, entity, true, "MERGE") + if err != nil { + return err } - return nil + + return checkRespCode(sc, []int{http.StatusNoContent}) } func injectPartitionAndRowKeys(entity TableEntity, buf *bytes.Buffer) error { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/tableserviceclient.go b/vendor/github.com/Azure/azure-storage-go/tableserviceclient.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/tableserviceclient.go rename to vendor/github.com/Azure/azure-storage-go/tableserviceclient.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/util.go b/vendor/github.com/Azure/azure-storage-go/util.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/util.go rename to vendor/github.com/Azure/azure-storage-go/util.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/version.go b/vendor/github.com/Azure/azure-storage-go/version.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/storage/version.go rename to vendor/github.com/Azure/azure-storage-go/version.go diff --git a/vendor/vendor.json b/vendor/vendor.json index 52c5f6c088b2..52d711de91f4 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -55,10 +55,10 @@ "revisionTime": "2017-04-14T20:50:12Z" }, { - "checksumSHA1": "/wyEf3h+8N4zkqMXl+jT/+WWlxg=", - "path": "github.com/Azure/azure-sdk-for-go/storage", - "revision": "088007b3b08cc02b27f2eadfdcd870958460ce7e", - "revisionTime": "2017-04-05T20:18:34Z" + "checksumSHA1": "24EW3PGLGVSy/5joAOZdHzN/S2E=", + "path": "github.com/Azure/azure-storage-go", + "revision": "12ccaadb081cdd217702067d28da9a7ff4305239", + "revisionTime": "2017-03-02T22:15:08Z" }, { "checksumSHA1": "23FJUX+AInYeEM2hoUMvYZtXZd4=", diff --git a/website/source/api/system/revoke.html.md b/website/source/api/system/revoke.html.md index 2c005aa5ad6c..9bcbb9a34680 100644 --- a/website/source/api/system/revoke.html.md +++ b/website/source/api/system/revoke.html.md @@ -20,7 +20,7 @@ This endpoint revokes a secret immediately. ### Parameters -- `lease_id` `(string: )` – Specifies the ID of the lease to renew. +- `lease_id` `(string: )` – Specifies the ID of the lease to revoke. ### Sample Request