From 7b490ba773dab80a748dcd1c4c089f194fbaf8eb Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 29 Jan 2024 16:23:02 -0800 Subject: [PATCH] reverting go.mod --- .gitprecommit/codespell_ignore_words.txt | 1 + Makefile | 2 +- go.mod | 6 +++--- go.sum | 11 ++++++----- pkg/model/network.go | 13 ++++++++----- pkg/model/network_test.go | 3 ++- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitprecommit/codespell_ignore_words.txt b/.gitprecommit/codespell_ignore_words.txt index 5d7a03c545..aa2380b541 100644 --- a/.gitprecommit/codespell_ignore_words.txt +++ b/.gitprecommit/codespell_ignore_words.txt @@ -247,6 +247,7 @@ quic quickstart rabbitmq rawoutput +rcur rdbms reenqueuing rego diff --git a/Makefile b/Makefile index ca52a3c3bb..c95961657d 100644 --- a/Makefile +++ b/Makefile @@ -186,7 +186,7 @@ build-bacalhau: ${BINARY_PATH} CMD_FILES := $(shell bash -c 'comm -23 <(git ls-files cmd) <(git ls-files cmd --deleted)') PKG_FILES := $(shell bash -c 'comm -23 <(git ls-files pkg) <(git ls-files pkg --deleted)') - + ${BINARY_PATH}: ${CMD_FILES} ${PKG_FILES} ${WEB_BUILD_FILES} ${WEB_GO_FILES} main.go ${GO} build -ldflags "${BUILD_FLAGS}" -trimpath -o ${BINARY_PATH} . diff --git a/go.mod b/go.mod index d7bf29a6d2..7027a857fb 100644 --- a/go.mod +++ b/go.mod @@ -83,8 +83,8 @@ require ( go.uber.org/mock v0.4.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 - golang.org/x/crypto v0.17.0 - golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea + golang.org/x/crypto v0.18.0 + golang.org/x/exp v0.0.0-20230321023759-10a507213a29 gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 k8s.io/apimachinery v0.29.0 k8s.io/kubectl v0.29.0 @@ -210,7 +210,7 @@ require ( github.com/elastic/gosigar v0.14.2 // indirect github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302 // indirect github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 // indirect - github.com/fatih/color v1.16.0 // indirect + github.com/fatih/color v1.15.0 // indirect github.com/flynn/noise v1.0.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect diff --git a/go.sum b/go.sum index 3d05661347..c5045d1b6b 100644 --- a/go.sum +++ b/go.sum @@ -280,8 +280,8 @@ github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 h1:BBso6MBKW github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5/go.mod h1:JpoxHjuQauoxiFMl1ie8Xc/7TfLuMZ5eOCONd1sUBHg= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= @@ -1343,8 +1343,9 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1355,8 +1356,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4= -golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/pkg/model/network.go b/pkg/model/network.go index 16a03c8e3a..5706eeaa4c 100644 --- a/pkg/model/network.go +++ b/pkg/model/network.go @@ -150,24 +150,27 @@ func matchDomain(left, right string) (diff int) { lcur, rcur := len(lefts)-1, len(rights)-1 for lcur >= 0 && rcur >= 0 { // If neither is a blank, these components need to match. - if lefts[lcur] != wildcard && rights[rcur] != wildcard { - if diff = strings.Compare(lefts[lcur], rights[rcur]); diff != 0 { + l := lefts[lcur] + r := rights[rcur] + + if l != wildcard && r != wildcard { + if diff = strings.Compare(l, r); diff != 0 { return diff } } // If both are blanks, they match. - if lefts[lcur] == wildcard || rights[rcur] == wildcard { + if l == wildcard || r == wildcard { break } // Blank means we are matching any subdomains, so only the rest of // the domain needs to match for this to work. - if lefts[lcur] != wildcard { + if l != wildcard { lcur -= 1 } - if rights[rcur] != wildcard { + if r != wildcard { rcur -= 1 } } diff --git a/pkg/model/network_test.go b/pkg/model/network_test.go index b5ea47d839..ad69eeb7a9 100644 --- a/pkg/model/network_test.go +++ b/pkg/model/network_test.go @@ -71,7 +71,7 @@ func TestDomainSet(t *testing.T) { []string{"foo.com", "bar.com"}, }, { - []string{"y.foo.com", ".foo.com", "x.foo.com"}, + []string{".foo.com", "x.foo.com", "y.foo.com"}, []string{".foo.com"}, }, { @@ -99,6 +99,7 @@ func TestDomainMatching(t *testing.T) { {require.Equal, " .foo.com", ".foo.com"}, {require.Equal, "x.foo.com", ".foo.com"}, {require.Equal, "y.x.foo.com", ".foo.com"}, + {require.NotEqual, "x.foo.com", "y.foo.com"}, {require.NotEqual, "x.foo.com", "foo.com"}, {require.NotEqual, "foo.com", "x.foo.com"}, {require.NotEqual, "bar.com", "foo.com"},