openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2022
- 1 participants
- 2263 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dovecot23 for openSUSE:Factory checked in at 2022-12-24 14:52:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dovecot23 (Old)
and /work/SRC/openSUSE:Factory/.dovecot23.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dovecot23"
Sat Dec 24 14:52:04 2022 rev:49 rq:1045048 version:2.3.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/dovecot23/dovecot23.changes 2022-12-21 16:07:10.294726310 +0100
+++ /work/SRC/openSUSE:Factory/.dovecot23.new.1563/dovecot23.changes 2022-12-24 14:53:05.111909445 +0100
@@ -1,0 +2,56 @@
+Thu Dec 22 20:47:52 UTC 2022 - Michael Str��der <michael(a)stroeder.com>
+
+- removed obsolete dovecot-2.3.19-fix-doveadm-sync-special-folders.patch
+- update to 2.3.20 and pigeonhole 0.5.20
+ + Add dsync_features=no-header-hashes. When this setting is enabled and
+ one dsync side doesn't support mail GUIDs (i.e. imapc), there is no
+ fallback to using header hashes. Instead, dsync assumes that all mails
+ with identical IMAP UIDs contains the same mail contents. This can
+ significantly improve dsync performance with some IMAP servers that
+ don't support caching Date/Message-ID headers.
+ + lua: HTTP client has more settings now, see
+ https://doc.dovecot.org/admin_manual/lua/#dovecot.http.client
+ + replicator: "doveadm replicator status" command now outputs when the
+ next sync is expected for the user.
+ - LAYOUT=index: duplicate GUIDs were not cleaned out. Also the list
+ recovery was not optimal.
+ - auth: Assert crash would occur when iterating multiple userdb
+ backends.
+ - director: Logging into director using master user with
+ auth_master_user_separator character redirected user to a wrong
+ backend, unless master_user_separator setting was also set to the same
+ value. Merged these into auth_master_user_separator.
+ - dsync: Couldn't always fix folder GUID conflicts automatically with
+ Maildir format. This resulted in replication repeatedly failing
+ with "Remote lost mailbox GUID".
+ - dsync: Failed to migrate INBOX when using namespace prefix=INBOX/,
+ resulting in "Remote lost mailbox GUID" errors.
+ - dsync: INBOX was created too early with namespace prefix=INBOX/,
+ resulting a GUID conflict. This may have been resolved automatically,
+ but not always.
+ - dsync: v2.3.18 regression: Wrong imapc password with dsync caused
+ Panic: file lib-event.c: line 506 (event_pop_global):
+ assertion failed: (event == current_global_event)
+ - imapc: Requesting STATUS for a mailbox with imapc and INDEXPVT
+ configured did not return correct (private) unseen counts.
+ - lib-dict: Process would crash when committing data to redis without
+ dict proxy.
+ - lib-mail: Corrupted cached BODYSTRUCTURE caused panic during FETCH.
+ Fixes: Panic: file message-part-data.c: line 579 (message_part_is_attachment):
+ assertion failed: (data != NULL). v2.3.13 regression.
+ - lib-storage: mail_attribute_dict with dict-sql failed when it tried to
+ lookup empty dict keys.
+ - lib: ioloop-kqueue was missing include breaking some BSD builds.
+ - lua-http: Dovecot Lua HTTP client could not resolve DNS names in mail
+ processes, because it expected "dns-client" socket to exist in the
+ current directory.
+ - oauth2: Using %{oauth2:name} variables could cause useless
+ introspections.
+ - pop3: Sending POP3 command with ':' character caused an assert-crash.
+ v2.3.18 regression.
+ - replicator: Replication queue had various issues, potentially causing
+ replication requests to become stuck.
+ - stats: Invalid Prometheus label names were created with specific
+ histogram group_by configurations. Prometheus rejected these labels.
+
+-------------------------------------------------------------------
Old:
----
dovecot-2.3-pigeonhole-0.5.19.tar.gz
dovecot-2.3-pigeonhole-0.5.19.tar.gz.sig
dovecot-2.3.19-fix-doveadm-sync-special-folders.patch
dovecot-2.3.19.1.tar.gz
dovecot-2.3.19.1.tar.gz.sig
New:
----
dovecot-2.3-pigeonhole-0.5.20.tar.gz
dovecot-2.3-pigeonhole-0.5.20.tar.gz.sig
dovecot-2.3.20.tar.gz
dovecot-2.3.20.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dovecot23.spec ++++++
--- /var/tmp/diff_new_pack.1vMiHV/_old 2022-12-24 14:53:05.811913529 +0100
+++ /var/tmp/diff_new_pack.1vMiHV/_new 2022-12-24 14:53:05.819913576 +0100
@@ -19,11 +19,11 @@
%global _lto_cflags %{nil}
Name: dovecot23
-Version: 2.3.19.1
+Version: 2.3.20
Release: 0
%define pkg_name dovecot
-%define dovecot_version 2.3.19.1
-%define dovecot_pigeonhole_version 0.5.19
+%define dovecot_version 2.3.20
+%define dovecot_pigeonhole_version 0.5.20
%define dovecot_branch 2.3
%define dovecot_pigeonhole_source_dir %{pkg_name}-%{dovecot_branch}-pigeonhole-%{dovecot_pigeonhole_version}
%define dovecot_pigeonhole_docdir %{_docdir}/%{pkg_name}/dovecot-pigeonhole
@@ -160,7 +160,6 @@
Source12: dovecot23.keyring
Patch: dovecot-2.3.0-dont_use_etc_ssl_certs.patch
Patch1: dovecot-2.3.0-better_ssl_defaults.patch
-Patch2: dovecot-2.3.19-fix-doveadm-sync-special-folders.patch
Summary: IMAP and POP3 Server Written Primarily with Security in Mind
License: BSD-3-Clause AND LGPL-2.1-or-later AND MIT
Group: Productivity/Networking/Email/Servers
++++++ dovecot-2.3-pigeonhole-0.5.19.tar.gz -> dovecot-2.3-pigeonhole-0.5.20.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.3-pigeonhole-0.5.19/ChangeLog new/dovecot-2.3-pigeonhole-0.5.20/ChangeLog
--- old/dovecot-2.3-pigeonhole-0.5.19/ChangeLog 2022-06-14 08:56:10.000000000 +0200
+++ new/dovecot-2.3-pigeonhole-0.5.20/ChangeLog 2022-12-21 09:50:15.000000000 +0100
@@ -1,30 +1,37 @@
-2022-05-04 15:04:01 +0300 Aki Tuomi <aki.tuomi(a)open-xchange.com> (4eae2f79)
+2022-11-23 09:58:38 +0200 Aki Tuomi <aki.tuomi(a)open-xchange.com> (149edcf2)
- NEWS: Update date for 2.3.19 news
+ configure: Set version to 0.5.20
+
+
+M configure.ac
+
+2022-11-23 09:58:17 +0200 Aki Tuomi <aki.tuomi(a)open-xchange.com> (b3be0f58)
+
+ NEWS: Add news for 2.3.20
M NEWS
-2022-04-26 09:45:26 +0300 Aki Tuomi <aki.tuomi(a)open-xchange.com> (d0e82ef9)
+2022-05-04 15:04:01 +0300 Aki Tuomi <aki.tuomi(a)open-xchange.com> (68ccbf50)
- NEWS: Add news for 0.5.19
+ NEWS: Update date for 2.3.19 news
M NEWS
-2022-01-12 12:54:05 +0200 Aki Tuomi <aki.tuomi(a)open-xchange.com> (d9023d0c)
+2022-04-26 09:45:26 +0300 Aki Tuomi <aki.tuomi(a)open-xchange.com> (a254ae47)
- NEWS: Add news for 0.5.18
+ NEWS: Add news for 0.5.19
M NEWS
-2022-04-26 09:34:49 +0300 Aki Tuomi <aki.tuomi(a)open-xchange.com> (963ed291)
+2022-01-12 12:54:05 +0200 Aki Tuomi <aki.tuomi(a)open-xchange.com> (cf9d3352)
- configure: Update version
+ NEWS: Add news for 0.5.18
-M configure.ac
+M NEWS
2022-02-05 17:14:16 +0200 Martti Rannanj��rvi <martti.rannanjarvi(a)open-xchange.com> (7927a415)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.3-pigeonhole-0.5.19/NEWS new/dovecot-2.3-pigeonhole-0.5.20/NEWS
--- old/dovecot-2.3-pigeonhole-0.5.19/NEWS 2022-06-14 08:55:57.000000000 +0200
+++ new/dovecot-2.3-pigeonhole-0.5.20/NEWS 2022-12-21 09:50:02.000000000 +0100
@@ -1,3 +1,7 @@
+v0.5.20 2022-12-12 Aki Tuomi <aki.tuomi(a)open-xchange.com>
+
+ * No changes - release done to keep version numbers synced.
+
v0.5.19 2022-05-10 Aki Tuomi <aki.tuomi(a)open-xchange.com>
* No changes - release done to keep version numbers synced.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.3-pigeonhole-0.5.19/configure new/dovecot-2.3-pigeonhole-0.5.20/configure
--- old/dovecot-2.3-pigeonhole-0.5.19/configure 2022-06-14 08:56:03.000000000 +0200
+++ new/dovecot-2.3-pigeonhole-0.5.20/configure 2022-12-21 09:50:07.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Pigeonhole 0.5.19.
+# Generated by GNU Autoconf 2.69 for Pigeonhole 0.5.20.
#
# Report bugs to <dovecot(a)dovecot.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Pigeonhole'
PACKAGE_TARNAME='dovecot-2.3-pigeonhole'
-PACKAGE_VERSION='0.5.19'
-PACKAGE_STRING='Pigeonhole 0.5.19'
+PACKAGE_VERSION='0.5.20'
+PACKAGE_STRING='Pigeonhole 0.5.20'
PACKAGE_BUGREPORT='dovecot(a)dovecot.org'
PACKAGE_URL=''
@@ -1422,7 +1422,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Pigeonhole 0.5.19 to adapt to many kinds of systems.
+\`configure' configures Pigeonhole 0.5.20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1494,7 +1494,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Pigeonhole 0.5.19:";;
+ short | recursive ) echo "Configuration of Pigeonhole 0.5.20:";;
esac
cat <<\_ACEOF
@@ -1623,7 +1623,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Pigeonhole configure 0.5.19
+Pigeonhole configure 0.5.20
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1992,7 +1992,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Pigeonhole $as_me 0.5.19, which was
+It was created by Pigeonhole $as_me 0.5.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2342,7 +2342,7 @@
cat >>confdefs.h <<_ACEOF
-#define PIGEONHOLE_ABI_VERSION "0.5.ABIv19($PACKAGE_VERSION)"
+#define PIGEONHOLE_ABI_VERSION "0.5.ABIv20($PACKAGE_VERSION)"
_ACEOF
@@ -2882,7 +2882,7 @@
# Define the identity of the package.
PACKAGE='dovecot-2.3-pigeonhole'
- VERSION='0.5.19'
+ VERSION='0.5.20'
# Some tools Automake needs.
@@ -14243,7 +14243,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Pigeonhole $as_me 0.5.19, which was
+This file was extended by Pigeonhole $as_me 0.5.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14309,7 +14309,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Pigeonhole config.status 0.5.19
+Pigeonhole config.status 0.5.20
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.3-pigeonhole-0.5.19/configure.ac new/dovecot-2.3-pigeonhole-0.5.20/configure.ac
--- old/dovecot-2.3-pigeonhole-0.5.19/configure.ac 2022-06-14 08:55:57.000000000 +0200
+++ new/dovecot-2.3-pigeonhole-0.5.20/configure.ac 2022-12-21 09:50:02.000000000 +0100
@@ -2,8 +2,8 @@
# Be sure to update ABI version also if anything changes that might require
# recompiling plugins. Most importantly that means if any structs are changed.
-AC_INIT([Pigeonhole], [0.5.19], [dovecot(a)dovecot.org], [dovecot-2.3-pigeonhole])
-AC_DEFINE_UNQUOTED([PIGEONHOLE_ABI_VERSION], "0.5.ABIv19($PACKAGE_VERSION)", [Pigeonhole ABI version])
+AC_INIT([Pigeonhole], [0.5.20], [dovecot(a)dovecot.org], [dovecot-2.3-pigeonhole])
+AC_DEFINE_UNQUOTED([PIGEONHOLE_ABI_VERSION], "0.5.ABIv20($PACKAGE_VERSION)", [Pigeonhole ABI version])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_SRCDIR([src])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dovecot-2.3-pigeonhole-0.5.19/pigeonhole-version.h new/dovecot-2.3-pigeonhole-0.5.20/pigeonhole-version.h
--- old/dovecot-2.3-pigeonhole-0.5.19/pigeonhole-version.h 2022-06-14 08:56:10.000000000 +0200
+++ new/dovecot-2.3-pigeonhole-0.5.20/pigeonhole-version.h 2022-12-21 09:50:14.000000000 +0100
@@ -1,6 +1,6 @@
#ifndef PIGEONHOLE_VERSION_H
#define PIGEONHOLE_VERSION_H
-#define PIGEONHOLE_VERSION_FULL PIGEONHOLE_VERSION" (4eae2f79)"
+#define PIGEONHOLE_VERSION_FULL PIGEONHOLE_VERSION" (149edcf2)"
#endif /* PIGEONHOLE_VERSION_H */
++++++ dovecot-2.3-pigeonhole-0.5.19.tar.gz -> dovecot-2.3.20.tar.gz ++++++
/work/SRC/openSUSE:Factory/dovecot23/dovecot-2.3-pigeonhole-0.5.19.tar.gz /work/SRC/openSUSE:Factory/.dovecot23.new.1563/dovecot-2.3.20.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-fastparquet for openSUSE:Factory checked in at 2022-12-24 14:52:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-fastparquet (Old)
and /work/SRC/openSUSE:Factory/.python-fastparquet.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-fastparquet"
Sat Dec 24 14:52:02 2022 rev:24 rq:1045047 version:0.8.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-fastparquet/python-fastparquet.changes 2022-10-31 13:04:26.325726587 +0100
+++ /work/SRC/openSUSE:Factory/.python-fastparquet.new.1563/python-fastparquet.changes 2022-12-24 14:53:03.951902677 +0100
@@ -1,0 +2,7 @@
+Fri Dec 23 09:18:39 UTC 2022 - Guillaume GARDET <guillaume.gardet(a)opensuse.org>
+
+- Add patch to fox the test test_delta_from_def_2 on
+ aarch64, armv7 and ppc64le:
+ * fastparquet-pr835.patch
+
+-------------------------------------------------------------------
New:
----
fastparquet-pr835.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-fastparquet.spec ++++++
--- /var/tmp/diff_new_pack.Acugbv/_old 2022-12-24 14:53:04.523906014 +0100
+++ /var/tmp/diff_new_pack.Acugbv/_new 2022-12-24 14:53:04.527906037 +0100
@@ -25,6 +25,8 @@
Source: https://github.com/dask/fastparquet/archive/%{version}.tar.gz#/fastparquet-…
# PATCH-FIX-UPSTREAM fastparquet-pr813-updatefixes.patch gh#dask/fastparquet#813
Patch1: fastparquet-pr813-updatefixes.patch
+# PATCH-FIX-UPSTREAM fastparquet-pr835.patch gh#dask/fastparquet#835
+Patch2: fastparquet-pr835.patch
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module base >= 3.8}
BuildRequires: %{python_module cramjam >= 2.3.0}
++++++ fastparquet-pr835.patch ++++++
From f035a2d7b37e2cbdef1a99bc6130be7e4afcf35f Mon Sep 17 00:00:00 2001
From: Martin Durant <martin.durant(a)alumni.utoronto.ca>
Date: Thu, 22 Dec 2022 12:57:32 -0500
Subject: [PATCH 1/5] more print
---
fastparquet/cencoding.pyx | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/fastparquet/cencoding.pyx b/fastparquet/cencoding.pyx
index 4ab48be6..c151aff9 100644
--- a/fastparquet/cencoding.pyx
+++ b/fastparquet/cencoding.pyx
@@ -225,6 +225,7 @@ cdef void delta_read_bitpacked(NumpyIO file_obj, uint8_t bitwidth,
stop += 8
else:
o.write_int((data >> stop) & mask)
+ print("bitpack value", (data >> stop) & mask, data, stop, mask)
stop -= bitwidth
count -= 1
@@ -239,11 +240,13 @@ cpdef void delta_binary_unpack(NumpyIO file_obj, NumpyIO o):
const uint8_t[:] bitwidths
uint8_t bitwidth
values_per_miniblock = block_size // miniblock_per_block
+ print("\nstart", count, value, values_per_miniblock)
while True:
min_delta = zigzag_long(read_unsigned_var_int(file_obj))
bitwidths = file_obj.read(miniblock_per_block)
for i in range(miniblock_per_block):
bitwidth = bitwidths[i]
+ print("\n miniblock", i, "width", bitwidth)
if bitwidth:
temp = o.loc
if count > 1:
@@ -253,6 +256,7 @@ cpdef void delta_binary_unpack(NumpyIO file_obj, NumpyIO o):
for j in range(values_per_miniblock):
temp = o.read_int()
o.loc -= 4
+ print("miniblock value", value)
o.write_int(value)
value += min_delta + temp
count -= 1
@@ -260,6 +264,7 @@ cpdef void delta_binary_unpack(NumpyIO file_obj, NumpyIO o):
return
else:
for j in range(values_per_miniblock):
+ print("miniblock value", value)
o.write_int(value)
value += min_delta
count -= 1
From c453e140355055be1077f2c99b24785444b4ab20 Mon Sep 17 00:00:00 2001
From: Martin Durant <martin.durant(a)alumni.utoronto.ca>
Date: Thu, 22 Dec 2022 13:02:27 -0500
Subject: [PATCH 2/5] more
---
fastparquet/cencoding.pyx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fastparquet/cencoding.pyx b/fastparquet/cencoding.pyx
index c151aff9..6c2051c6 100644
--- a/fastparquet/cencoding.pyx
+++ b/fastparquet/cencoding.pyx
@@ -256,7 +256,7 @@ cpdef void delta_binary_unpack(NumpyIO file_obj, NumpyIO o):
for j in range(values_per_miniblock):
temp = o.read_int()
o.loc -= 4
- print("miniblock value", value)
+ print("miniblock value (bw)", value)
o.write_int(value)
value += min_delta + temp
count -= 1
From 76b8c4fefe703d980b72ad37841bb2e76b9da590 Mon Sep 17 00:00:00 2001
From: Martin Durant <martin.durant(a)alumni.utoronto.ca>
Date: Thu, 22 Dec 2022 13:32:27 -0500
Subject: [PATCH 3/5] more
---
fastparquet/cencoding.pyx | 1 +
1 file changed, 1 insertion(+)
diff --git a/fastparquet/cencoding.pyx b/fastparquet/cencoding.pyx
index 6c2051c6..9335b52a 100644
--- a/fastparquet/cencoding.pyx
+++ b/fastparquet/cencoding.pyx
@@ -223,6 +223,7 @@ cdef void delta_read_bitpacked(NumpyIO file_obj, uint8_t bitwidth,
if stop < 0:
data = ((data & 0X00FFFFFFFFFFFFFF) << 8) | file_obj.read_byte()
stop += 8
+ print("bin stop", bin(stop), bin(data))
else:
o.write_int((data >> stop) & mask)
print("bitpack value", (data >> stop) & mask, data, stop, mask)
From bbb32d8ea7f2cb97a817a22c0357f1a023f79b42 Mon Sep 17 00:00:00 2001
From: Martin Durant <martin.durant(a)alumni.utoronto.ca>
Date: Thu, 22 Dec 2022 13:39:14 -0500
Subject: [PATCH 4/5] trial
---
fastparquet/cencoding.pyx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fastparquet/cencoding.pyx b/fastparquet/cencoding.pyx
index 9335b52a..1be0a001 100644
--- a/fastparquet/cencoding.pyx
+++ b/fastparquet/cencoding.pyx
@@ -18,7 +18,7 @@ cdef extern from "string.h":
from cpython cimport (
PyBytes_FromStringAndSize, PyBytes_GET_SIZE, PyUnicode_DecodeUTF8,
)
-from libc.stdint cimport uint8_t, uint32_t, int32_t, uint64_t, int64_t
+from libc.stdint cimport int8_t, uint8_t, uint32_t, int32_t, uint64_t, int64_t
cpdef void read_rle(NumpyIO file_obj, int32_t header, int32_t bit_width, NumpyIO o, int32_t itemsize=4):
@@ -217,7 +217,7 @@ cdef void delta_read_bitpacked(NumpyIO file_obj, uint8_t bitwidth,
NumpyIO o, uint64_t count, uint8_t itemsize=4):
cdef:
uint64_t data = 0
- char stop = -bitwidth
+ int8_t stop = -bitwidth
uint64_t mask = 0XFFFFFFFFFFFFFFFF >> (64 - bitwidth)
while count > 0:
if stop < 0:
From 43e34e28b2e108f178b05bba8c109e2b131f5fc2 Mon Sep 17 00:00:00 2001
From: Martin Durant <martin.durant(a)alumni.utoronto.ca>
Date: Thu, 22 Dec 2022 13:43:11 -0500
Subject: [PATCH 5/5] fix
---
fastparquet/cencoding.pyx | 6 ------
1 file changed, 6 deletions(-)
diff --git a/fastparquet/cencoding.pyx b/fastparquet/cencoding.pyx
index 1be0a001..90ba15db 100644
--- a/fastparquet/cencoding.pyx
+++ b/fastparquet/cencoding.pyx
@@ -223,10 +223,8 @@ cdef void delta_read_bitpacked(NumpyIO file_obj, uint8_t bitwidth,
if stop < 0:
data = ((data & 0X00FFFFFFFFFFFFFF) << 8) | file_obj.read_byte()
stop += 8
- print("bin stop", bin(stop), bin(data))
else:
o.write_int((data >> stop) & mask)
- print("bitpack value", (data >> stop) & mask, data, stop, mask)
stop -= bitwidth
count -= 1
@@ -241,13 +239,11 @@ cpdef void delta_binary_unpack(NumpyIO file_obj, NumpyIO o):
const uint8_t[:] bitwidths
uint8_t bitwidth
values_per_miniblock = block_size // miniblock_per_block
- print("\nstart", count, value, values_per_miniblock)
while True:
min_delta = zigzag_long(read_unsigned_var_int(file_obj))
bitwidths = file_obj.read(miniblock_per_block)
for i in range(miniblock_per_block):
bitwidth = bitwidths[i]
- print("\n miniblock", i, "width", bitwidth)
if bitwidth:
temp = o.loc
if count > 1:
@@ -257,7 +253,6 @@ cpdef void delta_binary_unpack(NumpyIO file_obj, NumpyIO o):
for j in range(values_per_miniblock):
temp = o.read_int()
o.loc -= 4
- print("miniblock value (bw)", value)
o.write_int(value)
value += min_delta + temp
count -= 1
@@ -265,7 +260,6 @@ cpdef void delta_binary_unpack(NumpyIO file_obj, NumpyIO o):
return
else:
for j in range(values_per_miniblock):
- print("miniblock value", value)
o.write_int(value)
value += min_delta
count -= 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package StyLua for openSUSE:Factory checked in at 2022-12-24 14:52:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/StyLua (Old)
and /work/SRC/openSUSE:Factory/.StyLua.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "StyLua"
Sat Dec 24 14:52:00 2022 rev:3 rq:1045044 version:0.15.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/StyLua/StyLua.changes 2022-12-01 17:22:37.962695726 +0100
+++ /work/SRC/openSUSE:Factory/.StyLua.new.1563/StyLua.changes 2022-12-24 14:53:02.703895395 +0100
@@ -1,0 +2,14 @@
+Fri Dec 16 16:00:34 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela(a)gmail.com>
+
+- Disable --all-features in test since `cargo-insta` is
+ not installed or available in openSUSE.
+
+-------------------------------------------------------------------
+Fri Dec 16 14:20:59 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela(a)gmail.com>
+
+- Update to version 0.15.3:
+ * Fixed necessary parentheses removed in (-X) ^ Y causing change in semantics
+ * Take into account function token size when formatting an anonymous function function() end (particularly relevant when collapsing simple statements)
+ * Support hanging inside of Luau type arrays { T } to fix formatting issues when comments are present
+
+-------------------------------------------------------------------
Old:
----
StyLua-0.15.2.tar.gz
New:
----
StyLua-0.15.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ StyLua.spec ++++++
--- /var/tmp/diff_new_pack.gJiq4u/_old 2022-12-24 14:53:03.595900600 +0100
+++ /var/tmp/diff_new_pack.gJiq4u/_new 2022-12-24 14:53:03.599900623 +0100
@@ -18,7 +18,7 @@
%define _bin_name stylua
Name: StyLua
-Version: 0.15.2
+Version: 0.15.3
Release: 0
Summary: Opinionated Lua code formatter
License: (Apache-2.0 OR MIT) AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Unlicense) AND Apache-2.0 AND MIT AND MPL-2.0 AND MPL-2.0
@@ -47,7 +47,7 @@
%{cargo_install} --all-features
%check
-%{cargo_test} --all-features
+%{cargo_test}
%files
%{_bindir}/%{_bin_name}
++++++ StyLua-0.15.2.tar.gz -> StyLua-0.15.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/CHANGELOG.md new/StyLua-0.15.3/CHANGELOG.md
--- old/StyLua-0.15.2/CHANGELOG.md 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/CHANGELOG.md 2022-12-07 14:13:22.000000000 +0100
@@ -7,6 +7,14 @@
## [Unreleased]
+## [0.15.3] - 2022-12-07
+
+### Fixed
+
+- Fixed necessary parentheses removed in `(-X) ^ Y` causing change in semantics ([#623](https://github.com/JohnnyMorganz/StyLua/issues/623))
+- Take into account `function` token size when formatting an anonymous function `function() end` (particularly relevant when collapsing simple statements) ([#619](https://github.com/JohnnyMorganz/StyLua/issues/619))
+- Support hanging inside of Luau type arrays `{ T }` to fix formatting issues when comments are present ([#617](https://github.com/JohnnyMorganz/StyLua/issues/617))
+
## [0.15.2] - 2022-10-31
### Fixed
@@ -584,7 +592,8 @@
Initial alpha release
-[unreleased]: https://github.com/JohnnyMorganz/StyLua/compare/v0.15.2...HEAD
+[unreleased]: https://github.com/JohnnyMorganz/StyLua/compare/v0.15.3...HEAD
+[0.15.3]: https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.15.3
[0.15.2]: https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.15.2
[0.15.1]: https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.15.1
[0.15.0]: https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.15.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/Cargo.lock new/StyLua-0.15.3/Cargo.lock
--- old/StyLua-0.15.2/Cargo.lock 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/Cargo.lock 2022-12-07 14:13:22.000000000 +0100
@@ -917,7 +917,7 @@
[[package]]
name = "stylua"
-version = "0.15.2"
+version = "0.15.3"
dependencies = [
"anyhow",
"assert_cmd",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/Cargo.toml new/StyLua-0.15.3/Cargo.toml
--- old/StyLua-0.15.2/Cargo.toml 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/Cargo.toml 2022-12-07 14:13:22.000000000 +0100
@@ -1,6 +1,6 @@
[package]
name = "stylua"
-version = "0.15.2"
+version = "0.15.3"
authors = ["JohnnyMorganz <johnnymorganz(a)outlook.com>"]
description = "A code formatter for Lua"
license = "MPL-2.0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/README.md new/StyLua-0.15.3/README.md
--- old/StyLua-0.15.2/README.md 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/README.md 2022-12-07 14:13:22.000000000 +0100
@@ -54,7 +54,7 @@
```yaml
- repo: https://github.com/JohnnyMorganz/StyLua
- rev: v0.15.2
+ rev: v0.15.3
hooks:
- id: stylua # or stylua-system / stylua-github
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/src/cli/main.rs new/StyLua-0.15.3/src/cli/main.rs
--- old/StyLua-0.15.2/src/cli/main.rs 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/src/cli/main.rs 2022-12-07 14:13:22.000000000 +0100
@@ -398,7 +398,7 @@
)
.context("failed to parse ignore file")?;
- matches!(ignore.matched(&filepath, false), ignore::Match::Ignore(_))
+ matches!(ignore.matched(filepath, false), ignore::Match::Ignore(_))
}
None => false,
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/src/formatters/expression.rs new/StyLua-0.15.3/src/formatters/expression.rs
--- old/StyLua-0.15.2/src/formatters/expression.rs 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/src/formatters/expression.rs 2022-12-07 14:13:22.000000000 +0100
@@ -67,6 +67,12 @@
/// We should keep parentheses in this case to highlight precedence
BinaryLHS,
+ /// The internal expression is on the LHS of a binary expression involving ^
+ /// e.g. `(-X) ^ Y`
+ /// We need to keep parentheses here because ^ has higher precedence and is right associative
+ /// and removing parentheses changes meaning
+ BinaryLHSExponent,
+
/// The internal expression is having a unary operation applied to it: the `expr` part of #expr.
/// If this occurs, and `expr` is a type assertion, then we need to keep the parentheses
UnaryOrBinary,
@@ -124,7 +130,9 @@
} => {
// If the expression is of the format `(not X) and Y` or `(not X) == Y` etc.
// Where internal_expression = not X, we should keep the parentheses
- if let ExpressionContext::BinaryLHS = context {
+ if let ExpressionContext::BinaryLHSExponent = context {
+ return false;
+ } else if let ExpressionContext::BinaryLHS = context {
if let UnOp::Not(_) = unop {
return false;
}
@@ -146,7 +154,9 @@
if type_assertion.is_some()
&& matches!(
context,
- ExpressionContext::UnaryOrBinary | ExpressionContext::BinaryLHS
+ ExpressionContext::UnaryOrBinary
+ | ExpressionContext::BinaryLHS
+ | ExpressionContext::BinaryLHSExponent
)
{
return false;
@@ -314,7 +324,12 @@
}
}
Expression::BinaryOperator { lhs, binop, rhs } => {
- let lhs = format_expression_internal(ctx, lhs, ExpressionContext::BinaryLHS, shape);
+ let context = if let BinOp::Caret(_) = binop {
+ ExpressionContext::BinaryLHSExponent
+ } else {
+ ExpressionContext::BinaryLHS
+ };
+ let lhs = format_expression_internal(ctx, lhs, context, shape);
let binop = format_binop(ctx, binop, shape);
let shape = shape.take_last_line(&lhs) + binop.to_string().len();
Expression::BinaryOperator {
@@ -1141,12 +1156,12 @@
if contains_comments(&*lhs) {
hang_binop_expression(ctx, *lhs, binop.clone(), shape, lhs_range)
} else {
- format_expression_internal(
- ctx,
- &lhs,
- ExpressionContext::BinaryLHS,
- lhs_shape,
- )
+ let context = if let BinOp::Caret(_) = binop {
+ ExpressionContext::BinaryLHSExponent
+ } else {
+ ExpressionContext::BinaryLHS
+ };
+ format_expression_internal(ctx, &lhs, context, lhs_shape)
},
hang_binop_expression(
ctx,
@@ -1168,7 +1183,12 @@
let lhs = if contains_comments(&*lhs) {
hang_binop_expression(ctx, *lhs, binop.to_owned(), shape, lhs_range)
} else {
- format_expression_internal(ctx, &lhs, ExpressionContext::BinaryLHS, shape)
+ let context = if let BinOp::Caret(_) = binop {
+ ExpressionContext::BinaryLHSExponent
+ } else {
+ ExpressionContext::BinaryLHS
+ };
+ format_expression_internal(ctx, &lhs, context, shape)
};
let rhs = if contains_comments(&*rhs) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/src/formatters/functions.rs new/StyLua-0.15.3/src/formatters/functions.rs
--- old/StyLua-0.15.2/src/formatters/functions.rs 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/src/formatters/functions.rs 2022-12-07 14:13:22.000000000 +0100
@@ -39,8 +39,10 @@
function_body: &FunctionBody,
shape: Shape,
) -> (TokenReference, FunctionBody) {
+ const FUNCTION_LEN: usize = "function".len();
+
let function_token = fmt_symbol!(ctx, function_token, "function", shape);
- let function_body = format_function_body(ctx, function_body, shape);
+ let function_body = format_function_body(ctx, function_body, shape.add_width(FUNCTION_LEN));
(function_token, function_body)
}
@@ -901,6 +903,7 @@
}
#[cfg(not(feature = "luau"))]
+ #[allow(clippy::let_unit_value)]
let return_type = ();
break (
parameters_parentheses
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/src/formatters/luau.rs new/StyLua-0.15.3/src/formatters/luau.rs
--- old/StyLua-0.15.2/src/formatters/luau.rs 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/src/formatters/luau.rs 2022-12-07 14:13:22.000000000 +0100
@@ -14,7 +14,7 @@
UpdateLeadingTrivia, UpdateTrailingTrivia, UpdateTrivia,
},
trivia_util::{
- contains_comments, contains_singleline_comments,
+ contains_comments, contains_singleline_comments, spans_multiple_lines,
take_generic_parameter_trailing_comments, take_type_argument_trailing_comments,
take_type_info_trailing_comments, token_contains_comments,
token_trivia_contains_comments, trivia_contains_comments, trivia_is_comment,
@@ -165,14 +165,56 @@
pub fn format_type_info(ctx: &Context, type_info: &TypeInfo, shape: Shape) -> TypeInfo {
match type_info {
TypeInfo::Array { braces, type_info } => {
+ const BRACKET_LEN: usize = "{ ".len();
+
let (start_brace, end_brace) = braces.tokens().to_owned();
- let braces = ContainedSpan::new(
- fmt_symbol!(ctx, start_brace, "{ ", shape),
- fmt_symbol!(ctx, end_brace, " }", shape),
- );
- let type_info = Box::new(format_type_info(ctx, type_info, shape + 2)); // 2 = "{ "
- TypeInfo::Array { braces, type_info }
+ let contains_comments = start_brace.trailing_trivia().any(trivia_is_comment)
+ || end_brace.leading_trivia().any(trivia_is_comment)
+ || contains_comments(type_info);
+
+ let (table_type, new_type_info) = if contains_comments {
+ (TableType::MultiLine, None)
+ } else {
+ let new_type_info =
+ format_hangable_type_info(ctx, type_info, shape + BRACKET_LEN, 0);
+
+ (
+ if spans_multiple_lines(&new_type_info) {
+ TableType::MultiLine
+ } else {
+ TableType::SingleLine
+ },
+ Some(new_type_info),
+ )
+ };
+ let braces = create_table_braces(ctx, start_brace, end_brace, table_type, shape);
+
+ let (new_type_info, leading_trivia, trailing_trivia) = match table_type {
+ TableType::MultiLine => (
+ format_hangable_type_info(
+ ctx,
+ type_info,
+ shape.increment_additional_indent(),
+ 0,
+ ),
+ FormatTriviaType::Append(vec![create_indent_trivia(
+ ctx,
+ shape.increment_additional_indent(),
+ )]),
+ FormatTriviaType::Append(vec![create_newline_trivia(ctx)]),
+ ),
+ _ => (
+ new_type_info.unwrap_or_else(|| format_type_info(ctx, type_info, shape)),
+ FormatTriviaType::NoChange,
+ FormatTriviaType::NoChange,
+ ),
+ };
+
+ TypeInfo::Array {
+ braces,
+ type_info: Box::new(new_type_info.update_trivia(leading_trivia, trailing_trivia)),
+ }
}
TypeInfo::Basic(token_reference) => {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/src/lib.rs new/StyLua-0.15.3/src/lib.rs
--- old/StyLua-0.15.2/src/lib.rs 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/src/lib.rs 2022-12-07 14:13:22.000000000 +0100
@@ -317,6 +317,7 @@
}
/// Formats given [`Ast`]
+#[allow(clippy::result_large_err)]
pub fn format_ast(
input_ast: Ast,
config: Config,
@@ -353,6 +354,7 @@
}
/// Formats given Lua code
+#[allow(clippy::result_large_err)]
pub fn format_code(
code: &str,
config: Config,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/stylua-npm-bin/package-lock.json new/StyLua-0.15.3/stylua-npm-bin/package-lock.json
--- old/StyLua-0.15.2/stylua-npm-bin/package-lock.json 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/stylua-npm-bin/package-lock.json 2022-12-07 14:13:22.000000000 +0100
@@ -1,12 +1,12 @@
{
"name": "@johnnymorganz/stylua-bin",
- "version": "0.15.2",
+ "version": "0.15.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@johnnymorganz/stylua-bin",
- "version": "0.15.2",
+ "version": "0.15.3",
"hasInstallScript": true,
"license": "MPL-2.0",
"dependencies": {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/stylua-npm-bin/package.json new/StyLua-0.15.3/stylua-npm-bin/package.json
--- old/StyLua-0.15.2/stylua-npm-bin/package.json 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/stylua-npm-bin/package.json 2022-12-07 14:13:22.000000000 +0100
@@ -1,6 +1,6 @@
{
"name": "@johnnymorganz/stylua-bin",
- "version": "0.15.2",
+ "version": "0.15.3",
"description": "A code formatter for Lua",
"bin": {
"stylua": "./run.js"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/tests/inputs/excess-parentheses-dont-remove.lua new/StyLua-0.15.3/tests/inputs/excess-parentheses-dont-remove.lua
--- old/StyLua-0.15.2/tests/inputs/excess-parentheses-dont-remove.lua 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/tests/inputs/excess-parentheses-dont-remove.lua 2022-12-07 14:13:22.000000000 +0100
@@ -2,3 +2,7 @@
-- Indicate precedence
local _ = (not true) == true
local _ = (not true) and false
+
+-- https://github.com/JohnnyMorganz/StyLua/issues/623
+-- Changes meaning
+local y = (-X) ^ Y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/tests/inputs-collapse-single-statement/over-column-width-3.lua new/StyLua-0.15.3/tests/inputs-collapse-single-statement/over-column-width-3.lua
--- old/StyLua-0.15.2/tests/inputs-collapse-single-statement/over-column-width-3.lua 1970-01-01 01:00:00.000000000 +0100
+++ new/StyLua-0.15.3/tests/inputs-collapse-single-statement/over-column-width-3.lua 2022-12-07 14:13:22.000000000 +0100
@@ -0,0 +1,4 @@
+-- https://github.com/JohnnyMorganz/StyLua/issues/619
+local a = {
+ aa = function() return "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" end,
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/tests/inputs-luau/type-comments-3.lua new/StyLua-0.15.3/tests/inputs-luau/type-comments-3.lua
--- old/StyLua-0.15.2/tests/inputs-luau/type-comments-3.lua 1970-01-01 01:00:00.000000000 +0100
+++ new/StyLua-0.15.3/tests/inputs-luau/type-comments-3.lua 2022-12-07 14:13:22.000000000 +0100
@@ -0,0 +1,8 @@
+-- https://github.com/JohnnyMorganz/StyLua/issues/617
+type Table = {
+ {
+ Key -- [1]: Key
+ | Translations -- [2]: Translations
+ | Tags -- [3]: Tags
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/tests/snapshots/tests__collapse_single_statement(a)over-column-width-3.lua.snap new/StyLua-0.15.3/tests/snapshots/tests__collapse_single_statement(a)over-column-width-3.lua.snap
--- old/StyLua-0.15.2/tests/snapshots/tests__collapse_single_statement(a)over-column-width-3.lua.snap 1970-01-01 01:00:00.000000000 +0100
+++ new/StyLua-0.15.3/tests/snapshots/tests__collapse_single_statement(a)over-column-width-3.lua.snap 2022-12-07 14:13:22.000000000 +0100
@@ -0,0 +1,11 @@
+---
+source: tests/tests.rs
+expression: "format_code(&contents,\n Config::default().with_collapse_simple_statement(CollapseSimpleStatement::Always),\n None, OutputVerification::None).unwrap()"
+---
+-- https://github.com/JohnnyMorganz/StyLua/issues/619
+local a = {
+ aa = function()
+ return "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ end,
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/tests/snapshots/tests__luau(a)type-comments-3.lua.snap new/StyLua-0.15.3/tests/snapshots/tests__luau(a)type-comments-3.lua.snap
--- old/StyLua-0.15.2/tests/snapshots/tests__luau(a)type-comments-3.lua.snap 1970-01-01 01:00:00.000000000 +0100
+++ new/StyLua-0.15.3/tests/snapshots/tests__luau(a)type-comments-3.lua.snap 2022-12-07 14:13:22.000000000 +0100
@@ -0,0 +1,13 @@
+---
+source: tests/tests.rs
+expression: format(&contents)
+---
+-- https://github.com/JohnnyMorganz/StyLua/issues/617
+type Table = {
+ {
+ Key -- [1]: Key
+ | Translations -- [2]: Translations
+ | Tags -- [3]: Tags
+ }
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/tests/snapshots/tests__standard(a)excess-parentheses-dont-remove.lua.snap new/StyLua-0.15.3/tests/snapshots/tests__standard(a)excess-parentheses-dont-remove.lua.snap
--- old/StyLua-0.15.2/tests/snapshots/tests__standard(a)excess-parentheses-dont-remove.lua.snap 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/tests/snapshots/tests__standard(a)excess-parentheses-dont-remove.lua.snap 2022-12-07 14:13:22.000000000 +0100
@@ -7,3 +7,7 @@
local _ = (not true) == true
local _ = (not true) and false
+-- https://github.com/JohnnyMorganz/StyLua/issues/623
+-- Changes meaning
+local y = (-X) ^ Y
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/StyLua-0.15.2/wasm/package.json new/StyLua-0.15.3/wasm/package.json
--- old/StyLua-0.15.2/wasm/package.json 2022-10-31 10:55:48.000000000 +0100
+++ new/StyLua-0.15.3/wasm/package.json 2022-12-07 14:13:22.000000000 +0100
@@ -4,7 +4,7 @@
"JohnnyMorganz <johnnymorganz(a)outlook.com>"
],
"description": "A code formatter for Lua",
- "version": "0.15.2",
+ "version": "0.15.3",
"license": "MPL-2.0",
"readme": "README.md",
"repository": {
++++++ _service ++++++
--- /var/tmp/diff_new_pack.gJiq4u/_old 2022-12-24 14:53:03.795901766 +0100
+++ /var/tmp/diff_new_pack.gJiq4u/_new 2022-12-24 14:53:03.799901790 +0100
@@ -1,7 +1,7 @@
<services>
<service name="download_files" mode="disabled" />
<service name="cargo_vendor" mode="disabled">
- <param name="srctar">StyLua-0.15.2.tar.gz</param>
+ <param name="srctar">StyLua-0.15.3.tar.gz</param>
<param name="compression">gz</param>
<param name="update">true</param>
</service>
++++++ cargo_config ++++++
--- /var/tmp/diff_new_pack.gJiq4u/_old 2022-12-24 14:53:03.819901907 +0100
+++ /var/tmp/diff_new_pack.gJiq4u/_new 2022-12-24 14:53:03.823901929 +0100
@@ -3,4 +3,5 @@
[source.vendored-sources]
directory = "vendor"
+(No newline at EOF)
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/StyLua/vendor.tar.gz /work/SRC/openSUSE:Factory/.StyLua.new.1563/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package helmfile for openSUSE:Factory checked in at 2022-12-24 14:51:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/helmfile (Old)
and /work/SRC/openSUSE:Factory/.helmfile.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "helmfile"
Sat Dec 24 14:51:59 2022 rev:36 rq:1045042 version:0.149.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/helmfile/helmfile.changes 2022-11-16 15:42:52.855726786 +0100
+++ /work/SRC/openSUSE:Factory/.helmfile.new.1563/helmfile.changes 2022-12-24 14:53:01.551888673 +0100
@@ -1,0 +2,71 @@
+Fri Dec 23 15:20:12 UTC 2022 - Manfred Hollstein <manfred.h(a)gmx.net>
+
+- Update to version 0.149.0:
+ New feature
+ * Declare the use of --reuse-values in helmDefaults (#527)
+ * Pass helmfile.yaml via stdin using -f - (#520)
+ * The secrets field now accept go-getter URLs as well (#560)
+ * Declare the use of Helm���s --post-render via Helmfile flags,
+ helmfile.yaml helmDefaults and release fields (#510)
+ * Support helm v3.10.3 (#579)
+
+ What's Changed
+ * Enhance make fmt to cover running gci for golangci-lint compat
+ by @mumoshu in #515
+ * Use log capturing helper in TestApply_hooks by @mumoshu in #516
+ * Use the new log capturing helper in all remaining tests by
+ @mumoshu in #517
+ * declare "reuse values" control mode in helmDefaults by
+ @kkoralsky in #527
+ * Fix getArray function copy error by @xiaomudk in #533
+ * Remove redundant metadata fields from test samples by
+ @xiaomudk in #535
+ * Allow helmfile statefile to passed by stdin by @xiaomudk in #520
+ * Refactor integration tests by @yxxhero in #531
+ * fix ghr badge by @yxxhero in #537
+ * fix unit test by @yxxhero in #538
+ * fix ghcr-badge in docs by @yxxhero in #539
+ * rework dockerfiles by @jouve in #519
+ * use dyff as yamldiff tool by @yxxhero in #542
+ * fix go mod by @yxxhero in #543
+ * build(deps): bump github.com/Masterminds/semver/v3 from 3.1.1
+ to 3.2.0 by @dependabot in #551
+ * build(deps): bump github.com/variantdev/vals from 0.19.0 to
+ 0.20.0 by @dependabot in #552
+ * rm embrawtest/myapp/foo.yaml.gotmpl by @yxxhero in #554
+ * build(deps): bump github.com/Masterminds/sprig/v3 from 3.2.2
+ to 3.2.3 by @dependabot in #556
+ * typo: fix typo in cmd/apply.go by @yxxhero in #549
+ * build(deps): bump go.uber.org/zap from 1.23.0 to 1.24.0
+ by @dependabot in #557
+ * build(deps): bump golang.org/x/term from 0.2.0 to 0.3.0
+ by @dependabot in #562
+ * Use go-getter with secrets as well by @itscaro in #560
+ * Fix snapshot tests to pass regardless of helm version by
+ @yxxhero in #572
+ * Fix preapply hooks are not called on no diff when run apply
+ subcommand by @xiaomudk in #522
+ * build(deps): bump github.com/variantdev/vals from 0.20.0 to
+ 0.21.0 by @dependabot in #570
+ * build(deps): bump github.com/go-test/deep from 1.0.8 to
+ 1.1.0 by @dependabot in #569
+ * build(deps): bump k8s.io/apimachinery from 0.25.4 to
+ 0.26.0 by @dependabot in #568
+ * Add documentation on go-getter cache by @itscaro in #566
+ * Allow running images with users other than root by @pathob
+ in #546
+ * add xiaomudk as maintainer by @yxxhero in #504
+ * Avoid --skip-refresh on local charts by @indrekj in #541
+ * fea(#507): support assign --post-renderer flags ��� helmDefaults
+ config ��� release config when use helm v3 by @tanguofu in #510
+ * remove temporary dir as well by @itscaro in #563
+ * build(deps): bump go.uber.org/multierr from 1.6.0 to 1.9.0 by
+ @dependabot in #575
+ * add post render integration test by @yxxhero in #576
+ * clean: optimize post-render code by @yxxhero in #577
+ * build(deps): bump helm.sh/helm/v3 from 3.10.2 to 3.10.3 by
+ @dependabot in #578
+ * bump helm to v3.10.3 by @yxxhero in #579
+ * update postrenderer docs by @yxxhero in #580
+
+-------------------------------------------------------------------
Old:
----
helmfile-0.148.1.tar.gz
New:
----
helmfile-0.149.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ helmfile.spec ++++++
--- /var/tmp/diff_new_pack.EWcS0f/_old 2022-12-24 14:53:02.243892711 +0100
+++ /var/tmp/diff_new_pack.EWcS0f/_new 2022-12-24 14:53:02.247892734 +0100
@@ -17,9 +17,9 @@
#
-%define git_commit f09ec18aa9d555f6c8f668bfbcf084a6e5e8ee6b
+%define git_commit 7410316cf98a05eeac7b3c34763a1360d8c4d343
Name: helmfile
-Version: 0.148.1
+Version: 0.149.0
Release: 0
Summary: Deploy Kubernetes Helm Charts
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.EWcS0f/_old 2022-12-24 14:53:02.283892944 +0100
+++ /var/tmp/diff_new_pack.EWcS0f/_new 2022-12-24 14:53:02.287892968 +0100
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="revision">v0.148.1</param>
+ <param name="revision">v0.149.0</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.EWcS0f/_old 2022-12-24 14:53:02.307893084 +0100
+++ /var/tmp/diff_new_pack.EWcS0f/_new 2022-12-24 14:53:02.311893108 +0100
@@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/helmfile/helmfile.git</param>
- <param name="changesrevision">f09ec18aa9d555f6c8f668bfbcf084a6e5e8ee6b</param></service></servicedata>
+ <param name="changesrevision">7410316cf98a05eeac7b3c34763a1360d8c4d343</param></service></servicedata>
++++++ helmfile-0.148.1.tar.gz -> helmfile-0.149.0.tar.gz ++++++
++++ 12320 lines of diff (skipped)
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/helmfile/vendor.tar.gz /work/SRC/openSUSE:Factory/.helmfile.new.1563/vendor.tar.gz differ: char 4, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mercurial-extension-hg-evolve for openSUSE:Factory checked in at 2022-12-24 14:51:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mercurial-extension-hg-evolve (Old)
and /work/SRC/openSUSE:Factory/.mercurial-extension-hg-evolve.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial-extension-hg-evolve"
Sat Dec 24 14:51:58 2022 rev:4 rq:1045020 version:10.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/mercurial-extension-hg-evolve/mercurial-extension-hg-evolve.changes 2022-07-19 17:20:37.564467754 +0200
+++ /work/SRC/openSUSE:Factory/.mercurial-extension-hg-evolve.new.1563/mercurial-extension-hg-evolve.changes 2022-12-24 14:53:00.655883445 +0100
@@ -1,0 +2,7 @@
+Thu Dec 22 16:23:43 UTC 2022 - Andrei Dziahel <develop7(a)develop7.info>
+
+- Update to version 10.5.3
+ Changelog: https://foss.heptapod.net/mercurial/evolve/-/blob/10.5.3/CHANGELOG
+- Temporarily blacklist test-cmdserver.t
+
+-------------------------------------------------------------------
Old:
----
hg-evolve-10.5.2.tar.gz
New:
----
hg-evolve-10.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial-extension-hg-evolve.spec ++++++
--- /var/tmp/diff_new_pack.171pI7/_old 2022-12-24 14:53:01.119886153 +0100
+++ /var/tmp/diff_new_pack.171pI7/_new 2022-12-24 14:53:01.123886176 +0100
@@ -17,7 +17,7 @@
Name: mercurial-extension-hg-evolve
-Version: 10.5.2
+Version: 10.5.3
Release: 0
Summary: Flexible evolution of Mercurial history
License: GPL-2.0-or-later
++++++ hg-evolve-10.5.2.tar.gz -> hg-evolve-10.5.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/CHANGELOG new/hg-evolve-10.5.3/CHANGELOG
--- old/hg-evolve-10.5.2/CHANGELOG 2022-07-13 14:05:56.000000000 +0200
+++ new/hg-evolve-10.5.3/CHANGELOG 2022-12-09 13:06:27.000000000 +0100
@@ -1,6 +1,25 @@
Changelog
=========
+10.5.3 -- 2022-12-09
+--------------------
+
+ * compatibility with Mercurial 6.3
+
+ * evolve: make obs-hash-range cache and stable-range cache (that both use
+ SQLite databases) slightly more tolerant to FS issues (issue6246)
+ * evolve: adapt to Python 3.11 BC breakage with `random.sample()`
+
+topic (0.24.2)
+
+ * compatibility with Mercurial 6.3
+
+ * topic: invalidate the topic cache when branchcache is invalidated, to fix
+ an issue in TortoiseHg where stale topic labels appear in certain cases
+
+ * next: properly handle cases when user selects an aspiring child, making
+ sure that the destination is evolved when needed
+
10.5.2 -- 2022-07-13
--------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/PKG-INFO new/hg-evolve-10.5.3/PKG-INFO
--- old/hg-evolve-10.5.2/PKG-INFO 2022-07-13 14:28:22.000000000 +0200
+++ new/hg-evolve-10.5.3/PKG-INFO 2022-12-09 13:25:29.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: hg-evolve
-Version: 10.5.2
+Version: 10.5.3
Summary: Flexible evolution of Mercurial history.
Home-page: https://www.mercurial-scm.org/doc/evolution/
Author: Pierre-Yves David
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/hgext3rd/evolve/__init__.py new/hg-evolve-10.5.3/hgext3rd/evolve/__init__.py
--- old/hg-evolve-10.5.2/hgext3rd/evolve/__init__.py 2022-07-12 13:26:54.000000000 +0200
+++ new/hg-evolve-10.5.3/hgext3rd/evolve/__init__.py 2022-12-09 13:06:27.000000000 +0100
@@ -929,6 +929,8 @@
ui.warn(_(b"explicitly update to one of them\n"))
return 1
else:
+ if selectedrev in aspchildren:
+ return _nextevolve(ui, repo, selectedrev, opts)
return _updatetonext(ui, repo, repo[selectedrev], display, opts)
else:
if not opts['evolve'] or not aspchildren:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/hgext3rd/evolve/metadata.py new/hg-evolve-10.5.3/hgext3rd/evolve/metadata.py
--- old/hg-evolve-10.5.2/hgext3rd/evolve/metadata.py 2022-07-12 14:53:02.000000000 +0200
+++ new/hg-evolve-10.5.3/hgext3rd/evolve/metadata.py 2022-12-09 13:06:27.000000000 +0100
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-__version__ = b'10.5.2'
-testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2'
+__version__ = b'10.5.3'
+testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3'
minimumhgversion = b'4.8'
buglink = b'https://bz.mercurial-scm.org/'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/hgext3rd/evolve/obsdiscovery.py new/hg-evolve-10.5.3/hgext3rd/evolve/obsdiscovery.py
--- old/hg-evolve-10.5.2/hgext3rd/evolve/obsdiscovery.py 2022-07-12 13:26:54.000000000 +0200
+++ new/hg-evolve-10.5.3/hgext3rd/evolve/obsdiscovery.py 2022-12-07 18:37:49.000000000 +0100
@@ -485,6 +485,7 @@
if self._con is None:
self._cachekey = self.emptykey
self._ondiskcachekey = self.emptykey
+ repo.ui.debug(b'obshashrange cache: unable to load, regenerating\n')
assert self._cachekey is not None
def _db(self):
@@ -494,8 +495,11 @@
return None
if self._createmode is not None:
pre_existed = os.access(self._path, os.R_OK)
- con = sqlite3.connect(encoding.strfromlocal(self._path), timeout=30,
- isolation_level=r"IMMEDIATE")
+ try:
+ con = sqlite3.connect(encoding.strfromlocal(self._path),
+ timeout=30, isolation_level=r"IMMEDIATE")
+ except sqlite3.OperationalError:
+ return None
con.text_factory = bytes
if self._createmode is not None and not pre_existed:
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/hgext3rd/evolve/stablerangecache.py new/hg-evolve-10.5.3/hgext3rd/evolve/stablerangecache.py
--- old/hg-evolve-10.5.2/hgext3rd/evolve/stablerangecache.py 2022-07-12 13:26:54.000000000 +0200
+++ new/hg-evolve-10.5.3/hgext3rd/evolve/stablerangecache.py 2022-12-07 18:37:49.000000000 +0100
@@ -200,7 +200,7 @@
if len(new) < 300:
sample = new
else:
- sample = random.sample(new, 300)
+ sample = random.sample(list(new), 300)
known.update(sample)
query = _make_querysuperranges(sample)
ranges = set(con.execute(query).fetchall())
@@ -246,8 +246,11 @@
return None
if self._createmode is not None:
pre_existed = os.access(self._path, os.R_OK)
- con = sqlite3.connect(encoding.strfromlocal(self._path), timeout=30,
- isolation_level=r"IMMEDIATE")
+ try:
+ con = sqlite3.connect(encoding.strfromlocal(self._path),
+ timeout=30, isolation_level=r"IMMEDIATE")
+ except sqlite3.OperationalError:
+ return None
con.text_factory = bytes
if self._createmode is not None and not pre_existed:
try:
@@ -398,6 +401,8 @@
if self._con is not None:
self._cachekey = (self._ondisktiprev, self._ondisktipnode)
+ else:
+ repo.ui.debug(b'stable-range cache: unable to load, regenerating\n')
self._ondiskkey = self._cachekey
def save(self, repo):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/hgext3rd/topic/__init__.py new/hg-evolve-10.5.3/hgext3rd/topic/__init__.py
--- old/hg-evolve-10.5.2/hgext3rd/topic/__init__.py 2022-07-12 14:53:02.000000000 +0200
+++ new/hg-evolve-10.5.3/hgext3rd/topic/__init__.py 2022-12-09 13:06:27.000000000 +0100
@@ -231,9 +231,9 @@
b'log.topic': b'green_background',
}
-__version__ = b'0.24.1'
+__version__ = b'0.24.2'
-testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2'
+testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3'
minimumhgversion = b'4.8'
buglink = b'https://bz.mercurial-scm.org/'
@@ -541,13 +541,17 @@
start=start,
closed=closed)
+ def invalidatecaches(self):
+ self._topiccache.clear()
+ super(topicrepo, self).invalidatecaches()
+
def invalidatevolatilesets(self):
# XXX we might be able to move this to something invalidated less often
super(topicrepo, self).invalidatevolatilesets()
self._topics = None
- def peer(self):
- peer = super(topicrepo, self).peer()
+ def peer(self, *args, **kwargs):
+ peer = super(topicrepo, self).peer(*args, **kwargs)
if getattr(peer, '_repo', None) is not None: # localpeer
class topicpeer(peer.__class__):
def branchmap(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/tests/test-check-sdist.t new/hg-evolve-10.5.3/tests/test-check-sdist.t
--- old/hg-evolve-10.5.2/tests/test-check-sdist.t 2022-07-13 14:05:56.000000000 +0200
+++ new/hg-evolve-10.5.3/tests/test-check-sdist.t 2022-12-09 13:06:27.000000000 +0100
@@ -35,7 +35,7 @@
$ tar -tzf hg-evolve-*.tar.gz | sed 's|^hg-evolve-[^/]*/||' | sort > files
$ wc -l files
- 357 files
+ 359 files
$ fgrep debian files
tests/test-check-debian.t
$ fgrep __init__.py files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/tests/test-cmdserver.t new/hg-evolve-10.5.3/tests/test-cmdserver.t
--- old/hg-evolve-10.5.2/tests/test-cmdserver.t 1970-01-01 01:00:00.000000000 +0100
+++ new/hg-evolve-10.5.3/tests/test-cmdserver.t 2022-12-07 18:37:49.000000000 +0100
@@ -0,0 +1,116 @@
+#require no-rhg no-chg
+
+XXX-RHG this test hangs if `hg` is really `rhg`. This was hidden by the use of
+`alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed
+buggy. This need to be resolved sooner than later.
+
+XXX-CHG this test hangs if `hg` is really `chg`. This was hidden by the use of
+`alias hg=chg` by run-tests.py. With such alias removed, this test is revealed
+buggy. This need to be resolved sooner than later.
+
+ $ . "$TESTDIR/testlib/topic_setup.sh"
+
+#if windows
+ $ PYTHONPATH="$RUNTESTDIR/../contrib;$PYTHONPATH"
+#else
+ $ PYTHONPATH="$RUNTESTDIR/../contrib:$PYTHONPATH"
+#endif
+ $ export PYTHONPATH
+
+typical client does not want echo-back messages, so test without it:
+
+ $ grep -v '^promptecho ' < $HGRCPATH >> $HGRCPATH.new
+ $ mv $HGRCPATH.new $HGRCPATH
+
+ $ hg init repo
+ $ cd repo
+
+ $ touch a
+ $ hg ci -Am 'a'
+ adding a
+ $ touch b
+ $ hg ci -Am 'b'
+ adding b
+ $ touch c
+ $ hg ci -Am 'c'
+ adding c
+ $ touch d
+ $ hg ci -Am 'd'
+ adding d
+
+Ensure that topics are not left around for stale revisions.
+
+ >>> from hgclient import check, readchannel, runcommand
+ >>> @check
+ ... def checkruncommand(server):
+ ... # hello block
+ ... readchannel(server)
+ ...
+ ... # Initial case
+ ... runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
+ ...
+ ... # first topic
+ ... runcommand(server, [b'topic', b'topic1', b'-r', b'.'])
+ ...
+ ... # Current state
+ ... runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
+ ...
+ ... # status quo ante
+ ... runcommand(server, [b'rollback', b'--config', b'ui.rollback=True'])
+ ...
+ ... # Current state
+ ... runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
+ ...
+ ... # second topic
+ ... runcommand(server, [b'topic', b'topic2', b'-r', b'(.^^)::'])
+ ...
+ ... # Current state
+ ... runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
+ ...
+ ... # status quo ante
+ ... runcommand(server, [b'rollback', b'--config', b'ui.rollback=True'])
+ ...
+ ... # Current state
+ ... runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
+ *** runcommand log -T {rev} {desc} ({topic})
+
+ 3 d ()
+ 2 c ()
+ 1 b ()
+ 0 a ()
+ *** runcommand topic topic1 -r .
+ switching to topic topic1
+ changed topic on 1 changesets to "topic1"
+ *** runcommand log -T {rev} {desc} ({topic})
+
+ 4 d (topic1)
+ 2 c ()
+ 1 b ()
+ 0 a ()
+ *** runcommand rollback --config ui.rollback=True
+ repository tip rolled back to revision 3 (undo rewrite-topics)
+ working directory now based on revision 3
+ *** runcommand log -T {rev} {desc} ({topic})
+
+ 3 d ()
+ 2 c ()
+ 1 b ()
+ 0 a ()
+ *** runcommand topic topic2 -r (.^^)::
+ switching to topic topic2
+ changed topic on 3 changesets to "topic2"
+ *** runcommand log -T {rev} {desc} ({topic})
+
+ 6 d (topic2)
+ 5 c (topic2)
+ 4 b (topic2)
+ 0 a ()
+ *** runcommand rollback --config ui.rollback=True
+ repository tip rolled back to revision 3 (undo rewrite-topics)
+ working directory now based on revision 3
+ *** runcommand log -T {rev} {desc} ({topic})
+
+ 3 d ()
+ 2 c ()
+ 1 b ()
+ 0 a ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/tests/test-discovery-obshashrange-cache.t new/hg-evolve-10.5.3/tests/test-discovery-obshashrange-cache.t
--- old/hg-evolve-10.5.2/tests/test-discovery-obshashrange-cache.t 2022-07-13 14:05:56.000000000 +0200
+++ new/hg-evolve-10.5.3/tests/test-discovery-obshashrange-cache.t 2022-12-09 11:56:42.000000000 +0100
@@ -156,6 +156,21 @@
no changes found
[1]
+suddenly cache is inaccessible, check that the push still succeeds (issue6246)
+
+ $ chmod 0000 server/.hg/cache/*.sqlite
+
+ $ hg -R main push ssh://user@dummy/server
+ pushing to ssh://user@dummy/server
+ searching for changes
+ OBSEXC: computing relevant nodes
+ OBSEXC: looking for common markers in 8 nodes
+ OBSEXC: markers already in sync
+ no changes found
+ [1]
+
+ $ chmod 0644 server/.hg/cache/*.sqlite
+
client cache is warm
$ f -s main/.hg/cache/evoext*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/tests/test-discovery-obshashrange.t new/hg-evolve-10.5.3/tests/test-discovery-obshashrange.t
--- old/hg-evolve-10.5.2/tests/test-discovery-obshashrange.t 2022-07-13 14:05:56.000000000 +0200
+++ new/hg-evolve-10.5.3/tests/test-discovery-obshashrange.t 2022-12-09 13:25:19.000000000 +0100
@@ -198,6 +198,8 @@
received listkey for "namespaces": 40 bytes
OBSEXC: computing relevant nodes
OBSEXC: looking for common markers in 6 nodes
+ stable-range cache: unable to load, regenerating
+ obshashrange cache: unable to load, regenerating
query 0; add more sample (target 100, current 1)
query 0; sample size is 9, largest range 5
sending evoext_obshashrange_v1 command
@@ -322,8 +324,10 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "namespaces" (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "namespaces": 40 bytes (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> stable-range cache: unable to load, regenerating (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (6r) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (6r) (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obshashrange cache: unable to load, regenerating (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (6r, 4o) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 0; add more sample (target 100, current 1) (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 0; sample size is 9, largest range 5 (glob)
@@ -1113,6 +1117,8 @@
$ ls -1 .hg/cache/ | grep evoext
[1]
$ hg debugupdatecache --debug
+ stable-range cache: unable to load, regenerating
+ obshashrange cache: unable to load, regenerating
updating the branch cache
$ f -s .hg/cache/evoext*
.hg/cache/evoext-depthcache-00: size=96
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/tests/test-evolve-issue6246.t new/hg-evolve-10.5.3/tests/test-evolve-issue6246.t
--- old/hg-evolve-10.5.2/tests/test-evolve-issue6246.t 1970-01-01 01:00:00.000000000 +0100
+++ new/hg-evolve-10.5.3/tests/test-evolve-issue6246.t 2022-12-07 18:37:49.000000000 +0100
@@ -0,0 +1,32 @@
+Failure to open evoext_stablerange_v2.sqlite shouldn't affect operations (issue6246)
+https://bz.mercurial-scm.org/show_bug.cgi?id=6246
+
+ $ . $TESTDIR/testlib/common.sh
+
+ $ cat << EOF >> $HGRCPATH
+ > [extensions]
+ > evolve =
+ > EOF
+
+ $ hg init issue6246
+ $ cd issue6246
+ $ hg debugbuilddag '.+6'
+
+making a cache file that sqlite cannot open shouldn't break stablerange cache
+
+ $ touch .hg/cache/evoext_stablerange_v2.sqlite
+ $ chmod 0000 .hg/cache/evoext_stablerange_v2.sqlite
+
+ $ hg debugstablerange --method default --verify --subranges --rev 1 --debug
+ stable-range cache: unable to load, regenerating
+ 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1)
+ 1ea73414a91b-0 (0, 1, 1) [leaf] -
+ 66f7d451a68b-1 (1, 2, 1) [leaf] -
+
+ $ hg debugobshashrange --rev tip --debug
+ stable-range cache: unable to load, regenerating
+ rev node index size depth obshash
+ obshashrange cache: unable to load, regenerating
+ 6 f69452c5b1af 0 7 7 000000000000
+
+ $ cd ..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/tests/test-prev-next.t new/hg-evolve-10.5.3/tests/test-prev-next.t
--- old/hg-evolve-10.5.2/tests/test-prev-next.t 2022-07-13 14:05:56.000000000 +0200
+++ new/hg-evolve-10.5.3/tests/test-prev-next.t 2022-12-09 13:25:19.000000000 +0100
@@ -259,7 +259,17 @@
o 0:a154386e50d1 added a
- $ hg evolve -r 5 --update
+ $ hg prev
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ [6] added b (3)
+ $ hg next --evolve <<EOF
+ > 2
+ > EOF
+ ambiguous next changeset, choose one to update:
+ 1: [5ce67c2407b0] added c
+ 2: [9df671ccd2c7] added d
+ q: quit the prompt
+ enter the index of the revision you want to select: 2
move:[5] added d
atop:[6] added b (3)
working directory is now at 47ea25be8aea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-evolve-10.5.2/tests/test-pullbundle.t new/hg-evolve-10.5.3/tests/test-pullbundle.t
--- old/hg-evolve-10.5.2/tests/test-pullbundle.t 2022-07-13 14:05:56.000000000 +0200
+++ new/hg-evolve-10.5.3/tests/test-pullbundle.t 2022-12-09 13:25:19.000000000 +0100
@@ -186,6 +186,8 @@
bundle2-input: end of bundle2 stream
bundle2-input-bundle: 7 parts total
checking for updated bookmarks
+ stable-range cache: unable to load, regenerating
+ obshashrange cache: unable to load, regenerating
updating the branch cache
added 1235 changesets with 0 changes to 0 files
new changesets 1ea73414a91b:f864bc82f6a2
++++++ tests.blacklist ++++++
--- /var/tmp/diff_new_pack.171pI7/_old 2022-12-24 14:53:01.367887600 +0100
+++ /var/tmp/diff_new_pack.171pI7/_new 2022-12-24 14:53:01.371887623 +0100
@@ -2,4 +2,5 @@
test-check-compat-strings.t
test-version-install.t
+test-cmdserver.t
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hyperfine for openSUSE:Factory checked in at 2022-12-24 14:51:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hyperfine (Old)
and /work/SRC/openSUSE:Factory/.hyperfine.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hyperfine"
Sat Dec 24 14:51:56 2022 rev:9 rq:1045014 version:1.15.0+g27
Changes:
--------
--- /work/SRC/openSUSE:Factory/hyperfine/hyperfine.changes 2022-10-01 17:44:27.889812892 +0200
+++ /work/SRC/openSUSE:Factory/.hyperfine.new.1563/hyperfine.changes 2022-12-24 14:52:59.567877097 +0100
@@ -1,0 +2,32 @@
+Fri Dec 16 13:23:53 UTC 2022 - socvirnyl.estela(a)gmail.com
+
+- Update to version 1.15.0+g27:
+ * Bump serde_json from 1.0.87 to 1.0.89
+ * Bump once_cell from 1.15.0 to 1.16.0
+ * Update README.md
+ * Improve hints for outlier warnings
+ * remove unneeded var
+ * remove unneeded var
+ * bump msrv to 1.60.0
+ * chore: run fmt
+ * use wrap_help
+ * update to clap 4
+ * use set and settrue
+ * add clap deprecation notices
+ * Bump thiserror from 1.0.35 to 1.0.37
+ * Bump libc from 0.2.133 to 0.2.137
+ * Update CHANGELOG
+ * Fixes #568
+ * Default to $TERM unset = colour on Win32
+ * Revert to prev. sentence
+ * Fix Shell functions and aliases sexion in README
+ * Move information to CITATION.cff file
+ * got names wrong way around :p
+ * Update README.md
+ * Add citing guide, as per issue #566
+ * Fix typo in unit test.
+ * Update indicatif
+ * Updates for indicatif 0.17
+ * Bump indicatif from 0.16.2 to 0.17.0
+
+-------------------------------------------------------------------
Old:
----
hyperfine-1.15.0.tar.xz
New:
----
hyperfine-1.15.0+g27.obscpio
hyperfine-1.15.0+g27.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hyperfine.spec ++++++
--- /var/tmp/diff_new_pack.adY0VQ/_old 2022-12-24 14:53:00.395881929 +0100
+++ /var/tmp/diff_new_pack.adY0VQ/_new 2022-12-24 14:53:00.399881952 +0100
@@ -17,7 +17,7 @@
Name: hyperfine
-Version: 1.15.0
+Version: 1.15.0+g27
Release: 0
Summary: Command-line benchmarking tool
License: Apache-2.0 OR MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.adY0VQ/_old 2022-12-24 14:53:00.443882208 +0100
+++ /var/tmp/diff_new_pack.adY0VQ/_new 2022-12-24 14:53:00.447882232 +0100
@@ -2,8 +2,8 @@
<service name="obs_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/sharkdp/hyperfine.git</param>
- <param name="revision">c7e5694</param>
- <param name="versionformat">@PARENT_TAG@</param>
+ <param name="revision">4fe8db41a4bd151ad54908762fba635d25ef230b</param>
+ <param name="versionformat">@PARENT_TAG@+g@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<param name="changesgenerate">enable</param>
@@ -20,9 +20,7 @@
<param name="srcdir">hyperfine</param>
<param name="compression">xz</param>
</service>
- <service name="cargo_audit" mode="disabled">
- <param name="srcdir">hyperfine</param>
- </service>
+ <service name="cargo_audit" mode="disabled" />
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.adY0VQ/_old 2022-12-24 14:53:00.467882349 +0100
+++ /var/tmp/diff_new_pack.adY0VQ/_new 2022-12-24 14:53:00.471882372 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/sharkdp/hyperfine.git</param>
- <param name="changesrevision">c7e56942f7d32e8bacab055c743bc0d3f17680b1</param></service></servicedata>
+ <param name="changesrevision">4fe8db41a4bd151ad54908762fba635d25ef230b</param></service></servicedata>
(No newline at EOF)
++++++ hyperfine.obsinfo ++++++
--- /var/tmp/diff_new_pack.adY0VQ/_old 2022-12-24 14:53:00.503882558 +0100
+++ /var/tmp/diff_new_pack.adY0VQ/_new 2022-12-24 14:53:00.507882582 +0100
@@ -1,5 +1,5 @@
name: hyperfine
-version: 1.15.0
-mtime: 1662535250
-commit: c7e56942f7d32e8bacab055c743bc0d3f17680b1
+version: 1.15.0+g27
+mtime: 1670158762
+commit: 4fe8db41a4bd151ad54908762fba635d25ef230b
++++++ vendor.tar.xz ++++++
/work/SRC/openSUSE:Factory/hyperfine/vendor.tar.xz /work/SRC/openSUSE:Factory/.hyperfine.new.1563/vendor.tar.xz differ: char 26, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2022-12-24 14:51:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Sat Dec 24 14:51:55 2022 rev:457 rq:1045004 version:20221216.84941bd
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2022-12-08 16:52:14.555807901 +0100
+++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1563/openSUSE-release-tools.changes 2022-12-24 14:52:57.631865801 +0100
@@ -1,0 +2,26 @@
+Fri Dec 16 11:21:11 UTC 2022 - opensuse-releaseteam(a)opensuse.org
+
+- Update to version 20221216.84941bd:
+ * gocd: ensure timeout is set for packagelist generation
+
+-------------------------------------------------------------------
+Tue Dec 13 18:58:35 UTC 2022 - opensuse-releaseteam(a)opensuse.org
+
+- Update to version 20221213.82ee694:
+ * dashboard: add openQA information to Legacy x86
+
+-------------------------------------------------------------------
+Mon Dec 12 16:47:23 UTC 2022 - opensuse-releaseteam(a)opensuse.org
+
+- Update to version 20221212.41dbcc8:
+ * dashboard: Add LegacyX86 port and sort the list
+ * staging_accept: update Factory version in LegacyX86 port on accept
+
+-------------------------------------------------------------------
+Mon Dec 12 13:27:47 UTC 2022 - opensuse-releaseteam(a)opensuse.org
+
+- Update to version 20221212.5effc63:
+ * retab the line use spaces instead
+ * publish_distro add --now to set PUBLISH_DELAY=0
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20221130.db5d69f.obscpio
New:
----
openSUSE-release-tools-20221216.84941bd.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.urUHdA/_old 2022-12-24 14:52:58.335869909 +0100
+++ /var/tmp/diff_new_pack.urUHdA/_new 2022-12-24 14:52:58.343869955 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20221130.db5d69f
+Version: 20221216.84941bd
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.urUHdA/_old 2022-12-24 14:52:58.391870235 +0100
+++ /var/tmp/diff_new_pack.urUHdA/_new 2022-12-24 14:52:58.395870259 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param name="changesrevision">db5d69ffc61df5a51df915a0330bb5ce8c9e658f</param>
+ <param name="changesrevision">84941bd2b4093fe19ebcb727d15f3ddbebe9eed2</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20221130.db5d69f.obscpio -> openSUSE-release-tools-20221216.84941bd.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20221130.db5d69f/dashboard/generate.py new/openSUSE-release-tools-20221216.84941bd/dashboard/generate.py
--- old/openSUSE-release-tools-20221130.db5d69f/dashboard/generate.py 2022-11-30 10:50:01.000000000 +0100
+++ new/openSUSE-release-tools-20221216.84941bd/dashboard/generate.py 2022-12-16 12:20:09.000000000 +0100
@@ -161,14 +161,17 @@
fetcher.add('openSUSE:Factory:ARM:Live', nick='ARM Live')
fetcher.add('openSUSE:Factory:ARM:Rings:0-Bootstrap', nick='ARM Ring 0')
fetcher.add('openSUSE:Factory:ARM:Rings:1-MinimalX', nick='ARM Ring 1')
+ fetcher.add('openSUSE:Factory:LegacyX86', nick='Legacy X86',
+ download_url='http://download.opensuse.org/ports/i586/tumbleweed/iso/',
+ openqa_group='openSUSE Tumbleweed Legacy x86', openqa_version='Tumbleweed', openqa_groupid=75)
fetcher.add('openSUSE:Factory:PowerPC', nick='Power',
download_url='http://download.opensuse.org/ports/ppc/tumbleweed/iso/',
openqa_group='openSUSE Tumbleweed PowerPC', openqa_version='Tumbleweed', openqa_groupid=4)
+ fetcher.add('openSUSE:Factory:RISCV', nick='Risc V',
+ download_url='http://download.opensuse.org/ports/riscv/tumbleweed/iso/')
fetcher.add('openSUSE:Factory:zSystems', nick='System Z',
download_url='http://download.opensuse.org/ports/zsystems/tumbleweed/iso/',
openqa_group='openSUSE Tumbleweed s390x', openqa_version='Tumbleweed', openqa_groupid=34)
- fetcher.add('openSUSE:Factory:RISCV', nick='Risc V',
- download_url='http://download.opensuse.org/ports/riscv/tumbleweed/iso/')
else:
fetcher.add('openSUSE:Leap:Micro:5.3', nick='Leap:Micro:5.3',
download_url='https://download.opensuse.org/distribution/leap-micro/5.3/product/iso',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20221130.db5d69f/gocd/alp.gocd.yaml new/openSUSE-release-tools-20221216.84941bd/gocd/alp.gocd.yaml
--- old/openSUSE-release-tools-20221130.db5d69f/gocd/alp.gocd.yaml 2022-11-30 10:50:01.000000000 +0100
+++ new/openSUSE-release-tools-20221216.84941bd/gocd/alp.gocd.yaml 2022-12-16 12:20:09.000000000 +0100
@@ -17,24 +17,28 @@
type: manual
jobs:
SUSE_ALP_target:
+ timeout: 60
resources:
- repo-checker
tasks:
- script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p SUSE:ALP -s target --only-release-packages --force
- script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p SUSE:ALP -s target
SUSE_ALP_PowerPC:
+ timeout: 60
resources:
- repo-checker
tasks:
- script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p SUSE:ALP:PowerPC -s target --only-release-packages --force
- script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p SUSE:ALP:PowerPC -s target
SUSE_ALP_zSystems:
+ timeout: 60
resources:
- repo-checker
tasks:
- script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p SUSE:ALP:zSystems -s target --only-release-packages --force
- script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p SUSE:ALP:zSystems -s target
SUSE_ALP_RISCV:
+ timeout: 60
resources:
- repo-checker
tasks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20221130.db5d69f/gocd/alp.gocd.yaml.erb new/openSUSE-release-tools-20221216.84941bd/gocd/alp.gocd.yaml.erb
--- old/openSUSE-release-tools-20221130.db5d69f/gocd/alp.gocd.yaml.erb 2022-11-30 10:50:01.000000000 +0100
+++ new/openSUSE-release-tools-20221216.84941bd/gocd/alp.gocd.yaml.erb 2022-12-16 12:20:09.000000000 +0100
@@ -27,6 +27,7 @@
end
-%>
<%= name %>:
+ timeout: 60
resources:
- repo-checker
tasks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20221130.db5d69f/osclib/accept_command.py new/openSUSE-release-tools-20221216.84941bd/osclib/accept_command.py
--- old/openSUSE-release-tools-20221130.db5d69f/osclib/accept_command.py 2022-11-30 10:50:01.000000000 +0100
+++ new/openSUSE-release-tools-20221216.84941bd/osclib/accept_command.py 2022-12-16 12:20:09.000000000 +0100
@@ -276,6 +276,7 @@
self.update_version_attribute(project, curr_version)
ports_prjs = ['PowerPC', 'ARM', 'zSystems', 'RISCV']
+ ports_prjs = ['ARM', 'LegacyX86', 'PowerPC', 'RISCV', 'zSystems']
for ports in ports_prjs:
project = self.api.project + ':' + ports
if self.api.item_exists(project):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20221130.db5d69f/publish_distro new/openSUSE-release-tools-20221216.84941bd/publish_distro
--- old/openSUSE-release-tools-20221130.db5d69f/publish_distro 2022-11-30 10:50:01.000000000 +0100
+++ new/openSUSE-release-tools-20221216.84941bd/publish_distro 2022-12-16 12:20:09.000000000 +0100
@@ -70,6 +70,10 @@
do_cleanup=1
date="90 days ago"
continue
+ elif [ "$arg" == '--now' ]; then
+ PUBLISH_DELAY=0
+ shift
+ continue
else
newargs+=("$arg")
fi
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.urUHdA/_old 2022-12-24 14:52:59.243875207 +0100
+++ /var/tmp/diff_new_pack.urUHdA/_new 2022-12-24 14:52:59.247875230 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20221130.db5d69f
-mtime: 1669801801
-commit: db5d69ffc61df5a51df915a0330bb5ce8c9e658f
+version: 20221216.84941bd
+mtime: 1671189609
+commit: 84941bd2b4093fe19ebcb727d15f3ddbebe9eed2
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnucash-docs for openSUSE:Factory checked in at 2022-12-24 14:51:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnucash-docs (Old)
and /work/SRC/openSUSE:Factory/.gnucash-docs.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnucash-docs"
Sat Dec 24 14:51:52 2022 rev:49 rq:1045003 version:4.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnucash-docs/gnucash-docs.changes 2022-10-08 01:25:00.638200156 +0200
+++ /work/SRC/openSUSE:Factory/.gnucash-docs.new.1563/gnucash-docs.changes 2022-12-24 14:52:55.151851331 +0100
@@ -1,0 +2,29 @@
+Thu Dec 22 12:59:57 UTC 2022 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 4.13:
+ * Bug 798620 - Unable to build docs on Mageia Cauldron
+ * Bug 798623 - ENG. Typo "documenation"
+ * Bug 798624 - Document how to check if GnuCash is running when
+ updating quotes
+ * Bug 798645 - screens instead of WINDOWS
+ * Bug 798665 - New: ENG. Typo: Unnecessary determiner "a"
+ in 2.6.1. Migrating financial data.
+ * Bug 798674 - Broken link on Chapter 17. Python Bindings
+ * Manual:de: Account_Actions: Tippfehler-Korrektur
+ * Review URLs and replace them by entities in all parts and languages excepting in comments or FDL appendix
+ * manual, ch_Finance-Quote: fix broken entities
+ * gnc-gui-struct.dtd: fix some mistakes and add entities for menuitems and menuchoice.
+ * Update url-irc to "irc://irc.gimp.net/gnucash" see the email announcement
+ * Partial Modernization of Manual:C:Business: Differentiation of admonitions and improvement of lists
+ * Manual:C: Convert CSV assistant into <procedure>
+ * Multi-split csv elaboration
+ * Update app-fq-vers to "1.53"
+ * Replace "Online Quote Setup" instructions in Guide by links to the manual chapter.
+ O Enhance bookinfos by subtitle and titleabbrev;drop "Help" from manual. Adding titleabbrev allows yelp to display the version in its titlebar
+ * Guide:C: Fix image declarations: Some were not properly scaled and others didn't appear in the List of Figures.
+ * Replace all hardcoded width="510[px]" by "&img-w;" for for both components in all languages
+ * Ensure our documentation is also found when gnucash is run in KDE
+ * Restore draft status in gnc-docbook.dtd.
+ * New and Updated Translations: German
+
+-------------------------------------------------------------------
Old:
----
gnucash-docs-4.12.tar.gz
New:
----
gnucash-docs-4.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnucash-docs.spec ++++++
--- /var/tmp/diff_new_pack.gm5Jqk/_old 2022-12-24 14:52:56.567859593 +0100
+++ /var/tmp/diff_new_pack.gm5Jqk/_new 2022-12-24 14:52:56.571859617 +0100
@@ -17,7 +17,7 @@
Name: gnucash-docs
-Version: 4.12
+Version: 4.13
Release: 9.1
Summary: Documentation Module for GnuCash
License: GFDL-1.1-only AND GPL-2.0-or-later
++++++ gnucash-docs-4.12.tar.gz -> gnucash-docs-4.13.tar.gz ++++++
/work/SRC/openSUSE:Factory/gnucash-docs/gnucash-docs-4.12.tar.gz /work/SRC/openSUSE:Factory/.gnucash-docs.new.1563/gnucash-docs-4.13.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2022-12-24 14:51:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old)
and /work/SRC/openSUSE:Factory/.gnu_parallel.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnu_parallel"
Sat Dec 24 14:51:50 2022 rev:83 rq:1045000 version:20221222
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2022-11-24 12:25:22.902118238 +0100
+++ /work/SRC/openSUSE:Factory/.gnu_parallel.new.1563/gnu_parallel.changes 2022-12-24 14:52:51.927832520 +0100
@@ -1,0 +2,7 @@
+Fri Dec 23 11:35:34 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release 20221222
+ * --results works on more file systems (e.g. fat)
+ * Joblog gives the same exit code as bash
+
+-------------------------------------------------------------------
Old:
----
parallel-20221122.tar.bz2
parallel-20221122.tar.bz2.sig
New:
----
parallel-20221222.tar.bz2
parallel-20221222.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnu_parallel.spec ++++++
--- /var/tmp/diff_new_pack.B4gY5R/_old 2022-12-24 14:52:53.383841016 +0100
+++ /var/tmp/diff_new_pack.B4gY5R/_new 2022-12-24 14:52:53.403841132 +0100
@@ -17,7 +17,7 @@
Name: gnu_parallel
-Version: 20221122
+Version: 20221222
Release: 0
Summary: Shell tool for executing jobs in parallel
License: GPL-3.0-or-later
++++++ parallel-20221122.tar.bz2 -> parallel-20221222.tar.bz2 ++++++
++++ 2431 lines of diff (skipped)
++++++ parallel-20221122.tar.bz2.sig -> parallel-20221222.tar.bz2.sig ++++++
--- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20221122.tar.bz2.sig 2022-11-24 12:25:23.106119535 +0100
+++ /work/SRC/openSUSE:Factory/.gnu_parallel.new.1563/parallel-20221222.tar.bz2.sig 2022-12-24 14:52:52.087833454 +0100
@@ -2,7 +2,7 @@
# To check the signature run:
# echo | gpg
-# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20221122.tar.bz2.sig
+# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20221222.tar.bz2.sig
echo | gpg 2>/dev/null
gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0
@@ -10,32 +10,32 @@
-----BEGIN PGP SIGNATURE-----
-iQUHBAABCgAdFiEEzaAaQgjE90UGEH570atFFoiIiIgFAmN9EGkACgkQ0atFFoiI
-iIi6EiagoPb0GPxpAb4SLdnGwtamW4ww04qH/cgnHX2yxWO5F54/Yn6h+LIsP8MS
-UOo5Nl6m11JHepd4nDUd7yNkgLz7omOtagx3eu4yGcpceMw5yu/+VLnLoX7K3r14
-pOHd4h6LsaJlcFk3f4FngBinFAVb8CdNnAWorHmMiIoy62qNUU4Se8PzBYV4gBdx
-+mVsVpiF5dSrilHpb1UPegO7J4IUYJaWN8Pj9j+gjiJfXAXtVOB6PTh6pIEKP9pF
-/YebTmVkXTNc41gnyFkml2jwkrOEf1XJJD328+OOB4hQgrXhym4rfYdbiA7bUwzV
-LI+EsgFMSA2jfazUuenRN0bA7Hrix9voZY1hHD741lY4HQglZ9ns8xztQ5m+QtWs
-k+Kr0J81f1vdd7o4HFOx3hElwy4z//4TAItaslZH+SOa9s8lBvdEUIaw+1nk+WON
-eci4EMmbRlMWqXqIvYFg1q3e8U/h9jT/jiEFeA94TUG4Y3E+VMT1kUhdhgxWOjsM
-N2uMZq8xrb0zT5ciq8UoG85KcM0KGb/nBk7Ef+bZXed4hSIXwsk9nr6R5Be97aXi
-K2vJzyW06ETyQ9S86incTEpgDk1i/cBX/pgXA/HVsHE7e8TU2rPtkzo3C6mLnaEM
-yCN69iGhd9nJPcaTf1IrknbvhH6EBiSGTaz/N32nt5HGZi06lusm1t+X+TsJF1xr
-1myd0L1dSSfhH9Zybr6XzlB4/+UxUCYv6tfsmssnQTG6O98hg2ErVWh5ksUIhFHB
-l5eW6ytZqvAh/trsgIw4S+2tZk24VUPk5ixz77nIUMCYQMpFa+FGCVLRuFHRCKw4
-/iSviX8vQIw4FXcgjmH40hoP0os1koeVoeYwjuQAzWTcYqq+iCum1bjASRSD/CSd
-XZPL276ujC8VzsO58BNrvvBL1gzKjk3tvTnnCNAcfO74E0y5sQ5PdegXgubQiGZ+
-054WCKG+77YZr37yVPKmBldAv8HE1Udmeu3eUGYldKX9egf9n8uPnc9xudENw4hc
-Kz6H6L1OZ893aKPbj9NsJp1/kw2XBVc4WUSIo++3k1Y1BM+oUIh1q9tsv0kbNVvQ
-IzSSyDrJu1lTDI4ikCOhKMVRwQXXwUvE1RGqdb84iC9Xe05hwVqpk/nSXsoPw8LL
-AtlQ5fsAtpFGoqAd0dl9EIQTp4YWsr2WGWwSs58XbZJ8KEv7pFpLEQwmdlcPQ7b+
-67H5TN720hidNAQvGH8a0Jv2UOSmTWv1hZkQigrXvDey0a4JqWfCWHOR+M+1TZlS
-UX9RvAO6SoZUm80eYjeAm0csWrFx5rtk+bL1ppIIP3zMBWLSQHso0yyrG/kXgBTC
-B+kVoC3JgXaH6wYd8RhYzHjmjZYRyuyAz43S+tWtlW+Es8rzOSuLNUToeoWgrbl3
-2psZp5rEpVPprTUJD2tkOORWAv2bxq5jb7635YYgbTVc7eA5tSO86ixP6gtkrntn
-BenTYoqeeFjiJ65Vu8OawDTPtcmFDZaRSMEEMZu1GzmhsF3fRnPyhef/AGiJa/zH
-7QlfPlpb7bz6CmVCvQFwOkYqiHJDZ6Q7QOSlzi7DkB4wCrrX61LP/bGTMVtnTCri
-v4AXCf9KdYd5yT5AnFd7rGEAhPsDyelzCMbRq+cSU+keFQB0fdoAzHEF
-=5qkk
+iQUHBAABCgAdFiEEzaAaQgjE90UGEH570atFFoiIiIgFAmOiRv8ACgkQ0atFFoiI
+iIjJ3iagvUfkPlYI6LAL9IA2qiEehRk95nXpC4RxQ2dE0fS072QZXL4n80KYydKV
+/D4qJWyxs3NZ4dzLGGscs94YczFAAAXUhE18JloBNBhpd7YAtFo2Sp1OJVoTe3pw
+o9LRo0YSTQSX1rwbPJJoNEnicF+1FM/6GXuoOL5a7gSYBZN0/j1UD5srK226I9uw
+lcOj3jbLO/ImlISdyj8u6v9y70ylcTE1cmfNnC7g1RTY+TzjJks3mMUEWS8zcn9l
+onUcMwbSAM0XsfzeRJ8jHKNXsnoVmaUqDOHwPbk09VMnkZN9wkjIua3L2iHcTK3E
+b6yjvHXnamZl4JAGsp7CtkrsqX5uOyv9B94PeZWxSa0M4GOWMOEfXc+g4SgDAY0j
+Il5d/0F8yadiQ6mCJfxJ0hicqstyxuk+Z2R2Remke5rWtEnR3c8Y7JHKViGLMUUl
+oss7kUtOKUCvkQSSIXftrLtMj5fLsl9b/wkWU+7sN0klJ4Ds1j48Zj6wSRzFxdI8
+YDv4pwN5FBZx0wS4yAMT1D88tpoFmgFqMx3G3cZ7p7rctk07vQbEvofNS4Co2Fmi
+XwuP/Qh4ttk0ljW2SqocroXq9FMuRba1EA03tgPliwSsAh5HNfv+SxybVupA64Vt
+xECy2YNrG3UFUttsORwVv7IU0t1khTF6/6E4Tc4zkqH/4xHPxM/YWDEZrR5rynxQ
+IWDgqdU9blUImQxflrvNPRtGCLENA7DxyjuZs8o2wOsHHM9TMUHc6ipicPJUIloc
+PHqndunuWi86o70ClDv/l+QUcr/rcDe3sYoAELU52iFKpT96afocYmQ9eik6lmDi
+fIJKV5Y6KTxp3nAnh21VgD1aMz/SfEQQUtQnxkssM9ov2llMlHRs1kQIEuXaPIAf
+Ib51nH3gBheQUfKo9wNKdorSBQl8mYtW/gRWR1hmWzXUvHqJFTeCc3KVrFxdGb9H
+Sy95vZCtKGRBMnn8e4b0omQnkXhxMkK9aFPldGWLx3KwWJsPDZixEArky7qsOQlV
+RhzUbq9PTZ5jmFQDMQVNrqqR3UQqVxGMMzwce6ZNZoG5sbO6gUWvl1+ktsap8epA
+FcfBKnpTVStqLwtnJnA0Q1lN8c0Gb143vsj8tU2DnVoMSokhrUXCaaMQQtHPj+y7
+iLSJHWsImUGaYJwUAjR2fdcLCrD1xXQsz3EkvKmLEqOSg4zzLRCM1k2QcC0QuHYd
+3TaNw+pR5pXoS9WW1z97E5ULIqKwc4e3C+YF//Um6pRy6V8oHya/C3IDz25hAibK
+wSvTTJQXdiewO/84mRCP0pwHgTqqufikYjthXKDn/IRZr/rroZSuOCjyJGAiR2O0
+XZ+Ppw05sY6RgVHHBokZrHtAP4rUByopEwI1LNK1U41htL+wKLCXtNuOT61N8blQ
+ipOQdec2HP3YM4y+UhHF/ypfJYkINZ5GR4vDdABwShWtFzNlTeShhUACS+3C41np
+RLlkWaNHA/hxoewC9G9/s4SmG44yht9513lYP4wXdk8+FN2EigMa+7/walhAZydv
+oTB+xF+I1nG7d+lgnm4vr7UJeqtOUrwVgIlEF8T1mqBvM2S1QDyrQEUBJCzya9nY
+/7OxQVswkLxPH7sVO4TMEw35ij7hfUuKXuy5XCWB2sevERacFL3EIlA2
+=3Kt2
-----END PGP SIGNATURE-----
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mtail for openSUSE:Factory checked in at 2022-12-24 14:51:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mtail (Old)
and /work/SRC/openSUSE:Factory/.mtail.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtail"
Sat Dec 24 14:51:48 2022 rev:4 rq:1045001 version:3.0.0rc51
Changes:
--------
--- /work/SRC/openSUSE:Factory/mtail/mtail.changes 2022-08-05 19:51:52.981592318 +0200
+++ /work/SRC/openSUSE:Factory/.mtail.new.1563/mtail.changes 2022-12-24 14:52:50.079821738 +0100
@@ -1,0 +2,28 @@
+Thu Dec 22 14:34:19 UTC 2022 - michael(a)stroeder.com
+
+- Update to version 3.0.0rc51:
+ * Bump goreleaser/goreleaser-action from 3 to 4
+ * Bump github.com/prometheus/common from 0.37.0 to 0.38.0
+ * Bump github.com/prometheus/client_golang from 1.13.1 to 1.14.0
+ * Bump go.opencensus.io from 0.23.0 to 0.24.0
+ * Bump github.com/prometheus/client_golang from 1.13.0 to 1.13.1
+ * Bump hmarr/auto-approve-action from 3.0.0 to 3.1.0
+ * Bump lewagon/wait-on-check-action from 1.1.2 to 1.2.0
+ * Bump hmarr/auto-approve-action from 2.4.0 to 3.0.0
+ * Bump actions/stale from 5 to 6
+ * Fix linter error
+ * Disables rendering dead links
+ * Add http_info_endpoint to enable and disable info endpoints
+ * Add http_debugging_endpoint flag to allow disabeling http debug endpoint
+ (fixes #305)
+ * Bump github.com/google/go-cmp from 0.5.8 to 0.5.9
+ * Bump hmarr/auto-approve-action from 2.2.1 to 2.4.0
+ * Run gofumpt
+ * Fix memory leak on corrupt unicode character
+ * Bump github.com/prometheus/client_golang from 1.12.2 to 1.13.0
+ * ci: Remove actions/cache in favour of setup-go's cache.
+ * ci: Use the version of go specified in go.mod
+ * Fix missing imports.
+ * ci: Fix typo in name of sha-number file on non pull request.
+
+-------------------------------------------------------------------
Old:
----
mtail-3.0.0rc50.tar.gz
New:
----
mtail-3.0.0rc51.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mtail.spec ++++++
--- /var/tmp/diff_new_pack.oqfAXq/_old 2022-12-24 14:52:50.575824632 +0100
+++ /var/tmp/diff_new_pack.oqfAXq/_new 2022-12-24 14:52:50.583824678 +0100
@@ -24,7 +24,7 @@
%bcond_without apparmor
Name: mtail
-Version: 3.0.0rc50
+Version: 3.0.0rc51
Release: 0
Summary: Tool for extracting metrics from application logs
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.oqfAXq/_old 2022-12-24 14:52:50.619824889 +0100
+++ /var/tmp/diff_new_pack.oqfAXq/_new 2022-12-24 14:52:50.623824912 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/google/mtail.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v3.0.0-rc50</param>
+ <param name="revision">v3.0.0-rc51</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.+)-rc(.+)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.oqfAXq/_old 2022-12-24 14:52:50.639825006 +0100
+++ /var/tmp/diff_new_pack.oqfAXq/_new 2022-12-24 14:52:50.647825052 +0100
@@ -3,6 +3,6 @@
<param name="url">git://github.com/google/mtail.git</param>
<param name="changesrevision">baede67a6de1067a1d101b2978d7954d3fcd9435</param></service><service name="tar_scm">
<param name="url">https://github.com/google/mtail.git</param>
- <param name="changesrevision">b8131c8f0cbc3cf4cf12f7e409ece39e165ca04d</param></service></servicedata>
+ <param name="changesrevision">6fdbf8ec96a63c674c53148eeb9ec96043a2ec9c</param></service></servicedata>
(No newline at EOF)
++++++ mtail-3.0.0rc50.tar.gz -> mtail-3.0.0rc51.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/.github/workflows/auto-review.yml new/mtail-3.0.0rc51/.github/workflows/auto-review.yml
--- old/mtail-3.0.0rc50/.github/workflows/auto-review.yml 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/.github/workflows/auto-review.yml 2022-12-13 14:15:08.000000000 +0100
@@ -29,7 +29,7 @@
# create review
pull-requests: write
steps:
- - uses: lewagon/wait-on-check-action(a)v1.1.2
+ - uses: lewagon/wait-on-check-action(a)v1.2.0
with:
ref: ${{ github.event.pull_request.head.sha }}
repo-token: ${{ github.token }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/.github/workflows/automerge.yml new/mtail-3.0.0rc51/.github/workflows/automerge.yml
--- old/mtail-3.0.0rc50/.github/workflows/automerge.yml 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/.github/workflows/automerge.yml 2022-12-13 14:15:08.000000000 +0100
@@ -39,7 +39,7 @@
# wait-on-check requires only checks read
checks: read
steps:
- - uses: lewagon/wait-on-check-action(a)v1.1.2
+ - uses: lewagon/wait-on-check-action(a)v1.2.0
with:
ref: ${{ github.event.pull_request.head.sha }}
check-regexp: "test.*"
@@ -54,6 +54,6 @@
# auto-approve-action requires write on pull-requests
pull-requests: write
steps:
- - uses: hmarr/auto-approve-action@24ec4c8cc344fe1cdde70ff37e55ace9e848a1d8
+ - uses: hmarr/auto-approve-action@de8ae18c173c131e182d4adf2c874d8d2308a85b
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/.github/workflows/ci.yml new/mtail-3.0.0rc51/.github/workflows/ci.yml
--- old/mtail-3.0.0rc50/.github/workflows/ci.yml 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/.github/workflows/ci.yml 2022-12-13 14:15:08.000000000 +0100
@@ -26,20 +26,9 @@
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
- go-version: '^1.x'
- - uses: actions/cache@v3
- id: cache
- with:
- path: |
- ~/go/pkg/mod # Module download cache
- ~/.cache/go-build # Build cache (Linux)
- ~/Library/Caches/go-build # Build cache (Mac)
- '%LocalAppData%\go-build' # Build cache (Windows)
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-go-
+ go-version-file: 'go.mod'
+ cache: true
- name: install deps
- if: steps.cache.output.cache-hit != 'true'
run: go mod download
- name: build
run: make --debug all
@@ -51,7 +40,7 @@
if [[ ${{ github.event_name }} == 'pull_request' ]]; then
echo ${{ github.event.pull_request.head.sha }} > test-results/sha-number
else
- echo ${{ github.sha }} > test-result/sha-number
+ echo ${{ github.sha }} > test-results/sha-number
fi
make --debug junit-regtest TESTCOVERPROFILE=coverprofile
shell: bash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/.github/workflows/release.yml new/mtail-3.0.0rc51/.github/workflows/release.yml
--- old/mtail-3.0.0rc50/.github/workflows/release.yml 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/.github/workflows/release.yml 2022-12-13 14:15:08.000000000 +0100
@@ -20,7 +20,7 @@
- uses: actions/setup-go@v3
with:
go-version: '^1.x'
- - uses: goreleaser/goreleaser-action@v3
+ - uses: goreleaser/goreleaser-action@v4
with:
version: latest
args: release --rm-dist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/.github/workflows/stale.yml new/mtail-3.0.0rc51/.github/workflows/stale.yml
--- old/mtail-3.0.0rc50/.github/workflows/stale.yml 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/.github/workflows/stale.yml 2022-12-13 14:15:08.000000000 +0100
@@ -11,7 +11,7 @@
stale:
runs-on: ubuntu-latest
steps:
- - uses: actions/stale@v5
+ - uses: actions/stale@v6
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has been waiting for more information for more than 60 days and will be closed in 7 if no update is provided.'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/cmd/mtail/main.go new/mtail-3.0.0rc51/cmd/mtail/main.go
--- old/mtail-3.0.0rc50/cmd/mtail/main.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/cmd/mtail/main.go 2022-12-13 14:15:08.000000000 +0100
@@ -73,6 +73,8 @@
// Debugging flags.
blockProfileRate = flag.Int("block_profile_rate", 0, "Nanoseconds of block time before goroutine blocking events reported. 0 turns off. See https://golang.org/pkg/runtime/#SetBlockProfileRate")
mutexProfileFraction = flag.Int("mutex_profile_fraction", 0, "Fraction of mutex contention events reported. 0 turns off. See http://golang.org/pkg/runtime/#SetMutexProfileFraction")
+ httpDebugEndpoints = flag.Bool("http_debugging_endpoint", true, "Enable debugging endpoints (/debug/*).")
+ httpInfoEndpoints = flag.Bool("http_info_endpoint", true, "Enable info endpoints (/progz,/varz).")
// Tracing.
jaegerEndpoint = flag.String("jaeger_endpoint", "", "If set, collector endpoint URL of jaeger thrift service")
@@ -207,6 +209,12 @@
if *dumpBytecode {
opts = append(opts, mtail.DumpBytecode)
}
+ if *httpDebugEndpoints {
+ opts = append(opts, mtail.HTTPDebugEndpoints)
+ }
+ if *httpInfoEndpoints {
+ opts = append(opts, mtail.HTTPInfoEndpoints)
+ }
if *syslogUseCurrentYear {
opts = append(opts, mtail.SyslogUseCurrentYear)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/go.mod new/mtail-3.0.0rc51/go.mod
--- old/mtail-3.0.0rc50/go.mod 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/go.mod 2022-12-13 14:15:08.000000000 +0100
@@ -6,25 +6,26 @@
contrib.go.opencensus.io/exporter/jaeger v0.2.1
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
- github.com/google/go-cmp v0.5.8
+ github.com/google/go-cmp v0.5.9
github.com/pkg/errors v0.9.1
- github.com/prometheus/client_golang v1.12.2
- github.com/prometheus/common v0.37.0
- go.opencensus.io v0.23.0
- golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
+ github.com/prometheus/client_golang v1.14.0
+ github.com/prometheus/common v0.38.0
+ go.opencensus.io v0.24.0
+ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10
)
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
- github.com/prometheus/client_model v0.2.0 // indirect
- github.com/prometheus/procfs v0.7.3 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
+ github.com/prometheus/client_model v0.3.0 // indirect
+ github.com/prometheus/procfs v0.8.0 // indirect
github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect
- golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
+ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
google.golang.org/api v0.30.0 // indirect
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
google.golang.org/grpc v1.33.2 // indirect
- google.golang.org/protobuf v1.26.0 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/go.sum new/mtail-3.0.0rc51/go.sum
--- old/mtail-3.0.0rc50/go.sum 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/go.sum 2022-12-13 14:15:08.000000000 +0100
@@ -13,14 +13,36 @@
cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
+cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
+cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
+cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
+cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
+cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
+cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
+cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
+cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
+cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
+cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
+cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
+cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
+cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -30,21 +52,26 @@
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
contrib.go.opencensus.io/exporter/jaeger v0.2.1 h1:yGBYzYMewVL0yO9qqJv3Z5+IRhPdU7e9o/2oKpX4YvI=
contrib.go.opencensus.io/exporter/jaeger v0.2.1/go.mod h1:Y8IsLgdxqh1QxYxPC5IgXVmBaeLUeQFfBeBi9PbeZd0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -53,12 +80,28 @@
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -66,6 +109,7 @@
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
+github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
@@ -85,6 +129,8 @@
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -100,8 +146,10 @@
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -111,14 +159,20 @@
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
@@ -126,13 +180,29 @@
github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
+github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
+github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
+github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
+github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -147,10 +217,12 @@
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
+github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -168,47 +240,65 @@
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34=
-github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
+github.com/prometheus/common v0.38.0 h1:VTQitp6mXTdUoCmDMugDVOJ1opi6ADftKfp/yeqTR/E=
+github.com/prometheus/common v0.38.0/go.mod h1:MBXfmBQZrK5XpbCkjofnXs96LD2QQ7fEq4C0xjC/yec=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/uber/jaeger-client-go v2.25.0+incompatible h1:IxcNZ7WRY1Y3G4poYlx24szfsn/3LvK9QHCq9oQw8+U=
github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -237,6 +327,8 @@
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
@@ -245,6 +337,9 @@
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -273,18 +368,46 @@
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 h1:N9Vc/rorQUDes6B9CNdIxAn5jODGj2wzfrei2x4wNj4=
+golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
+golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -293,8 +416,11 @@
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -326,15 +452,44 @@
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -342,6 +497,8 @@
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -388,10 +545,24 @@
golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -409,12 +580,37 @@
google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
google.golang.org/api v0.30.0 h1:yfrXXP61wVuLb0vBcG6qaOoIoqYEzOQS8jum51jkv2w=
google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
+google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
+google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
+google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
+google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
+google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
+google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
+google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
+google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
+google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
+google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
+google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
+google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
+google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
+google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
+google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
+google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
+google.golang.org/api v0.84.0 h1:NMB9J4cCxs9xEm+1Z9QiO3eFvn7EnQj3Eo3hN6ugVlg=
+google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -438,6 +634,7 @@
google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
@@ -445,6 +642,55 @@
google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 h1:PDIOdWxZ8eRizhKa1AAvY53xsvLB1cWorMjslvY3VA8=
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
+google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
+google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 h1:4SPz2GL2CXJt28MTF8V6Ap/9ZiVbQlJeGSd9qtA7DLs=
+google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -457,8 +703,28 @@
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o=
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
+google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -470,20 +736,26 @@
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/mtail/examples_integration_unix_test.go new/mtail-3.0.0rc51/internal/mtail/examples_integration_unix_test.go
--- old/mtail-3.0.0rc50/internal/mtail/examples_integration_unix_test.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/mtail/examples_integration_unix_test.go 2022-12-13 14:15:08.000000000 +0100
@@ -6,6 +6,27 @@
package mtail_test
+import (
+ "context"
+ "errors"
+ "fmt"
+ "io"
+ "net"
+ "os"
+ "path/filepath"
+ "sync"
+ "testing"
+ "time"
+
+ "github.com/golang/glog"
+ "github.com/google/mtail/internal/metrics"
+ "github.com/google/mtail/internal/metrics/datum"
+ "github.com/google/mtail/internal/mtail"
+ "github.com/google/mtail/internal/testutil"
+ "github.com/google/mtail/internal/waker"
+ "golang.org/x/sys/unix"
+)
+
// TestFilePipeStreamComparison is a unix-specific test since unix.Mkfifo is not defined on Windows.
// Two mtails both alike in dignity.
func TestFilePipeStreamComparison(t *testing.T) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/mtail/httpstatus.go new/mtail-3.0.0rc51/internal/mtail/httpstatus.go
--- old/mtail-3.0.0rc50/internal/mtail/httpstatus.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/mtail/httpstatus.go 2022-12-13 14:15:08.000000000 +0100
@@ -11,6 +11,7 @@
)
const statusTemplate = `
+<!DOCTYPE html>
<html>
<head>
<title>mtail on {{.BindAddress}}</title>
@@ -18,8 +19,14 @@
<body>
<h1>mtail on {{.BindAddress}}</h1>
<p>Build: {{.BuildInfo}}</p>
-<p>Metrics: <a href="/json">json</a>, <a href="/graphite">graphite</a>, <a href="/metrics">prometheus</a>, <a href="/varz">varz</a></p>
-<p>Debug: <a href="/debug/pprof">debug/pprof</a>, <a href="/debug/vars">debug/vars</a>, <a href="/tracez">tracez</a>, <a href="/progz">progz</a></p>
+<p>Metrics: <a href="/json">json</a>, <a href="/graphite">graphite</a>, <a href="/metrics">prometheus</a></p>
+<p>Info: {{ if .HTTPInfoEndpoints }}<a href="/varz">varz</a>, <a href="/progz">progz</a> <a href="/tracez">tracez</a></p>{{ else }} disabled {{ end }}</p>
+<p>Debug: {{ if .HTTPDebugEndpoints }}<a href="/debug/pprof">debug/pprof</a>, <a href="/debug/vars">debug/vars</a>{{ else }} disabled {{ end }}</p>
+`
+
+const statusTemplateEnd = `
+</body>
+</html>
`
// ServeHTTP satisfies the http.Handler interface, and is used to serve the
@@ -31,25 +38,41 @@
return
}
+ te, err := template.New("statusend").Parse(statusTemplateEnd)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
+
data := struct {
- BindAddress string
- BuildInfo string
+ BindAddress string
+ BuildInfo string
+ HTTPDebugEndpoints bool
+ HTTPInfoEndpoints bool
}{
m.listener.Addr().String(),
m.buildInfo.String(),
+ m.httpDebugEndpoints,
+ m.httpInfoEndpoints,
}
w.Header().Add("Content-type", "text/html")
w.WriteHeader(http.StatusOK)
if err = t.Execute(w, data); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
}
- err = m.r.WriteStatusHTML(w)
- if err != nil {
- glog.Warningf("Error while writing loader status: %s", err)
+ if m.httpInfoEndpoints {
+ err = m.r.WriteStatusHTML(w)
+ if err != nil {
+ glog.Warningf("Error while writing loader status: %s", err)
+ }
+ err = m.t.WriteStatusHTML(w)
+ if err != nil {
+ glog.Warningf("Error while writing tailer status: %s", err)
+ }
}
- err = m.t.WriteStatusHTML(w)
- if err != nil {
- glog.Warningf("Error while writing tailer status: %s", err)
+
+ if err = te.Execute(w, data); err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/mtail/mtail.go new/mtail-3.0.0rc51/internal/mtail/mtail.go
--- old/mtail-3.0.0rc50/internal/mtail/mtail.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/mtail/mtail.go 2022-12-13 14:15:08.000000000 +0100
@@ -47,9 +47,11 @@
buildInfo BuildInfo // go build information
- programPath string // path to programs to load
- oneShot bool // if set, mtail reads log files from the beginning, once, then exits
- compileOnly bool // if set, mtail compiles programs then exits
+ programPath string // path to programs to load
+ oneShot bool // if set, mtail reads log files from the beginning, once, then exits
+ compileOnly bool // if set, mtail compiles programs then exit
+ httpDebugEndpoints bool // if set, mtail will enable debug endpoints
+ httpInfoEndpoints bool // if set, mtail will enable info endpoints for progz and varz
}
// initRuntime constructs a new runtime and performs the initial load of program files in the program directory.
@@ -96,19 +98,23 @@
}
mux := http.NewServeMux()
- mux.HandleFunc("/favicon.ico", FaviconHandler)
+ if m.httpDebugEndpoints {
+ mux.Handle("/debug/vars", expvar.Handler())
+ mux.HandleFunc("/debug/pprof/", pprof.Index)
+ mux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
+ mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
+ mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
+ mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
+ }
+ if m.httpInfoEndpoints {
+ mux.HandleFunc("/favicon.ico", FaviconHandler)
+ mux.HandleFunc("/varz", http.HandlerFunc(m.e.HandleVarz))
+ mux.Handle("/progz", http.HandlerFunc(m.r.ProgzHandler))
+ }
mux.Handle("/", m)
- mux.Handle("/progz", http.HandlerFunc(m.r.ProgzHandler))
- mux.HandleFunc("/json", http.HandlerFunc(m.e.HandleJSON))
mux.Handle("/metrics", promhttp.HandlerFor(m.reg, promhttp.HandlerOpts{}))
+ mux.HandleFunc("/json", http.HandlerFunc(m.e.HandleJSON))
mux.HandleFunc("/graphite", http.HandlerFunc(m.e.HandleGraphite))
- mux.HandleFunc("/varz", http.HandlerFunc(m.e.HandleVarz))
- mux.Handle("/debug/vars", expvar.Handler())
- mux.HandleFunc("/debug/pprof/", pprof.Index)
- mux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
- mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
- mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
- mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
zpages.Handle(mux, "/")
srv := &http.Server{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/mtail/options.go new/mtail-3.0.0rc51/internal/mtail/options.go
--- old/mtail-3.0.0rc50/internal/mtail/options.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/mtail/options.go 2022-12-13 14:15:08.000000000 +0100
@@ -202,6 +202,22 @@
},
}
+// HttpDebugEndpoints enables debug http endpoints
+var HTTPDebugEndpoints = &niladicOption{
+ func(m *Server) error {
+ m.httpDebugEndpoints = true
+ return nil
+ },
+}
+
+// HttpInfoEndpoints enables info http endpoints
+var HTTPInfoEndpoints = &niladicOption{
+ func(m *Server) error {
+ m.httpInfoEndpoints = true
+ return nil
+ },
+}
+
// SyslogUseCurrentYear instructs the Server to use the current year for year-less log timestamp during parsing.
var SyslogUseCurrentYear = &niladicOption{
func(m *Server) error {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/mtail/read_pipe_integration_unix_test.go new/mtail-3.0.0rc51/internal/mtail/read_pipe_integration_unix_test.go
--- old/mtail-3.0.0rc50/internal/mtail/read_pipe_integration_unix_test.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/mtail/read_pipe_integration_unix_test.go 2022-12-13 14:15:08.000000000 +0100
@@ -7,10 +7,12 @@
package mtail_test
import (
+ "net"
"os"
"path/filepath"
"syscall"
"testing"
+ "time"
"github.com/google/mtail/internal/mtail"
"github.com/google/mtail/internal/testutil"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/runtime/httpstatus.go new/mtail-3.0.0rc51/internal/runtime/httpstatus.go
--- old/mtail-3.0.0rc50/internal/runtime/httpstatus.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/runtime/httpstatus.go 2022-12-13 14:15:08.000000000 +0100
@@ -14,7 +14,7 @@
const loaderTemplate = `
<h2 id="loader">Program Loader</h2>
-<table border=1>
+<table border="1">
<tr>
<th>program name</th>
<th>errors</th>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/tailer/httpstatus.go new/mtail-3.0.0rc51/internal/tailer/httpstatus.go
--- old/mtail-3.0.0rc50/internal/tailer/httpstatus.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/tailer/httpstatus.go 2022-12-13 14:15:08.000000000 +0100
@@ -20,7 +20,7 @@
{{end}}
</ul>
<h3>Log files watched</h3>
-<table border=1>
+<table border="1">
<tr>
<th>pathname</th>
<th>errors</th>
@@ -38,7 +38,6 @@
</tr>
{{end}}
</table>
-</ul>
`
// WriteStatusHTML emits the Tailer's state in HTML format to the io.Writer w.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/tailer/logstream/decode.go new/mtail-3.0.0rc51/internal/tailer/logstream/decode.go
--- old/mtail-3.0.0rc50/internal/tailer/logstream/decode.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/tailer/logstream/decode.go 2022-12-13 14:15:08.000000000 +0100
@@ -23,9 +23,20 @@
width int
count int
)
- for i := 0; i < len(b) && i < n; i += width {
+ var i int
+ for ; i < len(b) && i < n; i += width {
r, width = utf8.DecodeRune(b[i:])
if r == utf8.RuneError {
+ if len(b)-i > 10 {
+ // If there are more than enough bytes in the buffer
+ // after this, ignore the error as it's not fixable.
+ // If not, return so that the caller can try again
+ // with a larger buffer, in the event that a unicode
+ // character has been cut in half by the buffer.
+
+ count += width
+ continue
+ }
return count
}
// Most file-based log sources will end with \n on Unixlike systems.
@@ -43,6 +54,7 @@
default:
partial.WriteRune(r)
}
+
count += width
}
return count
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtail-3.0.0rc50/internal/tailer/logstream/filestream_test.go new/mtail-3.0.0rc51/internal/tailer/logstream/filestream_test.go
--- old/mtail-3.0.0rc50/internal/tailer/logstream/filestream_test.go 2022-07-18 08:49:29.000000000 +0200
+++ new/mtail-3.0.0rc51/internal/tailer/logstream/filestream_test.go 2022-12-13 14:15:08.000000000 +0100
@@ -91,6 +91,52 @@
wg.Wait()
}
+func TestStreamDoesntBreakOnCorruptRune(t *testing.T) {
+ var wg sync.WaitGroup
+
+ tmpDir := testutil.TestTempDir(t)
+
+ name := filepath.Join(tmpDir, "log")
+ f := testutil.TestOpenFile(t, name)
+ defer f.Close()
+
+ lines := make(chan *logline.LogLine, 1)
+ ctx, cancel := context.WithCancel(context.Background())
+ waker, awaken := waker.NewTest(ctx, 1)
+ fs, err := logstream.New(ctx, &wg, waker, name, lines, true)
+ testutil.FatalIfErr(t, err)
+ awaken(1)
+
+ s := string([]byte{0xF1})
+ // 0xF1 = 11110001 , a byte signaling the start of a unicode character that
+ // is 4 bytes long.
+
+ // The following characters are regular single-byte characters.
+ // utf8.DecodeRune will expect bytes that start with a 1 after the initial
+ // unicode character 0xF1. This will result in a RuneError.
+ for i := 0; i < 100; i++ {
+ s += "a"
+ }
+
+ testutil.WriteString(t, f, s+"\n")
+ awaken(1)
+
+ fs.Stop()
+ wg.Wait()
+ close(lines)
+ received := testutil.LinesReceived(lines)
+ expected := []*logline.LogLine{
+ {context.TODO(), name, s[1:]},
+ }
+ testutil.ExpectNoDiff(t, expected, received, testutil.IgnoreFields(logline.LogLine{}, "Context"))
+
+ if !fs.IsComplete() {
+ t.Errorf("expecting filestream to be complete because stopped")
+ }
+ cancel()
+ wg.Wait()
+}
+
func TestFileStreamTruncation(t *testing.T) {
var wg sync.WaitGroup
++++++ vendor.tar.gz ++++++
++++ 48842 lines of diff (skipped)
1
0