Skip to content

Commit 3189ebd

Browse files
Update all go-deps (#3259)
1 parent 39bf627 commit 3189ebd

File tree

5 files changed

+141
-424
lines changed

5 files changed

+141
-424
lines changed

.github/workflows/vulncheck.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v3
2424
with:
25-
go-version: 1.21.7
25+
go-version: 1.21.8
2626
check-latest: true
2727
- name: Get official govulncheck
2828
run: go install golang.org/x/vuln/cmd/govulncheck@latest
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-latest
3737
strategy:
3838
matrix:
39-
go-version: [ 1.21.7 ]
39+
go-version: [ 1.21.8 ]
4040
os: [ ubuntu-latest ]
4141
steps:
4242
- name: Check out code

CREDITS

Lines changed: 0 additions & 265 deletions
Original file line numberDiff line numberDiff line change
@@ -14566,33 +14566,6 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
1456614566
the Mozilla Public License, v. 2.0.
1456714567

1456814568

14569-
================================================================
14570-
14571-
github.com/sirupsen/logrus
14572-
https://github.com/sirupsen/logrus
14573-
----------------------------------------------------------------
14574-
The MIT License (MIT)
14575-
14576-
Copyright (c) 2014 Simon Eskildsen
14577-
14578-
Permission is hereby granted, free of charge, to any person obtaining a copy
14579-
of this software and associated documentation files (the "Software"), to deal
14580-
in the Software without restriction, including without limitation the rights
14581-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14582-
copies of the Software, and to permit persons to whom the Software is
14583-
furnished to do so, subject to the following conditions:
14584-
14585-
The above copyright notice and this permission notice shall be included in
14586-
all copies or substantial portions of the Software.
14587-
14588-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14589-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14590-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14591-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
14592-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
14593-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
14594-
THE SOFTWARE.
14595-
1459614569
================================================================
1459714570

1459814571
github.com/stretchr/testify
@@ -16418,214 +16391,6 @@ https://google.golang.org/appengine
1641816391

1641916392
================================================================
1642016393

16421-
google.golang.org/genproto
16422-
https://google.golang.org/genproto
16423-
----------------------------------------------------------------
16424-
16425-
Apache License
16426-
Version 2.0, January 2004
16427-
http://www.apache.org/licenses/
16428-
16429-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
16430-
16431-
1. Definitions.
16432-
16433-
"License" shall mean the terms and conditions for use, reproduction,
16434-
and distribution as defined by Sections 1 through 9 of this document.
16435-
16436-
"Licensor" shall mean the copyright owner or entity authorized by
16437-
the copyright owner that is granting the License.
16438-
16439-
"Legal Entity" shall mean the union of the acting entity and all
16440-
other entities that control, are controlled by, or are under common
16441-
control with that entity. For the purposes of this definition,
16442-
"control" means (i) the power, direct or indirect, to cause the
16443-
direction or management of such entity, whether by contract or
16444-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
16445-
outstanding shares, or (iii) beneficial ownership of such entity.
16446-
16447-
"You" (or "Your") shall mean an individual or Legal Entity
16448-
exercising permissions granted by this License.
16449-
16450-
"Source" form shall mean the preferred form for making modifications,
16451-
including but not limited to software source code, documentation
16452-
source, and configuration files.
16453-
16454-
"Object" form shall mean any form resulting from mechanical
16455-
transformation or translation of a Source form, including but
16456-
not limited to compiled object code, generated documentation,
16457-
and conversions to other media types.
16458-
16459-
"Work" shall mean the work of authorship, whether in Source or
16460-
Object form, made available under the License, as indicated by a
16461-
copyright notice that is included in or attached to the work
16462-
(an example is provided in the Appendix below).
16463-
16464-
"Derivative Works" shall mean any work, whether in Source or Object
16465-
form, that is based on (or derived from) the Work and for which the
16466-
editorial revisions, annotations, elaborations, or other modifications
16467-
represent, as a whole, an original work of authorship. For the purposes
16468-
of this License, Derivative Works shall not include works that remain
16469-
separable from, or merely link (or bind by name) to the interfaces of,
16470-
the Work and Derivative Works thereof.
16471-
16472-
"Contribution" shall mean any work of authorship, including
16473-
the original version of the Work and any modifications or additions
16474-
to that Work or Derivative Works thereof, that is intentionally
16475-
submitted to Licensor for inclusion in the Work by the copyright owner
16476-
or by an individual or Legal Entity authorized to submit on behalf of
16477-
the copyright owner. For the purposes of this definition, "submitted"
16478-
means any form of electronic, verbal, or written communication sent
16479-
to the Licensor or its representatives, including but not limited to
16480-
communication on electronic mailing lists, source code control systems,
16481-
and issue tracking systems that are managed by, or on behalf of, the
16482-
Licensor for the purpose of discussing and improving the Work, but
16483-
excluding communication that is conspicuously marked or otherwise
16484-
designated in writing by the copyright owner as "Not a Contribution."
16485-
16486-
"Contributor" shall mean Licensor and any individual or Legal Entity
16487-
on behalf of whom a Contribution has been received by Licensor and
16488-
subsequently incorporated within the Work.
16489-
16490-
2. Grant of Copyright License. Subject to the terms and conditions of
16491-
this License, each Contributor hereby grants to You a perpetual,
16492-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
16493-
copyright license to reproduce, prepare Derivative Works of,
16494-
publicly display, publicly perform, sublicense, and distribute the
16495-
Work and such Derivative Works in Source or Object form.
16496-
16497-
3. Grant of Patent License. Subject to the terms and conditions of
16498-
this License, each Contributor hereby grants to You a perpetual,
16499-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
16500-
(except as stated in this section) patent license to make, have made,
16501-
use, offer to sell, sell, import, and otherwise transfer the Work,
16502-
where such license applies only to those patent claims licensable
16503-
by such Contributor that are necessarily infringed by their
16504-
Contribution(s) alone or by combination of their Contribution(s)
16505-
with the Work to which such Contribution(s) was submitted. If You
16506-
institute patent litigation against any entity (including a
16507-
cross-claim or counterclaim in a lawsuit) alleging that the Work
16508-
or a Contribution incorporated within the Work constitutes direct
16509-
or contributory patent infringement, then any patent licenses
16510-
granted to You under this License for that Work shall terminate
16511-
as of the date such litigation is filed.
16512-
16513-
4. Redistribution. You may reproduce and distribute copies of the
16514-
Work or Derivative Works thereof in any medium, with or without
16515-
modifications, and in Source or Object form, provided that You
16516-
meet the following conditions:
16517-
16518-
(a) You must give any other recipients of the Work or
16519-
Derivative Works a copy of this License; and
16520-
16521-
(b) You must cause any modified files to carry prominent notices
16522-
stating that You changed the files; and
16523-
16524-
(c) You must retain, in the Source form of any Derivative Works
16525-
that You distribute, all copyright, patent, trademark, and
16526-
attribution notices from the Source form of the Work,
16527-
excluding those notices that do not pertain to any part of
16528-
the Derivative Works; and
16529-
16530-
(d) If the Work includes a "NOTICE" text file as part of its
16531-
distribution, then any Derivative Works that You distribute must
16532-
include a readable copy of the attribution notices contained
16533-
within such NOTICE file, excluding those notices that do not
16534-
pertain to any part of the Derivative Works, in at least one
16535-
of the following places: within a NOTICE text file distributed
16536-
as part of the Derivative Works; within the Source form or
16537-
documentation, if provided along with the Derivative Works; or,
16538-
within a display generated by the Derivative Works, if and
16539-
wherever such third-party notices normally appear. The contents
16540-
of the NOTICE file are for informational purposes only and
16541-
do not modify the License. You may add Your own attribution
16542-
notices within Derivative Works that You distribute, alongside
16543-
or as an addendum to the NOTICE text from the Work, provided
16544-
that such additional attribution notices cannot be construed
16545-
as modifying the License.
16546-
16547-
You may add Your own copyright statement to Your modifications and
16548-
may provide additional or different license terms and conditions
16549-
for use, reproduction, or distribution of Your modifications, or
16550-
for any such Derivative Works as a whole, provided Your use,
16551-
reproduction, and distribution of the Work otherwise complies with
16552-
the conditions stated in this License.
16553-
16554-
5. Submission of Contributions. Unless You explicitly state otherwise,
16555-
any Contribution intentionally submitted for inclusion in the Work
16556-
by You to the Licensor shall be under the terms and conditions of
16557-
this License, without any additional terms or conditions.
16558-
Notwithstanding the above, nothing herein shall supersede or modify
16559-
the terms of any separate license agreement you may have executed
16560-
with Licensor regarding such Contributions.
16561-
16562-
6. Trademarks. This License does not grant permission to use the trade
16563-
names, trademarks, service marks, or product names of the Licensor,
16564-
except as required for reasonable and customary use in describing the
16565-
origin of the Work and reproducing the content of the NOTICE file.
16566-
16567-
7. Disclaimer of Warranty. Unless required by applicable law or
16568-
agreed to in writing, Licensor provides the Work (and each
16569-
Contributor provides its Contributions) on an "AS IS" BASIS,
16570-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
16571-
implied, including, without limitation, any warranties or conditions
16572-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
16573-
PARTICULAR PURPOSE. You are solely responsible for determining the
16574-
appropriateness of using or redistributing the Work and assume any
16575-
risks associated with Your exercise of permissions under this License.
16576-
16577-
8. Limitation of Liability. In no event and under no legal theory,
16578-
whether in tort (including negligence), contract, or otherwise,
16579-
unless required by applicable law (such as deliberate and grossly
16580-
negligent acts) or agreed to in writing, shall any Contributor be
16581-
liable to You for damages, including any direct, indirect, special,
16582-
incidental, or consequential damages of any character arising as a
16583-
result of this License or out of the use or inability to use the
16584-
Work (including but not limited to damages for loss of goodwill,
16585-
work stoppage, computer failure or malfunction, or any and all
16586-
other commercial damages or losses), even if such Contributor
16587-
has been advised of the possibility of such damages.
16588-
16589-
9. Accepting Warranty or Additional Liability. While redistributing
16590-
the Work or Derivative Works thereof, You may choose to offer,
16591-
and charge a fee for, acceptance of support, warranty, indemnity,
16592-
or other liability obligations and/or rights consistent with this
16593-
License. However, in accepting such obligations, You may act only
16594-
on Your own behalf and on Your sole responsibility, not on behalf
16595-
of any other Contributor, and only if You agree to indemnify,
16596-
defend, and hold each Contributor harmless for any liability
16597-
incurred by, or claims asserted against, such Contributor by reason
16598-
of your accepting any such warranty or additional liability.
16599-
16600-
END OF TERMS AND CONDITIONS
16601-
16602-
APPENDIX: How to apply the Apache License to your work.
16603-
16604-
To apply the Apache License to your work, attach the following
16605-
boilerplate notice, with the fields enclosed by brackets "[]"
16606-
replaced with your own identifying information. (Don't include
16607-
the brackets!) The text should be enclosed in the appropriate
16608-
comment syntax for the file format. We also recommend that a
16609-
file or class name and description of purpose be included on the
16610-
same "printed page" as the copyright notice for easier
16611-
identification within third-party archives.
16612-
16613-
Copyright [yyyy] [name of copyright owner]
16614-
16615-
Licensed under the Apache License, Version 2.0 (the "License");
16616-
you may not use this file except in compliance with the License.
16617-
You may obtain a copy of the License at
16618-
16619-
http://www.apache.org/licenses/LICENSE-2.0
16620-
16621-
Unless required by applicable law or agreed to in writing, software
16622-
distributed under the License is distributed on an "AS IS" BASIS,
16623-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16624-
See the License for the specific language governing permissions and
16625-
limitations under the License.
16626-
16627-
================================================================
16628-
1662916394
google.golang.org/genproto/googleapis/api
1663016395
https://google.golang.org/genproto/googleapis/api
1663116396
----------------------------------------------------------------
@@ -17314,36 +17079,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1731417079

1731517080
================================================================
1731617081

17317-
gopkg.in/h2non/filetype.v1
17318-
https://gopkg.in/h2non/filetype.v1
17319-
----------------------------------------------------------------
17320-
The MIT License
17321-
17322-
Copyright (c) Tomas Aparicio
17323-
17324-
Permission is hereby granted, free of charge, to any person
17325-
obtaining a copy of this software and associated documentation
17326-
files (the "Software"), to deal in the Software without
17327-
restriction, including without limitation the rights to use,
17328-
copy, modify, merge, publish, distribute, sublicense, and/or sell
17329-
copies of the Software, and to permit persons to whom the
17330-
Software is furnished to do so, subject to the following
17331-
conditions:
17332-
17333-
The above copyright notice and this permission notice shall be
17334-
included in all copies or substantial portions of the Software.
17335-
17336-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17337-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17338-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17339-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
17340-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
17341-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
17342-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
17343-
OTHER DEALINGS IN THE SOFTWARE.
17344-
17345-
================================================================
17346-
1734717082
gopkg.in/ini.v1
1734817083
https://gopkg.in/ini.v1
1734917084
----------------------------------------------------------------

api/client.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ func (c mcClient) list(ctx context.Context, opts mc.ListOptions) <-chan *mc.Clie
278278
}
279279

280280
func (c mcClient) get(ctx context.Context, opts mc.GetOptions) (io.ReadCloser, *probe.Error) {
281-
return c.client.Get(ctx, opts)
281+
rd, _, err := c.client.Get(ctx, opts)
282+
return rd, err
282283
}
283284

284285
func (c mcClient) shareDownload(ctx context.Context, versionID string, expires time.Duration) (string, *probe.Error) {

0 commit comments

Comments
 (0)