From fda8863c2eef7cbaeabfa0f3f881aab970754048 Mon Sep 17 00:00:00 2001 From: Cody Bruno Date: Wed, 29 Jun 2022 14:12:11 -0400 Subject: [PATCH 1/2] Update whois to v1.12.5 and whois-parser to v1.23.1 --- go.mod | 12 ++++++------ go.sum | 22 ++++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 1677a23..0f53656 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de - github.com/likexian/whois-go v1.7.2 - github.com/likexian/whois-parser-go v1.15.1 + github.com/likexian/whois v1.12.5 + github.com/likexian/whois-parser v1.23.1 github.com/sethvargo/go-retry v0.1.0 github.com/turbot/steampipe-plugin-sdk/v3 v3.1.0 ) @@ -29,7 +29,7 @@ require ( github.com/hashicorp/hcl/v2 v2.11.1 // indirect github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect github.com/iancoleman/strcase v0.2.0 // indirect - github.com/likexian/gokit v0.23.3 // indirect + github.com/likexian/gokit v0.25.8 // indirect github.com/mattn/go-colorable v0.1.4 // indirect github.com/mattn/go-isatty v0.0.10 // indirect github.com/mattn/go-runewidth v0.0.10 // indirect @@ -44,9 +44,9 @@ require ( github.com/tkrajina/go-reflector v0.5.4 // indirect github.com/turbot/go-kit v0.3.0 // indirect github.com/zclconf/go-cty v1.10.0 // indirect - golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect - golang.org/x/sys v0.0.0-20211102061401-a2f17f7b995c // indirect - golang.org/x/text v0.3.5 // indirect + golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/text v0.3.7 // indirect google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect google.golang.org/grpc v1.44.0 // indirect google.golang.org/protobuf v1.28.0 // indirect diff --git a/go.sum b/go.sum index c820ddd..8321f1f 100644 --- a/go.sum +++ b/go.sum @@ -102,12 +102,12 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= -github.com/likexian/gokit v0.23.3 h1:1klD04/osK9b16Q9sNEChOOim6oDa14fEuv1JL8yzU4= -github.com/likexian/gokit v0.23.3/go.mod h1:/asXq96N3H5gVxyfyNuQO7HFoSorzcU+ZMEImyBGZB8= -github.com/likexian/whois-go v1.7.2 h1:a8qrwkswABg6iaOmpsmeLEUsYg99EP99QzSGjZY9MWg= -github.com/likexian/whois-go v1.7.2/go.mod h1:jSJV7lvd6M6XuPdeMbKNTKBtV31ApQ3WVLz9R2Haqgw= -github.com/likexian/whois-parser-go v1.15.1 h1:IqGTdKYHxi+c7zNR6GR4s1HUKD+C/pFDT6yeyEfaAUQ= -github.com/likexian/whois-parser-go v1.15.1/go.mod h1:zbLK4/FJW/zO2K5wZmHe+Fu6q5JygxJg+cQkYPA3nNI= +github.com/likexian/gokit v0.25.8 h1:YL5yxnUxVMmJ5PRrMw3Dgr9gNidjXitdPs0/69T4PX0= +github.com/likexian/gokit v0.25.8/go.mod h1:oDDqJUcnnF9uAKuw54F7s6oEG+OJ7eallfDW2dq0A/o= +github.com/likexian/whois v1.12.5 h1:8T0M13RUIx3nYVrn4lnInUfFs2/BUvmQShHgarDF4O0= +github.com/likexian/whois v1.12.5/go.mod h1:SfdfmB72mSdrC/8eLjYkeaEJp9t1MPAgp0ebCzZfYXw= +github.com/likexian/whois-parser v1.23.1 h1:q9W1rMhLIOHc/Jd8XL6bZowwqzbXSyBmtf/IO6IRywI= +github.com/likexian/whois-parser v1.23.1/go.mod h1:umJD+xOa1wehGIjKBlRq3vCpgpQyzW5bCCk5r2zuerI= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -181,8 +181,9 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20220531201128-c960675eff93 h1:MYimHLfoXEpOhqd/zgoA/uoXzHB86AEky4LAx5ij9xA= +golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -197,13 +198,14 @@ golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20211102061401-a2f17f7b995c h1:QOfDMdrf/UwlVR0UBq2Mpr58UzNtvgJRXA4BgPfFACs= golang.org/x/sys v0.0.0-20211102061401-a2f17f7b995c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= From 74d64ceb289255aa7dc0ceaac797cee260ce9d28 Mon Sep 17 00:00:00 2001 From: Cody Bruno Date: Tue, 5 Jul 2022 11:41:24 -0400 Subject: [PATCH 2/2] Update whois-parser to v1.24.0 to fix .dk queries --- go.mod | 4 ++-- go.sum | 8 ++++---- whois/table_whois_domain.go | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 0f53656..d699873 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de github.com/likexian/whois v1.12.5 - github.com/likexian/whois-parser v1.23.1 + github.com/likexian/whois-parser v1.24.0 github.com/sethvargo/go-retry v0.1.0 github.com/turbot/steampipe-plugin-sdk/v3 v3.1.0 ) @@ -44,7 +44,7 @@ require ( github.com/tkrajina/go-reflector v0.5.4 // indirect github.com/turbot/go-kit v0.3.0 // indirect github.com/zclconf/go-cty v1.10.0 // indirect - golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect + golang.org/x/net v0.0.0-20220630215102-69896b714898 // indirect golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect diff --git a/go.sum b/go.sum index 8321f1f..4eebed6 100644 --- a/go.sum +++ b/go.sum @@ -106,8 +106,8 @@ github.com/likexian/gokit v0.25.8 h1:YL5yxnUxVMmJ5PRrMw3Dgr9gNidjXitdPs0/69T4PX0 github.com/likexian/gokit v0.25.8/go.mod h1:oDDqJUcnnF9uAKuw54F7s6oEG+OJ7eallfDW2dq0A/o= github.com/likexian/whois v1.12.5 h1:8T0M13RUIx3nYVrn4lnInUfFs2/BUvmQShHgarDF4O0= github.com/likexian/whois v1.12.5/go.mod h1:SfdfmB72mSdrC/8eLjYkeaEJp9t1MPAgp0ebCzZfYXw= -github.com/likexian/whois-parser v1.23.1 h1:q9W1rMhLIOHc/Jd8XL6bZowwqzbXSyBmtf/IO6IRywI= -github.com/likexian/whois-parser v1.23.1/go.mod h1:umJD+xOa1wehGIjKBlRq3vCpgpQyzW5bCCk5r2zuerI= +github.com/likexian/whois-parser v1.24.0 h1:jfC//AgBQvUaaxGPiG3Xo7p/yOEALAYxrQgxLcLFXXk= +github.com/likexian/whois-parser v1.24.0/go.mod h1:mDyeVdEg60cNU6VhXWjyvPc6oTHkigaNWIWZCiQ7kQk= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -182,8 +182,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20220531201128-c960675eff93 h1:MYimHLfoXEpOhqd/zgoA/uoXzHB86AEky4LAx5ij9xA= -golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220630215102-69896b714898 h1:K7wO6V1IrczY9QOQ2WkVpw4JQSwCd52UsxVEirZUfiw= +golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/whois/table_whois_domain.go b/whois/table_whois_domain.go index c9769d6..58f70b3 100644 --- a/whois/table_whois_domain.go +++ b/whois/table_whois_domain.go @@ -6,8 +6,8 @@ import ( "time" "github.com/araddon/dateparse" - "github.com/likexian/whois-go" - whoisparser "github.com/likexian/whois-parser-go" + "github.com/likexian/whois" + whoisparser "github.com/likexian/whois-parser" "github.com/sethvargo/go-retry" "github.com/turbot/steampipe-plugin-sdk/v3/grpc/proto" @@ -96,11 +96,11 @@ func listDomain(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) switch err { case nil: break - case whoisparser.ErrDomainNotFound: + case whoisparser.ErrNotFoundDomain: plugin.Logger(ctx).Warn("whois_domain.getDomain", "ErrDomainNotFound", err) plugin.Logger(ctx).Debug("whois_domain.getDomain", "domain", domain) return nil, nil - case whoisparser.ErrDomainInvalidData: + case whoisparser.ErrDomainDataInvalid: plugin.Logger(ctx).Warn("whois_domain.getDomain", "ErrDomainInvalidData", err) plugin.Logger(ctx).Debug("whois_domain.getDomain", "whoisRaw", whoisRaw) return nil, nil