diff --git a/cmd/jira-lifecycle-plugin/config.go b/cmd/jira-lifecycle-plugin/config.go index 590db570..1bc0f202 100644 --- a/cmd/jira-lifecycle-plugin/config.go +++ b/cmd/jira-lifecycle-plugin/config.go @@ -1,7 +1,11 @@ package main import ( + "bytes" + "compress/gzip" "fmt" + "io" + "os" "k8s.io/apimachinery/pkg/util/sets" ) @@ -401,3 +405,27 @@ func (b *Config) OptionsForRepo(org, repo string) map[string]JiraBranchOptions { return options } + +// ReadFileMaybeGZIP wraps util.ReadBytesMaybeGZIP, returning the decompressed contents +// if the file is gzipped, or otherwise the raw contents +func ReadFileMaybeGZIP(path string) ([]byte, error) { + b, err := os.ReadFile(path) + if err != nil { + return nil, err + } + return ReadBytesMaybeGZIP(b) +} + +func ReadBytesMaybeGZIP(data []byte) ([]byte, error) { + // check if data contains gzip header: http://www.zlib.org/rfc-gzip.html + if !bytes.HasPrefix(data, []byte("\x1F\x8B")) { + // go ahead and return the contents if not gzipped + return data, nil + } + // otherwise decode + gzipReader, err := gzip.NewReader(bytes.NewBuffer(data)) + if err != nil { + return nil, err + } + return io.ReadAll(gzipReader) +} diff --git a/cmd/jira-lifecycle-plugin/main.go b/cmd/jira-lifecycle-plugin/main.go index 78269f0f..40325bae 100644 --- a/cmd/jira-lifecycle-plugin/main.go +++ b/cmd/jira-lifecycle-plugin/main.go @@ -19,8 +19,6 @@ import ( "sigs.k8s.io/prow/prow/logrusutil" "sigs.k8s.io/prow/prow/pjutil" "sigs.k8s.io/yaml" - - "github.com/openshift/ci-tools/pkg/util/gzip" ) type options struct { @@ -73,7 +71,7 @@ func (o *options) Validate() error { return err } - bytes, err := gzip.ReadFileMaybeGZIP(o.configPath) + bytes, err := ReadFileMaybeGZIP(o.configPath) if err != nil { return fmt.Errorf("couldn't read configuration file: %v", o.configPath) } @@ -97,7 +95,7 @@ func (o *options) getConfigWatchAndUpdate() (func(ctx context.Context), error) { } eventFunc := func() error { - bytes, err := gzip.ReadFileMaybeGZIP(o.configPath) + bytes, err := ReadFileMaybeGZIP(o.configPath) if err != nil { return fmt.Errorf("couldn't read configuration file %s: %w", o.configPath, err) } @@ -128,7 +126,7 @@ func main() { o := gatherOptions() if o.validateConfig != "" { - bytes, err := gzip.ReadFileMaybeGZIP(o.validateConfig) + bytes, err := ReadFileMaybeGZIP(o.validateConfig) if err != nil { logger.Fatalf("couldn't read configuration file %s: %v", o.configPath, err) } diff --git a/go.mod b/go.mod index 60342a89..16c5a705 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,6 @@ require ( github.com/andygrunwald/go-jira v1.15.1 github.com/google/go-cmp v0.5.9 github.com/openshift/build-machinery-go v0.0.0-20220429084610-baff9f8d23b3 - github.com/openshift/ci-tools v0.0.0-20221125132251-82b14fbc45df github.com/shurcooL/githubv4 v0.0.0-20220520033151-0b4e3294ff00 github.com/sirupsen/logrus v1.9.0 github.com/trivago/tgo v1.0.7 @@ -144,7 +143,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.27.2 // indirect - k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible // indirect + k8s.io/client-go v0.27.2 // indirect k8s.io/component-base v0.27.2 // indirect k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect k8s.io/klog/v2 v2.90.1 // indirect diff --git a/go.sum b/go.sum index d5ffcdae..dcc0f0d8 100644 --- a/go.sum +++ b/go.sum @@ -451,8 +451,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/openshift/build-machinery-go v0.0.0-20220429084610-baff9f8d23b3 h1:M7ttIUk99wNgpBImKJEbE/QgmuRK+HZ4xUh8ZpH/r3Y= github.com/openshift/build-machinery-go v0.0.0-20220429084610-baff9f8d23b3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/ci-tools v0.0.0-20221125132251-82b14fbc45df h1:lFSN/EioSQ6kcVc3BVcR3ji7BeuL7bQ0ryTrfnZ1OcY= -github.com/openshift/ci-tools v0.0.0-20221125132251-82b14fbc45df/go.mod h1:+v6edduOOB6Sm9h+1sSpaM6/ConMZwRuBYF4lE+xZ/4= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/vendor/github.com/openshift/ci-tools/LICENSE b/vendor/github.com/openshift/ci-tools/LICENSE deleted file mode 100644 index c4ea8b6f..00000000 --- a/vendor/github.com/openshift/ci-tools/LICENSE +++ /dev/null @@ -1,191 +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 - - Copyright 2014 Red Hat, 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. diff --git a/vendor/github.com/openshift/ci-tools/pkg/util/gzip/gzip.go b/vendor/github.com/openshift/ci-tools/pkg/util/gzip/gzip.go deleted file mode 100644 index dc0d9751..00000000 --- a/vendor/github.com/openshift/ci-tools/pkg/util/gzip/gzip.go +++ /dev/null @@ -1,45 +0,0 @@ -package gzip - -import ( - "bytes" - "compress/gzip" - "encoding/base64" - "io/ioutil" -) - -// ReadFileMaybeGZIP wraps util.ReadBytesMaybeGZIP, returning the decompressed contents -// if the file is gzipped, or otherwise the raw contents -func ReadFileMaybeGZIP(path string) ([]byte, error) { - b, err := ioutil.ReadFile(path) - if err != nil { - return nil, err - } - return ReadBytesMaybeGZIP(b) -} - -func ReadBytesMaybeGZIP(data []byte) ([]byte, error) { - // check if data contains gzip header: http://www.zlib.org/rfc-gzip.html - if !bytes.HasPrefix(data, []byte("\x1F\x8B")) { - // go ahead and return the contents if not gzipped - return data, nil - } - // otherwise decode - gzipReader, err := gzip.NewReader(bytes.NewBuffer(data)) - if err != nil { - return nil, err - } - return ioutil.ReadAll(gzipReader) -} - -func CompressStringAndBase64(data string) (string, error) { - buf := new(bytes.Buffer) - writer, err := gzip.NewWriterLevel(buf, gzip.BestCompression) - if err != nil { - return "", err - } - if _, err := writer.Write([]byte(data)); err != nil { - return "", err - } - writer.Close() - return base64.StdEncoding.EncodeToString(buf.Bytes()), nil -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 0a756eba..a5b74d47 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -331,9 +331,6 @@ github.com/openshift/build-machinery-go/make/targets/golang github.com/openshift/build-machinery-go/make/targets/openshift github.com/openshift/build-machinery-go/make/targets/openshift/operator github.com/openshift/build-machinery-go/scripts -# github.com/openshift/ci-tools v0.0.0-20221125132251-82b14fbc45df -## explicit; go 1.18 -github.com/openshift/ci-tools/pkg/util/gzip # github.com/peterbourgon/diskv v2.0.1+incompatible ## explicit github.com/peterbourgon/diskv @@ -793,7 +790,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible => k8s.io/client-go v0.27.2 +# k8s.io/client-go v0.27.2 => k8s.io/client-go v0.27.2 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1