diff --git a/cmd/ooniprobe/internal/database/actions_test.go b/cmd/ooniprobe/internal/database/actions_test.go index ea0bace..e1feeb5 100644 --- a/cmd/ooniprobe/internal/database/actions_test.go +++ b/cmd/ooniprobe/internal/database/actions_test.go @@ -113,6 +113,9 @@ func TestMeasurementWorkflow(t *testing.T) { var r Result err = sess.Collection("measurements").Find("result_id", result.ID).One(&r) + if err != nil { + t.Fatal(err) + } if r.IsUploaded == true { t.Error("result should be marked as not uploaded") } diff --git a/go.mod b/go.mod index 0e68474..867cf82 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/cretz/bine v0.1.0 github.com/dchest/siphash v1.2.2 // indirect github.com/fatih/color v1.10.0 - github.com/google/go-cmp v0.5.2 + github.com/google/go-cmp v0.5.5 github.com/google/martian/v3 v3.1.0 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/uuid v1.2.0 @@ -25,11 +25,11 @@ require ( github.com/mattn/go-colorable v0.1.8 github.com/mattn/go-sqlite3 v1.14.7 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect - github.com/miekg/dns v1.1.41 + github.com/miekg/dns v1.1.42 github.com/mitchellh/go-wordwrap v1.0.1 github.com/montanaflynn/stats v0.6.6 - github.com/ooni/probe-assets v0.2.0 - github.com/ooni/psiphon v0.7.0 + github.com/ooni/probe-assets v0.3.1 + github.com/ooni/psiphon v0.8.0 github.com/oschwald/geoip2-golang v1.5.0 github.com/pborman/getopt/v2 v2.1.0 github.com/pion/stun v0.3.5 @@ -38,10 +38,10 @@ require ( github.com/rubenv/sql-migrate v0.0.0-20210408115534-a32ed26c37ea github.com/sirupsen/logrus v1.7.0 // indirect github.com/ziutek/mymysql v1.5.4 // indirect - gitlab.com/yawning/obfs4.git v0.0.0-20201217005658-f638c33f6c6f - golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect - golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 - golang.org/x/sys v0.0.0-20210426080607-c94f62235c83 + gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b + golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf // indirect + golang.org/x/net v0.0.0-20210510120150-4163338589ed + golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gopkg.in/AlecAivazis/survey.v1 v1.8.8 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect diff --git a/go.sum b/go.sum index cede0d8..fe6ff98 100644 --- a/go.sum +++ b/go.sum @@ -9,7 +9,6 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D filippo.io/age v1.0.0-rc.1 h1:jQ+dz16Xxx3W/WY+YS0J96nVAAidLHO3kfQe0eOmKgI= filippo.io/age v1.0.0-rc.1/go.mod h1:Vvd9IlwNo4Au31iqNZeZVnYtGcOf/wT4mtvZQ2ODlSk= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6 h1:zOrl5/RvK48MxMrif6Z+/OpuYyRnvB+ZTrQWEV9VYb0= git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6/go.mod h1:BWqTsj8PgcPriQJGl7el20J/7TuT1d/hSyFDXMEpoEo= git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q= git.torproject.org/pluggable-transports/goptlib.git v1.1.0 h1:LMQAA8pAho+QtYrrVNimJQiINNEwcwuuD99vezD/PAo= @@ -126,8 +125,8 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= @@ -233,8 +232,8 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyex github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= -github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/miekg/dns v1.1.42 h1:gWGe42RGaIqXQZ+r3WUGEKBEtvPHY2SXo4dqixDNxuY= +github.com/miekg/dns v1.1.42/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -261,10 +260,10 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/ooni/probe-assets v0.2.0 h1:x4zWJVVJCWlFD6TUvFpN7cqanCCpiYGZxqmZ1Vb0KmA= -github.com/ooni/probe-assets v0.2.0/go.mod h1:N0PyNM3aadlYDDCFXAPzs54HC54+MZA/4/xnCtd9EAo= -github.com/ooni/psiphon v0.7.0 h1:rWMQP7BTR5FSgzxhbOdk9XwegQJjiR2l9L57+HX300Q= -github.com/ooni/psiphon v0.7.0/go.mod h1:i1v6JweJtxDKaI0i1aEw2/Fr/CUi5BoQ75GYz5KmKwU= +github.com/ooni/probe-assets v0.3.1 h1:6PDcoJTICJxL8PdeM0+a3ZfkTWrFfCn90fUqTWR0LDA= +github.com/ooni/probe-assets v0.3.1/go.mod h1:N0PyNM3aadlYDDCFXAPzs54HC54+MZA/4/xnCtd9EAo= +github.com/ooni/psiphon v0.8.0 h1:digldztBlINi3HWuxdK4gFhkiaheAoDVjZN/ApZHWBM= +github.com/ooni/psiphon v0.8.0/go.mod h1:i1v6JweJtxDKaI0i1aEw2/Fr/CUi5BoQ75GYz5KmKwU= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/oschwald/geoip2-golang v1.5.0 h1:igg2yQIrrcRccB1ytFXqBfOHCjXWIoMv85lVJ1ONZzw= github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s= @@ -372,10 +371,14 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -gitlab.com/yawning/obfs4.git v0.0.0-20201217005658-f638c33f6c6f h1:5wW6o0LA6gOrtcHxAsgkPIivJnlP71xIxhozJz+a5EA= +gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo= +gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ= gitlab.com/yawning/obfs4.git v0.0.0-20201217005658-f638c33f6c6f/go.mod h1:FUUyT4HhKr0w0jUZOrBcfSo69IP7kTuTuDLOqfHIpmw= -gitlab.com/yawning/utls.git v0.0.11-1 h1:cQLJ4sN+u07Rn9M7RpvCEWUPndtrsQsy6U3ZaEHeDvI= +gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b h1:w/f20IHUkUYEp+xYgpKz4Bs78zms0DbjPZCep5lc0xA= +gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b/go.mod h1:OM1ngEp5brdANPox+rqk2AGTLQvzobyB5Dwm3vu3CgM= gitlab.com/yawning/utls.git v0.0.11-1/go.mod h1:eYdrOOCoedNc3xw50kJ/s8JquyxeS5kr3vkFZFPTI9w= +gitlab.com/yawning/utls.git v0.0.12-1 h1:RL6O0MP2YI0KghuEU/uGN6+8b4183eqNWoYgx7CXD0U= +gitlab.com/yawning/utls.git v0.0.12-1/go.mod h1:3ONKiSFR9Im/c3t5RKmMJTVdmZN496FNyk3mjrY1dyo= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -396,8 +399,8 @@ golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf h1:B2n+Zi5QeYRDAEodEu72OS36gmTWjgpXr2+cWcBW90o= +golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -425,8 +428,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 h1:0PC75Fz/kyMGhL0e1QnypqK2kQMqKt9csD1GnMJR+Zk= -golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -453,6 +456,7 @@ golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -466,8 +470,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201231184435-2d18734c6014/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426080607-c94f62235c83 h1:kHSDPqCtsHZOg0nVylfTo20DDhE9gG4Y0jn7hKQ0QAM= -golang.org/x/sys v0.0.0-20210426080607-c94f62235c83/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744 h1:yhBbb4IRs2HS9PPlAg6DMC6mUOKexJBNsLf4Z+6En1Q= +golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/internal/engine/httpheader/useragent.go b/internal/engine/httpheader/useragent.go index 9f6bac1..b8e7b59 100644 --- a/internal/engine/httpheader/useragent.go +++ b/internal/engine/httpheader/useragent.go @@ -3,8 +3,8 @@ package httpheader // UserAgent returns the User-Agent header used for measuring. func UserAgent() string { - // 9.6% as of Apr 26, 2021 according to https://techblog.willshouse.com/2012/01/03/most-common-user-agents/ - const ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36" + // 11.0% as of May 13, 2021 according to https://techblog.willshouse.com/2012/01/03/most-common-user-agents/ + const ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36" return ua } @@ -12,5 +12,5 @@ func UserAgent() string { // pretent to be a command line HTTP client. func CLIUserAgent() string { // here we always put the latest version of cURL. - return "curl/7.73.0" + return "curl/7.76.1" } diff --git a/internal/engine/netx/gocertifi/certifi.go b/internal/engine/netx/gocertifi/certifi.go index c934dad..0a1f0f9 100644 --- a/internal/engine/netx/gocertifi/certifi.go +++ b/internal/engine/netx/gocertifi/certifi.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:17.585901576 +0200 CEST m=+1.233232011 +// 2021-05-12 09:14:54.779668278 +0200 CEST m=+6.872930413 // https://curl.haxx.se/ca/cacert.pem package gocertifi @@ -3227,7 +3227,7 @@ CAezNIm8BZ/3Hobui3A= ` // CACerts builds an X.509 certificate pool containing the -// certificate bundle from https://curl.haxx.se/ca/cacert.pem fetch on 2021-04-26 14:35:17.585901576 +0200 CEST m=+1.233232011. +// certificate bundle from https://curl.haxx.se/ca/cacert.pem fetch on 2021-05-12 09:14:54.779668278 +0200 CEST m=+6.872930413. // Returns nil on error along with an appropriate error code. func CACerts() (*x509.CertPool, error) { pool := x509.NewCertPool() diff --git a/internal/engine/ooapi/apis.go b/internal/engine/ooapi/apis.go index df5d06c..cbb69ae 100644 --- a/internal/engine/ooapi/apis.go +++ b/internal/engine/ooapi/apis.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:18.174476677 +0200 CEST m=+0.000080813 +// 2021-05-12 09:15:00.422051399 +0200 CEST m=+0.000129449 package ooapi diff --git a/internal/engine/ooapi/apis_test.go b/internal/engine/ooapi/apis_test.go index 2e9b838..792df41 100644 --- a/internal/engine/ooapi/apis_test.go +++ b/internal/engine/ooapi/apis_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:18.667452571 +0200 CEST m=+0.000086966 +// 2021-05-12 09:15:01.254917327 +0200 CEST m=+0.000217025 package ooapi diff --git a/internal/engine/ooapi/caching.go b/internal/engine/ooapi/caching.go index 1838650..e3171d5 100644 --- a/internal/engine/ooapi/caching.go +++ b/internal/engine/ooapi/caching.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:18.94343681 +0200 CEST m=+0.000101052 +// 2021-05-12 09:15:01.869492095 +0200 CEST m=+0.000168945 package ooapi diff --git a/internal/engine/ooapi/caching_test.go b/internal/engine/ooapi/caching_test.go index c405321..746df68 100644 --- a/internal/engine/ooapi/caching_test.go +++ b/internal/engine/ooapi/caching_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:19.289301439 +0200 CEST m=+0.000109438 +// 2021-05-12 09:15:02.497717446 +0200 CEST m=+0.000113904 package ooapi diff --git a/internal/engine/ooapi/callers.go b/internal/engine/ooapi/callers.go index d072a59..042addc 100644 --- a/internal/engine/ooapi/callers.go +++ b/internal/engine/ooapi/callers.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:19.528700386 +0200 CEST m=+0.000110320 +// 2021-05-12 09:15:03.02266641 +0200 CEST m=+0.000097757 package ooapi diff --git a/internal/engine/ooapi/clientcall.go b/internal/engine/ooapi/clientcall.go index e34f267..2347207 100644 --- a/internal/engine/ooapi/clientcall.go +++ b/internal/engine/ooapi/clientcall.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:19.81671012 +0200 CEST m=+0.000117403 +// 2021-05-12 09:15:03.586305848 +0200 CEST m=+0.000123000 package ooapi diff --git a/internal/engine/ooapi/clientcall_test.go b/internal/engine/ooapi/clientcall_test.go index ef5c5f3..f52a087 100644 --- a/internal/engine/ooapi/clientcall_test.go +++ b/internal/engine/ooapi/clientcall_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:20.134323167 +0200 CEST m=+0.000073269 +// 2021-05-12 09:15:04.198485035 +0200 CEST m=+0.000114145 package ooapi diff --git a/internal/engine/ooapi/cloners.go b/internal/engine/ooapi/cloners.go index 18cfa4b..e058269 100644 --- a/internal/engine/ooapi/cloners.go +++ b/internal/engine/ooapi/cloners.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:20.359406685 +0200 CEST m=+0.000143603 +// 2021-05-12 09:15:04.793154609 +0200 CEST m=+0.000108739 package ooapi diff --git a/internal/engine/ooapi/fakeapi_test.go b/internal/engine/ooapi/fakeapi_test.go index 4af1e05..cf617e3 100644 --- a/internal/engine/ooapi/fakeapi_test.go +++ b/internal/engine/ooapi/fakeapi_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:20.569073374 +0200 CEST m=+0.000071055 +// 2021-05-12 09:15:05.331414434 +0200 CEST m=+0.000124504 package ooapi diff --git a/internal/engine/ooapi/login.go b/internal/engine/ooapi/login.go index 30398bd..5c8f2b4 100644 --- a/internal/engine/ooapi/login.go +++ b/internal/engine/ooapi/login.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:20.827334668 +0200 CEST m=+0.000104378 +// 2021-05-12 09:15:06.213159282 +0200 CEST m=+0.000104135 package ooapi diff --git a/internal/engine/ooapi/login_test.go b/internal/engine/ooapi/login_test.go index 5779c0e..a6e7624 100644 --- a/internal/engine/ooapi/login_test.go +++ b/internal/engine/ooapi/login_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:21.135933711 +0200 CEST m=+0.000163009 +// 2021-05-12 09:15:06.893164862 +0200 CEST m=+0.000136881 package ooapi diff --git a/internal/engine/ooapi/requests.go b/internal/engine/ooapi/requests.go index a75aafb..ab0c0af 100644 --- a/internal/engine/ooapi/requests.go +++ b/internal/engine/ooapi/requests.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:21.432026711 +0200 CEST m=+0.000117272 +// 2021-05-12 09:15:07.590481334 +0200 CEST m=+0.000085230 package ooapi diff --git a/internal/engine/ooapi/responses.go b/internal/engine/ooapi/responses.go index eb7a03d..f843040 100644 --- a/internal/engine/ooapi/responses.go +++ b/internal/engine/ooapi/responses.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:21.766001644 +0200 CEST m=+0.000159663 +// 2021-05-12 09:15:08.237841277 +0200 CEST m=+0.000121556 package ooapi diff --git a/internal/engine/ooapi/swagger_test.go b/internal/engine/ooapi/swagger_test.go index fdd7cce..c44a93e 100644 --- a/internal/engine/ooapi/swagger_test.go +++ b/internal/engine/ooapi/swagger_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-04-26 14:35:22.20867232 +0200 CEST m=+0.000560530 +// 2021-05-12 09:15:08.888123159 +0200 CEST m=+0.000883704 package ooapi @@ -9,7 +9,7 @@ const swagger = `{ "swagger": "2.0", "info": { "title": "OONI API specification", - "version": "0.20210426.4123522" + "version": "0.20210512.5071508" }, "host": "api.ooni.io", "basePath": "/", diff --git a/internal/version/version.go b/internal/version/version.go index 5cc6b11..91b4720 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -3,5 +3,5 @@ package version const ( // Version is the software version - Version = "3.10.0-beta.2" + Version = "3.10.0-beta.3" )