From a44eb4dacc8899be4bb28a5ba0d40a3ea3592d64 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Wed, 15 May 2019 11:13:42 +0000 Subject: [PATCH] update vendor --- Gopkg.lock | 20 +++--- vendor/yunion.io/x/jsonutils/access.go | 14 +++++ vendor/yunion.io/x/jsonutils/clone.go | 14 +++++ vendor/yunion.io/x/jsonutils/compond.go | 14 +++++ vendor/yunion.io/x/jsonutils/currency.go | 14 +++++ vendor/yunion.io/x/jsonutils/dict.go | 14 +++++ vendor/yunion.io/x/jsonutils/doc.go | 14 +++++ vendor/yunion.io/x/jsonutils/equals.go | 14 +++++ vendor/yunion.io/x/jsonutils/interface.go | 14 +++++ vendor/yunion.io/x/jsonutils/iszero.go | 14 +++++ vendor/yunion.io/x/jsonutils/jsonutils.go | 14 +++++ vendor/yunion.io/x/jsonutils/length.go | 14 +++++ vendor/yunion.io/x/jsonutils/marshal.go | 14 +++++ vendor/yunion.io/x/jsonutils/querystring.go | 14 +++++ vendor/yunion.io/x/jsonutils/reflect.go | 14 +++++ vendor/yunion.io/x/jsonutils/size.go | 14 +++++ vendor/yunion.io/x/jsonutils/unmarshal.go | 14 +++++ vendor/yunion.io/x/jsonutils/update.go | 14 +++++ vendor/yunion.io/x/jsonutils/utils.go | 14 +++++ vendor/yunion.io/x/jsonutils/yamlutils.go | 14 +++++ vendor/yunion.io/x/log/doc.go | 14 +++++ vendor/yunion.io/x/log/formatter.go | 14 +++++ vendor/yunion.io/x/log/hooks/caller.go | 14 +++++ vendor/yunion.io/x/log/hooks/doc.go | 14 +++++ vendor/yunion.io/x/log/hooks/file.go | 14 +++++ vendor/yunion.io/x/log/hooks/stdio.go | 14 +++++ vendor/yunion.io/x/log/log.go | 14 +++++ vendor/yunion.io/x/pkg/gotypes/deepcopy.go | 14 +++++ vendor/yunion.io/x/pkg/gotypes/doc.go | 14 +++++ vendor/yunion.io/x/pkg/gotypes/gotypes.go | 14 +++++ vendor/yunion.io/x/pkg/gotypes/serialize.go | 14 +++++ vendor/yunion.io/x/pkg/prettytable/doc.go | 14 +++++ .../x/pkg/prettytable/prettytable.go | 14 +++++ vendor/yunion.io/x/pkg/trace/doc.go | 14 +++++ vendor/yunion.io/x/pkg/trace/trace.go | 14 +++++ vendor/yunion.io/x/pkg/tristate/doc.go | 14 +++++ vendor/yunion.io/x/pkg/tristate/tristate.go | 14 +++++ vendor/yunion.io/x/pkg/util/cache/doc.go | 14 +++++ .../x/pkg/util/cache/expiration_cache.go | 14 +++++ .../pkg/util/cache/expiration_cache_fakes.go | 14 +++++ vendor/yunion.io/x/pkg/util/cache/fifo.go | 14 +++++ vendor/yunion.io/x/pkg/util/cache/index.go | 14 +++++ vendor/yunion.io/x/pkg/util/cache/lru.go | 14 +++++ vendor/yunion.io/x/pkg/util/cache/store.go | 14 +++++ .../x/pkg/util/cache/thread_safe_store.go | 14 +++++ vendor/yunion.io/x/pkg/util/clock/clock.go | 14 +++++ vendor/yunion.io/x/pkg/util/clock/doc.go | 14 +++++ .../yunion.io/x/pkg/util/compare/compare.go | 14 +++++ vendor/yunion.io/x/pkg/util/compare/doc.go | 14 +++++ .../x/pkg/util/compare/syncresults.go | 14 +++++ vendor/yunion.io/x/pkg/util/errors/doc.go | 14 +++++ vendor/yunion.io/x/pkg/util/errors/errors.go | 14 +++++ .../yunion.io/x/pkg/util/errors/http_error.go | 14 +++++ vendor/yunion.io/x/pkg/util/fileutils/doc.go | 14 +++++ .../x/pkg/util/fileutils/filesize.go | 14 +++++ .../yunion.io/x/pkg/util/filterclause/doc.go | 14 +++++ .../x/pkg/util/filterclause/filterclause.go | 63 ++++++++++++++----- .../x/pkg/util/goroutine_pool/doc.go | 14 +++++ .../yunion.io/x/pkg/util/goroutine_pool/gp.go | 14 +++++ vendor/yunion.io/x/pkg/util/netutils/doc.go | 14 +++++ .../yunion.io/x/pkg/util/netutils/netutils.go | 14 +++++ vendor/yunion.io/x/pkg/util/osprofile/doc.go | 14 +++++ .../x/pkg/util/osprofile/osprofile.go | 14 +++++ vendor/yunion.io/x/pkg/util/prometheus/doc.go | 14 +++++ .../x/pkg/util/prometheus/gin_handler.go | 14 +++++ .../yunion.io/x/pkg/util/reflectutils/doc.go | 14 +++++ .../x/pkg/util/reflectutils/jsonfield.go | 14 +++++ .../x/pkg/util/reflectutils/reflectutils.go | 14 +++++ vendor/yunion.io/x/pkg/util/regutils/doc.go | 14 +++++ .../yunion.io/x/pkg/util/regutils/regutils.go | 14 +++++ vendor/yunion.io/x/pkg/util/runtime/doc.go | 14 +++++ .../yunion.io/x/pkg/util/runtime/runtime.go | 14 +++++ vendor/yunion.io/x/pkg/util/seclib/doc.go | 14 +++++ vendor/yunion.io/x/pkg/util/seclib/seclib.go | 14 +++++ vendor/yunion.io/x/pkg/util/secrules/cut.go | 14 +++++ vendor/yunion.io/x/pkg/util/secrules/doc.go | 14 +++++ vendor/yunion.io/x/pkg/util/secrules/port.go | 14 +++++ .../yunion.io/x/pkg/util/secrules/secrules.go | 14 +++++ .../x/pkg/util/secrules/secruleset.go | 14 +++++ .../x/pkg/util/secrules/securityruleset.go | 14 +++++ vendor/yunion.io/x/pkg/util/sets/byte.go | 14 +++++ vendor/yunion.io/x/pkg/util/sets/doc.go | 14 +++++ vendor/yunion.io/x/pkg/util/sets/empty.go | 14 +++++ vendor/yunion.io/x/pkg/util/sets/int.go | 14 +++++ vendor/yunion.io/x/pkg/util/sets/int64.go | 14 +++++ vendor/yunion.io/x/pkg/util/sets/string.go | 14 +++++ .../yunion.io/x/pkg/util/signalutils/doc.go | 14 +++++ .../x/pkg/util/signalutils/signalutils.go | 14 +++++ .../yunion.io/x/pkg/util/stringutils/doc.go | 14 +++++ .../x/pkg/util/stringutils/stringutils.go | 14 +++++ vendor/yunion.io/x/pkg/util/timeutils/doc.go | 14 +++++ .../x/pkg/util/timeutils/timeutils.go | 14 +++++ vendor/yunion.io/x/pkg/util/trace/doc.go | 14 +++++ vendor/yunion.io/x/pkg/util/trace/trace.go | 14 +++++ vendor/yunion.io/x/pkg/util/ttlpool/doc.go | 14 +++++ vendor/yunion.io/x/pkg/util/ttlpool/pool.go | 14 +++++ vendor/yunion.io/x/pkg/util/version/base.go | 14 +++++ vendor/yunion.io/x/pkg/util/version/doc.go | 14 +++++ .../yunion.io/x/pkg/util/version/version.go | 14 +++++ vendor/yunion.io/x/pkg/util/wait/doc.go | 14 +++++ vendor/yunion.io/x/pkg/util/wait/wait.go | 14 +++++ vendor/yunion.io/x/pkg/util/workqueue/doc.go | 14 +++++ .../x/pkg/util/workqueue/parallelizer.go | 14 +++++ vendor/yunion.io/x/pkg/utils/crypt.go | 14 +++++ vendor/yunion.io/x/pkg/utils/doc.go | 14 +++++ .../x/pkg/utils/fibonacci_retrier.go | 14 +++++ vendor/yunion.io/x/pkg/utils/misc.go | 14 +++++ vendor/yunion.io/x/pkg/utils/net.go | 14 +++++ vendor/yunion.io/x/pkg/utils/pidfile.go | 14 +++++ vendor/yunion.io/x/pkg/utils/profiler.go | 14 +++++ vendor/yunion.io/x/pkg/utils/tags.go | 14 +++++ vendor/yunion.io/x/pkg/utils/utils.go | 14 +++++ vendor/yunion.io/x/pkg/utils/uuid.go | 14 +++++ vendor/yunion.io/x/pkg/utils/wait_group.go | 14 +++++ vendor/yunion.io/x/sqlchemy/functions.go | 8 ++- vendor/yunion.io/x/structarg/doc.go | 14 +++++ vendor/yunion.io/x/structarg/errors.go | 14 +++++ vendor/yunion.io/x/structarg/stringdist.go | 14 +++++ vendor/yunion.io/x/structarg/structarg.go | 14 +++++ 119 files changed, 1689 insertions(+), 26 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 04e1de76a5..cecb4eeb5e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1746,26 +1746,26 @@ [[projects]] branch = "master" - digest = "1:42d239ae111f048d344c571367c60b87846ca8a8091ba6a7ff28653946b87aa9" + digest = "1:dd1650e297358d848ef6dcee19dfc771c3797a4d4de4a35308776a6cb7ef4f55" name = "yunion.io/x/jsonutils" packages = ["."] pruneopts = "UT" - revision = "592000e7859ab9736b06085e0c99301897ba9ff9" + revision = "c321606ff64b549fbcfc530f26f8b1858695918d" [[projects]] branch = "master" - digest = "1:20590bdd812710ad3257e92c23c7d19d9595a48ed69b200ac1d23ac76eee848e" + digest = "1:b41b7202c73bb184085e87e1373d2729f0a4fb5776c0b41376c14809159508af" name = "yunion.io/x/log" packages = [ ".", "hooks", ] pruneopts = "UT" - revision = "3c4f24289a1b2fd39b94a9ccbd40931b3a20aab7" + revision = "04ce53b17c6b0db6eaff6bd810db2c6106232176" [[projects]] branch = "master" - digest = "1:ff4334957fadf486ac19ce9d6aa120a25fda56f09cc2d369ba46dc70c7e24961" + digest = "1:0fbe21d28e25757df5cfc5266c9c8d8183da6b1749dd20dfe06a94ba801db4fe" name = "yunion.io/x/pkg" packages = [ "gotypes", @@ -1799,23 +1799,23 @@ "utils", ] pruneopts = "UT" - revision = "c357d205e6857f7ed798e0c75e77bf1db438d455" + revision = "740ce1e70d2417c195f669bbddf8ade8ec967419" [[projects]] branch = "master" - digest = "1:f3186dd9bc7ac7c1ee87e12abc731f2c0736f25c8fe398da255f6a65300bd6b1" + digest = "1:66d19ef38985070b76f8ca9f9fc468e69e923bf331cb9bf4488d7997f2f4a7b0" name = "yunion.io/x/sqlchemy" packages = ["."] pruneopts = "UT" - revision = "4fa510b83b623547911537efb70a2817fa690009" + revision = "b100553e017505920d398be5bb4bafe7914d6ef0" [[projects]] branch = "master" - digest = "1:cfa79b54c4ec8d1fe6b1599846b3975c50212f58114d807a6db69bbee5a16b7a" + digest = "1:505f3ac78ea58d528c24f804b58e03638515fb817bd0e07f4809bc0200316d33" name = "yunion.io/x/structarg" packages = ["."] pruneopts = "UT" - revision = "5b725f46d67547e7fb603b2118eddc5358ac2a39" + revision = "4a479a4597e8856097209f3e3b38b8e39fbbd9e1" [solve-meta] analyzer-name = "dep" diff --git a/vendor/yunion.io/x/jsonutils/access.go b/vendor/yunion.io/x/jsonutils/access.go index 86b24ff039..90bb0859fb 100644 --- a/vendor/yunion.io/x/jsonutils/access.go +++ b/vendor/yunion.io/x/jsonutils/access.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils import ( diff --git a/vendor/yunion.io/x/jsonutils/clone.go b/vendor/yunion.io/x/jsonutils/clone.go index ee76350d0e..43c705ecdc 100644 --- a/vendor/yunion.io/x/jsonutils/clone.go +++ b/vendor/yunion.io/x/jsonutils/clone.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils import ( diff --git a/vendor/yunion.io/x/jsonutils/compond.go b/vendor/yunion.io/x/jsonutils/compond.go index 1ffc930c35..1b3dd83040 100644 --- a/vendor/yunion.io/x/jsonutils/compond.go +++ b/vendor/yunion.io/x/jsonutils/compond.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils func (val *JSONValue) isCompond() bool { diff --git a/vendor/yunion.io/x/jsonutils/currency.go b/vendor/yunion.io/x/jsonutils/currency.go index 0f2d2b77f8..ed2abbc76e 100644 --- a/vendor/yunion.io/x/jsonutils/currency.go +++ b/vendor/yunion.io/x/jsonutils/currency.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils import ( diff --git a/vendor/yunion.io/x/jsonutils/dict.go b/vendor/yunion.io/x/jsonutils/dict.go index 1bf6a3fc69..87db0ca23b 100644 --- a/vendor/yunion.io/x/jsonutils/dict.go +++ b/vendor/yunion.io/x/jsonutils/dict.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils func (dict *JSONDict) Update(json JSONObject) { diff --git a/vendor/yunion.io/x/jsonutils/doc.go b/vendor/yunion.io/x/jsonutils/doc.go index 0fcfa10c08..91528f8467 100644 --- a/vendor/yunion.io/x/jsonutils/doc.go +++ b/vendor/yunion.io/x/jsonutils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils // import "yunion.io/x/jsonutils" diff --git a/vendor/yunion.io/x/jsonutils/equals.go b/vendor/yunion.io/x/jsonutils/equals.go index ffba96318a..41dd24ce2f 100644 --- a/vendor/yunion.io/x/jsonutils/equals.go +++ b/vendor/yunion.io/x/jsonutils/equals.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils // import "yunion.io/x/pkg/gotypes" diff --git a/vendor/yunion.io/x/jsonutils/interface.go b/vendor/yunion.io/x/jsonutils/interface.go index 3ee19a10f6..c1d627655c 100644 --- a/vendor/yunion.io/x/jsonutils/interface.go +++ b/vendor/yunion.io/x/jsonutils/interface.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils func (self *JSONValue) Interface() interface{} { diff --git a/vendor/yunion.io/x/jsonutils/iszero.go b/vendor/yunion.io/x/jsonutils/iszero.go index 72ad2551cc..f16be304ce 100644 --- a/vendor/yunion.io/x/jsonutils/iszero.go +++ b/vendor/yunion.io/x/jsonutils/iszero.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils func (this *JSONValue) IsZero() bool { diff --git a/vendor/yunion.io/x/jsonutils/jsonutils.go b/vendor/yunion.io/x/jsonutils/jsonutils.go index 372bd6f859..9452236eee 100644 --- a/vendor/yunion.io/x/jsonutils/jsonutils.go +++ b/vendor/yunion.io/x/jsonutils/jsonutils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils import ( diff --git a/vendor/yunion.io/x/jsonutils/length.go b/vendor/yunion.io/x/jsonutils/length.go index d47009cc41..a9ab1ded5d 100644 --- a/vendor/yunion.io/x/jsonutils/length.go +++ b/vendor/yunion.io/x/jsonutils/length.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils func (this *JSONString) Length() int { diff --git a/vendor/yunion.io/x/jsonutils/marshal.go b/vendor/yunion.io/x/jsonutils/marshal.go index db0d942cd8..e0e258d5a4 100644 --- a/vendor/yunion.io/x/jsonutils/marshal.go +++ b/vendor/yunion.io/x/jsonutils/marshal.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils /** diff --git a/vendor/yunion.io/x/jsonutils/querystring.go b/vendor/yunion.io/x/jsonutils/querystring.go index 143688f7d9..956a374049 100644 --- a/vendor/yunion.io/x/jsonutils/querystring.go +++ b/vendor/yunion.io/x/jsonutils/querystring.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils import ( diff --git a/vendor/yunion.io/x/jsonutils/reflect.go b/vendor/yunion.io/x/jsonutils/reflect.go index eab866e8dc..ca836a14a2 100644 --- a/vendor/yunion.io/x/jsonutils/reflect.go +++ b/vendor/yunion.io/x/jsonutils/reflect.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils import ( diff --git a/vendor/yunion.io/x/jsonutils/size.go b/vendor/yunion.io/x/jsonutils/size.go index d184e7cff0..f4a01f566a 100644 --- a/vendor/yunion.io/x/jsonutils/size.go +++ b/vendor/yunion.io/x/jsonutils/size.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils func (this *JSONDict) Size() int { diff --git a/vendor/yunion.io/x/jsonutils/unmarshal.go b/vendor/yunion.io/x/jsonutils/unmarshal.go index e507e40821..dd30470bc2 100644 --- a/vendor/yunion.io/x/jsonutils/unmarshal.go +++ b/vendor/yunion.io/x/jsonutils/unmarshal.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils /** diff --git a/vendor/yunion.io/x/jsonutils/update.go b/vendor/yunion.io/x/jsonutils/update.go index 0122563356..cd3170a7f9 100644 --- a/vendor/yunion.io/x/jsonutils/update.go +++ b/vendor/yunion.io/x/jsonutils/update.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils func Update(dst, src interface{}) error { diff --git a/vendor/yunion.io/x/jsonutils/utils.go b/vendor/yunion.io/x/jsonutils/utils.go index cfd77eee04..e4a7635ada 100644 --- a/vendor/yunion.io/x/jsonutils/utils.go +++ b/vendor/yunion.io/x/jsonutils/utils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils import ( diff --git a/vendor/yunion.io/x/jsonutils/yamlutils.go b/vendor/yunion.io/x/jsonutils/yamlutils.go index e23ccad3d9..5146ad8a57 100644 --- a/vendor/yunion.io/x/jsonutils/yamlutils.go +++ b/vendor/yunion.io/x/jsonutils/yamlutils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package jsonutils import ( diff --git a/vendor/yunion.io/x/log/doc.go b/vendor/yunion.io/x/log/doc.go index bebc20ce8a..ea334fa1d3 100644 --- a/vendor/yunion.io/x/log/doc.go +++ b/vendor/yunion.io/x/log/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package log // import "yunion.io/x/log" diff --git a/vendor/yunion.io/x/log/formatter.go b/vendor/yunion.io/x/log/formatter.go index 6ec09ade94..540b4709ef 100644 --- a/vendor/yunion.io/x/log/formatter.go +++ b/vendor/yunion.io/x/log/formatter.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package log import ( diff --git a/vendor/yunion.io/x/log/hooks/caller.go b/vendor/yunion.io/x/log/hooks/caller.go index 008dfb5f16..8bb8de6a25 100644 --- a/vendor/yunion.io/x/log/hooks/caller.go +++ b/vendor/yunion.io/x/log/hooks/caller.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package hooks import ( diff --git a/vendor/yunion.io/x/log/hooks/doc.go b/vendor/yunion.io/x/log/hooks/doc.go index 9052e13a36..6a0f49f56c 100644 --- a/vendor/yunion.io/x/log/hooks/doc.go +++ b/vendor/yunion.io/x/log/hooks/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package hooks // import "yunion.io/x/log/hooks" diff --git a/vendor/yunion.io/x/log/hooks/file.go b/vendor/yunion.io/x/log/hooks/file.go index 3a99b0397a..e0980165d1 100644 --- a/vendor/yunion.io/x/log/hooks/file.go +++ b/vendor/yunion.io/x/log/hooks/file.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package hooks import ( diff --git a/vendor/yunion.io/x/log/hooks/stdio.go b/vendor/yunion.io/x/log/hooks/stdio.go index e5d32000ad..fcb4f83c70 100644 --- a/vendor/yunion.io/x/log/hooks/stdio.go +++ b/vendor/yunion.io/x/log/hooks/stdio.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package hooks import ( diff --git a/vendor/yunion.io/x/log/log.go b/vendor/yunion.io/x/log/log.go index bc1cb1afa6..0fa33c0661 100644 --- a/vendor/yunion.io/x/log/log.go +++ b/vendor/yunion.io/x/log/log.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + // Just logrus wrapper, maybe replace in the future package log diff --git a/vendor/yunion.io/x/pkg/gotypes/deepcopy.go b/vendor/yunion.io/x/pkg/gotypes/deepcopy.go index fdddec00ba..93030a8a52 100644 --- a/vendor/yunion.io/x/pkg/gotypes/deepcopy.go +++ b/vendor/yunion.io/x/pkg/gotypes/deepcopy.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package gotypes import ( diff --git a/vendor/yunion.io/x/pkg/gotypes/doc.go b/vendor/yunion.io/x/pkg/gotypes/doc.go index 84ed9fdcd0..91f89d5492 100644 --- a/vendor/yunion.io/x/pkg/gotypes/doc.go +++ b/vendor/yunion.io/x/pkg/gotypes/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package gotypes // import "yunion.io/x/pkg/gotypes" diff --git a/vendor/yunion.io/x/pkg/gotypes/gotypes.go b/vendor/yunion.io/x/pkg/gotypes/gotypes.go index e510878a3e..f7aab16202 100644 --- a/vendor/yunion.io/x/pkg/gotypes/gotypes.go +++ b/vendor/yunion.io/x/pkg/gotypes/gotypes.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package gotypes import ( diff --git a/vendor/yunion.io/x/pkg/gotypes/serialize.go b/vendor/yunion.io/x/pkg/gotypes/serialize.go index ae601e6310..5cc3bb0105 100644 --- a/vendor/yunion.io/x/pkg/gotypes/serialize.go +++ b/vendor/yunion.io/x/pkg/gotypes/serialize.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package gotypes import ( diff --git a/vendor/yunion.io/x/pkg/prettytable/doc.go b/vendor/yunion.io/x/pkg/prettytable/doc.go index df12f27798..b6fa5d6add 100644 --- a/vendor/yunion.io/x/pkg/prettytable/doc.go +++ b/vendor/yunion.io/x/pkg/prettytable/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package prettytable // import "yunion.io/x/pkg/prettytable" diff --git a/vendor/yunion.io/x/pkg/prettytable/prettytable.go b/vendor/yunion.io/x/pkg/prettytable/prettytable.go index feba929161..c2872d2aca 100644 --- a/vendor/yunion.io/x/pkg/prettytable/prettytable.go +++ b/vendor/yunion.io/x/pkg/prettytable/prettytable.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package prettytable import ( diff --git a/vendor/yunion.io/x/pkg/trace/doc.go b/vendor/yunion.io/x/pkg/trace/doc.go index 251fa75b2f..62f1aa21ff 100644 --- a/vendor/yunion.io/x/pkg/trace/doc.go +++ b/vendor/yunion.io/x/pkg/trace/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package trace // import "yunion.io/x/pkg/trace" diff --git a/vendor/yunion.io/x/pkg/trace/trace.go b/vendor/yunion.io/x/pkg/trace/trace.go index 2803de6305..b9a06e60dc 100644 --- a/vendor/yunion.io/x/pkg/trace/trace.go +++ b/vendor/yunion.io/x/pkg/trace/trace.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package trace import ( diff --git a/vendor/yunion.io/x/pkg/tristate/doc.go b/vendor/yunion.io/x/pkg/tristate/doc.go index 61c3996464..88e20f110d 100644 --- a/vendor/yunion.io/x/pkg/tristate/doc.go +++ b/vendor/yunion.io/x/pkg/tristate/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package tristate // import "yunion.io/x/pkg/tristate" diff --git a/vendor/yunion.io/x/pkg/tristate/tristate.go b/vendor/yunion.io/x/pkg/tristate/tristate.go index c1ad028dbb..671aef4625 100644 --- a/vendor/yunion.io/x/pkg/tristate/tristate.go +++ b/vendor/yunion.io/x/pkg/tristate/tristate.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package tristate import "reflect" diff --git a/vendor/yunion.io/x/pkg/util/cache/doc.go b/vendor/yunion.io/x/pkg/util/cache/doc.go index 1b7a348f26..e6c9eeda02 100644 --- a/vendor/yunion.io/x/pkg/util/cache/doc.go +++ b/vendor/yunion.io/x/pkg/util/cache/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package cache // import "yunion.io/x/pkg/util/cache" diff --git a/vendor/yunion.io/x/pkg/util/cache/expiration_cache.go b/vendor/yunion.io/x/pkg/util/cache/expiration_cache.go index f39a6a1b54..58cde5746b 100644 --- a/vendor/yunion.io/x/pkg/util/cache/expiration_cache.go +++ b/vendor/yunion.io/x/pkg/util/cache/expiration_cache.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package cache import ( diff --git a/vendor/yunion.io/x/pkg/util/cache/expiration_cache_fakes.go b/vendor/yunion.io/x/pkg/util/cache/expiration_cache_fakes.go index 6be9e4b8ca..0d01665156 100644 --- a/vendor/yunion.io/x/pkg/util/cache/expiration_cache_fakes.go +++ b/vendor/yunion.io/x/pkg/util/cache/expiration_cache_fakes.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package cache import ( diff --git a/vendor/yunion.io/x/pkg/util/cache/fifo.go b/vendor/yunion.io/x/pkg/util/cache/fifo.go index 39ba63b307..0cfce6ccf7 100644 --- a/vendor/yunion.io/x/pkg/util/cache/fifo.go +++ b/vendor/yunion.io/x/pkg/util/cache/fifo.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package cache import ( diff --git a/vendor/yunion.io/x/pkg/util/cache/index.go b/vendor/yunion.io/x/pkg/util/cache/index.go index 5cc4adcf0b..01448762fd 100644 --- a/vendor/yunion.io/x/pkg/util/cache/index.go +++ b/vendor/yunion.io/x/pkg/util/cache/index.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package cache import ( diff --git a/vendor/yunion.io/x/pkg/util/cache/lru.go b/vendor/yunion.io/x/pkg/util/cache/lru.go index 56af729b07..f7af58bcef 100644 --- a/vendor/yunion.io/x/pkg/util/cache/lru.go +++ b/vendor/yunion.io/x/pkg/util/cache/lru.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + // Copyright 2012, Google Inc. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. diff --git a/vendor/yunion.io/x/pkg/util/cache/store.go b/vendor/yunion.io/x/pkg/util/cache/store.go index 212aa4b20a..1ef62a8239 100644 --- a/vendor/yunion.io/x/pkg/util/cache/store.go +++ b/vendor/yunion.io/x/pkg/util/cache/store.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package cache import ( diff --git a/vendor/yunion.io/x/pkg/util/cache/thread_safe_store.go b/vendor/yunion.io/x/pkg/util/cache/thread_safe_store.go index bdf0c0102c..23d04ac4d1 100644 --- a/vendor/yunion.io/x/pkg/util/cache/thread_safe_store.go +++ b/vendor/yunion.io/x/pkg/util/cache/thread_safe_store.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package cache import ( diff --git a/vendor/yunion.io/x/pkg/util/clock/clock.go b/vendor/yunion.io/x/pkg/util/clock/clock.go index 48a088f216..3b9ab3337f 100644 --- a/vendor/yunion.io/x/pkg/util/clock/clock.go +++ b/vendor/yunion.io/x/pkg/util/clock/clock.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package clock import ( diff --git a/vendor/yunion.io/x/pkg/util/clock/doc.go b/vendor/yunion.io/x/pkg/util/clock/doc.go index 177fa09011..6d0ece4bc5 100644 --- a/vendor/yunion.io/x/pkg/util/clock/doc.go +++ b/vendor/yunion.io/x/pkg/util/clock/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package clock // import "yunion.io/x/pkg/util/clock" diff --git a/vendor/yunion.io/x/pkg/util/compare/compare.go b/vendor/yunion.io/x/pkg/util/compare/compare.go index 7696a37f0d..f3e4bf65c4 100644 --- a/vendor/yunion.io/x/pkg/util/compare/compare.go +++ b/vendor/yunion.io/x/pkg/util/compare/compare.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package compare import ( diff --git a/vendor/yunion.io/x/pkg/util/compare/doc.go b/vendor/yunion.io/x/pkg/util/compare/doc.go index bae40be3e8..486710edde 100644 --- a/vendor/yunion.io/x/pkg/util/compare/doc.go +++ b/vendor/yunion.io/x/pkg/util/compare/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package compare // import "yunion.io/x/pkg/util/compare" diff --git a/vendor/yunion.io/x/pkg/util/compare/syncresults.go b/vendor/yunion.io/x/pkg/util/compare/syncresults.go index 8c39aba7b0..449caa9a6e 100644 --- a/vendor/yunion.io/x/pkg/util/compare/syncresults.go +++ b/vendor/yunion.io/x/pkg/util/compare/syncresults.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package compare import ( diff --git a/vendor/yunion.io/x/pkg/util/errors/doc.go b/vendor/yunion.io/x/pkg/util/errors/doc.go index e9ae6a1e0b..9e5fea3b9e 100644 --- a/vendor/yunion.io/x/pkg/util/errors/doc.go +++ b/vendor/yunion.io/x/pkg/util/errors/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package errors // import "yunion.io/x/pkg/util/errors" diff --git a/vendor/yunion.io/x/pkg/util/errors/errors.go b/vendor/yunion.io/x/pkg/util/errors/errors.go index b870a15cee..4be924ee71 100644 --- a/vendor/yunion.io/x/pkg/util/errors/errors.go +++ b/vendor/yunion.io/x/pkg/util/errors/errors.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package errors import ( diff --git a/vendor/yunion.io/x/pkg/util/errors/http_error.go b/vendor/yunion.io/x/pkg/util/errors/http_error.go index 8edc9a3aeb..6f07e01346 100644 --- a/vendor/yunion.io/x/pkg/util/errors/http_error.go +++ b/vendor/yunion.io/x/pkg/util/errors/http_error.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package errors import ( diff --git a/vendor/yunion.io/x/pkg/util/fileutils/doc.go b/vendor/yunion.io/x/pkg/util/fileutils/doc.go index d143a0f9c4..dca3875fd9 100644 --- a/vendor/yunion.io/x/pkg/util/fileutils/doc.go +++ b/vendor/yunion.io/x/pkg/util/fileutils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package fileutils // import "yunion.io/x/pkg/util/fileutils" diff --git a/vendor/yunion.io/x/pkg/util/fileutils/filesize.go b/vendor/yunion.io/x/pkg/util/fileutils/filesize.go index cb0badf81d..01bddf3db4 100644 --- a/vendor/yunion.io/x/pkg/util/fileutils/filesize.go +++ b/vendor/yunion.io/x/pkg/util/fileutils/filesize.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package fileutils import ( diff --git a/vendor/yunion.io/x/pkg/util/filterclause/doc.go b/vendor/yunion.io/x/pkg/util/filterclause/doc.go index d0688d10e6..a6e5cdc6f1 100644 --- a/vendor/yunion.io/x/pkg/util/filterclause/doc.go +++ b/vendor/yunion.io/x/pkg/util/filterclause/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package filterclause // import "yunion.io/x/pkg/util/filterclause" diff --git a/vendor/yunion.io/x/pkg/util/filterclause/filterclause.go b/vendor/yunion.io/x/pkg/util/filterclause/filterclause.go index 0aa0865444..5fddf4ab15 100644 --- a/vendor/yunion.io/x/pkg/util/filterclause/filterclause.go +++ b/vendor/yunion.io/x/pkg/util/filterclause/filterclause.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package filterclause import ( @@ -35,7 +49,7 @@ func (jfc *SJointFilterClause) GetJointModelName() string { func (fc *SFilterClause) QueryCondition(q *sqlchemy.SQuery) sqlchemy.ICondition { field := q.Field(fc.field) if field == nil { - log.Errorf("Cannot find filed %s", fc.field) + log.Errorf("Cannot find field %s", fc.field) return nil } switch fc.funcName { @@ -44,27 +58,49 @@ func (fc *SFilterClause) QueryCondition(q *sqlchemy.SQuery) sqlchemy.ICondition case "notin": return sqlchemy.NotIn(field, fc.params) case "between": - return sqlchemy.Between(field, fc.params[0], fc.params[1]) + if len(fc.params) == 2 { + return sqlchemy.Between(field, fc.params[0], fc.params[1]) + } case "ge": - return sqlchemy.GE(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.GE(field, fc.params[0]) + } case "gt": - return sqlchemy.GT(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.GT(field, fc.params[0]) + } case "le": - return sqlchemy.LE(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.LE(field, fc.params[0]) + } case "lt": - return sqlchemy.LT(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.LT(field, fc.params[0]) + } case "like": - return sqlchemy.Like(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.Like(field, fc.params[0]) + } case "contains": - return sqlchemy.Contains(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.Contains(field, fc.params[0]) + } case "startswith": - return sqlchemy.Startswith(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.Startswith(field, fc.params[0]) + } case "endswith": - return sqlchemy.Endswith(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.Endswith(field, fc.params[0]) + } case "equals": - return sqlchemy.Equals(field, fc.params[0]) + if len(fc.params) == 1 { + return sqlchemy.Equals(field, fc.params[0]) + } case "notequals": - return sqlchemy.NOT(sqlchemy.Equals(field, fc.params[0])) + if len(fc.params) == 1 { + return sqlchemy.NOT(sqlchemy.Equals(field, fc.params[0])) + } case "isnull": return sqlchemy.IsNull(field) case "isnotnull": @@ -75,9 +111,8 @@ func (fc *SFilterClause) QueryCondition(q *sqlchemy.SQuery) sqlchemy.ICondition return sqlchemy.IsNotEmpty(field) case "isnullorempty": return sqlchemy.IsNullOrEmpty(field) - default: - return nil } + return nil } func (fc *SFilterClause) GetField() string { diff --git a/vendor/yunion.io/x/pkg/util/goroutine_pool/doc.go b/vendor/yunion.io/x/pkg/util/goroutine_pool/doc.go index d66b9e3046..28a7dc8791 100644 --- a/vendor/yunion.io/x/pkg/util/goroutine_pool/doc.go +++ b/vendor/yunion.io/x/pkg/util/goroutine_pool/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package goroutine_pool // import "yunion.io/x/pkg/util/goroutine_pool" diff --git a/vendor/yunion.io/x/pkg/util/goroutine_pool/gp.go b/vendor/yunion.io/x/pkg/util/goroutine_pool/gp.go index c4459a1800..c0d5549d04 100644 --- a/vendor/yunion.io/x/pkg/util/goroutine_pool/gp.go +++ b/vendor/yunion.io/x/pkg/util/goroutine_pool/gp.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package goroutine_pool import ( diff --git a/vendor/yunion.io/x/pkg/util/netutils/doc.go b/vendor/yunion.io/x/pkg/util/netutils/doc.go index 69d6340a27..fec2489e01 100644 --- a/vendor/yunion.io/x/pkg/util/netutils/doc.go +++ b/vendor/yunion.io/x/pkg/util/netutils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package netutils // import "yunion.io/x/pkg/util/netutils" diff --git a/vendor/yunion.io/x/pkg/util/netutils/netutils.go b/vendor/yunion.io/x/pkg/util/netutils/netutils.go index e7e30273d7..7c8bbd056e 100644 --- a/vendor/yunion.io/x/pkg/util/netutils/netutils.go +++ b/vendor/yunion.io/x/pkg/util/netutils/netutils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package netutils import ( diff --git a/vendor/yunion.io/x/pkg/util/osprofile/doc.go b/vendor/yunion.io/x/pkg/util/osprofile/doc.go index 5efb8ccddc..1f335bd85d 100644 --- a/vendor/yunion.io/x/pkg/util/osprofile/doc.go +++ b/vendor/yunion.io/x/pkg/util/osprofile/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package osprofile // import "yunion.io/x/pkg/util/osprofile" diff --git a/vendor/yunion.io/x/pkg/util/osprofile/osprofile.go b/vendor/yunion.io/x/pkg/util/osprofile/osprofile.go index 09cb355365..e7cf74365d 100644 --- a/vendor/yunion.io/x/pkg/util/osprofile/osprofile.go +++ b/vendor/yunion.io/x/pkg/util/osprofile/osprofile.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package osprofile import ( diff --git a/vendor/yunion.io/x/pkg/util/prometheus/doc.go b/vendor/yunion.io/x/pkg/util/prometheus/doc.go index e6cec97108..d4baa33e92 100644 --- a/vendor/yunion.io/x/pkg/util/prometheus/doc.go +++ b/vendor/yunion.io/x/pkg/util/prometheus/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package prometheus // import "yunion.io/x/pkg/util/prometheus" diff --git a/vendor/yunion.io/x/pkg/util/prometheus/gin_handler.go b/vendor/yunion.io/x/pkg/util/prometheus/gin_handler.go index d99773f557..d952f072ad 100644 --- a/vendor/yunion.io/x/pkg/util/prometheus/gin_handler.go +++ b/vendor/yunion.io/x/pkg/util/prometheus/gin_handler.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package prometheus import ( diff --git a/vendor/yunion.io/x/pkg/util/reflectutils/doc.go b/vendor/yunion.io/x/pkg/util/reflectutils/doc.go index b96d15b66e..8c0a818313 100644 --- a/vendor/yunion.io/x/pkg/util/reflectutils/doc.go +++ b/vendor/yunion.io/x/pkg/util/reflectutils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package reflectutils // import "yunion.io/x/pkg/util/reflectutils" diff --git a/vendor/yunion.io/x/pkg/util/reflectutils/jsonfield.go b/vendor/yunion.io/x/pkg/util/reflectutils/jsonfield.go index 44e8390ab7..e8f5748b20 100644 --- a/vendor/yunion.io/x/pkg/util/reflectutils/jsonfield.go +++ b/vendor/yunion.io/x/pkg/util/reflectutils/jsonfield.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package reflectutils import ( diff --git a/vendor/yunion.io/x/pkg/util/reflectutils/reflectutils.go b/vendor/yunion.io/x/pkg/util/reflectutils/reflectutils.go index d33f9438e0..72de921aca 100644 --- a/vendor/yunion.io/x/pkg/util/reflectutils/reflectutils.go +++ b/vendor/yunion.io/x/pkg/util/reflectutils/reflectutils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package reflectutils import ( diff --git a/vendor/yunion.io/x/pkg/util/regutils/doc.go b/vendor/yunion.io/x/pkg/util/regutils/doc.go index 30ad5a6e5a..328b16ea30 100644 --- a/vendor/yunion.io/x/pkg/util/regutils/doc.go +++ b/vendor/yunion.io/x/pkg/util/regutils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package regutils // import "yunion.io/x/pkg/util/regutils" diff --git a/vendor/yunion.io/x/pkg/util/regutils/regutils.go b/vendor/yunion.io/x/pkg/util/regutils/regutils.go index e8427c8f00..8597a56b5c 100644 --- a/vendor/yunion.io/x/pkg/util/regutils/regutils.go +++ b/vendor/yunion.io/x/pkg/util/regutils/regutils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package regutils import ( diff --git a/vendor/yunion.io/x/pkg/util/runtime/doc.go b/vendor/yunion.io/x/pkg/util/runtime/doc.go index 8762d3a915..87814c2488 100644 --- a/vendor/yunion.io/x/pkg/util/runtime/doc.go +++ b/vendor/yunion.io/x/pkg/util/runtime/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package runtime // import "yunion.io/x/pkg/util/runtime" diff --git a/vendor/yunion.io/x/pkg/util/runtime/runtime.go b/vendor/yunion.io/x/pkg/util/runtime/runtime.go index 7e8555675a..7262b347c7 100644 --- a/vendor/yunion.io/x/pkg/util/runtime/runtime.go +++ b/vendor/yunion.io/x/pkg/util/runtime/runtime.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package runtime import ( diff --git a/vendor/yunion.io/x/pkg/util/seclib/doc.go b/vendor/yunion.io/x/pkg/util/seclib/doc.go index 584e5e2fb6..3c728e3190 100644 --- a/vendor/yunion.io/x/pkg/util/seclib/doc.go +++ b/vendor/yunion.io/x/pkg/util/seclib/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package seclib // import "yunion.io/x/pkg/util/seclib" diff --git a/vendor/yunion.io/x/pkg/util/seclib/seclib.go b/vendor/yunion.io/x/pkg/util/seclib/seclib.go index 5acf713c9e..c2659526ad 100644 --- a/vendor/yunion.io/x/pkg/util/seclib/seclib.go +++ b/vendor/yunion.io/x/pkg/util/seclib/seclib.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package seclib import ( diff --git a/vendor/yunion.io/x/pkg/util/secrules/cut.go b/vendor/yunion.io/x/pkg/util/secrules/cut.go index 3217d07800..d500b82e6c 100644 --- a/vendor/yunion.io/x/pkg/util/secrules/cut.go +++ b/vendor/yunion.io/x/pkg/util/secrules/cut.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package secrules import ( diff --git a/vendor/yunion.io/x/pkg/util/secrules/doc.go b/vendor/yunion.io/x/pkg/util/secrules/doc.go index 9623af3555..f45b1144b6 100644 --- a/vendor/yunion.io/x/pkg/util/secrules/doc.go +++ b/vendor/yunion.io/x/pkg/util/secrules/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package secrules // import "yunion.io/x/pkg/util/secrules" diff --git a/vendor/yunion.io/x/pkg/util/secrules/port.go b/vendor/yunion.io/x/pkg/util/secrules/port.go index f7fea85eed..a72d0be2bd 100644 --- a/vendor/yunion.io/x/pkg/util/secrules/port.go +++ b/vendor/yunion.io/x/pkg/util/secrules/port.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package secrules import ( diff --git a/vendor/yunion.io/x/pkg/util/secrules/secrules.go b/vendor/yunion.io/x/pkg/util/secrules/secrules.go index 348d5d0c46..86b9649f28 100644 --- a/vendor/yunion.io/x/pkg/util/secrules/secrules.go +++ b/vendor/yunion.io/x/pkg/util/secrules/secrules.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package secrules import ( diff --git a/vendor/yunion.io/x/pkg/util/secrules/secruleset.go b/vendor/yunion.io/x/pkg/util/secrules/secruleset.go index 7ff2370e15..ba65aafaf6 100644 --- a/vendor/yunion.io/x/pkg/util/secrules/secruleset.go +++ b/vendor/yunion.io/x/pkg/util/secrules/secruleset.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package secrules import ( diff --git a/vendor/yunion.io/x/pkg/util/secrules/securityruleset.go b/vendor/yunion.io/x/pkg/util/secrules/securityruleset.go index 9e56ed9768..7d84fe4711 100644 --- a/vendor/yunion.io/x/pkg/util/secrules/securityruleset.go +++ b/vendor/yunion.io/x/pkg/util/secrules/securityruleset.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package secrules import ( diff --git a/vendor/yunion.io/x/pkg/util/sets/byte.go b/vendor/yunion.io/x/pkg/util/sets/byte.go index a460e4b1f5..39d30c29d5 100644 --- a/vendor/yunion.io/x/pkg/util/sets/byte.go +++ b/vendor/yunion.io/x/pkg/util/sets/byte.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + /* Copyright 2017 The Kubernetes Authors. diff --git a/vendor/yunion.io/x/pkg/util/sets/doc.go b/vendor/yunion.io/x/pkg/util/sets/doc.go index 98c69db3b4..a8210c63e6 100644 --- a/vendor/yunion.io/x/pkg/util/sets/doc.go +++ b/vendor/yunion.io/x/pkg/util/sets/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package sets // import "yunion.io/x/pkg/util/sets" diff --git a/vendor/yunion.io/x/pkg/util/sets/empty.go b/vendor/yunion.io/x/pkg/util/sets/empty.go index cd22b953aa..98ffe48ebe 100644 --- a/vendor/yunion.io/x/pkg/util/sets/empty.go +++ b/vendor/yunion.io/x/pkg/util/sets/empty.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + /* Copyright 2017 The Kubernetes Authors. diff --git a/vendor/yunion.io/x/pkg/util/sets/int.go b/vendor/yunion.io/x/pkg/util/sets/int.go index 0614e9fb00..90f5e460ca 100644 --- a/vendor/yunion.io/x/pkg/util/sets/int.go +++ b/vendor/yunion.io/x/pkg/util/sets/int.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + /* Copyright 2017 The Kubernetes Authors. diff --git a/vendor/yunion.io/x/pkg/util/sets/int64.go b/vendor/yunion.io/x/pkg/util/sets/int64.go index 82e1ba7821..6b63262631 100644 --- a/vendor/yunion.io/x/pkg/util/sets/int64.go +++ b/vendor/yunion.io/x/pkg/util/sets/int64.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + /* Copyright 2017 The Kubernetes Authors. diff --git a/vendor/yunion.io/x/pkg/util/sets/string.go b/vendor/yunion.io/x/pkg/util/sets/string.go index f618e46c01..0348f897d9 100644 --- a/vendor/yunion.io/x/pkg/util/sets/string.go +++ b/vendor/yunion.io/x/pkg/util/sets/string.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + /* Copyright 2017 The Kubernetes Authors. diff --git a/vendor/yunion.io/x/pkg/util/signalutils/doc.go b/vendor/yunion.io/x/pkg/util/signalutils/doc.go index 437bc1abdd..c35081774b 100644 --- a/vendor/yunion.io/x/pkg/util/signalutils/doc.go +++ b/vendor/yunion.io/x/pkg/util/signalutils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package signalutils // import "yunion.io/x/pkg/util/signalutils" diff --git a/vendor/yunion.io/x/pkg/util/signalutils/signalutils.go b/vendor/yunion.io/x/pkg/util/signalutils/signalutils.go index 5779b79e32..765308f9fc 100644 --- a/vendor/yunion.io/x/pkg/util/signalutils/signalutils.go +++ b/vendor/yunion.io/x/pkg/util/signalutils/signalutils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package signalutils import ( diff --git a/vendor/yunion.io/x/pkg/util/stringutils/doc.go b/vendor/yunion.io/x/pkg/util/stringutils/doc.go index e3d27f0361..31d5c3b5db 100644 --- a/vendor/yunion.io/x/pkg/util/stringutils/doc.go +++ b/vendor/yunion.io/x/pkg/util/stringutils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package stringutils // import "yunion.io/x/pkg/util/stringutils" diff --git a/vendor/yunion.io/x/pkg/util/stringutils/stringutils.go b/vendor/yunion.io/x/pkg/util/stringutils/stringutils.go index ab5ddf523e..df65e2f535 100644 --- a/vendor/yunion.io/x/pkg/util/stringutils/stringutils.go +++ b/vendor/yunion.io/x/pkg/util/stringutils/stringutils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package stringutils import ( diff --git a/vendor/yunion.io/x/pkg/util/timeutils/doc.go b/vendor/yunion.io/x/pkg/util/timeutils/doc.go index f4e2f77610..83c347a124 100644 --- a/vendor/yunion.io/x/pkg/util/timeutils/doc.go +++ b/vendor/yunion.io/x/pkg/util/timeutils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package timeutils // import "yunion.io/x/pkg/util/timeutils" diff --git a/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go b/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go index 382c35cbc7..2eba33ade5 100644 --- a/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go +++ b/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package timeutils import ( diff --git a/vendor/yunion.io/x/pkg/util/trace/doc.go b/vendor/yunion.io/x/pkg/util/trace/doc.go index ce1c3bc8cb..7066324fe7 100644 --- a/vendor/yunion.io/x/pkg/util/trace/doc.go +++ b/vendor/yunion.io/x/pkg/util/trace/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package trace // import "yunion.io/x/pkg/util/trace" diff --git a/vendor/yunion.io/x/pkg/util/trace/trace.go b/vendor/yunion.io/x/pkg/util/trace/trace.go index b2faea48e7..3a6e271235 100644 --- a/vendor/yunion.io/x/pkg/util/trace/trace.go +++ b/vendor/yunion.io/x/pkg/util/trace/trace.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package trace import ( diff --git a/vendor/yunion.io/x/pkg/util/ttlpool/doc.go b/vendor/yunion.io/x/pkg/util/ttlpool/doc.go index 07e7e6b4a0..71019ae5f5 100644 --- a/vendor/yunion.io/x/pkg/util/ttlpool/doc.go +++ b/vendor/yunion.io/x/pkg/util/ttlpool/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package ttlpool // import "yunion.io/x/pkg/util/ttlpool" diff --git a/vendor/yunion.io/x/pkg/util/ttlpool/pool.go b/vendor/yunion.io/x/pkg/util/ttlpool/pool.go index 099d378796..2f35a6696a 100644 --- a/vendor/yunion.io/x/pkg/util/ttlpool/pool.go +++ b/vendor/yunion.io/x/pkg/util/ttlpool/pool.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package ttlpool import ( diff --git a/vendor/yunion.io/x/pkg/util/version/base.go b/vendor/yunion.io/x/pkg/util/version/base.go index e9f321e9b1..e37014f2bb 100644 --- a/vendor/yunion.io/x/pkg/util/version/base.go +++ b/vendor/yunion.io/x/pkg/util/version/base.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package version // Base version information. diff --git a/vendor/yunion.io/x/pkg/util/version/doc.go b/vendor/yunion.io/x/pkg/util/version/doc.go index 48ce4f25f9..0590b3c5ad 100644 --- a/vendor/yunion.io/x/pkg/util/version/doc.go +++ b/vendor/yunion.io/x/pkg/util/version/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package version // import "yunion.io/x/pkg/util/version" diff --git a/vendor/yunion.io/x/pkg/util/version/version.go b/vendor/yunion.io/x/pkg/util/version/version.go index 4b63204e26..e06a8e1bc1 100644 --- a/vendor/yunion.io/x/pkg/util/version/version.go +++ b/vendor/yunion.io/x/pkg/util/version/version.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package version import ( diff --git a/vendor/yunion.io/x/pkg/util/wait/doc.go b/vendor/yunion.io/x/pkg/util/wait/doc.go index c3d61c5ad9..0cba250c13 100644 --- a/vendor/yunion.io/x/pkg/util/wait/doc.go +++ b/vendor/yunion.io/x/pkg/util/wait/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package wait // import "yunion.io/x/pkg/util/wait" diff --git a/vendor/yunion.io/x/pkg/util/wait/wait.go b/vendor/yunion.io/x/pkg/util/wait/wait.go index 8ae22a828d..05c9c82cd6 100644 --- a/vendor/yunion.io/x/pkg/util/wait/wait.go +++ b/vendor/yunion.io/x/pkg/util/wait/wait.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package wait import ( diff --git a/vendor/yunion.io/x/pkg/util/workqueue/doc.go b/vendor/yunion.io/x/pkg/util/workqueue/doc.go index b084c2fb1a..7e762bc4c2 100644 --- a/vendor/yunion.io/x/pkg/util/workqueue/doc.go +++ b/vendor/yunion.io/x/pkg/util/workqueue/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package workqueue // import "yunion.io/x/pkg/util/workqueue" diff --git a/vendor/yunion.io/x/pkg/util/workqueue/parallelizer.go b/vendor/yunion.io/x/pkg/util/workqueue/parallelizer.go index 03ae22c0fe..e1dbf3f67d 100644 --- a/vendor/yunion.io/x/pkg/util/workqueue/parallelizer.go +++ b/vendor/yunion.io/x/pkg/util/workqueue/parallelizer.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package workqueue import ( diff --git a/vendor/yunion.io/x/pkg/utils/crypt.go b/vendor/yunion.io/x/pkg/utils/crypt.go index 4dc959585d..7d36b6b3c8 100644 --- a/vendor/yunion.io/x/pkg/utils/crypt.go +++ b/vendor/yunion.io/x/pkg/utils/crypt.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/doc.go b/vendor/yunion.io/x/pkg/utils/doc.go index c562971768..973a2f625c 100644 --- a/vendor/yunion.io/x/pkg/utils/doc.go +++ b/vendor/yunion.io/x/pkg/utils/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package utils // import "yunion.io/x/pkg/utils" diff --git a/vendor/yunion.io/x/pkg/utils/fibonacci_retrier.go b/vendor/yunion.io/x/pkg/utils/fibonacci_retrier.go index bd8beaf243..b05cab5ac7 100644 --- a/vendor/yunion.io/x/pkg/utils/fibonacci_retrier.go +++ b/vendor/yunion.io/x/pkg/utils/fibonacci_retrier.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/misc.go b/vendor/yunion.io/x/pkg/utils/misc.go index db9e9b8a4b..661daf67c4 100644 --- a/vendor/yunion.io/x/pkg/utils/misc.go +++ b/vendor/yunion.io/x/pkg/utils/misc.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/net.go b/vendor/yunion.io/x/pkg/utils/net.go index fbe238eea4..b874be6c45 100644 --- a/vendor/yunion.io/x/pkg/utils/net.go +++ b/vendor/yunion.io/x/pkg/utils/net.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/pidfile.go b/vendor/yunion.io/x/pkg/utils/pidfile.go index e1fcbe6d18..414f55274a 100644 --- a/vendor/yunion.io/x/pkg/utils/pidfile.go +++ b/vendor/yunion.io/x/pkg/utils/pidfile.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/profiler.go b/vendor/yunion.io/x/pkg/utils/profiler.go index 35064e43c5..7394137b37 100644 --- a/vendor/yunion.io/x/pkg/utils/profiler.go +++ b/vendor/yunion.io/x/pkg/utils/profiler.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/tags.go b/vendor/yunion.io/x/pkg/utils/tags.go index c76585597a..92c0ba88cb 100644 --- a/vendor/yunion.io/x/pkg/utils/tags.go +++ b/vendor/yunion.io/x/pkg/utils/tags.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/utils.go b/vendor/yunion.io/x/pkg/utils/utils.go index 641b447799..1c1506e852 100644 --- a/vendor/yunion.io/x/pkg/utils/utils.go +++ b/vendor/yunion.io/x/pkg/utils/utils.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/uuid.go b/vendor/yunion.io/x/pkg/utils/uuid.go index 1a011a975b..540183f820 100644 --- a/vendor/yunion.io/x/pkg/utils/uuid.go +++ b/vendor/yunion.io/x/pkg/utils/uuid.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/pkg/utils/wait_group.go b/vendor/yunion.io/x/pkg/utils/wait_group.go index 7d9b6ed67f..4e5f197ddb 100644 --- a/vendor/yunion.io/x/pkg/utils/wait_group.go +++ b/vendor/yunion.io/x/pkg/utils/wait_group.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package utils import ( diff --git a/vendor/yunion.io/x/sqlchemy/functions.go b/vendor/yunion.io/x/sqlchemy/functions.go index a9c0c6b9c9..03c9ecfc7b 100644 --- a/vendor/yunion.io/x/sqlchemy/functions.go +++ b/vendor/yunion.io/x/sqlchemy/functions.go @@ -87,14 +87,15 @@ func GROUP_CONCAT(name string, field IQueryField) IQueryField { type SStringField struct { strConst string + alias string } func (s *SStringField) Expression() string { - return "" + return fmt.Sprintf("%s AS `%s`", s.Reference(), s.Name()) } func (s *SStringField) Name() string { - return "" + return s.alias } func (s *SStringField) Reference() string { @@ -102,6 +103,9 @@ func (s *SStringField) Reference() string { } func (s *SStringField) Label(label string) IQueryField { + if len(label) > 0 { + s.alias = label + } return s } diff --git a/vendor/yunion.io/x/structarg/doc.go b/vendor/yunion.io/x/structarg/doc.go index 779786382a..ffd912ca03 100644 --- a/vendor/yunion.io/x/structarg/doc.go +++ b/vendor/yunion.io/x/structarg/doc.go @@ -1 +1,15 @@ +// Copyright 2019 Yunion +// +// 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. + package structarg // import "yunion.io/x/structarg" diff --git a/vendor/yunion.io/x/structarg/errors.go b/vendor/yunion.io/x/structarg/errors.go index 3aeeac0b81..020e1f2b00 100644 --- a/vendor/yunion.io/x/structarg/errors.go +++ b/vendor/yunion.io/x/structarg/errors.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package structarg import ( diff --git a/vendor/yunion.io/x/structarg/stringdist.go b/vendor/yunion.io/x/structarg/stringdist.go index 4c087923cf..da50253a02 100644 --- a/vendor/yunion.io/x/structarg/stringdist.go +++ b/vendor/yunion.io/x/structarg/stringdist.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package structarg import ( diff --git a/vendor/yunion.io/x/structarg/structarg.go b/vendor/yunion.io/x/structarg/structarg.go index 5020249dc2..d5a5a1f5d2 100644 --- a/vendor/yunion.io/x/structarg/structarg.go +++ b/vendor/yunion.io/x/structarg/structarg.go @@ -1,3 +1,17 @@ +// Copyright 2019 Yunion +// +// 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. + package structarg import (