Skip to content

Commit 9e59e44

Browse files
kristinapathakkristinapathak
authored
Small fixes (#596)
* updated fanout tests to include api version path changes * bumped ancla, argus and fixed client creation * deprecated webhook/aws package * prep for release
1 parent 74173f6 commit 9e59e44

File tree

9 files changed

+44
-492
lines changed

9 files changed

+44
-492
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [Unreleased]
88

9+
## [v2.0.5]
10+
- Deprecated webhook/aws package, which also won't work with go 1.18+. [#596](https://github.com/xmidt-org/webpa-common/pull/596)
11+
- Bumped argus to v0.9.0. [#596](https://github.com/xmidt-org/webpa-common/pull/596)
12+
913
## [v2.0.4]
1014
- Enforce cipher suites for TLS versions less than 1.3 that are not vulnerable to SWEET32
1115

@@ -226,7 +230,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
226230
- The first official release. We will be better about documenting changes
227231
moving forward.
228232

229-
[Unreleased]: https://github.com/xmidt-org/webpa-common/compare/v2.0.4...HEAD
233+
[Unreleased]: https://github.com/xmidt-org/webpa-common/compare/v2.0.5...HEAD
234+
[v2.0.5]: https://github.com/xmidt-org/webpa-common/compare/v2.0.4...v2.0.5
230235
[v2.0.4]: https://github.com/xmidt-org/webpa-common/compare/v2.0.3...v2.0.4
231236
[v2.0.3]: https://github.com/xmidt-org/webpa-common/compare/v2.0.2...v2.0.3
232237
[v2.0.2]: https://github.com/xmidt-org/webpa-common/compare/v2.0.1...v2.0.2

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.13
44

55
require (
66
github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2
7-
github.com/aws/aws-sdk-go v1.31.6
7+
github.com/aws/aws-sdk-go v1.43.35
88
github.com/billhathaway/consistentHash v0.0.0-20140718022140-addea16d2229
99
github.com/c9s/goprocinfo v0.0.0-20151025191153-19cb9f127a9c
1010
github.com/davecgh/go-spew v1.1.1
@@ -26,7 +26,7 @@ require (
2626
github.com/spf13/viper v1.9.0
2727
github.com/stretchr/testify v1.7.0
2828
github.com/ugorji/go/codec v1.1.7
29-
github.com/xmidt-org/argus v0.6.0
29+
github.com/xmidt-org/argus v0.9.0
3030
github.com/xmidt-org/bascule v0.10.2
3131
github.com/xmidt-org/candlelight v0.0.5
3232
github.com/xmidt-org/themis v0.4.7

‎go.sum

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQ
9696
github.com/aws/aws-sdk-go v1.8.12/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=
9797
github.com/aws/aws-sdk-go v1.25.41/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
9898
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
99-
github.com/aws/aws-sdk-go v1.31.6 h1:nKjQbpXhdImctBh1e0iLg9iQW/X297LPPuY/9f92R2k=
10099
github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
100+
github.com/aws/aws-sdk-go v1.43.35 h1:Ko1HiU7c7C8cZ5nvwp4GoLl08nmdQtZVZHxhrD8icwk=
101+
github.com/aws/aws-sdk-go v1.43.35/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
101102
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
102103
github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg=
103104
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -441,8 +442,11 @@ github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW
441442
github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
442443
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4=
443444
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
444-
github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
445445
github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
446+
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
447+
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
448+
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
449+
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
446450
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
447451
github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA=
448452
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
@@ -741,8 +745,8 @@ github.com/xmidt-org/argus v0.3.9/go.mod h1:mDFS44R704gl9Fif3gkfAyvnZa53SvMepmXj
741745
github.com/xmidt-org/argus v0.3.10-0.20201105190057-402fede05764/go.mod h1:lnMCVB/i0gOlUOOd2WbzDDgzTEqP5TipzQ8xKIw+N/I=
742746
github.com/xmidt-org/argus v0.3.10-0.20201217204602-66f69b12c498/go.mod h1:lnMCVB/i0gOlUOOd2WbzDDgzTEqP5TipzQ8xKIw+N/I=
743747
github.com/xmidt-org/argus v0.3.12/go.mod h1:T0oHbqQ1SAjE616Q9f1p+7nsmuvmHNoC0zAIUpUiFuE=
744-
github.com/xmidt-org/argus v0.6.0 h1:cjAeyILtyGSvUv02e4wEpUdYtgd1EYoFtwfjC5JroQ8=
745-
github.com/xmidt-org/argus v0.6.0/go.mod h1:IRVJlpd8JsoWXhys8o6tFU+dZi9Q6YWTX1Wn3AkyEkI=
748+
github.com/xmidt-org/argus v0.9.0 h1:vP2Bh5J3YpqQjyP23E6BnW9Qn2S69ZBfOq/OORaLPd8=
749+
github.com/xmidt-org/argus v0.9.0/go.mod h1:qa9zafyQDJDcL6lxD2hniA+D0oM27GTa5uXxO/UDRMA=
746750
github.com/xmidt-org/arrange v0.1.9/go.mod h1:PRA8iEZ11L93NsEkDP56x1mZyfDcWxzDULgHj56TaEk=
747751
github.com/xmidt-org/arrange v0.3.0 h1:YNO+1lufCx3EeN17xuSRMC1sci9y9rzZVZ+TkWwq9QE=
748752
github.com/xmidt-org/arrange v0.3.0/go.mod h1:pCHeb93OFA0QnEJ//Mmly7QqUt7y/w3xllK0VQ3Bigo=
@@ -950,8 +954,9 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
950954
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
951955
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
952956
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
953-
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 h1:a8jGStKg0XqKDlKqjLrXn0ioF5MH36pT7Z0BRTqLhbk=
954957
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
958+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
959+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
955960
golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
956961
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
957962
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1056,9 +1061,11 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
10561061
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10571062
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10581063
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1059-
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
10601064
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1065+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
1066+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10611067
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
1068+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
10621069
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10631070
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10641071
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1067,8 +1074,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
10671074
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10681075
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10691076
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
1070-
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
10711077
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
1078+
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
1079+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
10721080
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10731081
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10741082
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎service/consul/datacenterWatch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func newDatacenterWatcher(logger log.Logger, environment Environment, options Op
7676
m := &chrysom.Measures{
7777
Polls: environment.Provider().NewCounterVec(chrysom.PollCounter),
7878
}
79-
basic, err := chrysom.NewBasicClient(options.Chrysom.BasicClientConfig, getLogger, logging.WithLogger)
79+
basic, err := chrysom.NewBasicClient(options.Chrysom.BasicClientConfig, getLogger)
8080
if err != nil {
8181
return nil, fmt.Errorf("failed to create chrysom basic client: %v", err)
8282
}

‎webhook/aws/doc.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
Package aws provides functionality for webhook management using AWS. This
3+
package will not work with go 1.18+ due to its dependency on SHA1. For further
4+
information, please see https://github.com/golang/go/issues/41682.
5+
6+
Deprecated: xmetrics is no longer planned to be used by future WebPA/XMiDT
7+
services.
8+
9+
This package is frozen and no new functionality will be added.
10+
*/
11+
package aws

‎webhook/aws/signature_validation.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ func NewSNSValidator() SNSValidator {
118118
return NewValidator(nil)
119119
}
120120

121-
// Validator validates an Amazon SNS message signature
121+
// Validator validates an Amazon SNS message signature. NOTE: This will not work
122+
// with go 1.18+, which no longer allows SHA1.
122123
func (v *Validator) Validate(msg *SNSMessage) (ok bool, err error) {
123124
var decodedSignature []byte
124125
if decodedSignature, err = base64Decode(msg); err != nil {
@@ -140,6 +141,7 @@ func (v *Validator) Validate(msg *SNSMessage) (ok bool, err error) {
140141
return
141142
}
142143

144+
// NOTE: This will not work with go 1.18+, which no longer allows SHA1.
143145
if err = cert.CheckSignature(x509.SHA1WithRSA, []byte(formatedSignature), decodedSignature); err != nil {
144146
// signature verification failed
145147
return

‎webhook/aws/signature_validation_test.go

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import (
1111
"encoding/base64"
1212
"encoding/pem"
1313
"fmt"
14-
"github.com/stretchr/testify/assert"
1514
"io/ioutil"
1615
"math/big"
1716
"net/http"
1817
"net/http/httptest"
1918
"net/url"
2019
"testing"
2120
"time"
21+
22+
"github.com/stretchr/testify/assert"
2223
)
2324

2425
func testSNSMessage(scURL string) (*SNSMessage, *SNSMessage) {
@@ -272,34 +273,3 @@ func Test_formatSignature(t *testing.T) {
272273
assert.NotNil(fs1)
273274
assert.NotNil(fs2)
274275
}
275-
276-
func Test_Validate(t *testing.T) {
277-
assert := assert.New(t)
278-
279-
pemkey, server, snsMsg, err := testCreateEnv()
280-
if server != nil {
281-
defer server.Close()
282-
}
283-
assert.Nil(err)
284-
285-
client, err := testClient(server.URL, pemkey)
286-
assert.Nil(err)
287-
288-
v := NewValidator(client)
289-
290-
okGood, errGood := v.Validate(snsMsg["noti-good"])
291-
okBad, errBad := v.Validate(snsMsg["noti-bad"])
292-
293-
assert.True(okGood)
294-
assert.Nil(errGood)
295-
assert.False(okBad)
296-
assert.NotNil(errBad)
297-
298-
okGood, errGood = v.Validate(snsMsg["conf-good"])
299-
okBad, errBad = v.Validate(snsMsg["conf-bad"])
300-
301-
assert.True(okGood)
302-
assert.Nil(errGood)
303-
assert.False(okBad)
304-
assert.NotNil(errBad)
305-
}

0 commit comments

Comments
 (0)