From 7c3a556f45aacdc7766ef3cdc29048c4ec805057 Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Fri, 29 Sep 2023 16:36:26 +0400 Subject: [PATCH 01/10] Hide metric_name_new test --- src/internal/testing/bindata.go | 354 +++++++++--------- src/internal/testing/certificates.go | 110 +++--- src/internal/testing/certs/localhost.crt | 55 +-- src/internal/testing/certs/localhost.csr | 30 +- src/internal/testing/certs/localhost.key | 55 ++- .../testing/certs/metric-store-ca.crl | 26 +- .../testing/certs/metric-store-ca.crt | 48 +-- .../testing/certs/metric-store-ca.key | 98 ++--- .../testing/certs/metric-store-ca.srl | 2 +- src/internal/testing/certs/metric-store.crt | 46 +-- src/internal/testing/certs/metric-store.csr | 24 +- src/internal/testing/certs/metric-store.key | 50 +-- vendor/modules.txt | 16 + 13 files changed, 462 insertions(+), 452 deletions(-) diff --git a/src/internal/testing/bindata.go b/src/internal/testing/bindata.go index 1001c9872..9e143f07f 100644 --- a/src/internal/testing/bindata.go +++ b/src/internal/testing/bindata.go @@ -1,18 +1,17 @@ -// Code generated for package testing by go-bindata DO NOT EDIT. (@generated) +// Code generated by go-bindata. DO NOT EDIT. // sources: -// certs/metric-store-ca.crl (934B) -// certs/metric-store-ca.crt (1.777kB) -// certs/metric-store-ca.key (3.243kB) -// certs/metric-store.crt (1.545kB) -// certs/metric-store.csr (952B) -// certs/metric-store.key (1.679kB) +// metric-store-ca.crl (934B) +// metric-store-ca.crt (1.777kB) +// metric-store-ca.key (3.243kB) +// metric-store.crt (1.545kB) +// metric-store.csr (952B) +// metric-store.key (1.679kB) package testing import ( "crypto/sha256" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -32,27 +31,18 @@ type bindataFileInfo struct { modTime time.Time } -// Name return file name func (fi bindataFileInfo) Name() string { return fi.name } - -// Size return file size func (fi bindataFileInfo) Size() int64 { return fi.size } - -// Mode return file mode func (fi bindataFileInfo) Mode() os.FileMode { return fi.mode } - -// Mode return file modify time func (fi bindataFileInfo) ModTime() time.Time { return fi.modTime } - -// IsDir return file whether a directory func (fi bindataFileInfo) IsDir() bool { return false } @@ -62,19 +52,19 @@ func (fi bindataFileInfo) Sys() interface{} { var _metricStoreCaCrl = []byte(`-----BEGIN X509 CRL----- MIICiTBzAgEBMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNVBAMTD21ldHJpYy1zdG9y -ZS1jYRcNMjIwMzA5MTUwMzQ5WhcNMjMwOTA5MTUwMzQ4WjAAoCMwITAfBgNVHSME -GDAWgBRQx2ANY3ddbypAOvQQVwOmZVmqDDANBgkqhkiG9w0BAQsFAAOCAgEAGjh8 -u3eRPs1wOwYb/mk7CX4bARvK1wtrMKmZ40FGYgFIjZNi/+pO1JwhQxmrWnirjcdO -960Om5Ol8+iABWuEVe41RdbEERTsfg72m0MZwSVTkYhtnnoMU3qYr0/J4aopvD4u -IRMtE0TSrz037O3AJUePqrcqSTZEQVgPSco81CYLakVLUrffPhL7ejndEbwcKMvT -xh1eFol0NvApsdThf3E5UdcEENBqVTRTj0bBWxK+qJdDT86zTJGE6hIGsi2/WVqc -9nuo59hUrHsGoQTHDD8Qk+Q9VuqflKNqkHjpfTSKzZCHuVW5/VoVXt9g+G2PCK08 -IiG4X/b/nlPKEz+nT6dYJO/VLWIrIPEClz2LWqsLUEsjBSmK/r3zq9sYOUayBAn2 -OaCnYir8+9YZYhyUhYbJ3XYuXMolVof55reR3gXN2/27wVvf84pdhUGjc3l7PCaX -TNcS96hLdc7VeQXjkrRUaPsk5WWcp6Xgk6NS/gcnnMP7XciNBbyBqHtbg4mCAMaE -vcWKiwBM5g6ZsDjjDQthGAW1bLKCRn8tIeqKApv/e+sVaG6Axfvut8Qsrj92vUfA -iioWmuA/rEARPHBTOKIuog9x6yjxEC7maNVMQApnXYo/nQjj/n0Q0cUTZF6rLCz3 -7VpMtEfi49jhKk5pzfPBLHwRLtZr/yeR3la/DYs= +ZS1jYRcNMjMwOTI5MTIyOTAxWhcNMjUwMzI5MTIyODU2WjAAoCMwITAfBgNVHSME +GDAWgBRe77cOX34ZLZlM152+09grbMuWfjANBgkqhkiG9w0BAQsFAAOCAgEAMl3x +Igte06qF1VBfG+q84H+kbWAO/DplFDD3CFJYHuUnWFoM2IIMy+jc+iE2s7c1bG5o +GGeCyfKPXfNWcr16BlMx6a5W0IfliJJCFa/Okt/SdegUJndVXxNEHvw6vp2vaLdo +QCw6gNMZrcoVxNgU3Q438qO91nS27HKO7XPukKNxDyQ8jTgblh/AKLKQrGLwIK7Z +BfxdgvXUlcrg6xyao8+cJT4aEnDy3o2svtBBrQ/aapnO9ohBbjGbPYdNqYbOBpLz +ot+FEtPTJqbWVi1kKOP08lg1YszynektdlrsG7276GngTA/rucDA57RFUU/EpmFP +gLVsZoDseB5N6s4ciG1T4e3p6l68C6kkLU7tO4/mPw95dlVr6nLMNLhwic/61JME +j3m9iX19SgRTYYFDFYyuTh9gDgbXN3XEoBjnuiNzNvNed1UOgli3p69aHnVQSda2 +UB1WxZMq5b0ugTgAHAUBx9sS8nTmbZs+cwNLq5qONB60wQlb/WqXmrhvHsPx3anC +JmGkq0gesEfewzUcYu4RuAOmUb6p578fs06dS+0aSMfaseY8Lu6eDXePBEC0//jC +VDq5KqMPl/kZwRmv0eTrmGtACz678sgyKWTSMSvDW51gIXlgyt7vO7Xd8U5Ly2b4 +EiFa95Ym2YvQZqwBqTEsF/1qtqCoqDn8zGw+RWs= -----END X509 CRL----- `) @@ -88,39 +78,39 @@ func metricStoreCaCrl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "metric-store-ca.crl", size: 934, mode: os.FileMode(0444), modTime: time.Unix(1646838229, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xc8, 0xc9, 0x9a, 0x7, 0xeb, 0x65, 0xdc, 0x2a, 0xf1, 0x80, 0x58, 0xf, 0xf6, 0x4c, 0xa6, 0x7f, 0x9a, 0xbb, 0x9f, 0x23, 0x65, 0x1b, 0x10, 0x74, 0xff, 0xcc, 0xbe, 0x22, 0xd1, 0xfe, 0x68, 0x75}} + info := bindataFileInfo{name: "metric-store-ca.crl", size: 934, mode: os.FileMode(0444), modTime: time.Unix(1695990541, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xc6, 0x90, 0x24, 0x87, 0x22, 0xdf, 0x2, 0x1e, 0x3, 0x83, 0x76, 0x19, 0x27, 0xf1, 0x45, 0xdb, 0x48, 0xd3, 0xe2, 0xec, 0x92, 0xde, 0xb6, 0xca, 0x56, 0x67, 0xf2, 0x30, 0xee, 0xf0, 0xb1, 0xf8}} return a, nil } var _metricStoreCaCrt = []byte(`-----BEGIN CERTIFICATE----- MIIE9DCCAtygAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9tZXRy -aWMtc3RvcmUtY2EwHhcNMjIwMzA5MTUwMzQ5WhcNMjMwOTA5MTUwMzQ4WjAaMRgw +aWMtc3RvcmUtY2EwHhcNMjMwOTI5MTIyOTAxWhcNMjUwMzI5MTIyODU2WjAaMRgw FgYDVQQDEw9tZXRyaWMtc3RvcmUtY2EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQCvtwbrXjFP7VSmTFOPUi4uL/jPgg4aQhHgBVCqGVpOgjIDSBkj1IzB -ePyZe3jcFmm4GN0l4Pnuiy1kqRgYYX1tiJ2B/tkkUthPGlenDXTnu3paW6+BFTKN -as7+4fk7tlfSH2Kef5BQqhbDyij5tDdpqOL/9XYHZ3OaYRhytG2WvnnXWm7jduZZ -ldSvwLF50HdKJ0RCC51ohJkyXK9MBpF6eQdAEV5DABmmpFSBaFEqXi3V+8d3D5vF -c6wGrm052DwoZMzDwQKZEtTZjlkqMiHfHN6YtC7zCdOkSuTrijmC2Y9VIJ3jJYYr -/MWpZTbVLgIr6Tmk377z+ayZcAqNY0z/0Ojl0cRzj6T+NHYHB7t1rZW2r+Ujusk+ -PKqj2xao86SaO8Ftro+ggIyGqjHSMNiozrvh6jvmq1rFuUn1J5IoWV77zDpFSq61 -HgQJU9HrWjZl7yrGMuQArYMRwMq2DkxFnnZA0APxob4ik8cfaUccIRfEmN/FQXRJ -oTOIk0hKyjni+H4CC/l6tQfwA9s45dfpnaumUValBwE1BYhO3VtmbQ/evNh//aFu -HUtgtyKGrS8VugfdhKQtIgW6wwbStkLFK8srPHdPtfMR+jhb7cR5tzjiPSi6/pId -N/Ln/5Is8KPAW8y5nEeODAZqP7EMEhNYn9gVwwG3aHTJK3fpyQaBtwIDAQABo0Uw +ggIKAoICAQC3xuw9dqGjW1z1K0/Asen/DbyxTq1di4SIHm83d4sJ7bINQX9jacXm +d8WuEmmFw3VOoKdrF7XtAq3hkpwWQ6s53wiOiRhunoIYhsfdwjnv7MPM54OWHBaY +wy5kdQRul36AvareIN9JPxiWHIr9qmB1JArsceFJ0CDd0WPuz1c3X2Bx/wnERi7K +VBZtuA2tv7CRAxhqrnOrh1dyX0MSQlm5bCyEoIq0bmLbH45pzpDaIUMIk8k/cp3U +NMjtb8mYN5AyQ1++ec1pQoJYZ603sLaaWLR4nZjJjT4YrZoPZSp8XoWH+8GI4728 +OAQXuNQ4RL0c0Ix2YM0efO1cRRwuxTaS+H4ndx+aIEYicKERKo34iVBF2mZlTFCe +P67xj+gIPs9jh9rilv14njwQ+HrEhVGiQwOUCtYisvOFMIJDOt1FRAF+vFTXvtQy +IfBirRZ01QvHGQaELWYvTQuM5G7VkhI/Xy7CygoapyuoNFqafOtoCqSQIjEIvFth +P/4nvOq2s0axh5Gmv1YDvLcE1WJ6X6wAJ9wWSQyN9SMzutQJ4mAWRCQzK0F0gIcM +B0ZuCpP4KTJSzFVZE8bBSwqm76aaiqyb08hb8kISKfcsGZpB0y9YwfSW/Z1tn6jJ +Zw5x8103RRgJP/PJpoLOm54s+iOvWDU5XgDhbkivKbDmgK7Y0CfhrQIDAQABo0Uw QzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQU -UMdgDWN3XW8qQDr0EFcDpmVZqgwwDQYJKoZIhvcNAQELBQADggIBADRh6s4NV++b -AXwSADBn4bVBJJPkIjkgIpL5lvi8qvNeEvpKRCAnhPctIOk7OeuKbygXwWiz/4pv -Ym9rO7rV6bXAtWfGheMLVH2qG4xRyzMs8qVM6fF658iC11JEB43q+7D93IeS+bJO -6JqZpzNNsf0iFKvu3HQ3F4JrqJ7TLykrlT0yajMe8baf3dhh4wVHWEvWNapfgGqf -BSASRdnODr/i8lf4sLMMvr8ngJZjH2RcZ+QzjsDS2OxJBvgsam1zWHxHLIsz7DJf -TJ7RgXk5FKi6fqlI6yCe2duSoLOq5XD+JoCWj4eqiaDAL+zM/tVa450zp8uenDi4 -HM3H/bjRXtrJOftWEoCNbojxL+W02kLy9caZDY4kJdDuv7SMFWJ6NvURhBYMxMH3 -l3UU5e21B5hoIeMpwQLPK9kXRNIoVyaNgSsAxuIH+e3j3rDs23kPbzbT2ZyleXjL -b+hF27U1UgqcjRuygFQBqg1ktW6xgSJVtZ5nK1XfUV2yRltcEONCDBmAeWs0ngQK -fC+Yk05jLixEEXyctPompCZKhcJ8pILfdFdlboi4p+GkhHVZy8aprQPdDbB+QJZy -X3gU3VC7g9ukmfBIhEDOKEDXKLlVmb5WIsU6wYj1HuK3drAY7Z+RAWn0gNrNaGH+ -Do1UYd4MMINEUDbfYyT7agie+jwOa9oY +Xu+3Dl9+GS2ZTNedvtPYK2zLln4wDQYJKoZIhvcNAQELBQADggIBAGL/l+1XtgAt +Zx3S2p5r2i0uY80WvYgd9+3vesj4aJImBLRcXL5TD61MbMW6dX0UOAH9GWfyuPmE +im90ylQLlxeKIeuc/C+0qcf8qmuJ3JmkdBV3av9GbaDZsQmRzTCzccMtjZGOXOgT +oKAOxUmKRgX9ezMYFWYE44a2RzX/3Il63pbJft3cnRe+uiomgsybIJI/TytzlZ0P +4kDHGAUgpwV5YH4OAx264cNWW9Jeexg/uPmT1AKEAXrs99DgM5Q4bT0E7colRSKl +QxGOBJ9C2vbmObny9t62TKqPB7SEwxPKISTljdvypmWwdJlDBEfmLFWvbin9ycOG +YPCLUwH/EJLhFpsshgmka6E4gkUMGyO6rkZoziJD62mRkbdp4olDWkJAe8DXSmZl +1xcVbypGXCcbq/HRRHpSjThgzVKFwG0lovE7tqXn+UXdDw9+/1Khl0qmTsqmRIxs +6xfmJ0bNd7VRginae/U8g+AasGnQk4n8JBprWUz39Lfi5jY9JtBrXd7tB/2212oU +nwgV0JACmfcRN8l0x+oAkvl2qouvdlJaR0q65ihrYHiIHW3RVQbsg7y+2zKbrzl9 +RsKOH4p1CfjB6rvIRmQ7kgkuPZrtibGFgQtjr76/Cj7fDr9+vM5r0RjO1VKrn869 +C2jQDjkQlLWn4gtVq7qUjufbii9aBy4c -----END CERTIFICATE----- `) @@ -134,61 +124,61 @@ func metricStoreCaCrt() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "metric-store-ca.crt", size: 1777, mode: os.FileMode(0444), modTime: time.Unix(1646838229, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x4c, 0xe1, 0x35, 0xe4, 0x67, 0xbe, 0x4c, 0x1f, 0xf9, 0x95, 0x86, 0xea, 0xf8, 0xb4, 0xb3, 0x8b, 0xf8, 0xdf, 0xea, 0xf0, 0x31, 0xb3, 0x70, 0xc2, 0x20, 0x1a, 0xf, 0x7b, 0x29, 0xad, 0x20, 0xc0}} + info := bindataFileInfo{name: "metric-store-ca.crt", size: 1777, mode: os.FileMode(0444), modTime: time.Unix(1695990541, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xed, 0xf4, 0x67, 0xdc, 0xcd, 0x2c, 0x8c, 0x60, 0x0, 0x2a, 0xab, 0xe7, 0x27, 0x53, 0x9f, 0x1c, 0xdf, 0x27, 0xc0, 0xac, 0x74, 0xe4, 0xb8, 0xcd, 0x56, 0x4f, 0xd8, 0x94, 0x3d, 0xac, 0x68, 0x2f}} return a, nil } var _metricStoreCaKey = []byte(`-----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- `) @@ -202,35 +192,35 @@ func metricStoreCaKey() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "metric-store-ca.key", size: 3243, mode: os.FileMode(0440), modTime: time.Unix(1646838229, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x73, 0x89, 0x9a, 0xb5, 0xa7, 0x33, 0x1e, 0xab, 0x36, 0xe5, 0xc6, 0x5a, 0x50, 0xde, 0x17, 0xe5, 0xa6, 0xd7, 0x8d, 0x4c, 0x1, 0xca, 0x3f, 0x16, 0x14, 0x1c, 0xb7, 0xe2, 0x6, 0x59, 0x4f, 0xc5}} + info := bindataFileInfo{name: "metric-store-ca.key", size: 3243, mode: os.FileMode(0440), modTime: time.Unix(1695990541, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xac, 0x6a, 0xb4, 0x6a, 0xd1, 0x3f, 0xff, 0x15, 0x31, 0x88, 0x8e, 0xd8, 0xef, 0x6a, 0xe4, 0x61, 0xa3, 0xb8, 0x2f, 0x64, 0x3f, 0x25, 0xb7, 0x74, 0xfd, 0xb8, 0x71, 0xd5, 0xc0, 0xaf, 0x93, 0x98}} return a, nil } var _metricStoreCrt = []byte(`-----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- `) @@ -244,26 +234,26 @@ func metricStoreCrt() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "metric-store.crt", size: 1545, mode: os.FileMode(0444), modTime: time.Unix(1646838230, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x92, 0x1e, 0xf4, 0xbc, 0x4a, 0x7f, 0xad, 0xb5, 0x9e, 0x8f, 0xc7, 0x2f, 0x13, 0xe2, 0x75, 0x80, 0x96, 0x8c, 0x54, 0xb6, 0xf4, 0x8a, 0x3e, 0x57, 0x67, 0xc4, 0xb5, 0xd3, 0x38, 0x47, 0xc7, 0x4c}} + info := bindataFileInfo{name: "metric-store.crt", size: 1545, mode: os.FileMode(0444), modTime: time.Unix(1695990542, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xa0, 0x9f, 0xf1, 0xbd, 0xb8, 0x61, 0x7e, 0x7b, 0x79, 0xa2, 0x64, 0xb6, 0x9, 0x92, 0x74, 0xfb, 0x87, 0xeb, 0xfa, 0x1d, 0x90, 0x7a, 0xda, 0x75, 0x8b, 0x38, 0xd2, 0x51, 0x5, 0xc6, 0xfd, 0x99}} return a, nil } var _metricStoreCsr = []byte(`-----BEGIN CERTIFICATE REQUEST----- MIIChjCCAW4CAQAwFzEVMBMGA1UEAxMMbWV0cmljLXN0b3JlMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtqB1jT7jtkJ9cUZk2RBeAi8itAO3A087Gwf0 -3wMw4BTRC0c86yi0dDe12sO8Lbm08DmUI3fUStsMttym65vGyUkEcdnNhYTvUlMb -W3bkjyvs+YZ+RPiKoF/McgGZTBGxZ3i/+wt4HA6eIhzBjMFvB6cE/dwV308xVswN -HcRkQOBj6n98lJUImUAmCLJ1I1WCZ8Kyu0E+ROuzQenM3zKm7dI4f0wpezwcJ/U/ -wOCPnEzKH/fYoFBpvcAibTh00IGctLWOKgkdH1kRklfnzzSMein3LyaKy85p86UL -5IMEb2Ic0kAMhvNL/XRb1jF4x4pfzNVTflPukOx0bJkCn0v5+wIDAQABoCowKAYJ +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwXvn1XJkUf2JaWWGueg/ukdyzvef6kTHH7Zq +G1MS+Ib08/CBKwhTeL56dUxCJHNwPlKVKu3yfWPtPn3ONyB36lAtOp7mjMN3c/zo +XErjrwTVisy2UAv+0xv5oCCIeKRjYSK2lsN0qLpO0HH33gJkfCHayTpQYopSYz2O +y9p+wZ/3AFNwf2YZIohbnmZr6iVsxhWSD0KzZrgDohyHIBjlLVNoCnRd4cCBk8PR +gF+LZZXBmB9X9vKn6/wlhmGHeeLgP1J3yJZPyYkMcrL3yn2zKjpeHDVDN7c9l0Ij +yZCFeMvF4kBdGvA95e8pp6MI27w6MscaJi420M8dtK3gRKoWDwIDAQABoCowKAYJ KoZIhvcNAQkOMRswGTAXBgNVHREEEDAOggxtZXRyaWMtc3RvcmUwDQYJKoZIhvcN -AQELBQADggEBAIs4RZuJw0VLlxzCQLkQ0nkyQ9cRL5uhqWQBPR9qs9lTghfJeUhF -dLKDMRpmUZMGGG2sgBZev5wrjmMFdsBBytwzknbWbPy7+uDYSxaJkjq3uj/X7Dn0 -f/iBqvcSN6LHmdKraVK2pSwHwSceuU9MHE8OssL1RdgzPDvTaNAQjKSp63FqfK7o -8R3BqRsJVXzVl5G+UwVJIdlBiBvKkUbx+zxtjDGEfAWY5qKeVCchuyq/ZssLZe05 -XndWJ2hit6kFfa0ZdL3aVtChC5RyBpnt/mTvip4UY5k5ptW+RE7KNUQ0Yrfs4Zab -O30E1tiZcLg7r0ASfnin5VLCO+dsJATp7QI= +AQELBQADggEBAHd2z8BeOdgUcDY8QueoYKNlee27hpPCGOle584vrhiEFyEOprJU +wgDM59nQF1rMkM4jpvLDw65eRDFg+E+9HwU72yU8Brfbz77O1b02n4q+8U6CpTN1 +nuOu/Yx+4Mc+9ksN08pwm+5iGcbrK0Vl7zRO/Jsc1zke9kxM6fgJcDo3dC68oTlz +SEqtZLW/HtBlzpDVJk6j0OU6MddTcPu9/ICTn2J+FmJYM+7EH6JCi9Se/kXZjs93 +odBE5Wpq8OvP4p2ugO3fOEiRYLZVoc58sP01vuTYZBfD5dqQpmRcIf4YeaubPUVN +ZGIccSHG4QKtk2kAraNGSbUplv8K9xWq/oY= -----END CERTIFICATE REQUEST----- `) @@ -277,37 +267,37 @@ func metricStoreCsr() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "metric-store.csr", size: 952, mode: os.FileMode(0444), modTime: time.Unix(1646838229, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x7c, 0xe8, 0xa2, 0xa8, 0xdb, 0x0, 0xd, 0x77, 0x7b, 0xca, 0xf1, 0x8d, 0x8, 0x2a, 0x38, 0xcc, 0xbc, 0x5b, 0x5f, 0x41, 0x69, 0x4c, 0x8a, 0xfa, 0x57, 0x16, 0x9a, 0xc4, 0x54, 0x14, 0x41, 0xab}} + info := bindataFileInfo{name: "metric-store.csr", size: 952, mode: os.FileMode(0444), modTime: time.Unix(1695990542, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x14, 0x74, 0xfc, 0x2d, 0x3e, 0x50, 0x43, 0xed, 0x86, 0x54, 0xc1, 0xf9, 0x9, 0x28, 0x17, 0xdc, 0x91, 0xab, 0x7a, 0x22, 0xfd, 0xb0, 0x65, 0x81, 0x84, 0xe4, 0x80, 0x34, 0xf, 0x69, 0x7a, 0x19}} return a, nil } var _metricStoreKey = []byte(`-----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- `) @@ -321,8 +311,8 @@ func metricStoreKey() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "metric-store.key", size: 1679, mode: os.FileMode(0440), modTime: time.Unix(1646838229, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf1, 0x45, 0x2, 0x53, 0x58, 0x9, 0x7f, 0x9b, 0x1c, 0xcf, 0x7b, 0x7, 0x90, 0xe2, 0x20, 0xf, 0xef, 0x10, 0x35, 0x86, 0xe9, 0x35, 0x8a, 0x36, 0xe2, 0x90, 0xc2, 0x67, 0xfe, 0x93, 0xb6, 0x95}} + info := bindataFileInfo{name: "metric-store.key", size: 1679, mode: os.FileMode(0440), modTime: time.Unix(1695990542, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf, 0x69, 0x50, 0xca, 0x5d, 0xc8, 0x51, 0x35, 0x77, 0x6e, 0x3c, 0xc6, 0xf0, 0x9f, 0xa9, 0x2d, 0x77, 0x0, 0xb8, 0xfe, 0xf, 0x7e, 0x8f, 0x87, 0x13, 0x43, 0x53, 0x73, 0x19, 0xf9, 0x2d, 0x63}} return a, nil } @@ -432,11 +422,13 @@ const AssetDebug = false // directory embedded in the file by go-bindata. // For example if you run go-bindata on data/... and data contains the // following hierarchy: -// data/ -// foo.txt -// img/ -// a.png -// b.png +// +// data/ +// foo.txt +// img/ +// a.png +// b.png +// // then AssetDir("data") would return []string{"foo.txt", "img"}, // AssetDir("data/img") would return []string{"a.png", "b.png"}, // AssetDir("foo.txt") and AssetDir("notexist") would return an error, and @@ -491,7 +483,7 @@ func RestoreAsset(dir, name string) error { if err != nil { return err } - err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) + err = os.WriteFile(_filePath(dir, name), data, info.Mode()) if err != nil { return err } diff --git a/src/internal/testing/certificates.go b/src/internal/testing/certificates.go index 61f2b2e6b..aeec023a0 100644 --- a/src/internal/testing/certificates.go +++ b/src/internal/testing/certificates.go @@ -84,60 +84,60 @@ func MutualTLSClientConfig() *tls.Config { } var localhostCert = []byte(`-----BEGIN CERTIFICATE----- -MIIE4jCCAsqgAwIBAgIUI8iSzXNezM6iOg5vtRBhZn3mzUkwDQYJKoZIhvcNAQEL -BQAwGjEYMBYGA1UEAxMPbWV0cmljLXN0b3JlLWNhMB4XDTIyMDMwOTE1MDcwNVoX -DTMyMDMwODE1MDcwNVowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3Rh -dGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBAOqksMLdWozNxrD1QoESMcsq/AgGp628mr6C -zc6D8xmxOE/fdeege5JBCSxuDvz8DxJI/UaDrbDUzH72X8bcsVRGf+hYt9dpnZWb -UCrumJsjLQ2vX3TuypEx7mTdx4GzYaLgfMDf2fi3m3ny8iggwt529+45GRgQAxG5 -rVqvl5VYMLWTnMXUGJEGBGSeBOii6lbzJ28alaAh/gd7gDiTI1JLpR7RLm+YoLBx -VVC66yNlQ4r8mov0xx3b4kwawgJK35UiH80APwzzIttFCfgnib/BIhZQPCHsNAZz -g86CmPhnnhyw67wMVO1+U4rTv39LauRb2qG+M1sHyRakwWo87V8CAwEAAaOB9DCB -8TAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhCAQ0EJhYk -T3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1UdDgQWBBRt -d279oTFLecXqo1YRvzMt4SxQnjBCBgNVHSMEOzA5gBRQx2ANY3ddbypAOvQQVwOm -ZVmqDKEepBwwGjEYMBYGA1UEAxMPbWV0cmljLXN0b3JlLWNhggEBMA4GA1UdDwEB -/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAUBgNVHREEDTALgglsb2NhbGhv -c3QwDQYJKoZIhvcNAQELBQADggIBAD0qSeQjbYdQgootqizqYcvpgkWX0CKg9raK -JwRiYNxhbuqtZ6huYeyxxou4WuebK/mO2Suvy6MSBydb7g9r7rTwM681rWITrobx -udzEpW6BScs4vEIPXgYURsp+eOEyMKL5s6FRY3C6yD0tYQnvjzFx4pOB8eyCVHwD -9ZCm3OZDT+acTWc4i0nz9WIQ1nOTwNeF/VJtQE9FH5yIJ1XESaHLlcy+8H4nIeec -w8NBiVlO4oLcK3HWaYc+g9mujmoB6o9kLY0FO44u/Rt+X/Gcyv6teJNc0Eu7fhgv -3ABuiZ0QkoD9DqBPIRNZf7ruafxS0pP7j93DxoNMYjaYjlXZdN0jUsLWJeW0CYzo -VJ5f4b9X9DPvB3Migmcwrb2d9SPfnTmp34CdVqHRDnRIol99VXT5ilR0JERmY8Bq -aFKhWHPzNEcRzii0LTcZknlcz5aQbPyQlXTG3kPHG3mAV2kSQJIa/FbgPtAjVOwe -ZPBCSanpVaBP5ZvKK6Q6P83ycovlzEdzrbAApoAy7TA9jj8wGlm1Y+qtr+EnV/6k -pWNFvRTImjB1drpKXpHNZg+F8NBC3SRZicdf7C1WOnXS18i6LT9P+s2SBwIqBP04 -ndr92NJF3OgurD6NCG7eIf4hSOxVvNbEtnfsJRYI9UKMFRMZ5O6uZQP517+0uwGC -37se3AY6 +MIIFGjCCAwKgAwIBAgIJANCFTxfmfZSQMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV +BAMTD21ldHJpYy1zdG9yZS1jYTAeFw0yMzA5MjkxMjMyMjJaFw0zMzA5MjgxMjMy +MjJaMIGHMQswCQYDVQQGEwJBQTEQMA4GA1UECAwHWWVyZXZhbjEPMA0GA1UEBwwG +UW9jaGFyMQ8wDQYDVQQKDAZWTXdhcmUxEDAOBgNVBAsMB1Bpdm90YWwxDTALBgNV +BAMMBHRlc3QxIzAhBgkqhkiG9w0BCQEWFGhtYW51a3lhbkB2bXdhcmUuY29tMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApE91Uh3WaUoBPEiSfKrkpR+T +/9wkGw2eo7vfWX6ECkpAXMX7om6WQ1MiU8rOruMRVtwfNN9XjWghVeG7BJt8a7i1 +pXkbJ37Qf7P4Xgkpf/yKpUXJgS9KTlFIoABJ7BRWr1zYSssQUSYGDjPN4skbaQ15 +TDDNqzTTrMxNxrDzPZpoMr2wSROHlOMaJz+1lfkQiU41WT4tOyj79sV2/AEu8sqW +AJ1Jfsvrn3kw84UjqlI90qQI+52Ub9FlgCRxRd1MQK+T9D8Iu5MgvCgswPDEIGmX +1CiQswetZC9OlhzWb/uZ/4G+a/+Hs4Ue2E+qrTezYX0cN/Lx7KFWklyLP+73cwID +AQABo4H0MIHxMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG ++EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD +VR0OBBYEFLXvuV9NrnKYsz2GV8aRHj8/TdaqMEIGA1UdIwQ7MDmAFF7vtw5ffhkt +mUzXnb7T2Ctsy5Z+oR6kHDAaMRgwFgYDVQQDEw9tZXRyaWMtc3RvcmUtY2GCAQEw +DgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBQGA1UdEQQNMAuC +CWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAgEAn24VZ0tzlOTD9WzFlkUEotNE +vbhPkRXi/qX+ZMA3b8nPK2flTgkiobgA5csvMLqgavFjiifNEDnHbU9SES2F4NrB +IzogcfrtuF46vUiBsA3QHsDu3CuFUlWZvT042cjvIS1DM3Cq0tRu4ubZWfMz9R73 +d+NacWRgneQxtw2I1Tu6IOc7XmYAWwdrjS7HzHpXirPKGI5gcnHk46+BtnUndx9G +d9kxVlPfUzePO2K9qlyE6uCDHsLxxFFkP7UDZTXIiIaVkVbrAskNHBf+e1P+iKJF +Ukavvj1TGLez92twmh+CfxRY+i9D3OrxmSyOq25UkIs3lco8/lEQp0/j9QRKHxFw +N8SJlz53wTE893uBiblbYPatx2G7RzcWAKTb+9mQDS2CLEDIDJppVrbKD57doGPy +8t/l71NUcVan5p6uLLcVoqLCLRgubD8RMWAMLGZW2iRDH6k+TwOXJF+juKrCG99U +xQmRGCv8uu29j/a3jbWfg0yZaGGFeBrQ0H2VH6v4zuPraHWiWmr1GBtrfCPxmzeE +WSAvPm/89SA0oSUO8Ek8dtQsQed2FeK/tlrG9fg2NTKTdUOqj2Mx8aM9AvKiSM6G +WGFilB0uXGOPk+nfMvyYi2uSbBk3qo0x2nfG7N+HgeP7lHNh4+oVGu+F3sd+hQ2M +pKVCanVS4qbmatd/r0w= -----END CERTIFICATE-----`) -var localhostKey = []byte(`-----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDqpLDC3VqMzcaw -9UKBEjHLKvwIBqetvJq+gs3Og/MZsThP33XnoHuSQQksbg78/A8SSP1Gg62w1Mx+ -9l/G3LFURn/oWLfXaZ2Vm1Aq7pibIy0Nr1907sqRMe5k3ceBs2Gi4HzA39n4t5t5 -8vIoIMLedvfuORkYEAMRua1ar5eVWDC1k5zF1BiRBgRkngTooupW8ydvGpWgIf4H -e4A4kyNSS6Ue0S5vmKCwcVVQuusjZUOK/JqL9Mcd2+JMGsICSt+VIh/NAD8M8yLb -RQn4J4m/wSIWUDwh7DQGc4POgpj4Z54csOu8DFTtflOK079/S2rkW9qhvjNbB8kW -pMFqPO1fAgMBAAECggEABhQEEYLYZfitTUeH1H4bKhnP84lF7gXftaWqcnoP4bop -15qAnGJs27SxlHlkDAD03FK7CjOTsUFMltFdA8gTE+LLoheCPk3vFhay30R/ptfP -bUuosQe/2ZOt4Duv1QKc5IePfmjjZZekAGcJsikUbdzZE/kIrGCQeR9n3THalF9q -wURS4pVZXGtO3CAbPeMxDL28N4o6EoYciVPJiYMvVV2Q4XPLZkkYRorPf4MJpC2p -Bhj6g1UY6hvBmXkJuwRkJFPM0ed7HQ1djfJzAY8xJLI/uGYeQEHkuMvte5BjR6vS -7Gt5o/17A8geGaoHZLgq8YrwKrtw6cuyhhi4db96WQKBgQDr5Rtm7zzWc4S+NX6c -tEZpJPew8HzJ1H999hXBxpZXHfv+wd7gniAFzoGPwQSDOPR6SAgovJlfB6qADpOb -M0S3vvNRx6+kICVPQlq9Z0ac9W7jcM3e6yX3kZLH0jsJhRI9T5y8sx8xapLjHM6z -HJG/pWxvL34M6FTKbhnHqimitQKBgQD+pEZTDmZotBlIrqZ21STrxG/VM+flHcpZ -8329pWZ6Y+1lEOTn0X9BhAdKKYsaxs6ze6dL0B6ZUMBH96n0Ym7iT+7/BgYCVySX -1dX/wnXa3M9Xh9OyDhaQGBdUkPuvAhIVhHx5gf8iA6Dp9A6j7Cp23O+qIFPOmWlo -pfFIF9j4QwKBgQC5qy+BOmY5KN1fVP2d26rb0VP/eZnOxim++/Ut+t+UHC6e2vtQ -8kSkLWD+w96IZkjPAmkhnyhcis0hU9fMPXMl6O7c/H37ga28D68aCvKiUe+ApuXz -QkQ08uiDzK3ZFVtA1Ku6PoYbwBVzGtZ6Vc9F9688aDYfdLJgTn6OEBoLTQKBgGci -whkBzBi8WUFG+8VFrx6PAXyo+VOjLUIhjNwzEb6gmpZEsXHzOEeg4hL3oI/H1hB8 -FNZwBPSz8C018nA5LhAbsAE6v1RTV07oHTTp3jI3HQOmz+deLWVPXKOz1Tyc6hYt -Av1z2ZI9Rf98CjH6hXh/I9MUJN2Y5UitbXx1rDthAoGAPS0P6EfrSVQzkpnaCD6B -HGUi1bDH9rqAO62ztNLZ3pQ1c2ViEnYcwG0zJj3bFSmufUlerMQLjsulBOxefJJQ -2svGsse8jo5Ke6m6zdZM5bJVoeKLlhPTdIqw2HaEa159j8vsDA4yKVIm5G7o33iH -sCllQE0CjkIFb/zbp0B8v68= ------END PRIVATE KEY-----`) +var localhostKey = []byte(`-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEApE91Uh3WaUoBPEiSfKrkpR+T/9wkGw2eo7vfWX6ECkpAXMX7 +om6WQ1MiU8rOruMRVtwfNN9XjWghVeG7BJt8a7i1pXkbJ37Qf7P4Xgkpf/yKpUXJ +gS9KTlFIoABJ7BRWr1zYSssQUSYGDjPN4skbaQ15TDDNqzTTrMxNxrDzPZpoMr2w +SROHlOMaJz+1lfkQiU41WT4tOyj79sV2/AEu8sqWAJ1Jfsvrn3kw84UjqlI90qQI ++52Ub9FlgCRxRd1MQK+T9D8Iu5MgvCgswPDEIGmX1CiQswetZC9OlhzWb/uZ/4G+ +a/+Hs4Ue2E+qrTezYX0cN/Lx7KFWklyLP+73cwIDAQABAoIBADT/mDUTgLxXbYyX +UAC8UqHcTK2jwVWkj/36NHG2eDqldps2FRNwnjE7GIB0kzQf89DTkZFJVQE8jDwa +Ymt7B6frXVPxe0vDANegIkWaqPMqb0Id/4AW093tJALP9QgcC1XnGbEOTMYQALYG +CavT+G5rNSvZNg26LWi4QYIMQ3kj14YSGJBqATDv2gKS7lU9hGXQvZWULJKurgpn +ptui/NkR3lFWjK8aa6aLPnAPp3+KisTyJxGYBoL7OPQHEy2P5es/Uw9W6JEoLaoi +UXFsWH6ZP/2yeC4Q/wX7zhYkSDE8d6kY+JUC/x0Tg4ffNvVPwGFbJJlOJYge/vWV +l8B1YUECgYEA077rfJeK4jQYv8UyFY8syLBoyMriNAEmU3C6STc62+ytjI+XM/tX +eKEfAtyUJeiZ7DBH1z7cfSdhNlSDNlf4GnjdQQIlj+ga4UFVo7iuBqRyBkrjE0nr +Xr3zt0f8LMBEWtzjffE/YJ1mA2chqYQDudsiIofz5FsNbmLqMcARneECgYEAxqaX +l6hxs6UOR8z2vNvw/cz9dUu+S51ljfPaBRMR3NOUnAW0KFAbGi1LCthLKGtDkliJ +XZeDjqFLeorBibxKXs4RSz9jT0lwfMdGaXOiIlby7FDYCc+lgQEZO7QRWfIe7J7s +RToZRV+ZbRjpIp2Jysow55bYpBvY02i74R9Ot9MCgYEAqAMIVR7li2Ds9lUgzWyC +i2c2bYRWAg+ben+qwGd7Y3+joTFaN1vKZyPpOFsPjhjG8VrJ1ifByeiSQQrD5j3c +1hxq6qcqaMoxceRmcHccVpbrBsUq8mYnxVARbq9Gj7erRTGZrJfcwuuBQ1f0pM3k +KveOWTnospvwx1LjIsCU+eECgYBf/6vsj2t7LD2tdyCZ/hQFIuYtpA/vTL4CDqEC +qMeOFvWPPLZmcOfYC6FjOUmA2+1IsN6ZSxo5eDsYmiuTW1n5XM5Atf5RF6Vzt32Q +gmANBkXY6+yrORy7LgO6tXdZJ0fIg7icb8o8m0lyzoIDx2wKgxGFKYHCNO7go5F/ +5nhNHwKBgEDz8M+OzXYg0y9qBNTaYbwEpOzHk3FL4Lei/qct8k/gzN5n/FshP6/W +jBQWqa1w5CqCwcqmAN6dDwRO5SJWIv3UeX+wyAear440ebfFuGNw5Fuf1m7lqJth +9A7NlLz+9jfzaPsOXeTiCvN1pDw+sNvHepkII2++pRPN7e1T7Wuo +-----END RSA PRIVATE KEY-----`) diff --git a/src/internal/testing/certs/localhost.crt b/src/internal/testing/certs/localhost.crt index b867a903f..2ac5c5f5b 100644 --- a/src/internal/testing/certs/localhost.crt +++ b/src/internal/testing/certs/localhost.crt @@ -1,29 +1,30 @@ -----BEGIN CERTIFICATE----- -MIIE4jCCAsqgAwIBAgIUI8iSzXNezM6iOg5vtRBhZn3mzUkwDQYJKoZIhvcNAQEL -BQAwGjEYMBYGA1UEAxMPbWV0cmljLXN0b3JlLWNhMB4XDTIyMDMwOTE1MDcwNVoX -DTMyMDMwODE1MDcwNVowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3Rh -dGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBAOqksMLdWozNxrD1QoESMcsq/AgGp628mr6C -zc6D8xmxOE/fdeege5JBCSxuDvz8DxJI/UaDrbDUzH72X8bcsVRGf+hYt9dpnZWb -UCrumJsjLQ2vX3TuypEx7mTdx4GzYaLgfMDf2fi3m3ny8iggwt529+45GRgQAxG5 -rVqvl5VYMLWTnMXUGJEGBGSeBOii6lbzJ28alaAh/gd7gDiTI1JLpR7RLm+YoLBx -VVC66yNlQ4r8mov0xx3b4kwawgJK35UiH80APwzzIttFCfgnib/BIhZQPCHsNAZz -g86CmPhnnhyw67wMVO1+U4rTv39LauRb2qG+M1sHyRakwWo87V8CAwEAAaOB9DCB -8TAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhCAQ0EJhYk -T3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1UdDgQWBBRt -d279oTFLecXqo1YRvzMt4SxQnjBCBgNVHSMEOzA5gBRQx2ANY3ddbypAOvQQVwOm -ZVmqDKEepBwwGjEYMBYGA1UEAxMPbWV0cmljLXN0b3JlLWNhggEBMA4GA1UdDwEB -/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAUBgNVHREEDTALgglsb2NhbGhv -c3QwDQYJKoZIhvcNAQELBQADggIBAD0qSeQjbYdQgootqizqYcvpgkWX0CKg9raK -JwRiYNxhbuqtZ6huYeyxxou4WuebK/mO2Suvy6MSBydb7g9r7rTwM681rWITrobx -udzEpW6BScs4vEIPXgYURsp+eOEyMKL5s6FRY3C6yD0tYQnvjzFx4pOB8eyCVHwD -9ZCm3OZDT+acTWc4i0nz9WIQ1nOTwNeF/VJtQE9FH5yIJ1XESaHLlcy+8H4nIeec -w8NBiVlO4oLcK3HWaYc+g9mujmoB6o9kLY0FO44u/Rt+X/Gcyv6teJNc0Eu7fhgv -3ABuiZ0QkoD9DqBPIRNZf7ruafxS0pP7j93DxoNMYjaYjlXZdN0jUsLWJeW0CYzo -VJ5f4b9X9DPvB3Migmcwrb2d9SPfnTmp34CdVqHRDnRIol99VXT5ilR0JERmY8Bq -aFKhWHPzNEcRzii0LTcZknlcz5aQbPyQlXTG3kPHG3mAV2kSQJIa/FbgPtAjVOwe -ZPBCSanpVaBP5ZvKK6Q6P83ycovlzEdzrbAApoAy7TA9jj8wGlm1Y+qtr+EnV/6k -pWNFvRTImjB1drpKXpHNZg+F8NBC3SRZicdf7C1WOnXS18i6LT9P+s2SBwIqBP04 -ndr92NJF3OgurD6NCG7eIf4hSOxVvNbEtnfsJRYI9UKMFRMZ5O6uZQP517+0uwGC -37se3AY6 +MIIFGjCCAwKgAwIBAgIJANCFTxfmfZSRMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV +BAMTD21ldHJpYy1zdG9yZS1jYTAeFw0yMzA5MjkxMjMzMjVaFw0zMzA5MjgxMjMz +MjVaMIGHMQswCQYDVQQGEwJBQTEQMA4GA1UECAwHWWVyZXZhbjEPMA0GA1UEBwwG +UW9jaGFyMQ8wDQYDVQQKDAZWTXdhcmUxEDAOBgNVBAsMB1Bpdm90YWwxDTALBgNV +BAMMBHRlc3QxIzAhBgkqhkiG9w0BCQEWFGhtYW51a3lhbkB2bXdhcmUuY29tMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApE91Uh3WaUoBPEiSfKrkpR+T +/9wkGw2eo7vfWX6ECkpAXMX7om6WQ1MiU8rOruMRVtwfNN9XjWghVeG7BJt8a7i1 +pXkbJ37Qf7P4Xgkpf/yKpUXJgS9KTlFIoABJ7BRWr1zYSssQUSYGDjPN4skbaQ15 +TDDNqzTTrMxNxrDzPZpoMr2wSROHlOMaJz+1lfkQiU41WT4tOyj79sV2/AEu8sqW +AJ1Jfsvrn3kw84UjqlI90qQI+52Ub9FlgCRxRd1MQK+T9D8Iu5MgvCgswPDEIGmX +1CiQswetZC9OlhzWb/uZ/4G+a/+Hs4Ue2E+qrTezYX0cN/Lx7KFWklyLP+73cwID +AQABo4H0MIHxMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG ++EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD +VR0OBBYEFLXvuV9NrnKYsz2GV8aRHj8/TdaqMEIGA1UdIwQ7MDmAFF7vtw5ffhkt +mUzXnb7T2Ctsy5Z+oR6kHDAaMRgwFgYDVQQDEw9tZXRyaWMtc3RvcmUtY2GCAQEw +DgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBQGA1UdEQQNMAuC +CWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAgEAZusGE+VNU+XYYJxIIMyGtP7W +D/rKJfA9su6ziCD5M4INn3ipXkMdcSXiEzbCe/jkCgjICr4YR25vVXl0AYCOK7o4 +zvs4ZLiL+RrTjdi6T1JSLcpFPVQvfDqtdwr31jpk+4bi3SukU9yv7bki3APfbPUz +HWRassKLNwsjoAy7N4UvnEvjDvTvgxkqSNaVmsQgy2vZoINdB1w1tEGa6Lflozyl +o/3wwXb3y/cKJChO52YnsxEH5alImE4AhsWsJDrSz9HW3TetUB/WOHFNFCIvU3E/ +eCEjw2pGqM3xsdlGF4KMJ149nJMP3PFJOnGxaGrHNTkHSXX799OyEM+jJDM0KM7t +bxRkY91ln5JZuVufWQTEz0G4bTzACWabLUeW5FQzLcru7CwpT3mVuU5TWCEn3Slx +tn4S8VMuD0QNhNMbl6d6acyZ/tNdEtABFiAm7cfBBPrEHwa7x+TTxx8v6O+fxrWL +XncNnHfYtSi9TK/FLmB+D1kQOR0wMA/RHgsrTVNvJq1/SjxXd48QATacGdHyELLL +etiy74MkqChdSyVFLlY5vizgM9jh8KX2NeQkgWyoPlrOd3xBXXzZPpX36KE5nj5W +WrHyEU/CFLjmqUH70c8f7lAqZduNL35tUdOC7VY6hNGP45JOnecZWIZMeUeSxQhP +dQVBDTvYddukeSZMIA4= -----END CERTIFICATE----- diff --git a/src/internal/testing/certs/localhost.csr b/src/internal/testing/certs/localhost.csr index 91884458e..b6289d1da 100644 --- a/src/internal/testing/certs/localhost.csr +++ b/src/internal/testing/certs/localhost.csr @@ -1,16 +1,18 @@ -----BEGIN CERTIFICATE REQUEST----- -MIICijCCAXICAQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx -ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAOqksMLdWozNxrD1QoESMcsq/AgGp628mr6Czc6D -8xmxOE/fdeege5JBCSxuDvz8DxJI/UaDrbDUzH72X8bcsVRGf+hYt9dpnZWbUCru -mJsjLQ2vX3TuypEx7mTdx4GzYaLgfMDf2fi3m3ny8iggwt529+45GRgQAxG5rVqv -l5VYMLWTnMXUGJEGBGSeBOii6lbzJ28alaAh/gd7gDiTI1JLpR7RLm+YoLBxVVC6 -6yNlQ4r8mov0xx3b4kwawgJK35UiH80APwzzIttFCfgnib/BIhZQPCHsNAZzg86C -mPhnnhyw67wMVO1+U4rTv39LauRb2qG+M1sHyRakwWo87V8CAwEAAaAAMA0GCSqG -SIb3DQEBCwUAA4IBAQBqb8Q9UiHSqdSUwmx+nmBfWIkSzCY89ZovtzqHXc6jAkEK -DWvKznXUI/a4kuQrpsG8WqK9sXNhYPLXvB6rywBPz+K8Y+p5UW1Wr+92XVACqbDe -FjTwu+4SBI8UQQG17dz3y3En6GyU2iTsot2oDhhf0jhRdtYc6JO9VNlQissW2G+D -wGyPqYZQgL0DfI0M2WfD0J5XdLDf3y644d48nUsEXOX2YJIzgWPQC9x/UKDghH9M -vov6hRO2r7SDnoplk/77hD4KOIm2fJ89sP7qO+iY+AwToeXQDTQqA5hl+F0ZJSHE -KJ1dKaiwp6M7wGXbjpKDz49hsQWBJne/7aWys/OY +MIIC4jCCAcoCAQAwgYcxCzAJBgNVBAYTAkFBMRAwDgYDVQQIDAdZZXJldmFuMQ8w +DQYDVQQHDAZRb2NoYXIxDzANBgNVBAoMBlZNd2FyZTEQMA4GA1UECwwHUGl2b3Rh +bDENMAsGA1UEAwwEdGVzdDEjMCEGCSqGSIb3DQEJARYUaG1hbnVreWFuQHZtd2Fy +ZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkT3VSHdZpSgE8 +SJJ8quSlH5P/3CQbDZ6ju99ZfoQKSkBcxfuibpZDUyJTys6u4xFW3B8031eNaCFV +4bsEm3xruLWleRsnftB/s/heCSl//IqlRcmBL0pOUUigAEnsFFavXNhKyxBRJgYO +M83iyRtpDXlMMM2rNNOszE3GsPM9mmgyvbBJE4eU4xonP7WV+RCJTjVZPi07KPv2 +xXb8AS7yypYAnUl+y+ufeTDzhSOqUj3SpAj7nZRv0WWAJHFF3UxAr5P0Pwi7kyC8 +KCzA8MQgaZfUKJCzB61kL06WHNZv+5n/gb5r/4ezhR7YT6qtN7NhfRw38vHsoVaS +XIs/7vdzAgMBAAGgFTATBgkqhkiG9w0BCQcxBgwEdGVzdDANBgkqhkiG9w0BAQsF +AAOCAQEATKkrVuj1HQDu/pRMDUGSNlZnvyahzVyGlD8TxYYc+NpFlze3tD4iSwtE +loEfH8ScS9P2rXPhmuSZGM5OZr9x2aNbbyZtEkbAxYzBihYOc36aXhLvbHNXS6Jn +OvxGF4mCQF9tRFbp9sGz/VvoatMaHRH/I2POzc8UReoSzf1+49PVbsRIfharvQyE +Zs99CxsucHEwrB1Na+U1z0ZZg9JvXOHkNs3UiI37TncoPbHTx30G/cg+UzT+Ozi+ +hnFADipd6ntr6jXcNOv1xXh/cAiSujYtwlDnljyEb4DsZqdayBnk8tewO1S9Pe+o +2ivXh8jlRv82q8zvR+CQ9dPA3iTg/A== -----END CERTIFICATE REQUEST----- diff --git a/src/internal/testing/certs/localhost.key b/src/internal/testing/certs/localhost.key index 9bbb3dead..796e3fee3 100644 --- a/src/internal/testing/certs/localhost.key +++ b/src/internal/testing/certs/localhost.key @@ -1,28 +1,27 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDqpLDC3VqMzcaw -9UKBEjHLKvwIBqetvJq+gs3Og/MZsThP33XnoHuSQQksbg78/A8SSP1Gg62w1Mx+ -9l/G3LFURn/oWLfXaZ2Vm1Aq7pibIy0Nr1907sqRMe5k3ceBs2Gi4HzA39n4t5t5 -8vIoIMLedvfuORkYEAMRua1ar5eVWDC1k5zF1BiRBgRkngTooupW8ydvGpWgIf4H -e4A4kyNSS6Ue0S5vmKCwcVVQuusjZUOK/JqL9Mcd2+JMGsICSt+VIh/NAD8M8yLb -RQn4J4m/wSIWUDwh7DQGc4POgpj4Z54csOu8DFTtflOK079/S2rkW9qhvjNbB8kW -pMFqPO1fAgMBAAECggEABhQEEYLYZfitTUeH1H4bKhnP84lF7gXftaWqcnoP4bop -15qAnGJs27SxlHlkDAD03FK7CjOTsUFMltFdA8gTE+LLoheCPk3vFhay30R/ptfP -bUuosQe/2ZOt4Duv1QKc5IePfmjjZZekAGcJsikUbdzZE/kIrGCQeR9n3THalF9q -wURS4pVZXGtO3CAbPeMxDL28N4o6EoYciVPJiYMvVV2Q4XPLZkkYRorPf4MJpC2p -Bhj6g1UY6hvBmXkJuwRkJFPM0ed7HQ1djfJzAY8xJLI/uGYeQEHkuMvte5BjR6vS -7Gt5o/17A8geGaoHZLgq8YrwKrtw6cuyhhi4db96WQKBgQDr5Rtm7zzWc4S+NX6c -tEZpJPew8HzJ1H999hXBxpZXHfv+wd7gniAFzoGPwQSDOPR6SAgovJlfB6qADpOb -M0S3vvNRx6+kICVPQlq9Z0ac9W7jcM3e6yX3kZLH0jsJhRI9T5y8sx8xapLjHM6z -HJG/pWxvL34M6FTKbhnHqimitQKBgQD+pEZTDmZotBlIrqZ21STrxG/VM+flHcpZ -8329pWZ6Y+1lEOTn0X9BhAdKKYsaxs6ze6dL0B6ZUMBH96n0Ym7iT+7/BgYCVySX -1dX/wnXa3M9Xh9OyDhaQGBdUkPuvAhIVhHx5gf8iA6Dp9A6j7Cp23O+qIFPOmWlo -pfFIF9j4QwKBgQC5qy+BOmY5KN1fVP2d26rb0VP/eZnOxim++/Ut+t+UHC6e2vtQ -8kSkLWD+w96IZkjPAmkhnyhcis0hU9fMPXMl6O7c/H37ga28D68aCvKiUe+ApuXz -QkQ08uiDzK3ZFVtA1Ku6PoYbwBVzGtZ6Vc9F9688aDYfdLJgTn6OEBoLTQKBgGci -whkBzBi8WUFG+8VFrx6PAXyo+VOjLUIhjNwzEb6gmpZEsXHzOEeg4hL3oI/H1hB8 -FNZwBPSz8C018nA5LhAbsAE6v1RTV07oHTTp3jI3HQOmz+deLWVPXKOz1Tyc6hYt -Av1z2ZI9Rf98CjH6hXh/I9MUJN2Y5UitbXx1rDthAoGAPS0P6EfrSVQzkpnaCD6B -HGUi1bDH9rqAO62ztNLZ3pQ1c2ViEnYcwG0zJj3bFSmufUlerMQLjsulBOxefJJQ -2svGsse8jo5Ke6m6zdZM5bJVoeKLlhPTdIqw2HaEa159j8vsDA4yKVIm5G7o33iH -sCllQE0CjkIFb/zbp0B8v68= ------END PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEApE91Uh3WaUoBPEiSfKrkpR+T/9wkGw2eo7vfWX6ECkpAXMX7 +om6WQ1MiU8rOruMRVtwfNN9XjWghVeG7BJt8a7i1pXkbJ37Qf7P4Xgkpf/yKpUXJ +gS9KTlFIoABJ7BRWr1zYSssQUSYGDjPN4skbaQ15TDDNqzTTrMxNxrDzPZpoMr2w +SROHlOMaJz+1lfkQiU41WT4tOyj79sV2/AEu8sqWAJ1Jfsvrn3kw84UjqlI90qQI ++52Ub9FlgCRxRd1MQK+T9D8Iu5MgvCgswPDEIGmX1CiQswetZC9OlhzWb/uZ/4G+ +a/+Hs4Ue2E+qrTezYX0cN/Lx7KFWklyLP+73cwIDAQABAoIBADT/mDUTgLxXbYyX +UAC8UqHcTK2jwVWkj/36NHG2eDqldps2FRNwnjE7GIB0kzQf89DTkZFJVQE8jDwa +Ymt7B6frXVPxe0vDANegIkWaqPMqb0Id/4AW093tJALP9QgcC1XnGbEOTMYQALYG +CavT+G5rNSvZNg26LWi4QYIMQ3kj14YSGJBqATDv2gKS7lU9hGXQvZWULJKurgpn +ptui/NkR3lFWjK8aa6aLPnAPp3+KisTyJxGYBoL7OPQHEy2P5es/Uw9W6JEoLaoi +UXFsWH6ZP/2yeC4Q/wX7zhYkSDE8d6kY+JUC/x0Tg4ffNvVPwGFbJJlOJYge/vWV +l8B1YUECgYEA077rfJeK4jQYv8UyFY8syLBoyMriNAEmU3C6STc62+ytjI+XM/tX +eKEfAtyUJeiZ7DBH1z7cfSdhNlSDNlf4GnjdQQIlj+ga4UFVo7iuBqRyBkrjE0nr +Xr3zt0f8LMBEWtzjffE/YJ1mA2chqYQDudsiIofz5FsNbmLqMcARneECgYEAxqaX +l6hxs6UOR8z2vNvw/cz9dUu+S51ljfPaBRMR3NOUnAW0KFAbGi1LCthLKGtDkliJ +XZeDjqFLeorBibxKXs4RSz9jT0lwfMdGaXOiIlby7FDYCc+lgQEZO7QRWfIe7J7s +RToZRV+ZbRjpIp2Jysow55bYpBvY02i74R9Ot9MCgYEAqAMIVR7li2Ds9lUgzWyC +i2c2bYRWAg+ben+qwGd7Y3+joTFaN1vKZyPpOFsPjhjG8VrJ1ifByeiSQQrD5j3c +1hxq6qcqaMoxceRmcHccVpbrBsUq8mYnxVARbq9Gj7erRTGZrJfcwuuBQ1f0pM3k +KveOWTnospvwx1LjIsCU+eECgYBf/6vsj2t7LD2tdyCZ/hQFIuYtpA/vTL4CDqEC +qMeOFvWPPLZmcOfYC6FjOUmA2+1IsN6ZSxo5eDsYmiuTW1n5XM5Atf5RF6Vzt32Q +gmANBkXY6+yrORy7LgO6tXdZJ0fIg7icb8o8m0lyzoIDx2wKgxGFKYHCNO7go5F/ +5nhNHwKBgEDz8M+OzXYg0y9qBNTaYbwEpOzHk3FL4Lei/qct8k/gzN5n/FshP6/W +jBQWqa1w5CqCwcqmAN6dDwRO5SJWIv3UeX+wyAear440ebfFuGNw5Fuf1m7lqJth +9A7NlLz+9jfzaPsOXeTiCvN1pDw+sNvHepkII2++pRPN7e1T7Wuo +-----END RSA PRIVATE KEY----- diff --git a/src/internal/testing/certs/metric-store-ca.crl b/src/internal/testing/certs/metric-store-ca.crl index fd6351cea..dff9837bc 100644 --- a/src/internal/testing/certs/metric-store-ca.crl +++ b/src/internal/testing/certs/metric-store-ca.crl @@ -1,16 +1,16 @@ -----BEGIN X509 CRL----- MIICiTBzAgEBMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNVBAMTD21ldHJpYy1zdG9y -ZS1jYRcNMjIwMzA5MTUwMzQ5WhcNMjMwOTA5MTUwMzQ4WjAAoCMwITAfBgNVHSME -GDAWgBRQx2ANY3ddbypAOvQQVwOmZVmqDDANBgkqhkiG9w0BAQsFAAOCAgEAGjh8 -u3eRPs1wOwYb/mk7CX4bARvK1wtrMKmZ40FGYgFIjZNi/+pO1JwhQxmrWnirjcdO -960Om5Ol8+iABWuEVe41RdbEERTsfg72m0MZwSVTkYhtnnoMU3qYr0/J4aopvD4u -IRMtE0TSrz037O3AJUePqrcqSTZEQVgPSco81CYLakVLUrffPhL7ejndEbwcKMvT -xh1eFol0NvApsdThf3E5UdcEENBqVTRTj0bBWxK+qJdDT86zTJGE6hIGsi2/WVqc -9nuo59hUrHsGoQTHDD8Qk+Q9VuqflKNqkHjpfTSKzZCHuVW5/VoVXt9g+G2PCK08 -IiG4X/b/nlPKEz+nT6dYJO/VLWIrIPEClz2LWqsLUEsjBSmK/r3zq9sYOUayBAn2 -OaCnYir8+9YZYhyUhYbJ3XYuXMolVof55reR3gXN2/27wVvf84pdhUGjc3l7PCaX -TNcS96hLdc7VeQXjkrRUaPsk5WWcp6Xgk6NS/gcnnMP7XciNBbyBqHtbg4mCAMaE -vcWKiwBM5g6ZsDjjDQthGAW1bLKCRn8tIeqKApv/e+sVaG6Axfvut8Qsrj92vUfA -iioWmuA/rEARPHBTOKIuog9x6yjxEC7maNVMQApnXYo/nQjj/n0Q0cUTZF6rLCz3 -7VpMtEfi49jhKk5pzfPBLHwRLtZr/yeR3la/DYs= +ZS1jYRcNMjMwOTI5MTIyOTAxWhcNMjUwMzI5MTIyODU2WjAAoCMwITAfBgNVHSME +GDAWgBRe77cOX34ZLZlM152+09grbMuWfjANBgkqhkiG9w0BAQsFAAOCAgEAMl3x +Igte06qF1VBfG+q84H+kbWAO/DplFDD3CFJYHuUnWFoM2IIMy+jc+iE2s7c1bG5o +GGeCyfKPXfNWcr16BlMx6a5W0IfliJJCFa/Okt/SdegUJndVXxNEHvw6vp2vaLdo +QCw6gNMZrcoVxNgU3Q438qO91nS27HKO7XPukKNxDyQ8jTgblh/AKLKQrGLwIK7Z +BfxdgvXUlcrg6xyao8+cJT4aEnDy3o2svtBBrQ/aapnO9ohBbjGbPYdNqYbOBpLz +ot+FEtPTJqbWVi1kKOP08lg1YszynektdlrsG7276GngTA/rucDA57RFUU/EpmFP +gLVsZoDseB5N6s4ciG1T4e3p6l68C6kkLU7tO4/mPw95dlVr6nLMNLhwic/61JME +j3m9iX19SgRTYYFDFYyuTh9gDgbXN3XEoBjnuiNzNvNed1UOgli3p69aHnVQSda2 +UB1WxZMq5b0ugTgAHAUBx9sS8nTmbZs+cwNLq5qONB60wQlb/WqXmrhvHsPx3anC +JmGkq0gesEfewzUcYu4RuAOmUb6p578fs06dS+0aSMfaseY8Lu6eDXePBEC0//jC +VDq5KqMPl/kZwRmv0eTrmGtACz678sgyKWTSMSvDW51gIXlgyt7vO7Xd8U5Ly2b4 +EiFa95Ym2YvQZqwBqTEsF/1qtqCoqDn8zGw+RWs= -----END X509 CRL----- diff --git a/src/internal/testing/certs/metric-store-ca.crt b/src/internal/testing/certs/metric-store-ca.crt index 9301b1e25..67993e8e9 100644 --- a/src/internal/testing/certs/metric-store-ca.crt +++ b/src/internal/testing/certs/metric-store-ca.crt @@ -1,29 +1,29 @@ -----BEGIN CERTIFICATE----- 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 -Do1UYd4MMINEUDbfYyT7agie+jwOa9oY +Xu+3Dl9+GS2ZTNedvtPYK2zLln4wDQYJKoZIhvcNAQELBQADggIBAGL/l+1XtgAt +Zx3S2p5r2i0uY80WvYgd9+3vesj4aJImBLRcXL5TD61MbMW6dX0UOAH9GWfyuPmE +im90ylQLlxeKIeuc/C+0qcf8qmuJ3JmkdBV3av9GbaDZsQmRzTCzccMtjZGOXOgT +oKAOxUmKRgX9ezMYFWYE44a2RzX/3Il63pbJft3cnRe+uiomgsybIJI/TytzlZ0P +4kDHGAUgpwV5YH4OAx264cNWW9Jeexg/uPmT1AKEAXrs99DgM5Q4bT0E7colRSKl +QxGOBJ9C2vbmObny9t62TKqPB7SEwxPKISTljdvypmWwdJlDBEfmLFWvbin9ycOG +YPCLUwH/EJLhFpsshgmka6E4gkUMGyO6rkZoziJD62mRkbdp4olDWkJAe8DXSmZl +1xcVbypGXCcbq/HRRHpSjThgzVKFwG0lovE7tqXn+UXdDw9+/1Khl0qmTsqmRIxs +6xfmJ0bNd7VRginae/U8g+AasGnQk4n8JBprWUz39Lfi5jY9JtBrXd7tB/2212oU +nwgV0JACmfcRN8l0x+oAkvl2qouvdlJaR0q65ihrYHiIHW3RVQbsg7y+2zKbrzl9 +RsKOH4p1CfjB6rvIRmQ7kgkuPZrtibGFgQtjr76/Cj7fDr9+vM5r0RjO1VKrn869 +C2jQDjkQlLWn4gtVq7qUjufbii9aBy4c -----END CERTIFICATE----- diff --git a/src/internal/testing/certs/metric-store-ca.key b/src/internal/testing/certs/metric-store-ca.key index e3e95c254..e3f2c1472 100644 --- a/src/internal/testing/certs/metric-store-ca.key +++ b/src/internal/testing/certs/metric-store-ca.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -MIIJJwIBAAKCAgEAr7cG614xT+1UpkxTj1IuLi/4z4IOGkIR4AVQqhlaToIyA0gZ -I9SMwXj8mXt43BZpuBjdJeD57ostZKkYGGF9bYidgf7ZJFLYTxpXpw1057t6Wluv -gRUyjWrO/uH5O7ZX0h9inn+QUKoWw8oo+bQ3aaji//V2B2dzmmEYcrRtlr5511pu -43bmWZXUr8CxedB3SidEQgudaISZMlyvTAaRenkHQBFeQwAZpqRUgWhRKl4t1fvH -dw+bxXOsBq5tOdg8KGTMw8ECmRLU2Y5ZKjIh3xzemLQu8wnTpErk64o5gtmPVSCd -4yWGK/zFqWU21S4CK+k5pN++8/msmXAKjWNM/9Do5dHEc4+k/jR2Bwe7da2Vtq/l -I7rJPjyqo9sWqPOkmjvBba6PoICMhqox0jDYqM674eo75qtaxblJ9SeSKFle+8w6 -RUqutR4ECVPR61o2Ze8qxjLkAK2DEcDKtg5MRZ52QNAD8aG+IpPHH2lHHCEXxJjf -xUF0SaEziJNISso54vh+Agv5erUH8APbOOXX6Z2rplFWpQcBNQWITt1bZm0P3rzY -f/2hbh1LYLcihq0vFboH3YSkLSIFusMG0rZCxSvLKzx3T7XzEfo4W+3Eebc44j0o -uv6SHTfy5/+SLPCjwFvMuZxHjgwGaj+xDBITWJ/YFcMBt2h0ySt36ckGgbcCAwEA -AQKCAgB/yr3Wic+VUIbC1zniPyNk5fCvgeedwzVa1qK+wueBt4CGEHZwL5Ia11Hm -kfzpG8fRYwvbE47RpRjjX3MtsCFXewcKVv03RKUaio766HeAXUHz20B9wZvda7OV -fWUUv12JbNf9a8raT4l05V79k8rFJlXJT4yCgAN8YGc2bPBStL7KF3QULBIFT0m6 -dIrei/Vl0b77xZS6Qc1k6jF3OkOtbb4PI1KJqdX98v+eie6VwJ7XRGDhv1FLvf97 -cHnxmsjNm9mr+IBaMW7ptnQ0kvc9W7KsHkcS7K+mie2JPCLtfiqW/7y0SUMWVKSw -uPKzAd4Eb39D4JHwwEF96hVSlMiXA59kr2ox3hAQq3MpRGJfa2vlOXLJKSj82Zn/ -Bku1QztYGRc2fD5f2cbnBoH9Jrbt2TvQCe+UNGpbP+5Zo9ePHk92tQbdci+Z0Az5 -mxZts4fVxqMguQOsFMEvakptHh5rpaauZjimOoefzbj4SmsbZjDsKvcMvy3ebo/A -jp6GLwlXtoJpWj92UXQ4YUR/qMfqvJflrbHE2hsaOvfjklzxLxSRr7eMp+5bxk1d -BX1aDt+VkVaCqYpf4qAoHCx7TPZYbC/r7OvDgJgY+bTsZkhEeccblM9BowW6cm6s -8olP9iQBwmWLXieOVmEH3I5cNe+MlE/ZZBULQdbxqKmdmNkT4QKCAQEA0Lw0O5TS -6Sb/Q+8rj0NIXG7o/L+dF9PQ/3tEcDE/0r17Z5BaOyOn4EePhcGaULuWJMnmwalX -QEZ3DZIGq8iGQyFZTe/oWzpqYGfNu0+68NdGC44yfLRjiMfgRA0ZXJ08eRtsJCHb -7g+Z/Kr5iT+vcLrIi7sHCCHdoaAJteQ8cLMRL8g2ejvFPs8eFEkTTiOAXvg7chAS -Lpz1Snjk2RrBfiKF/EHwyWXok8rMwCEswalDdKH55aQZSjzDjv4a+TUJkOw+cSm9 -Z9Ho2PweVfc7k89JCPznJyYQutuw50Bm32IiCptzMlqkS/YV0cvuLAZuP+ZKKGk0 -lrToIDD9QesesQKCAQEA14C7lUzrcNSYOJHJ9UMeF1jC8JM8p/a12NKUSH2cvTwH -iwaTwzsYHZv/s5p5XbyH4A9wlkGxbCEIeZ6aoppjwbKKbwy9D4ZGMtm9Cvs8yAXH -741OIQkPWz2Rr3n0zDgbIhZjJOtY74V2+20W6MgbOCb18JAje6KJ1mlXzfm7YVVT -n9i5TIEB9OaFPXZfos23eK7ngmhvYuZ5M1KU3C0pGpLUa0SRhDDud7Zug2x+x7+G -hhCftDiZnpVMMV9JH/aaYdg3R9Zx45d4js98tl1gPoRa5Q/ea8NPQVTxTBLKSV+G -YbIxLEQrHF5ZKHObPxZnRLSlyWhMeGrSEPrIW07Q5wKCAQA0iirblGpCJX67Kshc -FyNvoLskY1a3WKmSpQRk+QCHmwok10DfAeqPmXOWx1SAXbc9K1TaCjXcB+CPmeHz -+1VQMGS6KVjjHaEJAxfVvgvf80++ONycZwtmsmjQuDtaBHnkQfLGZX9mPKcV4jNN -SKpwRZOVGE58zYlr1UycbAaKl4gL7ulHeyP620dG893YHTeCsBjGbSUmdnuHc0an -HwT1Kttu02o4R15zVOiUs8UAOgqwoNS16Mg013ah13QSpjbyM4TEFy2FpGBnvY4l -NUXZvqMzj/Te9cXgQswUaTF7qMfIw7gLRKV2OUrks+APVM8LZnvkEBccmAyVjb8x -iG0BAoIBAEGcVwAosBHlGAc5E8TRT2sKQieenDwDF/BQhIbhf4P5r847DWfGKRxy -r1IOON86FCA6cyu8CnmCQSNOD4Rr/u0tH4qZ1UHRvrOiqTSbszCu2eVsHxpduMgt -oZpMRiSa/F/PcxX9dVFPUB9SYkQzEF5zNjOsnrD4loCqB+qVGuCSauhiwl+xc1gN -iwlgbdOSUEa08ZU5mJgC1WmzvdCfC0Gk7HlQIgGeKCxYZaMruBm2jQ1qKEVlahfn -GpB5kzjhCrW5b3M2rev95N2N/ElFepTuFQJiZ3RlvU6FvwVLPz1BkRdTejcg9gMo -EnsHX3/AoWZAna0JTSboVtaGk9OA1ocCggEAO8mdwL1cnUH+tDHZb4KfGFG2dNor -Cqd1Z7re8c8ABxhCcMfBGqzpfzcZWfpwS6JZ6S3dUykA8FEkB7ry758e3WXX9LQ8 -iVFBi+8IjuvXTWNeIWKTUkSN2husBfv0KtLEw/L+GLlK6rwhDiX6qHLUG7YzxVHV -e6uRNLivc/1KjMv+LTbvpU8zsxxPLLT0Udw9s8aCcqim8Vi/NgPqb+fpLDVcoS64 -PKszfPZ1SS7NaJeXTzOBLcpxq+6vl6eXiYNIE1N+sfo4Y56BSMX8/vvOUXzKf/9G -81Kdl5r7jvkC9JyaA8p8rL8bofN/fZBmaRO4mx0UDWSUdjYjW7183B3a2A== +MIIJKAIBAAKCAgEAt8bsPXaho1tc9StPwLHp/w28sU6tXYuEiB5vN3eLCe2yDUF/ +Y2nF5nfFrhJphcN1TqCnaxe17QKt4ZKcFkOrOd8IjokYbp6CGIbH3cI57+zDzOeD +lhwWmMMuZHUEbpd+gL2q3iDfST8YlhyK/apgdSQK7HHhSdAg3dFj7s9XN19gcf8J +xEYuylQWbbgNrb+wkQMYaq5zq4dXcl9DEkJZuWwshKCKtG5i2x+Oac6Q2iFDCJPJ +P3Kd1DTI7W/JmDeQMkNfvnnNaUKCWGetN7C2mli0eJ2YyY0+GK2aD2UqfF6Fh/vB +iOO9vDgEF7jUOES9HNCMdmDNHnztXEUcLsU2kvh+J3cfmiBGInChESqN+IlQRdpm +ZUxQnj+u8Y/oCD7PY4fa4pb9eJ48EPh6xIVRokMDlArWIrLzhTCCQzrdRUQBfrxU +177UMiHwYq0WdNULxxkGhC1mL00LjORu1ZISP18uwsoKGqcrqDRamnzraAqkkCIx +CLxbYT/+J7zqtrNGsYeRpr9WA7y3BNViel+sACfcFkkMjfUjM7rUCeJgFkQkMytB +dICHDAdGbgqT+CkyUsxVWRPGwUsKpu+mmoqsm9PIW/JCEin3LBmaQdMvWMH0lv2d +bZ+oyWcOcfNdN0UYCT/zyaaCzpueLPojr1g1OV4A4W5Irymw5oCu2NAn4a0CAwEA +AQKCAgB5faLdOxi+Qn7ggSJ3E+bKOw2b9ZQ8fChASEZj175t8No9Uyhg0yMGKfXg +DsH9sOpS8XfcH0+ggJ3supw/R7rhRiWE/PLO5jDBABEO9ACTMOV8By0BRk5V7Oo1 +dPpaFgKGH1ze/cI+zNx3GCV2bnTX29zw1JQH1PR1T6CN1jolHANJOT3+qBr0nMQ7 +AmrgixGxu+cfV3aWVaGktX9EieKA5xdDElK/1x25GFJwdiNiYIzNFc38CMx35fFS +rg0KeOj1oX6hECqQRGyg/uEPKN5+iNe9yQmhbKM5c0KenNWKZH5IGFGoKk5bKHjk +Kcb5789JRkElXPcdCZ9s2S85aBybyav7FPuuIntOY41E6x70rfn2oFhX/AYdcErL +SlsOm9ZGzEFxMGsnoRiIC9w3IdolY51lQi7bfBnMtV7DUsCi2Mww5GJGlP2J0OEh +XSRcz8yWchLU+CkEeiuUK0/SwxAAszEFzQ+hN36zi0lLeOjKH2Ryegu1D1Ci0ebf +u2mnDRbUWEqsipntoP4z+r6ikgNWqyQ9TdqWy53P7mlDVs+vc1KQLILr1GrPVvVJ +Xakn7zVdbO0xqSW5CChYteR1AWtUOh0F0uUTEvEmZ2i5agKWOg64l99KFRNaesvx ++cZijN8vcVxR6ZFsjZUs4o3tGH9niAvf6C9nZgIv+S9Hspw+7QKCAQEA9BSaO6Zz +3uKJfzVcJzgq/Tol3539dLtzm3a1omCe0eHIUJReZvFPPoEhnCIxqbribFjHC04l +eUWWAd4md/u5R+FUIxpouEhgzBG1TVI3Xm1tlj42819HnMHlw7k8M98r4QtAWCw7 +wwDQJZmsYrszJ0KfRHKBL6/lQBJWMDKvm1UubI3V/l+U+4seP/Oo8KXuVuvKNpoI +u1sz8NNnkcgzecCjsTYfz/rxXL9BCQ5XnBvsX5qosgDQfvHfwM1LejYr62fNUaQs +uUUGWJ4kWi6Pkg31x7EXir3zR2m0nhJl4+pttn0m7/voxpO69vC15Puyztmq59Dx +rv/L50Hk6xid0wKCAQEAwMBuPyNbw8tW6aiWwGmaxeaIGmm4ekymk6ZiDn+Hlzfj +ay1cHujtTykxYjfDEUfe+TwwMTG449QQqqEPLgIi6VjgES0uLjYfhMG3dXckWA5E +b6Lc8nicWxmMDFp/EAJmjtIrLUM8J85jZ9YJsH1YninHOsufcdVxMfcADm7fqNck +9Z4pM45AshrfI49qTZYQT/8qw3DnSZPu6YHYCBL4niS9otUUcOG8gSCIGMUnxcNi +GoimSaIk1MNHMMGlA83QJeqI2VwgEUjis/wRo4vv+Yo8RcP0oZMNNG8l2aXb9HOM +a0DDYK52a9Lq1ntywX76UoIq+SBwjkIl5RGk74xSfwKCAQEAjCkwkER7kWhBUN1R +d+wXM6cqjIjrPRdPwdyfXQli6l9fanZo53B28wuwQzqXjkIVN+abFnDfsA43oAbz +zD6vHQnWCPpnXDuj6kvY8vfdd8oa/gXoBEWYl/n4eTZrzdXAGtEdOATepJJY9N6U +UXXyX/8v+lxOtxWo7ewZtj/E+8wkho3EbvhwUyqGSm8femGuxhdM3aIClaQ/5XFg +riRq+uWWmnLcPdB6vanOLOchhDG8wQHNEbrJ/7vho5PAXgOxoNLQ4qsGS7XJeSYG +9gp6w4JkuzGEtVVy2HVpFMS34fOC4SJpM7JS74Vx/dAog7/N5F62d7xSrQ2TB8+d +JyvRpQKCAQADC0byclGBrxVpTUNMOJ68H17o4+CI9ervjAIibnsqtTQ/PhElX9JX +nLPt9Cl9fWAVGZE9RabA2lmFCFQgCuKYQtIPE2KWUj5/LzwBe+c0CM2l4bGRlrwJ +aEbg7xDwpMkP2lvaNCSgEE9blXLDuccLgGdoE00qVA+clWUH1VJs7TDlPCE0cjut +VGVPv3UTUpphWQtI2OCeNdrhDy7lOb95Z+UizDCtc7Mxat0bXwm4wtQqzRurMAda +4Naf+37qp3ZxEtokbKMJAtiptQJmTdB1ZWx8QZL8dkEQIe08GbV2j9iY3QX44eh2 +3Xbd+kcerS2w3eNl2dBNPtgwXO345oNrAoIBAH3Xmtn0OmDdf1WL7TR/mpo7cB0Z ++kpAP12BtF40O0HGQES8NzCTDgdn+tvumY/IFE8jfzzmJT15RbVIoFDQxUKEVwjt +RSfRA+ZxB+nNbVbevazpofh87opmzLQOovOld+e37OQe5jwHaEYiAWGCr0HEQT7O +qSk10e+T9bon/PgbbNfVd3lrHZK5z2kiCJg31tGbvv0lj0YrXRhuKdLdzLDbKsDG +gvg6q2jUATMWorhGvrtj89dQ1CP+1tE2VOxfDQjHpilzmJKaRSAYIRNwaA05k7rc +JwN1ueQw6cGvq9gYtyHBYe8+w732tTyuVjkh/GeSNE8eILMvuURmF7en1XE= -----END RSA PRIVATE KEY----- diff --git a/src/internal/testing/certs/metric-store-ca.srl b/src/internal/testing/certs/metric-store-ca.srl index 738d8760b..895e5fa5e 100644 --- a/src/internal/testing/certs/metric-store-ca.srl +++ b/src/internal/testing/certs/metric-store-ca.srl @@ -1 +1 @@ -31C3E7429098807F7C88AD03802A40EEC140D755 +D0854F17E67D9491 diff --git a/src/internal/testing/certs/metric-store.crt b/src/internal/testing/certs/metric-store.crt index c5607d3bd..c6902e086 100644 --- a/src/internal/testing/certs/metric-store.crt +++ b/src/internal/testing/certs/metric-store.crt @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/src/internal/testing/certs/metric-store.csr b/src/internal/testing/certs/metric-store.csr index b911090d3..3e8c40068 100644 --- a/src/internal/testing/certs/metric-store.csr +++ b/src/internal/testing/certs/metric-store.csr @@ -1,16 +1,16 @@ -----BEGIN CERTIFICATE REQUEST----- MIIChjCCAW4CAQAwFzEVMBMGA1UEAxMMbWV0cmljLXN0b3JlMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtqB1jT7jtkJ9cUZk2RBeAi8itAO3A087Gwf0 -3wMw4BTRC0c86yi0dDe12sO8Lbm08DmUI3fUStsMttym65vGyUkEcdnNhYTvUlMb -W3bkjyvs+YZ+RPiKoF/McgGZTBGxZ3i/+wt4HA6eIhzBjMFvB6cE/dwV308xVswN -HcRkQOBj6n98lJUImUAmCLJ1I1WCZ8Kyu0E+ROuzQenM3zKm7dI4f0wpezwcJ/U/ -wOCPnEzKH/fYoFBpvcAibTh00IGctLWOKgkdH1kRklfnzzSMein3LyaKy85p86UL -5IMEb2Ic0kAMhvNL/XRb1jF4x4pfzNVTflPukOx0bJkCn0v5+wIDAQABoCowKAYJ +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwXvn1XJkUf2JaWWGueg/ukdyzvef6kTHH7Zq +G1MS+Ib08/CBKwhTeL56dUxCJHNwPlKVKu3yfWPtPn3ONyB36lAtOp7mjMN3c/zo +XErjrwTVisy2UAv+0xv5oCCIeKRjYSK2lsN0qLpO0HH33gJkfCHayTpQYopSYz2O +y9p+wZ/3AFNwf2YZIohbnmZr6iVsxhWSD0KzZrgDohyHIBjlLVNoCnRd4cCBk8PR +gF+LZZXBmB9X9vKn6/wlhmGHeeLgP1J3yJZPyYkMcrL3yn2zKjpeHDVDN7c9l0Ij +yZCFeMvF4kBdGvA95e8pp6MI27w6MscaJi420M8dtK3gRKoWDwIDAQABoCowKAYJ KoZIhvcNAQkOMRswGTAXBgNVHREEEDAOggxtZXRyaWMtc3RvcmUwDQYJKoZIhvcN -AQELBQADggEBAIs4RZuJw0VLlxzCQLkQ0nkyQ9cRL5uhqWQBPR9qs9lTghfJeUhF -dLKDMRpmUZMGGG2sgBZev5wrjmMFdsBBytwzknbWbPy7+uDYSxaJkjq3uj/X7Dn0 -f/iBqvcSN6LHmdKraVK2pSwHwSceuU9MHE8OssL1RdgzPDvTaNAQjKSp63FqfK7o -8R3BqRsJVXzVl5G+UwVJIdlBiBvKkUbx+zxtjDGEfAWY5qKeVCchuyq/ZssLZe05 -XndWJ2hit6kFfa0ZdL3aVtChC5RyBpnt/mTvip4UY5k5ptW+RE7KNUQ0Yrfs4Zab -O30E1tiZcLg7r0ASfnin5VLCO+dsJATp7QI= +AQELBQADggEBAHd2z8BeOdgUcDY8QueoYKNlee27hpPCGOle584vrhiEFyEOprJU +wgDM59nQF1rMkM4jpvLDw65eRDFg+E+9HwU72yU8Brfbz77O1b02n4q+8U6CpTN1 +nuOu/Yx+4Mc+9ksN08pwm+5iGcbrK0Vl7zRO/Jsc1zke9kxM6fgJcDo3dC68oTlz +SEqtZLW/HtBlzpDVJk6j0OU6MddTcPu9/ICTn2J+FmJYM+7EH6JCi9Se/kXZjs93 +odBE5Wpq8OvP4p2ugO3fOEiRYLZVoc58sP01vuTYZBfD5dqQpmRcIf4YeaubPUVN +ZGIccSHG4QKtk2kAraNGSbUplv8K9xWq/oY= -----END CERTIFICATE REQUEST----- diff --git a/src/internal/testing/certs/metric-store.key b/src/internal/testing/certs/metric-store.key index 0efea1895..4e982232f 100644 --- a/src/internal/testing/certs/metric-store.key +++ b/src/internal/testing/certs/metric-store.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/vendor/modules.txt b/vendor/modules.txt index bad594713..f475fdb23 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -22,6 +22,8 @@ code.cloudfoundry.org/rfc5424 code.cloudfoundry.org/tlsconfig # collectd.org v0.5.0 ## explicit +# filippo.io/edwards25519 v1.0.0-rc.1 +## explicit; go 1.17 # github.com/Azure/azure-sdk-for-go v65.0.0+incompatible ## explicit github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute @@ -132,6 +134,8 @@ github.com/cespare/xxhash/v2 github.com/cncf/xds/go/udpa/annotations github.com/cncf/xds/go/xds/annotations/v3 github.com/cncf/xds/go/xds/core/v3 +# github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d +## explicit; go 1.12 # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew @@ -417,6 +421,8 @@ github.com/hashicorp/serf/coordinate github.com/hetznercloud/hcloud-go/hcloud github.com/hetznercloud/hcloud-go/hcloud/internal/instrumentation github.com/hetznercloud/hcloud-go/hcloud/schema +# github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c +## explicit # github.com/imdario/mergo v0.3.13 ## explicit; go 1.13 github.com/imdario/mergo @@ -736,6 +742,8 @@ github.com/prometheus/prometheus/util/testutil github.com/prometheus/prometheus/util/treecache github.com/prometheus/prometheus/util/zeropool github.com/prometheus/prometheus/web/api/v1 +# github.com/russross/blackfriday/v2 v2.0.1 +## explicit # github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 ## explicit; go 1.17 github.com/scaleway/scaleway-sdk-go/api/baremetal/v1 @@ -753,9 +761,13 @@ github.com/scaleway/scaleway-sdk-go/scw github.com/scaleway/scaleway-sdk-go/validation # github.com/sergi/go-diff v1.1.0 ## explicit; go 1.12 +# github.com/shurcooL/sanitized_anchor_name v1.0.0 +## explicit # github.com/spf13/pflag v1.0.5 ## explicit; go 1.12 github.com/spf13/pflag +# github.com/square/certstrap v1.3.0 +## explicit; go 1.18 # github.com/stretchr/testify v1.8.2 ## explicit; go 1.13 github.com/stretchr/testify/assert @@ -763,6 +775,8 @@ github.com/stretchr/testify/require # github.com/tinylib/msgp v1.1.2 ## explicit github.com/tinylib/msgp/msgp +# github.com/urfave/cli v1.22.9 +## explicit; go 1.11 # github.com/vultr/govultr/v2 v2.17.2 ## explicit; go 1.17 github.com/vultr/govultr/v2 @@ -825,6 +839,8 @@ go.opentelemetry.io/otel/metric/internal/global # go.opentelemetry.io/otel/trace v1.14.0 ## explicit; go 1.18 go.opentelemetry.io/otel/trace +# go.step.sm/crypto v0.16.2 +## explicit; go 1.16 # go.uber.org/atomic v1.10.0 ## explicit; go 1.18 go.uber.org/atomic From eb528ba96613f2a48e6878b3ba8e58ae8a9cb878 Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Fri, 29 Sep 2023 16:36:36 +0400 Subject: [PATCH 02/10] Hide metric_name_new test --- go.mod | 8 ++++++++ go.sum | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/go.mod b/go.mod index 700f8956c..fefa5436e 100644 --- a/go.mod +++ b/go.mod @@ -39,6 +39,7 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a // indirect collectd.org v0.5.0 // indirect + filippo.io/edwards25519 v1.0.0-rc.1 // indirect github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect @@ -58,6 +59,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dennwc/varint v1.0.0 // indirect github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8 // indirect @@ -117,6 +119,7 @@ require ( github.com/hashicorp/nomad/api v0.0.0-20230418003350-3067191c5197 // indirect github.com/hashicorp/serf v0.10.1 // indirect github.com/hetznercloud/hcloud-go v1.42.0 // indirect + github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/influxdata/flux v0.194.1 // indirect github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6 // indirect @@ -155,11 +158,15 @@ require ( github.com/prometheus/alertmanager v0.25.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 // indirect github.com/sergi/go-diff v1.1.0 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/square/certstrap v1.3.0 // indirect github.com/stretchr/testify v1.8.2 // indirect github.com/tinylib/msgp v1.1.2 // indirect + github.com/urfave/cli v1.22.9 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/willf/bitset v1.1.10 // indirect github.com/xlab/treeprint v1.1.0 // indirect @@ -169,6 +176,7 @@ require ( go.opentelemetry.io/otel v1.14.0 // indirect go.opentelemetry.io/otel/metric v0.37.0 // indirect go.opentelemetry.io/otel/trace v1.14.0 // indirect + go.step.sm/crypto v0.16.2 // indirect go.uber.org/goleak v1.2.1 // indirect go.uber.org/multierr v1.7.0 // indirect golang.org/x/crypto v0.7.0 // indirect diff --git a/go.sum b/go.sum index f3d405293..06d0f9cb0 100644 --- a/go.sum +++ b/go.sum @@ -411,6 +411,7 @@ collectd.org v0.5.0 h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= collectd.org v0.5.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= +filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -455,8 +456,10 @@ github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy86 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= @@ -583,6 +586,8 @@ github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43/go.mod h1:eXthEFrGJvWH github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= @@ -1022,7 +1027,10 @@ github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfE github.com/hetznercloud/hcloud-go v1.39.0/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA= github.com/hetznercloud/hcloud-go v1.42.0 h1:Es/CDOForQN3nOOP5Vxh1N/YHjpCg386iYEX5zCgi+A= github.com/hetznercloud/hcloud-go v1.42.0/go.mod h1:YADL8AbmQYH0Eo+1lkuyoc8LutT0UeMvaKP47nNUb+Y= +github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0= +github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= @@ -1031,6 +1039,7 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= @@ -1179,8 +1188,10 @@ github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.1.1 h1:Bp6x9R1Wn16SIz3OfeDr0b7RnCG2OB66Y7PQyC/cvq4= github.com/mitchellh/copystructure v1.1.1/go.mod h1:EBArHfARyrSWO/+Wyr9zwEkc6XMFB9XyNgFNmRkZZU4= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -1195,8 +1206,10 @@ github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= @@ -1366,6 +1379,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= @@ -1382,7 +1397,10 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shoenig/test v0.6.0/go.mod h1:xYtyGBC5Q3kzCNyJg/SjgNpfAa2kvmgA0i5+lQso8x0= github.com/shoenig/test v0.6.3 h1:GVXWJFk9PiOjN0KoJ7VrJGH6uLPnqxR7/fe3HUPfE0c= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1392,6 +1410,7 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -1404,6 +1423,8 @@ github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY52 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -1412,6 +1433,7 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= github.com/square/certstrap v1.3.0 h1:N9P0ZRA+DjT8pq5fGDj0z3FjafRKnBDypP0QHpMlaAk= +github.com/square/certstrap v1.3.0/go.mod h1:wGZo9eE1B7WX2GKBn0htJ+B3OuRl2UsdCFySNooy9hU= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1446,6 +1468,8 @@ github.com/uber-go/tally v3.3.15+incompatible h1:9hLSgNBP28CjIaDmAuRTq9qV+UZY+9P github.com/uber/athenadriver v1.1.4 h1:k6k0RBeXjR7oZ8NO557MsRw3eX1cc/9B0GNx+W9eHiQ= github.com/uber/jaeger-client-go v2.28.0+incompatible h1:G4QSBfvPKvg5ZM2j9MrJFdfI5iSljY/WnJqOGFao6HI= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= +github.com/urfave/cli v1.22.9 h1:cv3/KhXGBGjEXLC4bH0sLuJ9BewaAbpk5oyMOveu4pw= +github.com/urfave/cli v1.22.9/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vertica/vertica-sql-go v1.1.1 h1:sZYijzBbvdAbJcl4cYlKjR+Eh/X1hGKzukWuhh8PjvI= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= @@ -1520,6 +1544,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.step.sm/crypto v0.16.2 h1:Pr9aazTwWBBZNogUsOqhOrPSdwAa9pPs+lMB602lnDA= +go.step.sm/crypto v0.16.2/go.mod h1:1WkTOTY+fOX/RY4TnZREp6trQAsBHRQ7nu6QJBiNQF8= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -1554,6 +1579,7 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= @@ -1563,6 +1589,7 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1835,6 +1862,7 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/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-20210915083310-ed5796bab164/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2270,6 +2298,7 @@ gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/telebot.v3 v3.1.2/go.mod h1:GJKwwWqp9nSkIVN51eRKU78aB5f5OnQuWdwiIZfPbko= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= From a194bd822c0865744c0ce81b864739b423ad2833 Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Fri, 29 Sep 2023 17:17:19 +0400 Subject: [PATCH 03/10] Update go version in github --- .github/workflows/tests.yml | 2 +- .github/workflows/vendoring.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 606533e47..2eb770f26 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.20.5' + go-version: '1.21.0' id: go - uses: actions/checkout@v2 - uses: actions/cache@v2 diff --git a/.github/workflows/vendoring.yml b/.github/workflows/vendoring.yml index e1aecad38..78119a09d 100644 --- a/.github/workflows/vendoring.yml +++ b/.github/workflows/vendoring.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.20.5' + go-version: '1.21.0' id: go - uses: actions/checkout@v2 - uses: actions/cache@v2 From 3597c14ca4b84b079e7e9c8c450b3d7ac34d77b2 Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Fri, 29 Sep 2023 17:43:57 +0400 Subject: [PATCH 04/10] some changes --- go.mod | 9 +----- go.sum | 31 ++----------------- .../metric-store/metric_store_test.go | 16 +++++----- .../metric-store/metric_store_test.go | 2 +- vendor/modules.txt | 18 ++--------- 5 files changed, 14 insertions(+), 62 deletions(-) diff --git a/go.mod b/go.mod index fefa5436e..6b6cbf3e1 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,6 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a // indirect collectd.org v0.5.0 // indirect - filippo.io/edwards25519 v1.0.0-rc.1 // indirect github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect @@ -59,7 +58,6 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dennwc/varint v1.0.0 // indirect github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8 // indirect @@ -119,7 +117,6 @@ require ( github.com/hashicorp/nomad/api v0.0.0-20230418003350-3067191c5197 // indirect github.com/hashicorp/serf v0.10.1 // indirect github.com/hetznercloud/hcloud-go v1.42.0 // indirect - github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/influxdata/flux v0.194.1 // indirect github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6 // indirect @@ -138,6 +135,7 @@ require ( github.com/mattn/go-isatty v0.0.17 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/miekg/dns v1.1.53 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -158,15 +156,11 @@ require ( github.com/prometheus/alertmanager v0.25.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect - github.com/russross/blackfriday/v2 v2.0.1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 // indirect github.com/sergi/go-diff v1.1.0 // indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/square/certstrap v1.3.0 // indirect github.com/stretchr/testify v1.8.2 // indirect github.com/tinylib/msgp v1.1.2 // indirect - github.com/urfave/cli v1.22.9 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/willf/bitset v1.1.10 // indirect github.com/xlab/treeprint v1.1.0 // indirect @@ -176,7 +170,6 @@ require ( go.opentelemetry.io/otel v1.14.0 // indirect go.opentelemetry.io/otel/metric v0.37.0 // indirect go.opentelemetry.io/otel/trace v1.14.0 // indirect - go.step.sm/crypto v0.16.2 // indirect go.uber.org/goleak v1.2.1 // indirect go.uber.org/multierr v1.7.0 // indirect golang.org/x/crypto v0.7.0 // indirect diff --git a/go.sum b/go.sum index 06d0f9cb0..f4e757f8f 100644 --- a/go.sum +++ b/go.sum @@ -411,7 +411,6 @@ collectd.org v0.5.0 h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= collectd.org v0.5.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= -filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -456,10 +455,8 @@ github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy86 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= @@ -586,8 +583,6 @@ github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43/go.mod h1:eXthEFrGJvWH github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= @@ -1027,10 +1022,7 @@ github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfE github.com/hetznercloud/hcloud-go v1.39.0/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA= github.com/hetznercloud/hcloud-go v1.42.0 h1:Es/CDOForQN3nOOP5Vxh1N/YHjpCg386iYEX5zCgi+A= github.com/hetznercloud/hcloud-go v1.42.0/go.mod h1:YADL8AbmQYH0Eo+1lkuyoc8LutT0UeMvaKP47nNUb+Y= -github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0= -github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= @@ -1039,7 +1031,6 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= @@ -1188,9 +1179,8 @@ github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= -github.com/mitchellh/copystructure v1.1.1 h1:Bp6x9R1Wn16SIz3OfeDr0b7RnCG2OB66Y7PQyC/cvq4= github.com/mitchellh/copystructure v1.1.1/go.mod h1:EBArHfARyrSWO/+Wyr9zwEkc6XMFB9XyNgFNmRkZZU4= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -1206,9 +1196,8 @@ github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= @@ -1379,8 +1368,6 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= @@ -1397,10 +1384,7 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shoenig/test v0.6.0/go.mod h1:xYtyGBC5Q3kzCNyJg/SjgNpfAa2kvmgA0i5+lQso8x0= github.com/shoenig/test v0.6.3 h1:GVXWJFk9PiOjN0KoJ7VrJGH6uLPnqxR7/fe3HUPfE0c= -github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1410,7 +1394,6 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -1423,8 +1406,6 @@ github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY52 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -1433,7 +1414,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= github.com/square/certstrap v1.3.0 h1:N9P0ZRA+DjT8pq5fGDj0z3FjafRKnBDypP0QHpMlaAk= -github.com/square/certstrap v1.3.0/go.mod h1:wGZo9eE1B7WX2GKBn0htJ+B3OuRl2UsdCFySNooy9hU= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1468,8 +1448,6 @@ github.com/uber-go/tally v3.3.15+incompatible h1:9hLSgNBP28CjIaDmAuRTq9qV+UZY+9P github.com/uber/athenadriver v1.1.4 h1:k6k0RBeXjR7oZ8NO557MsRw3eX1cc/9B0GNx+W9eHiQ= github.com/uber/jaeger-client-go v2.28.0+incompatible h1:G4QSBfvPKvg5ZM2j9MrJFdfI5iSljY/WnJqOGFao6HI= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= -github.com/urfave/cli v1.22.9 h1:cv3/KhXGBGjEXLC4bH0sLuJ9BewaAbpk5oyMOveu4pw= -github.com/urfave/cli v1.22.9/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vertica/vertica-sql-go v1.1.1 h1:sZYijzBbvdAbJcl4cYlKjR+Eh/X1hGKzukWuhh8PjvI= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= @@ -1544,7 +1522,6 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.step.sm/crypto v0.16.2 h1:Pr9aazTwWBBZNogUsOqhOrPSdwAa9pPs+lMB602lnDA= -go.step.sm/crypto v0.16.2/go.mod h1:1WkTOTY+fOX/RY4TnZREp6trQAsBHRQ7nu6QJBiNQF8= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -1579,7 +1556,6 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= @@ -1589,7 +1565,6 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1862,7 +1837,6 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/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-20210915083310-ed5796bab164/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2298,7 +2272,6 @@ gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/telebot.v3 v3.1.2/go.mod h1:GJKwwWqp9nSkIVN51eRKU78aB5f5OnQuWdwiIZfPbko= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= diff --git a/src/internal/acceptance/metric-store/metric_store_test.go b/src/internal/acceptance/metric-store/metric_store_test.go index fa8f2d8a5..bbb994f05 100644 --- a/src/internal/acceptance/metric-store/metric_store_test.go +++ b/src/internal/acceptance/metric-store/metric_store_test.go @@ -653,7 +653,7 @@ scrape_configs: }, ) - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 100) value, err := makeInstantQuery(tc, testInstantQuery{ Query: "metric_name", TimeInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -690,7 +690,7 @@ scrape_configs: }, }, ) - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 100) value, err := makeInstantQuery(tc, testInstantQuery{ Query: MAGIC_MEASUREMENT_PEER_NAME, TimeInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -736,7 +736,7 @@ scrape_configs: }, ) - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 100) value, err := makeInstantQuery(tc, testInstantQuery{ Query: "metric_name_for_node_0+metric_name_for_node_1", TimeInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -799,7 +799,7 @@ scrape_configs: }, ) - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 100) value, err := makeRangeQuery(tc, testRangeQuery{ Query: "metric_name", StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -850,7 +850,7 @@ scrape_configs: }, ) - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 100) value, err := makeRangeQuery(tc, testRangeQuery{ Query: "metric_name_for_node_1", StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds), @@ -909,7 +909,7 @@ scrape_configs: }, ) - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 100) value, err := makeRangeQuery(tc, testRangeQuery{ Query: "metric_name_for_node_0 + metric_name_for_node_1", StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -1046,7 +1046,7 @@ scrape_configs: }, ) - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 100) value, err := makeSeriesQuery(tc, testSeriesQuery{ Match: []string{"metric_name"}, StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds), @@ -1123,7 +1123,7 @@ scrape_configs: }, ) - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 100) value, err := makeSeriesQuery(tc, testSeriesQuery{ Match: []string{"metric_name_for_node_0", "metric_name_for_node_1"}, StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds), diff --git a/src/internal/metric-store/metric_store_test.go b/src/internal/metric-store/metric_store_test.go index 2d179d8a9..008b3066f 100644 --- a/src/internal/metric-store/metric_store_test.go +++ b/src/internal/metric-store/metric_store_test.go @@ -336,7 +336,7 @@ var _ = Describe("MetricStore", func() { {Timestamp: now.Add(2 * time.Second).UnixNano(), Name: MAGIC_MEASUREMENT_PEER_NAME}, }) tc.peer.Resume() - time.Sleep(time.Second) + time.Sleep(time.Millisecond * 500) Eventually(tc.peer.GetInternodePoints).Should(HaveLen(2)) Expect(tc.peer.GetInternodePoints()[0].Timestamp).To(Equal(now.Add(time.Second).UnixNano())) diff --git a/vendor/modules.txt b/vendor/modules.txt index f475fdb23..b26e23b17 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -22,8 +22,6 @@ code.cloudfoundry.org/rfc5424 code.cloudfoundry.org/tlsconfig # collectd.org v0.5.0 ## explicit -# filippo.io/edwards25519 v1.0.0-rc.1 -## explicit; go 1.17 # github.com/Azure/azure-sdk-for-go v65.0.0+incompatible ## explicit github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute @@ -134,8 +132,6 @@ github.com/cespare/xxhash/v2 github.com/cncf/xds/go/udpa/annotations github.com/cncf/xds/go/xds/annotations/v3 github.com/cncf/xds/go/xds/core/v3 -# github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d -## explicit; go 1.12 # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew @@ -421,8 +417,6 @@ github.com/hashicorp/serf/coordinate github.com/hetznercloud/hcloud-go/hcloud github.com/hetznercloud/hcloud-go/hcloud/internal/instrumentation github.com/hetznercloud/hcloud-go/hcloud/schema -# github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c -## explicit # github.com/imdario/mergo v0.3.13 ## explicit; go 1.13 github.com/imdario/mergo @@ -525,6 +519,8 @@ github.com/matttproud/golang_protobuf_extensions/pbutil # github.com/miekg/dns v1.1.53 ## explicit; go 1.19 github.com/miekg/dns +# github.com/mitchellh/copystructure v1.2.0 +## explicit; go 1.15 # github.com/mitchellh/go-homedir v1.1.0 ## explicit github.com/mitchellh/go-homedir @@ -742,8 +738,6 @@ github.com/prometheus/prometheus/util/testutil github.com/prometheus/prometheus/util/treecache github.com/prometheus/prometheus/util/zeropool github.com/prometheus/prometheus/web/api/v1 -# github.com/russross/blackfriday/v2 v2.0.1 -## explicit # github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 ## explicit; go 1.17 github.com/scaleway/scaleway-sdk-go/api/baremetal/v1 @@ -761,13 +755,9 @@ github.com/scaleway/scaleway-sdk-go/scw github.com/scaleway/scaleway-sdk-go/validation # github.com/sergi/go-diff v1.1.0 ## explicit; go 1.12 -# github.com/shurcooL/sanitized_anchor_name v1.0.0 -## explicit # github.com/spf13/pflag v1.0.5 ## explicit; go 1.12 github.com/spf13/pflag -# github.com/square/certstrap v1.3.0 -## explicit; go 1.18 # github.com/stretchr/testify v1.8.2 ## explicit; go 1.13 github.com/stretchr/testify/assert @@ -775,8 +765,6 @@ github.com/stretchr/testify/require # github.com/tinylib/msgp v1.1.2 ## explicit github.com/tinylib/msgp/msgp -# github.com/urfave/cli v1.22.9 -## explicit; go 1.11 # github.com/vultr/govultr/v2 v2.17.2 ## explicit; go 1.17 github.com/vultr/govultr/v2 @@ -839,8 +827,6 @@ go.opentelemetry.io/otel/metric/internal/global # go.opentelemetry.io/otel/trace v1.14.0 ## explicit; go 1.18 go.opentelemetry.io/otel/trace -# go.step.sm/crypto v0.16.2 -## explicit; go 1.16 # go.uber.org/atomic v1.10.0 ## explicit; go 1.18 go.uber.org/atomic From b591bcffa7ea2a0a401bf9969251cb1e51f29360 Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Mon, 2 Oct 2023 11:50:32 +0400 Subject: [PATCH 05/10] Add sleep deletes shards with old data when Metric Store starts --- src/internal/acceptance/metric-store/metric_store_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/internal/acceptance/metric-store/metric_store_test.go b/src/internal/acceptance/metric-store/metric_store_test.go index bbb994f05..8374c8ef5 100644 --- a/src/internal/acceptance/metric-store/metric_store_test.go +++ b/src/internal/acceptance/metric-store/metric_store_test.go @@ -443,7 +443,7 @@ scrape_configs: } Context("with a single node", func() { - It("deletes shards with old data when Metric Store starts", func() { + FIt("deletes shards with old data when Metric Store starts", func() { tc, cleanup := setup(1) defer cleanup() @@ -480,6 +480,8 @@ scrape_configs: startNode(tc, 0) + time.Sleep(time.Second) + Eventually(func() error { _, _, err := tc.localEgressClient.LabelValues(context.Background(), model.MetricNameLabel, result, minTime, maxTime) From f1b9258e00935aae8815e6bc2fe8a577e16224d9 Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Mon, 2 Oct 2023 11:50:43 +0400 Subject: [PATCH 06/10] Add sleep deletes shards with old data when Metric Store starts --- src/internal/acceptance/metric-store/metric_store_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internal/acceptance/metric-store/metric_store_test.go b/src/internal/acceptance/metric-store/metric_store_test.go index 8374c8ef5..f54ffcf01 100644 --- a/src/internal/acceptance/metric-store/metric_store_test.go +++ b/src/internal/acceptance/metric-store/metric_store_test.go @@ -443,7 +443,7 @@ scrape_configs: } Context("with a single node", func() { - FIt("deletes shards with old data when Metric Store starts", func() { + It("deletes shards with old data when Metric Store starts", func() { tc, cleanup := setup(1) defer cleanup() From 21be7b89cfc54fd9710e58483bf1142b7e1a4d9c Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Mon, 2 Oct 2023 13:07:18 +0400 Subject: [PATCH 07/10] add timeout --- scripts/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test b/scripts/test index 4e569a32e..b7970197c 100755 --- a/scripts/test +++ b/scripts/test @@ -105,7 +105,7 @@ function run_unit { } function run_norace() { - TEST_OPTIONS="-ginkgo.randomizeAllSpecs -ginkgo.slowSpecThreshold 20" + TEST_OPTIONS="-ginkgo.randomizeAllSpecs -ginkgo.slowSpecThreshold 20 -timeout 99999s" tests=$(go list -mod=vendor ./...) From 3b4b0a7634126df10a088c0e3ef08a1e9ee2a84f Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Mon, 2 Oct 2023 15:04:43 +0400 Subject: [PATCH 08/10] Increase attempts for test --- src/internal/acceptance/metric-store/metric_store_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/internal/acceptance/metric-store/metric_store_test.go b/src/internal/acceptance/metric-store/metric_store_test.go index f54ffcf01..d5094ffc6 100644 --- a/src/internal/acceptance/metric-store/metric_store_test.go +++ b/src/internal/acceptance/metric-store/metric_store_test.go @@ -28,7 +28,6 @@ import ( "github.com/cloudfoundry/metric-store-release/src/pkg/rpc" "github.com/cloudfoundry/metric-store-release/src/pkg/rulesclient" . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" prom_api_client "github.com/prometheus/client_golang/api" prom_versioned_api_client "github.com/prometheus/client_golang/api/prometheus/v1" @@ -480,13 +479,11 @@ scrape_configs: startNode(tc, 0) - time.Sleep(time.Second) - Eventually(func() error { _, _, err := tc.localEgressClient.LabelValues(context.Background(), model.MetricNameLabel, result, minTime, maxTime) return err - }, 15).Should(Succeed()) + }, 55).Should(Succeed()) Eventually(func() model.LabelValues { value, _, err := tc.localEgressClient.LabelValues(context.Background(), model.MetricNameLabel, From 06a010ef239c32b6df4962fe875485fb312dfbfd Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Mon, 2 Oct 2023 15:16:48 +0400 Subject: [PATCH 09/10] Revert --- scripts/test | 2 +- src/internal/metric-store/metric_store_test.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/test b/scripts/test index b7970197c..4e569a32e 100755 --- a/scripts/test +++ b/scripts/test @@ -105,7 +105,7 @@ function run_unit { } function run_norace() { - TEST_OPTIONS="-ginkgo.randomizeAllSpecs -ginkgo.slowSpecThreshold 20 -timeout 99999s" + TEST_OPTIONS="-ginkgo.randomizeAllSpecs -ginkgo.slowSpecThreshold 20" tests=$(go list -mod=vendor ./...) diff --git a/src/internal/metric-store/metric_store_test.go b/src/internal/metric-store/metric_store_test.go index 008b3066f..221b02bdd 100644 --- a/src/internal/metric-store/metric_store_test.go +++ b/src/internal/metric-store/metric_store_test.go @@ -26,8 +26,6 @@ import ( "github.com/influxdata/influxql" . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" - . "github.com/onsi/gomega" prom_api_client "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/client_golang/prometheus" config_util "github.com/prometheus/common/config" From 272a5d3d4552f5114b597c9b690da7963eaf69dd Mon Sep 17 00:00:00 2001 From: hmanukyan Date: Mon, 2 Oct 2023 15:22:47 +0400 Subject: [PATCH 10/10] Fix changres --- .../acceptance/metric-store/metric_store_test.go | 16 ++++++++-------- src/internal/metric-store/metric_store_test.go | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/internal/acceptance/metric-store/metric_store_test.go b/src/internal/acceptance/metric-store/metric_store_test.go index d5094ffc6..01a8cd3c0 100644 --- a/src/internal/acceptance/metric-store/metric_store_test.go +++ b/src/internal/acceptance/metric-store/metric_store_test.go @@ -652,7 +652,7 @@ scrape_configs: }, ) - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Second) value, err := makeInstantQuery(tc, testInstantQuery{ Query: "metric_name", TimeInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -689,7 +689,7 @@ scrape_configs: }, }, ) - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Second) value, err := makeInstantQuery(tc, testInstantQuery{ Query: MAGIC_MEASUREMENT_PEER_NAME, TimeInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -735,7 +735,7 @@ scrape_configs: }, ) - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Second) value, err := makeInstantQuery(tc, testInstantQuery{ Query: "metric_name_for_node_0+metric_name_for_node_1", TimeInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -798,7 +798,7 @@ scrape_configs: }, ) - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Second) value, err := makeRangeQuery(tc, testRangeQuery{ Query: "metric_name", StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -849,7 +849,7 @@ scrape_configs: }, ) - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Second) value, err := makeRangeQuery(tc, testRangeQuery{ Query: "metric_name_for_node_1", StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds), @@ -908,7 +908,7 @@ scrape_configs: }, ) - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Second) value, err := makeRangeQuery(tc, testRangeQuery{ Query: "metric_name_for_node_0 + metric_name_for_node_1", StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds + 1000), @@ -1045,7 +1045,7 @@ scrape_configs: }, ) - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Second) value, err := makeSeriesQuery(tc, testSeriesQuery{ Match: []string{"metric_name"}, StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds), @@ -1122,7 +1122,7 @@ scrape_configs: }, ) - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Second) value, err := makeSeriesQuery(tc, testSeriesQuery{ Match: []string{"metric_name_for_node_0", "metric_name_for_node_1"}, StartInSeconds: transform.MillisecondsToString(firstTimeMilliseconds), diff --git a/src/internal/metric-store/metric_store_test.go b/src/internal/metric-store/metric_store_test.go index 221b02bdd..2d179d8a9 100644 --- a/src/internal/metric-store/metric_store_test.go +++ b/src/internal/metric-store/metric_store_test.go @@ -26,6 +26,8 @@ import ( "github.com/influxdata/influxql" . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/gomega" prom_api_client "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/client_golang/prometheus" config_util "github.com/prometheus/common/config" @@ -334,7 +336,7 @@ var _ = Describe("MetricStore", func() { {Timestamp: now.Add(2 * time.Second).UnixNano(), Name: MAGIC_MEASUREMENT_PEER_NAME}, }) tc.peer.Resume() - time.Sleep(time.Millisecond * 500) + time.Sleep(time.Second) Eventually(tc.peer.GetInternodePoints).Should(HaveLen(2)) Expect(tc.peer.GetInternodePoints()[0].Timestamp).To(Equal(now.Add(time.Second).UnixNano()))