From 20df96f978bfdcfddb5852708815872036fb22a5 Mon Sep 17 00:00:00 2001 From: runzexia Date: Wed, 7 Aug 2019 18:01:15 +0800 Subject: [PATCH] Revert "temp" This reverts commit e4ff1b0baddf5aecbeac7de94a8901ee83fdead8. --- cmd/ks-apiserver/app/server.go | 14 +- go.mod | 2 - go.sum | 5 - pkg/apis/devops/v1alpha2/register.go | 13 -- pkg/apiserver/devops/s2ibinary.go | 34 --- pkg/models/devops/s2ibinary_handler.go | 1 - vendor/code.cloudfoundry.org/bytefmt/LICENSE | 201 ------------------ vendor/code.cloudfoundry.org/bytefmt/NOTICE | 20 -- .../code.cloudfoundry.org/bytefmt/README.md | 15 -- vendor/code.cloudfoundry.org/bytefmt/bytes.go | 121 ----------- .../code.cloudfoundry.org/bytefmt/package.go | 1 - vendor/modules.txt | 2 - 12 files changed, 7 insertions(+), 422 deletions(-) delete mode 100644 pkg/apiserver/devops/s2ibinary.go delete mode 100644 pkg/models/devops/s2ibinary_handler.go delete mode 100644 vendor/code.cloudfoundry.org/bytefmt/LICENSE delete mode 100644 vendor/code.cloudfoundry.org/bytefmt/NOTICE delete mode 100644 vendor/code.cloudfoundry.org/bytefmt/README.md delete mode 100644 vendor/code.cloudfoundry.org/bytefmt/bytes.go delete mode 100644 vendor/code.cloudfoundry.org/bytefmt/package.go diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go index 2b88ff90..fbd96077 100644 --- a/cmd/ks-apiserver/app/server.go +++ b/cmd/ks-apiserver/app/server.go @@ -180,13 +180,13 @@ func waitForResourceSync() { informerFactory.Start(stopChan) informerFactory.WaitForCacheSync(stopChan) - //s2iInformerFactory := informers.S2iSharedInformerFactory() - //s2iInformerFactory.Devops().V1alpha1().S2iBuilderTemplates().Lister() - //s2iInformerFactory.Devops().V1alpha1().S2iRuns().Lister() - //s2iInformerFactory.Devops().V1alpha1().S2iBuilders().Lister() - // - //s2iInformerFactory.Start(stopChan) - //s2iInformerFactory.WaitForCacheSync(stopChan) + s2iInformerFactory := informers.S2iSharedInformerFactory() + s2iInformerFactory.Devops().V1alpha1().S2iBuilderTemplates().Lister() + s2iInformerFactory.Devops().V1alpha1().S2iRuns().Lister() + s2iInformerFactory.Devops().V1alpha1().S2iBuilders().Lister() + + s2iInformerFactory.Start(stopChan) + s2iInformerFactory.WaitForCacheSync(stopChan) ksInformerFactory := informers.KsSharedInformerFactory() ksInformerFactory.Tenant().V1alpha1().Workspaces().Lister() diff --git a/go.mod b/go.mod index db901bba..960adce2 100644 --- a/go.mod +++ b/go.mod @@ -4,14 +4,12 @@ go 1.12 require ( bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c // indirect - code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/Microsoft/go-winio v0.4.12 // indirect github.com/PuerkitoBio/goquery v1.5.0 github.com/Sirupsen/logrus v1.4.1 // indirect github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 // indirect github.com/asaskevich/govalidator v0.0.0-20180315120708-ccb8e960c48f - github.com/aws/aws-sdk-go v1.22.0 // indirect github.com/beevik/etree v1.1.0 github.com/beorn7/perks v1.0.0 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect diff --git a/go.sum b/go.sum index c52e3545..21ba56f9 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c h1:t+Ra932MCC0eeyD bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c/go.mod h1:1vhO7Mn/FZMgOgDVGLy5X1mE6rq1HbkBdkF/yj8zkcg= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6 h1:tW+ztA4A9UT9xnco5wUjW1oNi35k22eUEn9tNpPYVwE= -code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= @@ -34,8 +32,6 @@ github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 h1:Kn3rqvbUFqSe github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30/go.mod h1:4AJxUpXUhv4N+ziTvIcWWXgeorXpxPZOfk9HdEVr96M= github.com/asaskevich/govalidator v0.0.0-20180315120708-ccb8e960c48f h1:y2hSFdXeA1y5z5f0vfNO0Dg5qVY036qzlz3Pds0B92o= github.com/asaskevich/govalidator v0.0.0-20180315120708-ccb8e960c48f/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws/aws-sdk-go v1.22.0 h1:e88V6+dSEyBibUy0ekOydtTfNWzqG3hrtCR8SF6UqqY= -github.com/aws/aws-sdk-go v1.22.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -216,7 +212,6 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a h1:BcF8coBl0QFVhe8vAMMlD+CV8EISiu9MGKLoj6ZEyJA= github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= diff --git a/pkg/apis/devops/v1alpha2/register.go b/pkg/apis/devops/v1alpha2/register.go index 8c2b6c31..ce5dec98 100644 --- a/pkg/apis/devops/v1alpha2/register.go +++ b/pkg/apis/devops/v1alpha2/register.go @@ -593,19 +593,6 @@ The last one is encrypted info, such as the password of the username-password ty Returns(http.StatusOK, RespOK, devops.Crumb{}). Writes(devops.Crumb{})) - webservice.Route(webservice.PUT("/namespaces/{namespace}/s2ibinaries/{s2ibinary}/file"). - To(devopsapi.UploadS2iBinary). - Consumes("multipart/form-data"). - Produces(restful.MIME_JSON). - Doc("Upload S2iBinary file"). - Returns(http.StatusOK, RespOK, devops.Crumb{})) - - webservice.Route(webservice.GET("/namespaces/{namespace}/s2ibinaries/{s2ibinary}/file/{file}"). - To(devopsapi.DownloadS2iBinary). - Produces(restful.MIME_OCTET). - Doc("Download S2iBinary file"). - Returns(http.StatusOK, RespOK, nil)) - // TODO are not used in this version. will be added in 2.1.0 //// match /job/init-job/descriptorByName/org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition/checkScriptCompile //webservice.Route(webservice.POST("/devops/check/scriptcompile"). diff --git a/pkg/apiserver/devops/s2ibinary.go b/pkg/apiserver/devops/s2ibinary.go deleted file mode 100644 index b1ce315b..00000000 --- a/pkg/apiserver/devops/s2ibinary.go +++ /dev/null @@ -1,34 +0,0 @@ -package devops - -import ( - "code.cloudfoundry.org/bytefmt" - "fmt" - "github.com/emicklei/go-restful" - "github.com/golang/glog" - "kubesphere.io/kubesphere/pkg/errors" - "net/http" -) - -func UploadS2iBinary(req *restful.Request, resp *restful.Response) { - err := req.Request.ParseMultipartForm(bytefmt.MEGABYTE * 20) - if err != nil { - glog.Errorf("%+v", err) - errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp) - return - } - if len(req.Request.MultipartForm.File) == 0 { - err := fmt.Errorf("could not get file from form") - glog.Errorf("%+v", err) - errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp) - } - if len(req.Request.MultipartForm.File["binary"]) == 0 { - err := fmt.Errorf("could not get file from form") - glog.Errorf("%+v", err) - errors.ParseSvcErr(restful.NewError(http.StatusBadRequest, err.Error()), resp) - } - -} - -func DownloadS2iBinary(req *restful.Request, resp *restful.Response) { - -} diff --git a/pkg/models/devops/s2ibinary_handler.go b/pkg/models/devops/s2ibinary_handler.go deleted file mode 100644 index 583141b5..00000000 --- a/pkg/models/devops/s2ibinary_handler.go +++ /dev/null @@ -1 +0,0 @@ -package devops diff --git a/vendor/code.cloudfoundry.org/bytefmt/LICENSE b/vendor/code.cloudfoundry.org/bytefmt/LICENSE deleted file mode 100644 index f49a4e16..00000000 --- a/vendor/code.cloudfoundry.org/bytefmt/LICENSE +++ /dev/null @@ -1,201 +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 [yyyy] [name of copyright owner] - - 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. \ No newline at end of file diff --git a/vendor/code.cloudfoundry.org/bytefmt/NOTICE b/vendor/code.cloudfoundry.org/bytefmt/NOTICE deleted file mode 100644 index 8625a7f4..00000000 --- a/vendor/code.cloudfoundry.org/bytefmt/NOTICE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. - -This project contains software that is Copyright (c) 2013-2015 Pivotal Software, Inc. - -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. - -This project may include a number of subcomponents with separate -copyright notices and license terms. Your use of these subcomponents -is subject to the terms and conditions of each subcomponent's license, -as noted in the LICENSE file. diff --git a/vendor/code.cloudfoundry.org/bytefmt/README.md b/vendor/code.cloudfoundry.org/bytefmt/README.md deleted file mode 100644 index 44d287d1..00000000 --- a/vendor/code.cloudfoundry.org/bytefmt/README.md +++ /dev/null @@ -1,15 +0,0 @@ -bytefmt -======= - -**Note**: This repository should be imported as `code.cloudfoundry.org/bytefmt`. - -Human-readable byte formatter. - -Example: - -```go -bytefmt.ByteSize(100.5*bytefmt.MEGABYTE) // returns "100.5M" -bytefmt.ByteSize(uint64(1024)) // returns "1K" -``` - -For documentation, please see http://godoc.org/code.cloudfoundry.org/bytefmt diff --git a/vendor/code.cloudfoundry.org/bytefmt/bytes.go b/vendor/code.cloudfoundry.org/bytefmt/bytes.go deleted file mode 100644 index 6808a5e2..00000000 --- a/vendor/code.cloudfoundry.org/bytefmt/bytes.go +++ /dev/null @@ -1,121 +0,0 @@ -// Package bytefmt contains helper methods and constants for converting to and from a human-readable byte format. -// -// bytefmt.ByteSize(100.5*bytefmt.MEGABYTE) // "100.5M" -// bytefmt.ByteSize(uint64(1024)) // "1K" -// -package bytefmt - -import ( - "errors" - "strconv" - "strings" - "unicode" -) - -const ( - BYTE = 1 << (10 * iota) - KILOBYTE - MEGABYTE - GIGABYTE - TERABYTE - PETABYTE - EXABYTE -) - -var invalidByteQuantityError = errors.New("byte quantity must be a positive integer with a unit of measurement like M, MB, MiB, G, GiB, or GB") - -// ByteSize returns a human-readable byte string of the form 10M, 12.5K, and so forth. The following units are available: -// E: Exabyte -// P: Petabyte -// T: Terabyte -// G: Gigabyte -// M: Megabyte -// K: Kilobyte -// B: Byte -// The unit that results in the smallest number greater than or equal to 1 is always chosen. -func ByteSize(bytes uint64) string { - unit := "" - value := float64(bytes) - - switch { - case bytes >= EXABYTE: - unit = "E" - value = value / EXABYTE - case bytes >= PETABYTE: - unit = "P" - value = value / PETABYTE - case bytes >= TERABYTE: - unit = "T" - value = value / TERABYTE - case bytes >= GIGABYTE: - unit = "G" - value = value / GIGABYTE - case bytes >= MEGABYTE: - unit = "M" - value = value / MEGABYTE - case bytes >= KILOBYTE: - unit = "K" - value = value / KILOBYTE - case bytes >= BYTE: - unit = "B" - case bytes == 0: - return "0" - } - - result := strconv.FormatFloat(value, 'f', 1, 64) - result = strings.TrimSuffix(result, ".0") - return result + unit -} - -// ToMegabytes parses a string formatted by ByteSize as megabytes. -func ToMegabytes(s string) (uint64, error) { - bytes, err := ToBytes(s) - if err != nil { - return 0, err - } - - return bytes / MEGABYTE, nil -} - -// ToBytes parses a string formatted by ByteSize as bytes. Note binary-prefixed and SI prefixed units both mean a base-2 units -// KB = K = KiB = 1024 -// MB = M = MiB = 1024 * K -// GB = G = GiB = 1024 * M -// TB = T = TiB = 1024 * G -// PB = P = PiB = 1024 * T -// EB = E = EiB = 1024 * P -func ToBytes(s string) (uint64, error) { - s = strings.TrimSpace(s) - s = strings.ToUpper(s) - - i := strings.IndexFunc(s, unicode.IsLetter) - - if i == -1 { - return 0, invalidByteQuantityError - } - - bytesString, multiple := s[:i], s[i:] - bytes, err := strconv.ParseFloat(bytesString, 64) - if err != nil || bytes <= 0 { - return 0, invalidByteQuantityError - } - - switch multiple { - case "E", "EB", "EIB": - return uint64(bytes * EXABYTE), nil - case "P", "PB", "PIB": - return uint64(bytes * PETABYTE), nil - case "T", "TB", "TIB": - return uint64(bytes * TERABYTE), nil - case "G", "GB", "GIB": - return uint64(bytes * GIGABYTE), nil - case "M", "MB", "MIB": - return uint64(bytes * MEGABYTE), nil - case "K", "KB", "KIB": - return uint64(bytes * KILOBYTE), nil - case "B": - return uint64(bytes), nil - default: - return 0, invalidByteQuantityError - } -} diff --git a/vendor/code.cloudfoundry.org/bytefmt/package.go b/vendor/code.cloudfoundry.org/bytefmt/package.go deleted file mode 100644 index 03429300..00000000 --- a/vendor/code.cloudfoundry.org/bytefmt/package.go +++ /dev/null @@ -1 +0,0 @@ -package bytefmt // import "code.cloudfoundry.org/bytefmt" diff --git a/vendor/modules.txt b/vendor/modules.txt index 0efa4143..3fd6a94a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,7 +1,5 @@ # bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c bitbucket.org/ww/goautoneg -# code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6 -code.cloudfoundry.org/bytefmt # github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 github.com/Azure/go-ansiterm/winterm github.com/Azure/go-ansiterm -- GitLab