diff --git a/projects/goharbor/harbor/ATTRIBUTION.txt b/projects/goharbor/harbor/ATTRIBUTION.txt index 90a555cadf..d3c61d8f5c 100644 --- a/projects/goharbor/harbor/ATTRIBUTION.txt +++ b/projects/goharbor/harbor/ATTRIBUTION.txt @@ -1,8 +1,8 @@ -** github.com/aliyun/alibaba-cloud-sdk-go; version v0.0.0-20190726115642-cd293c93fd97 -- +** github.com/aliyun/alibaba-cloud-sdk-go; version v1.61.1193 -- https://github.com/aliyun/alibaba-cloud-sdk-go -** github.com/aws/aws-sdk-go; version v1.50.24 -- +** github.com/aws/aws-sdk-go; version v1.55.5 -- https://github.com/aws/aws-sdk-go ** github.com/Azure/azure-sdk-for-go; version v37.2.0+incompatible -- @@ -23,10 +23,10 @@ https://github.com/Azure/go-autorest/logger ** github.com/Azure/go-autorest/tracing; version v0.6.0 -- https://github.com/Azure/go-autorest/tracing -** github.com/beego/beego/v2; version v2.0.6 -- +** github.com/beego/beego/v2; version v2.2.1 -- https://github.com/beego/beego/v2 -** github.com/beego/beego/v2/server/web; version v2.0.6 -- +** github.com/beego/beego/v2/server/web; version v2.2.1 -- https://github.com/beego/beego/v2 ** github.com/beego/i18n; version v0.0.0-20140604031826-e87155e8f0c0 -- @@ -41,18 +41,15 @@ https://github.com/cloudevents/sdk-go/v2 ** github.com/containerd/stargz-snapshotter/estargz; version v0.14.3 -- https://github.com/containerd/stargz-snapshotter/estargz -** github.com/coreos/go-oidc/v3/oidc; version v3.10.0 -- +** github.com/coreos/go-oidc/v3/oidc; version v3.11.0 -- https://github.com/coreos/go-oidc/v3 -** github.com/docker/cli/cli/config; version v24.0.6+incompatible -- +** github.com/docker/cli/cli/config; version v27.1.1+incompatible -- https://github.com/docker/cli ** github.com/distribution/distribution; version v2.8.2+incompatible -- https://github.com/distribution/distribution -** github.com/docker/docker/pkg/homedir; version v24.0.9+incompatible -- -https://github.com/moby/moby - ** github.com/docker/go-metrics; version v0.0.1 -- https://github.com/docker/go-metrics @@ -62,52 +59,52 @@ https://github.com/docker/libtrust ** github.com/FZambia/sentinel; version v1.1.0 -- https://github.com/FZambia/sentinel -** github.com/go-jose/go-jose/v4; version v4.0.1 -- +** github.com/go-jose/go-jose/v4; version v4.0.2 -- https://github.com/go-jose/go-jose/v4 -** github.com/go-logr/logr; version v1.4.1 -- +** github.com/go-logr/logr; version v1.4.2 -- https://github.com/go-logr/logr ** github.com/go-logr/stdr; version v1.2.2 -- https://github.com/go-logr/stdr -** github.com/go-openapi/analysis; version v0.21.4 -- +** github.com/go-openapi/analysis; version v0.23.0 -- https://github.com/go-openapi/analysis ** github.com/go-openapi/errors; version v0.22.0 -- https://github.com/go-openapi/errors -** github.com/go-openapi/jsonpointer; version v0.20.0 -- +** github.com/go-openapi/jsonpointer; version v0.21.0 -- https://github.com/go-openapi/jsonpointer -** github.com/go-openapi/jsonreference; version v0.20.2 -- +** github.com/go-openapi/jsonreference; version v0.21.0 -- https://github.com/go-openapi/jsonreference -** github.com/go-openapi/loads; version v0.21.2 -- +** github.com/go-openapi/loads; version v0.22.0 -- https://github.com/go-openapi/loads -** github.com/go-openapi/runtime; version v0.26.2 -- +** github.com/go-openapi/runtime; version v0.28.0 -- https://github.com/go-openapi/runtime -** github.com/go-openapi/spec; version v0.20.11 -- +** github.com/go-openapi/spec; version v0.21.0 -- https://github.com/go-openapi/spec ** github.com/go-openapi/strfmt; version v0.23.0 -- https://github.com/go-openapi/strfmt -** github.com/go-openapi/swag; version v0.22.7 -- +** github.com/go-openapi/swag; version v0.23.0 -- https://github.com/go-openapi/swag -** github.com/go-openapi/validate; version v0.22.3 -- +** github.com/go-openapi/validate; version v0.24.0 -- https://github.com/go-openapi/validate -** github.com/goharbor/harbor/src; version v2.11.1 -- +** github.com/goharbor/harbor/src; version v2.12.0 -- https://github.com/goharbor/harbor/src ** github.com/gomodule/redigo/redis; version v1.8.8 -- https://github.com/gomodule/redigo -** github.com/google/go-containerregistry; version v0.19.0 -- +** github.com/google/go-containerregistry; version v0.20.2 -- https://github.com/google/go-containerregistry ** github.com/google/gofuzz; version v1.2.0 -- @@ -116,12 +113,9 @@ https://github.com/google/gofuzz ** github.com/jmespath/go-jmespath; version v0.4.0 -- https://github.com/jmespath/go-jmespath -** github.com/klauspost/compress; version v1.16.5 -- +** github.com/klauspost/compress; version v1.17.9 -- https://github.com/klauspost/compress -** github.com/matttproud/golang_protobuf_extensions/pbutil; version v1.0.4 -- -https://github.com/matttproud/golang_protobuf_extensions - ** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd -- https://github.com/modern-go/concurrent @@ -140,22 +134,19 @@ https://github.com/opencontainers/image-spec ** github.com/opentracing/opentracing-go; version v1.2.0 -- https://github.com/opentracing/opentracing-go -** github.com/pelletier/go-toml; version v1.9.3 -- -https://github.com/pelletier/go-toml - -** github.com/prometheus/client_golang/prometheus; version v1.17.0 -- +** github.com/prometheus/client_golang/prometheus; version v1.20.4 -- https://github.com/prometheus/client_golang -** github.com/prometheus/client_model/go; version v0.4.1-0.20230718164431-9a2bf3000d16 -- +** github.com/prometheus/client_model/go; version v0.6.1 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.44.0 -- +** github.com/prometheus/common; version v0.55.0 -- https://github.com/prometheus/common -** github.com/prometheus/procfs; version v0.11.1 -- +** github.com/prometheus/procfs; version v0.15.1 -- https://github.com/prometheus/procfs -** github.com/spf13/afero; version v1.6.0 -- +** github.com/spf13/afero; version v1.11.0 -- https://github.com/spf13/afero ** github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud; version v1.0.7 -- @@ -170,7 +161,7 @@ https://github.com/volcengine/volc-sdk-golang ** github.com/volcengine/volc-sdk-golang/service/sts; version v1.0.23 -- https://github.com/volcengine/volc-sdk-golang -** github.com/volcengine/volcengine-go-sdk; version v1.0.97 -- +** github.com/volcengine/volcengine-go-sdk; version v1.0.159 -- https://github.com/volcengine/volcengine-go-sdk ** go.mongodb.org/mongo-driver; version v1.14.0 -- @@ -179,10 +170,10 @@ https://github.com/mongodb/mongo-go-driver ** go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux; version v0.51.0 -- https://github.com/open-telemetry/opentelemetry-go-contrib -** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.47.0 -- +** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.55.0 -- https://github.com/open-telemetry/opentelemetry-go-contrib -** go.opentelemetry.io/otel; version v1.26.0 -- +** go.opentelemetry.io/otel; version v1.31.0 -- https://github.com/open-telemetry/opentelemetry-go ** go.opentelemetry.io/otel/exporters/jaeger; version v1.0.0 -- @@ -191,55 +182,55 @@ https://github.com/open-telemetry/opentelemetry-go ** go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift; version v1.0.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.26.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.29.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp; version v1.26.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/metric; version v1.26.0 -- +** go.opentelemetry.io/otel/metric; version v1.31.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/sdk; version v1.26.0 -- +** go.opentelemetry.io/otel/sdk; version v1.29.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/trace; version v1.26.0 -- +** go.opentelemetry.io/otel/trace; version v1.31.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/proto/otlp; version v1.2.0 -- +** go.opentelemetry.io/proto/otlp; version v1.3.1 -- https://github.com/open-telemetry/opentelemetry-proto-go -** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20240227224415-6ceb2ff114de -- +** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20240528184218-531527333157 -- https://github.com/googleapis/go-genproto -** google.golang.org/genproto/googleapis/rpc/status; version v0.0.0-20240401170217-c3f982113cda -- +** google.golang.org/genproto/googleapis/rpc/status; version v0.0.0-20240701130421-f6361c86f094 -- https://github.com/googleapis/go-genproto -** google.golang.org/grpc; version v1.63.2 -- +** google.golang.org/grpc; version v1.65.0 -- https://github.com/grpc/grpc-go -** gopkg.in/ini.v1; version v1.62.0 -- +** gopkg.in/ini.v1; version v1.67.0 -- https://gopkg.in/ini.v1 ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** helm.sh/helm/v3; version v3.14.4 -- +** helm.sh/helm/v3; version v3.16.2 -- https://github.com/helm/helm -** k8s.io/api; version v0.30.0 -- +** k8s.io/api; version v0.31.1 -- https://github.com/kubernetes/api -** k8s.io/apimachinery/pkg; version v0.30.0 -- +** k8s.io/apimachinery/pkg; version v0.31.1 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.29.0 -- +** k8s.io/client-go; version v0.31.1 -- https://github.com/kubernetes/client-go -** k8s.io/klog/v2; version v2.120.1 -- +** k8s.io/klog/v2; version v2.130.1 -- https://github.com/kubernetes/klog -** k8s.io/utils; version v0.0.0-20230726121419-3b25d923346b -- +** k8s.io/utils; version v0.0.0-20240711033017-18e509b52bc8 -- https://github.com/kubernetes/utils ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- @@ -491,29 +482,7 @@ United States and other governments. It is your responsibility to ensure that your use and/or transfer does not violate applicable laws. -For more information, please see https://www.bis.doc.gov - -See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. - - -* For github.com/docker/docker/pkg/homedir see also this required NOTICE: -Docker -Copyright 2012-2017 Docker, Inc. - -This product includes software developed at Docker, Inc. (https://www.docker.com). - -This product contains software (https://github.com/creack/pty) developed -by Keith Rarick, licensed under the MIT License. - -The following is courtesy of our legal counsel: - - -Use and transfer of Docker may be subject to certain restrictions by the -United States and other governments. -It is your responsibility to ensure that your use and/or transfer does not -violate applicable laws. - -For more information, please see https://www.bis.doc.gov +For more information, see https://www.bis.doc.gov See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. @@ -537,10 +506,6 @@ For more information, please see https://www.bis.doc.gov See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. -* For github.com/matttproud/golang_protobuf_extensions/pbutil see also this required NOTICE: -Copyright 2012 Matt T. Proud (matt.proud@gmail.com) - - * For github.com/prometheus/client_golang/prometheus see also this required NOTICE: Prometheus instrumentation library for Go applications Copyright 2012-2015 The Prometheus Authors @@ -561,11 +526,6 @@ http://github.com/golang/protobuf/ Copyright 2010 The Go Authors See source code for license details. -Support for streaming Protocol Buffer messages for the Go language (golang). -https://github.com/matttproud/golang_protobuf_extensions -Copyright 2013 Matt T. Proud -Licensed under the Apache License, Version 2.0 - * For github.com/prometheus/client_model/go see also this required NOTICE: Data model artifacts for Prometheus. @@ -665,7 +625,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/magiconair/properties; version v1.8.5 -- +** github.com/magiconair/properties; version v1.8.7 -- https://github.com/magiconair/properties Copyright (c) 2013-2020, Frank Schroeder @@ -786,37 +746,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/aws/aws-sdk-go/internal/sync/singleflight; version v1.50.24 -- +** github.com/aws/aws-sdk-go/internal/sync/singleflight; version v1.55.5 -- https://github.com/aws/aws-sdk-go -** golang.org/go; version go1.22.8 -- -https://github.com/golang/go - -** golang.org/x/crypto; version v0.22.0 -- -https://golang.org/x/crypto +** github.com/sagikazarmark/slog-shim; version v0.1.0 -- +https://github.com/sagikazarmark/slog-shim -** golang.org/x/net; version v0.24.0 -- -https://golang.org/x/net - -** golang.org/x/oauth2; version v0.19.0 -- -https://golang.org/x/oauth2 - -** golang.org/x/sync; version v0.6.0 -- -https://golang.org/x/sync - -** golang.org/x/sys; version v0.19.0 -- -https://golang.org/x/sys - -** golang.org/x/term; version v0.19.0 -- -https://golang.org/x/term - -** golang.org/x/text; version v0.14.0 -- -https://golang.org/x/text - -** golang.org/x/time/rate; version v0.5.0 -- -https://golang.org/x/time +** golang.org/go; version go1.23.2 -- +https://github.com/golang/go -** k8s.io/apimachinery/third_party/forked/golang/reflect; version v0.30.0 -- +** k8s.io/apimachinery/third_party/forked/golang/reflect; version v0.31.1 -- https://github.com/kubernetes/apimachinery Copyright (c) 2009 The Go Authors. All rights reserved. @@ -849,44 +788,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/fsnotify/fsnotify; version v1.4.9 -- +** github.com/fsnotify/fsnotify; version v1.7.0 -- https://github.com/fsnotify/fsnotify -Copyright (c) 2012 The Go Authors. All rights reserved. -Copyright (c) 2012-2019 fsnotify Authors. All rights reserved. +Copyright © 2012 The Go Authors. All rights reserved. +Copyright © fsnotify Authors. All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. +* Neither the name of Google Inc. nor the names of its contributors may be used + to endorse or promote products derived from this software without specific + prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/go-jose/go-jose/v4/json; version v4.0.1 -- +** github.com/go-jose/go-jose/v4/json; version v4.0.2 -- https://github.com/go-jose/go-jose/v4 -** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20230726121419-3b25d923346b -- +** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20240711033017-18e509b52bc8 -- https://github.com/kubernetes/utils Copyright (c) 2012 The Go Authors. All rights reserved. @@ -958,40 +894,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------- - -** github.com/golang/protobuf/proto; version v1.5.4 -- -https://github.com/golang/protobuf - -Copyright 2010 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ------ ** github.com/google/uuid; version v1.6.0 -- @@ -1069,7 +971,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.19.1 -- +** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.20.0 -- https://github.com/grpc-ecosystem/grpc-gateway/v2 Copyright (c) 2015, Gengo, Inc. @@ -1102,7 +1004,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/klauspost/compress/internal/snapref; version v1.16.5 -- +** github.com/klauspost/compress/internal/snapref; version v1.17.9 -- https://github.com/klauspost/compress Copyright (c) 2011 The Snappy-Go Authors. All rights reserved. @@ -1135,7 +1037,44 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/pmezard/go-difflib/difflib; version v1.0.0 -- +** github.com/munnerz/goautoneg; version v0.0.0-20191010083416-a7dc8b61c822 -- +https://github.com/munnerz/goautoneg + +Copyright (c) 2011, Open Knowledge Foundation Ltd. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + Neither the name of the Open Knowledge Foundation Ltd. nor the + names of its contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + +** github.com/pmezard/go-difflib/difflib; version v1.0.1-0.20181226105442-5d4384ee4fb2 -- https://github.com/pmezard/go-difflib Copyright (c) 2013, Patrick Mezard @@ -1168,40 +1107,37 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.44.0 -- -https://github.com/prometheus/common +** github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil; version v1.20.4 -- +https://github.com/prometheus/client_golang -Copyright (c) 2011, Open Knowledge Foundation Ltd. -All rights reserved. +Copyright (c) 2013 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - Neither the name of the Open Knowledge Foundation Ltd. nor the - names of its contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ------ ** github.com/spf13/pflag; version v1.0.5 -- @@ -1272,7 +1208,61 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.33.0 -- +** golang.org/x/crypto; version v0.28.0 -- +https://golang.org/x/crypto + +** golang.org/x/net; version v0.29.0 -- +https://golang.org/x/net + +** golang.org/x/oauth2; version v0.23.0 -- +https://golang.org/x/oauth2 + +** golang.org/x/sync; version v0.8.0 -- +https://golang.org/x/sync + +** golang.org/x/sys; version v0.26.0 -- +https://golang.org/x/sys + +** golang.org/x/term; version v0.25.0 -- +https://golang.org/x/term + +** golang.org/x/text; version v0.19.0 -- +https://golang.org/x/text + +** golang.org/x/time/rate; version v0.7.0 -- +https://golang.org/x/time + +Copyright 2009 The Go Authors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google LLC nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + +** google.golang.org/protobuf; version v1.34.2 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -1339,7 +1329,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/davecgh/go-spew/spew; version v1.1.1 -- +** github.com/davecgh/go-spew/spew; version v1.1.2-0.20180830191138-d8f796af33cc -- https://github.com/davecgh/go-spew ISC License @@ -1403,7 +1393,7 @@ Copyright (c) 2014 Bob Matcuk https://github.com/cenkalti/backoff/v4 Copyright (c) 2014 Cenk Altı -** github.com/cespare/xxhash/v2; version v2.2.0 -- +** github.com/cespare/xxhash/v2; version v2.3.0 -- https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare @@ -1419,7 +1409,11 @@ Copyright (c) 2016 David Calavera https://github.com/felixge/httpsnoop Copyright (c) 2016 Felix Geisendörfer (felix@debuggable.com) -** github.com/go-openapi/runtime/middleware/denco; version v0.26.2 -- +** github.com/fxamacker/cbor/v2; version v2.7.0 -- +https://github.com/fxamacker/cbor/v2 +Copyright (c) 2019-present Faye Amacker + +** github.com/go-openapi/runtime/middleware/denco; version v0.28.0 -- https://github.com/go-openapi/runtime Copyright (c) 2014 Naoya Inada @@ -1489,7 +1483,7 @@ Copyright (c) 2017 Jaime Pillora https://github.com/json-iterator/go Copyright (c) 2016 json-iterator -** github.com/klauspost/compress/zstd/internal/xxhash; version v1.16.5 -- +** github.com/klauspost/compress/zstd/internal/xxhash; version v1.17.9 -- https://github.com/klauspost/compress Copyright (c) 2016 Caleb Spare @@ -1505,7 +1499,7 @@ Copyright (c) 2016 Mail.Ru Group https://github.com/Masterminds/semver Copyright (C) 2014-2019, Matt Butcher and Matt Farina -** github.com/Masterminds/semver/v3; version v3.2.1 -- +** github.com/Masterminds/semver/v3; version v3.3.0 -- https://github.com/Masterminds/semver/v3 Copyright (C) 2014-2019, Matt Butcher and Matt Farina @@ -1541,15 +1535,11 @@ Copyright (c) [2014] [shiena] https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen -** github.com/spf13/cast; version v1.5.0 -- +** github.com/spf13/cast; version v1.7.0 -- https://github.com/spf13/cast Copyright (c) 2014 Steve Francia -** github.com/spf13/jwalterweatherman; version v1.1.0 -- -https://github.com/spf13/jwalterweatherman -Copyright (c) 2014 Steve Francia - -** github.com/spf13/viper; version v1.8.1 -- +** github.com/spf13/viper; version v1.19.0 -- https://github.com/spf13/viper Copyright (c) 2014 Steve Francia @@ -1562,23 +1552,31 @@ Copyright (c) 2017-2018 objx contributors https://github.com/stretchr/testify Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors. -** github.com/subosito/gotenv; version v1.2.0 -- +** github.com/subosito/gotenv; version v1.6.0 -- https://github.com/subosito/gotenv Copyright (c) 2013 Alif Rachmawadi -** go.uber.org/atomic; version v1.7.0 -- +** github.com/valyala/bytebufferpool; version v1.0.0 -- +https://github.com/valyala/bytebufferpool +Copyright (c) 2016 Aliaksandr Valialkin, VertaMedia + +** github.com/x448/float16; version v0.8.4 -- +https://github.com/x448/float16 +Copyright (c) 2019 Montgomery Edwards⁴⁴⁸ and Faye Amacker + +** go.uber.org/atomic; version v1.9.0 -- https://github.com/uber-go/atomic Copyright (c) 2016 Uber Technologies, Inc. -** go.uber.org/multierr; version v1.6.0 -- +** go.uber.org/multierr; version v1.9.0 -- https://github.com/uber-go/multierr -Copyright (c) 2017 Uber Technologies, Inc. +Copyright (c) 2017-2021 Uber Technologies, Inc. ** go.uber.org/ratelimit; version v0.3.1 -- https://github.com/uber-go/ratelimit Copyright (c) 2016 Uber Technologies, Inc. -** go.uber.org/zap; version v1.19.0 -- +** go.uber.org/zap; version v1.21.0 -- https://github.com/uber-go/zap Copyright (c) 2016-2017 Uber Technologies, Inc. @@ -1601,7 +1599,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** github.com/go-asn1-ber/asn1-ber; version v1.5.6 -- +** github.com/go-asn1-ber/asn1-ber; version v1.5.7 -- https://github.com/go-asn1-ber/asn1-ber Copyright (c) 2011-2015 Michael Mitton (mmitton@gmail.com) @@ -1651,7 +1649,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** github.com/golang-migrate/migrate/v4; version v4.17.1 -- +** github.com/golang-migrate/migrate/v4; version v4.18.1 -- https://github.com/golang-migrate/migrate/v4 Copyright (c) 2016 Matthias Kadenbach Copyright (c) 2018 Dale Hui @@ -1746,6 +1744,32 @@ The above copyright notice and this permission notice shall be included in all c 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. ------ +** github.com/pelletier/go-toml/v2; version v2.2.2 -- +https://github.com/pelletier/go-toml/v2 +Copyright (c) 2021 - 2023 Thomas Pelletier + +go-toml v2 + + +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. +------ + ** github.com/robfig/cron; version v1.0.0 -- https://github.com/robfig/cron Copyright (C) 2012 Rob Figueiredo diff --git a/projects/goharbor/harbor/CHECKSUMS b/projects/goharbor/harbor/CHECKSUMS index fef02d7efa..b562f98c84 100644 --- a/projects/goharbor/harbor/CHECKSUMS +++ b/projects/goharbor/harbor/CHECKSUMS @@ -1,10 +1,10 @@ -3e0148f53c89e865ba1e83c1e7149b51454d8e978a3e4da7e4bb202db480c06b _output/bin/harbor/linux-amd64/harbor-core -185f39906718d8167044bae7f875563dbb3fa469883c94ca95fba6b62fa1e929 _output/bin/harbor/linux-amd64/harbor-exporter -005d9da9daaf67d80526e2fe3b0c32b27e5721bbd5f4db0dee196bee602c4823 _output/bin/harbor/linux-amd64/harbor-jobservice -29a4da1b8e1700decce4ed69246992aeed28c3819a8e24a0652ad5e96567154a _output/bin/harbor/linux-amd64/harbor-migrate -f607f04ad7f2b97b03d584690cde26ba549ca29c47f2e70ba9b81a59ead16ad9 _output/bin/harbor/linux-amd64/harbor-registryctl -94f646a42954d2c093066ddccde259b306bddb89ab74d4ffba9f28cc0271b7c1 _output/bin/harbor/linux-arm64/harbor-core -6ba7f8bf7daab963111da56522441c95aef331d5fbf78ef56d0d46ce1bab9e65 _output/bin/harbor/linux-arm64/harbor-exporter -68d1f0f393dbdbdae2be82ced40c2b1157468eae1577569af69bc77504cf6a34 _output/bin/harbor/linux-arm64/harbor-jobservice -34eb9afb5d74617b79af422521e691fd7b61fb4b56027afdf08421eef5e071c9 _output/bin/harbor/linux-arm64/harbor-migrate -317aa4ccc5356fa94abad5e9f3968f85bca011ef598568feff9d14036b296c73 _output/bin/harbor/linux-arm64/harbor-registryctl +037bfc9c74c0e869070f960b0194d645ddb10b858e65d03e6b837892ead67407 _output/bin/harbor/linux-amd64/harbor-core +ae4bdcfb435b759a6ba94323d9b818fe041a01ee74783daac848a0ad340607dd _output/bin/harbor/linux-amd64/harbor-exporter +63f425bc42734ccb2f0d076de6c033aade432fe3472d26b163b08f6d7135b0c2 _output/bin/harbor/linux-amd64/harbor-jobservice +f1ff6ac4dad35257f43600769c314ed9bc2b4075b028f618361a3bc8243dc057 _output/bin/harbor/linux-amd64/harbor-migrate +b49c589b11ee0fc5a5974641e31e6faa87d22574264fa38f6cc72d3a2a47f2e4 _output/bin/harbor/linux-amd64/harbor-registryctl +1ebda49cea89c02d0a3ff0193857f96ebeac61265ceaebeda2647c4680edfc1b _output/bin/harbor/linux-arm64/harbor-core +5214bbb11ef23f9c9d2efbe20184ea22df2a30e6edfec8b8a8e6b26e53bb2cc3 _output/bin/harbor/linux-arm64/harbor-exporter +cf2de4f73e0bcb68653ed4eae93643fe154a99ac6d8a7af7459ce1ef89e89a66 _output/bin/harbor/linux-arm64/harbor-jobservice +92375431b32998e1fa0fe02c36c6d2ec60dc8179e0dc6ac600601d9f16c1ccd7 _output/bin/harbor/linux-arm64/harbor-migrate +a32cc1b4279093fe80a76789d5d706a7f815a17a08ac44f053c5b54b95512b98 _output/bin/harbor/linux-arm64/harbor-registryctl diff --git a/projects/goharbor/harbor/patches/0001-tailor-cert-installation-script-for-al2.patch b/projects/goharbor/harbor/patches/0001-tailor-cert-installation-script-for-al2.patch index 22d3370b8c..783890bfbe 100644 --- a/projects/goharbor/harbor/patches/0001-tailor-cert-installation-script-for-al2.patch +++ b/projects/goharbor/harbor/patches/0001-tailor-cert-installation-script-for-al2.patch @@ -1,4 +1,4 @@ -From 34dc3e080a7f59fd3e756998e9f361063963f51e Mon Sep 17 00:00:00 2001 +From eba97582d4bedd2404e0bf433a27f87511420adf Mon Sep 17 00:00:00 2001 From: Vincent Ni Date: Tue, 28 Feb 2023 10:35:17 -0800 Subject: [PATCH 1/3] tailor cert installation script for al2 @@ -30,5 +30,5 @@ index c536b5665..3247e4950 100755 cp $ORIGINAL_LOCATION/ca-bundle.crt.original /etc/pki/tls/certs/ca-bundle.crt -- -2.40.1 +2.46.1 diff --git a/projects/goharbor/harbor/patches/0002-Generate-swagger-models-and-restapis.patch b/projects/goharbor/harbor/patches/0002-Generate-swagger-models-and-restapis.patch index edfc4b98d3..66762ecbad 100644 --- a/projects/goharbor/harbor/patches/0002-Generate-swagger-models-and-restapis.patch +++ b/projects/goharbor/harbor/patches/0002-Generate-swagger-models-and-restapis.patch @@ -1,4 +1,4 @@ -From cfee385827b0b8a044a35639afc32a6753265233 Mon Sep 17 00:00:00 2001 +From 11cc89a8f4c06724369756a31837ee35c97293bc Mon Sep 17 00:00:00 2001 From: Prow Bot Date: Thu, 22 Aug 2024 20:31:26 +0000 Subject: [PATCH 2/3] Generate swagger models and restapis @@ -15,8 +15,8 @@ Subject: [PATCH 2/3] Generate swagger models and restapis src/server/v2.0/models/authproxy_setting.go | 55 + src/server/v2.0/models/bool_config_item.go | 46 + .../v2.0/models/component_health_status.go | 49 + - src/server/v2.0/models/configurations.go | 202 + - .../v2.0/models/configurations_response.go | 1465 + + src/server/v2.0/models/configurations.go | 205 + + .../v2.0/models/configurations_response.go | 1490 + src/server/v2.0/models/cve_allowlist.go | 132 + src/server/v2.0/models/cve_allowlist_item.go | 43 + src/server/v2.0/models/dangerous_artifact.go | 58 + @@ -58,12 +58,12 @@ Subject: [PATCH 2/3] Generate swagger models and restapis src/server/v2.0/models/permission.go | 46 + src/server/v2.0/models/permissions.go | 112 + src/server/v2.0/models/platform.go | 55 + - src/server/v2.0/models/preheat_policy.go | 116 + + src/server/v2.0/models/preheat_policy.go | 119 + src/server/v2.0/models/project.go | 169 + src/server/v2.0/models/project_deletable.go | 46 + src/server/v2.0/models/project_member.go | 99 + .../v2.0/models/project_member_entity.go | 61 + - src/server/v2.0/models/project_metadata.go | 67 + + src/server/v2.0/models/project_metadata.go | 70 + src/server/v2.0/models/project_req.go | 127 + src/server/v2.0/models/project_scanner.go | 64 + src/server/v2.0/models/project_summary.go | 114 + @@ -101,7 +101,7 @@ Subject: [PATCH 2/3] Generate swagger models and restapis .../v2.0/models/retention_rule_trigger.go | 49 + src/server/v2.0/models/retention_selector.go | 52 + .../models/retention_selector_metadata.go | 49 + - src/server/v2.0/models/robot.go | 150 + + src/server/v2.0/models/robot.go | 156 + src/server/v2.0/models/robot_create.go | 98 + src/server/v2.0/models/robot_create_v1.go | 89 + src/server/v2.0/models/robot_created.go | 80 + @@ -156,7 +156,7 @@ Subject: [PATCH 2/3] Generate swagger models and restapis src/server/v2.0/models/worker_pool.go | 101 + src/server/v2.0/restapi/configure_harbor.go | 3785 ++ src/server/v2.0/restapi/doc.go | 23 + - src/server/v2.0/restapi/embedded_spec.go | 40167 ++++++++++++++++ + src/server/v2.0/restapi/embedded_spec.go | 40221 ++++++++++++++++ .../restapi/operations/artifact/add_label.go | 73 + .../artifact/add_label_parameters.go | 195 + .../artifact/add_label_responses.go | 456 + @@ -979,7 +979,7 @@ Subject: [PATCH 2/3] Generate swagger models and restapis .../webhookjob/list_webhook_jobs_responses.go | 370 + .../list_webhook_jobs_urlbuilder.go | 166 + src/server/v2.0/restapi/server.go | 5 + - 975 files changed, 201571 insertions(+) + 975 files changed, 201665 insertions(+) create mode 100644 src/server/v2.0/models/access.go create mode 100644 src/server/v2.0/models/accessory.go create mode 100644 src/server/v2.0/models/action_request.go @@ -2979,10 +2979,10 @@ index 000000000..3bf238260 +} diff --git a/src/server/v2.0/models/configurations.go b/src/server/v2.0/models/configurations.go new file mode 100644 -index 000000000..313d61791 +index 000000000..7966a9a7d --- /dev/null +++ b/src/server/v2.0/models/configurations.go -@@ -0,0 +1,202 @@ +@@ -0,0 +1,205 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package models @@ -3039,6 +3039,9 @@ index 000000000..313d61791 + // Specify the ldap group which have the same privilege with Harbor admin + LdapGroupAdminDn *string `json:"ldap_group_admin_dn,omitempty"` + ++ // Attach LDAP user group information in parallel, the parallel worker count is 5 ++ LdapGroupAttachParallel *bool `json:"ldap_group_attach_parallel,omitempty"` ++ + // The attribute which is used as identity of the LDAP group, default is cn.' + LdapGroupAttributeName *string `json:"ldap_group_attribute_name,omitempty"` + @@ -3187,10 +3190,10 @@ index 000000000..313d61791 +} diff --git a/src/server/v2.0/models/configurations_response.go b/src/server/v2.0/models/configurations_response.go new file mode 100644 -index 000000000..6a303e36c +index 000000000..a375ad683 --- /dev/null +++ b/src/server/v2.0/models/configurations_response.go -@@ -0,0 +1,1465 @@ +@@ -0,0 +1,1490 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package models @@ -3248,6 +3251,9 @@ index 000000000..6a303e36c + // Specify the ldap group which have the same privilege with Harbor admin + LdapGroupAdminDn *StringConfigItem `json:"ldap_group_admin_dn,omitempty"` + ++ // Attach LDAP user group information in parallel. ++ LdapGroupAttachParallel *BoolConfigItem `json:"ldap_group_attach_parallel,omitempty"` ++ + // The attribute which is used as identity of the LDAP group, default is cn.' + LdapGroupAttributeName *StringConfigItem `json:"ldap_group_attribute_name,omitempty"` + @@ -3425,6 +3431,10 @@ index 000000000..6a303e36c + res = append(res, err) + } + ++ if err := m.validateLdapGroupAttachParallel(formats); err != nil { ++ res = append(res, err) ++ } ++ + if err := m.validateLdapGroupAttributeName(formats); err != nil { + res = append(res, err) + } @@ -3825,6 +3835,24 @@ index 000000000..6a303e36c + return nil +} + ++func (m *ConfigurationsResponse) validateLdapGroupAttachParallel(formats strfmt.Registry) error { ++ ++ if swag.IsZero(m.LdapGroupAttachParallel) { // not required ++ return nil ++ } ++ ++ if m.LdapGroupAttachParallel != nil { ++ if err := m.LdapGroupAttachParallel.Validate(formats); err != nil { ++ if ve, ok := err.(*errors.Validation); ok { ++ return ve.ValidateName("ldap_group_attach_parallel") ++ } ++ return err ++ } ++ } ++ ++ return nil ++} ++ +func (m *ConfigurationsResponse) validateLdapGroupAttributeName(formats strfmt.Registry) error { + + if swag.IsZero(m.LdapGroupAttributeName) { // not required @@ -7714,10 +7742,10 @@ index 000000000..13a4fb0ca +} diff --git a/src/server/v2.0/models/preheat_policy.go b/src/server/v2.0/models/preheat_policy.go new file mode 100644 -index 000000000..9cd2d0539 +index 000000000..d38b65d4a --- /dev/null +++ b/src/server/v2.0/models/preheat_policy.go -@@ -0,0 +1,116 @@ +@@ -0,0 +1,119 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package models @@ -7765,6 +7793,9 @@ index 000000000..9cd2d0539 + // The Name of preheat policy provider + ProviderName string `json:"provider_name,omitempty"` + ++ // The scope of preheat policy ++ Scope string `json:"scope,omitempty"` ++ + // The Trigger of preheat policy + Trigger string `json:"trigger,omitempty"` + @@ -8235,10 +8266,10 @@ index 000000000..31d84b4a3 +} diff --git a/src/server/v2.0/models/project_metadata.go b/src/server/v2.0/models/project_metadata.go new file mode 100644 -index 000000000..8d2f298af +index 000000000..d60f340e7 --- /dev/null +++ b/src/server/v2.0/models/project_metadata.go -@@ -0,0 +1,67 @@ +@@ -0,0 +1,70 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package models @@ -8271,6 +8302,9 @@ index 000000000..8d2f298af + // Whether prevent the vulnerable images from running. The valid values are "true", "false". + PreventVul *string `json:"prevent_vul,omitempty"` + ++ // The bandwidth limit of proxy cache, in Kbps (kilobits per second). It limits the communication between Harbor and the upstream registry, not the client and the Harbor. ++ ProxySpeedKb *string `json:"proxy_speed_kb,omitempty"` ++ + // The public status of the project. The valid values are "true", "false". + Public string `json:"public,omitempty"` + @@ -11620,10 +11654,10 @@ index 000000000..92e20acc2 +} diff --git a/src/server/v2.0/models/robot.go b/src/server/v2.0/models/robot.go new file mode 100644 -index 000000000..4e9532ecd +index 000000000..f59c0d732 --- /dev/null +++ b/src/server/v2.0/models/robot.go -@@ -0,0 +1,150 @@ +@@ -0,0 +1,156 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package models @@ -11649,6 +11683,12 @@ index 000000000..4e9532ecd + // Format: date-time + CreationTime strfmt.DateTime `json:"creation_time,omitempty"` + ++ // The reference of the robot creator, like the id of harbor user. ++ CreatorRef int64 `json:"creator_ref,omitempty"` ++ ++ // The type of the robot creator, like local(harbor_user) or robot. ++ CreatorType string `json:"creator_type,omitempty"` ++ + // The description of the robot + Description string `json:"description,omitempty"` + @@ -20223,10 +20263,10 @@ index 000000000..304e51ed4 +package restapi diff --git a/src/server/v2.0/restapi/embedded_spec.go b/src/server/v2.0/restapi/embedded_spec.go new file mode 100644 -index 000000000..8ff558d9b +index 000000000..f189d0238 --- /dev/null +++ b/src/server/v2.0/restapi/embedded_spec.go -@@ -0,0 +1,40167 @@ +@@ -0,0 +1,40221 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package restapi @@ -21306,7 +21346,7 @@ index 000000000..8ff558d9b + }, + "/ldap/users/search": { + "get": { -+ "description": "This endpoint searches the available ldap users based on related configuration parameters. Support searched by input ladp configuration, load configuration from the system and specific filter.\n", ++ "description": "This endpoint searches the available ldap users based on related configuration parameters. Support searched by input ldap configuration, load configuration from the system and specific filter.\n", + "tags": [ + "Ldap" + ], @@ -30663,6 +30703,12 @@ index 000000000..8ff558d9b + "x-isnullable": true, + "x-omitempty": true + }, ++ "ldap_group_attach_parallel": { ++ "description": "Attach LDAP user group information in parallel, the parallel worker count is 5", ++ "type": "boolean", ++ "x-isnullable": true, ++ "x-omitempty": true ++ }, + "ldap_group_attribute_name": { + "description": "The attribute which is used as identity of the LDAP group, default is cn.'", + "type": "string", @@ -30966,6 +31012,10 @@ index 000000000..8ff558d9b + "description": "Specify the ldap group which have the same privilege with Harbor admin", + "$ref": "#/definitions/StringConfigItem" + }, ++ "ldap_group_attach_parallel": { ++ "description": "Attach LDAP user group information in parallel.", ++ "$ref": "#/definitions/BoolConfigItem" ++ }, + "ldap_group_attribute_name": { + "description": "The attribute which is used as identity of the LDAP group, default is cn.'", + "$ref": "#/definitions/StringConfigItem" @@ -32143,6 +32193,10 @@ index 000000000..8ff558d9b + "description": "The Name of preheat policy provider", + "type": "string" + }, ++ "scope": { ++ "description": "The scope of preheat policy", ++ "type": "string" ++ }, + "trigger": { + "description": "The Trigger of preheat policy", + "type": "string" @@ -32314,6 +32368,11 @@ index 000000000..8ff558d9b + "type": "string", + "x-nullable": true + }, ++ "proxy_speed_kb": { ++ "description": "The bandwidth limit of proxy cache, in Kbps (kilobits per second). It limits the communication between Harbor and the upstream registry, not the client and the Harbor.", ++ "type": "string", ++ "x-nullable": true ++ }, + "public": { + "description": "The public status of the project. The valid values are \"true\", \"false\".", + "type": "string" @@ -33334,6 +33393,14 @@ index 000000000..8ff558d9b + "type": "string", + "format": "date-time" + }, ++ "creator_ref": { ++ "description": "The reference of the robot creator, like the id of harbor user.", ++ "type": "integer" ++ }, ++ "creator_type": { ++ "description": "The type of the robot creator, like local(harbor_user) or robot.", ++ "type": "string" ++ }, + "description": { + "description": "The description of the robot", + "type": "string" @@ -37241,7 +37308,7 @@ index 000000000..8ff558d9b + }, + "/ldap/users/search": { + "get": { -+ "description": "This endpoint searches the available ldap users based on related configuration parameters. Support searched by input ladp configuration, load configuration from the system and specific filter.\n", ++ "description": "This endpoint searches the available ldap users based on related configuration parameters. Support searched by input ldap configuration, load configuration from the system and specific filter.\n", + "tags": [ + "Ldap" + ], @@ -55757,6 +55824,12 @@ index 000000000..8ff558d9b + "x-isnullable": true, + "x-omitempty": true + }, ++ "ldap_group_attach_parallel": { ++ "description": "Attach LDAP user group information in parallel, the parallel worker count is 5", ++ "type": "boolean", ++ "x-isnullable": true, ++ "x-omitempty": true ++ }, + "ldap_group_attribute_name": { + "description": "The attribute which is used as identity of the LDAP group, default is cn.'", + "type": "string", @@ -56060,6 +56133,10 @@ index 000000000..8ff558d9b + "description": "Specify the ldap group which have the same privilege with Harbor admin", + "$ref": "#/definitions/StringConfigItem" + }, ++ "ldap_group_attach_parallel": { ++ "description": "Attach LDAP user group information in parallel.", ++ "$ref": "#/definitions/BoolConfigItem" ++ }, + "ldap_group_attribute_name": { + "description": "The attribute which is used as identity of the LDAP group, default is cn.'", + "$ref": "#/definitions/StringConfigItem" @@ -57266,6 +57343,10 @@ index 000000000..8ff558d9b + "description": "The Name of preheat policy provider", + "type": "string" + }, ++ "scope": { ++ "description": "The scope of preheat policy", ++ "type": "string" ++ }, + "trigger": { + "description": "The Trigger of preheat policy", + "type": "string" @@ -57437,6 +57518,11 @@ index 000000000..8ff558d9b + "type": "string", + "x-nullable": true + }, ++ "proxy_speed_kb": { ++ "description": "The bandwidth limit of proxy cache, in Kbps (kilobits per second). It limits the communication between Harbor and the upstream registry, not the client and the Harbor.", ++ "type": "string", ++ "x-nullable": true ++ }, + "public": { + "description": "The public status of the project. The valid values are \"true\", \"false\".", + "type": "string" @@ -58457,6 +58543,14 @@ index 000000000..8ff558d9b + "type": "string", + "format": "date-time" + }, ++ "creator_ref": { ++ "description": "The reference of the robot creator, like the id of harbor user.", ++ "type": "integer" ++ }, ++ "creator_type": { ++ "description": "The type of the robot creator, like local(harbor_user) or robot.", ++ "type": "string" ++ }, + "description": { + "description": "The description of the robot", + "type": "string" @@ -94516,7 +94610,7 @@ index 000000000..7a7aee624 +} diff --git a/src/server/v2.0/restapi/operations/ldap/search_ldap_user.go b/src/server/v2.0/restapi/operations/ldap/search_ldap_user.go new file mode 100644 -index 000000000..e358f3b97 +index 000000000..b0b7c0f1f --- /dev/null +++ b/src/server/v2.0/restapi/operations/ldap/search_ldap_user.go @@ -0,0 +1,74 @@ @@ -94555,7 +94649,7 @@ index 000000000..e358f3b97 + +Search available ldap users. + -+This endpoint searches the available ldap users based on related configuration parameters. Support searched by input ladp configuration, load configuration from the system and specific filter. ++This endpoint searches the available ldap users based on related configuration parameters. Support searched by input ldap configuration, load configuration from the system and specific filter. + + +*/ @@ -209378,5 +209472,5 @@ index 000000000..77b66a099 + +// this file is intentionally empty. Otherwise go-swagger will generate a server which we don't want -- -2.40.1 +2.46.1 diff --git a/projects/goharbor/harbor/patches/0003-Update-tag-for-tencentcloud-sdk-go-to-v1.0.7.patch b/projects/goharbor/harbor/patches/0003-Update-tag-for-tencentcloud-sdk-go-to-v1.0.7.patch index 5489f65e85..60f487c89a 100644 --- a/projects/goharbor/harbor/patches/0003-Update-tag-for-tencentcloud-sdk-go-to-v1.0.7.patch +++ b/projects/goharbor/harbor/patches/0003-Update-tag-for-tencentcloud-sdk-go-to-v1.0.7.patch @@ -1,57 +1,41 @@ -From f58841b369010f6d78c776747d458ae869372714 Mon Sep 17 00:00:00 2001 +From 3b7d453ccc0c8b1fd257205f6e71d88779335aac Mon Sep 17 00:00:00 2001 From: Prow Bot Date: Thu, 22 Aug 2024 15:41:41 -0700 Subject: [PATCH 3/3] Update tag for tencentcloud-sdk-go to v1.0.7 --- - src/go.mod | 8 +++++--- + src/go.mod | 2 ++ src/go.sum | 4 ++-- - 2 files changed, 7 insertions(+), 5 deletions(-) + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/go.mod b/src/go.mod -index 46b7210df..356ced5a6 100644 +index 484e36795..57871f1d6 100644 --- a/src/go.mod +++ b/src/go.mod -@@ -21,12 +21,12 @@ require ( - github.com/go-asn1-ber/asn1-ber v1.5.6 - github.com/go-ldap/ldap/v3 v3.4.6 - github.com/go-openapi/errors v0.22.0 -- github.com/go-openapi/loads v0.21.2 // indirect -+ github.com/go-openapi/loads v0.21.2 - github.com/go-openapi/runtime v0.26.2 -- github.com/go-openapi/spec v0.20.11 // indirect -+ github.com/go-openapi/spec v0.20.11 - github.com/go-openapi/strfmt v0.23.0 - github.com/go-openapi/swag v0.22.7 -- github.com/go-openapi/validate v0.22.3 // indirect -+ github.com/go-openapi/validate v0.22.3 - github.com/go-redis/redis/v8 v8.11.4 - github.com/gocarina/gocsv v0.0.0-20210516172204-ca9e8a8ddea8 - github.com/gocraft/work v0.5.1 -@@ -78,6 +78,8 @@ require ( - sigs.k8s.io/yaml v1.4.0 - ) +@@ -80,6 +80,8 @@ require ( + + require github.com/prometheus/client_model v0.6.1 +replace github.com/tencentcloud/tencentcloud-sdk-go => github.com/tencentcloud/tencentcloud-sdk-go v1.0.7 + require ( - cloud.google.com/go/compute v1.24.0 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.3.0 // indirect + github.com/Azure/azure-sdk-for-go v37.2.0+incompatible // indirect diff --git a/src/go.sum b/src/go.sum -index 723ed50c2..7e2e1959f 100644 +index c8e8cd627..331087d63 100644 --- a/src/go.sum +++ b/src/go.sum -@@ -608,8 +608,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT +@@ -517,8 +517,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= - github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= - github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= + github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= + github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/tencentcloud/tencentcloud-sdk-go v3.0.233+incompatible h1:q+D/Y9jla3afgsIihtyhwyl0c2W+eRWNM9ohVwPiiPw= -github.com/tencentcloud/tencentcloud-sdk-go v3.0.233+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4= +github.com/tencentcloud/tencentcloud-sdk-go v1.0.7 h1:rTacbVIwMkEPjMq2255oMyFwrRCc3G/FUn7J/OByK4k= +github.com/tencentcloud/tencentcloud-sdk-go v1.0.7/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI= - github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= + github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -- -2.40.1 +2.46.1