8000 Merge branch 'main' into feature/server-token-validation · nginx/kubernetes-ingress@614f225 · GitHub
[go: up one dir, main page]
Skip to content

Commit 614f225

Browse files
author
“shaun-nx”
committed
Merge branch 'main' into feature/server-token-validation
2 parents b213740 + 33c67d6 commit 614f225

File tree

3 files changed

+78
-37
lines changed

3 files changed

+78
-37
lines changed

‎go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/nginxinc/kubernetes-ingress
33
go 1.18
44

55
require (
6-
github.com/aws/aws-sdk-go-v2/config v1.15.9
7-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.5
6+
github.com/aws/aws-sdk-go-v2/config v1.15.10
7+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.6
88
github.com/cert-manager/cert-manager v1.8.1-0.20220505101928-4ec33298a243
99
github.com/golang-jwt/jwt/v4 v4.4.1
1010
github.com/golang/glog v1.0.0
@@ -28,16 +28,16 @@ require (
2828
github.com/Microsoft/go-winio v0.5.2 // indirect
2929
github.com/PuerkitoBio/purell v1.1.1 // indirect
3030
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
31-
github.com/aws/aws-sdk-go-v2 v1.16.4 // indirect
32-
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 // indirect
33-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 // indirect
34-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 // indirect
35-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 // indirect
36-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 // indirect
39-
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 // indirect
40-
github.com/aws/smithy-go v1.11.2 // indirect
31+
github.com/aws/aws-sdk-go-v2 v1.16.5 // indirect
32+
github.com/aws/aws-sdk-go-v2/credentials v1.12.5 // indirect
33+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.6 // indirect
34+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.12 // indirect
35+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.6 // indirect
36+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.13 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.6 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.8 // indirect
39+
github.com/aws/aws-sdk-go-v2/service/sts v1.16.7 // indirect
40+
github.com/aws/smithy-go v1.11.3 // indirect
4141
github.com/beorn7/perks v1.0.1 // indirect
4242
github.com/blang/semver v3.5.1+incompatible // indirect
4343
github.com/cespare/xxhash/v2 v2.1.2 // indirect

‎go.sum‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -87,30 +87,30 @@ github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb
8787
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
8888
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
8989
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
90-
github.com/aws/aws-sdk-go-v2 v1.16.4 h1:swQTEQUyJF/UkEA94/Ga55miiKFoXmm/Zd67XHgmjSg=
91-
github.com/aws/aws-sdk-go-v2 v1.16.4/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU=
92-
github.com/aws/aws-sdk-go-v2/config v1.15.9 h1:TK5yNEnFDQ9iaO04gJS/3Y+eW8BioQiCUafW75/Wc3Q=
93-
github.com/aws/aws-sdk-go-v2/config v1.15.9/go.mod h1:rv/l/TbZo67kp99v/3Kb0qV6Fm1KEtKyruEV2GvVfgs=
94-
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 h1:xggwS+qxCukXRVXJBJWQJGyUsvuxGC8+J1kKzv2cxuw=
95-
github.com/aws/aws-sdk-go-v2/credentials v1.12.4/go.mod h1:7g+GGSp7xtR823o1jedxKmqRZGqLdoHQfI4eFasKKxs=
96-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 h1:YPxclBeE07HsLQE8vtjC8T2emcTjM9nzqsnDi2fv5UM=
97-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5/go.mod h1:WAPnuhG5IQ/i6DETFl5NmX3kKqCzw7aau9NHAGcm4QE=
98-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 h1:gsqHplNh1DaQunEKZISK56wlpbCg0yKxNVvGWCFuF1k=
99-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11/go.mod h1:tmUB6jakq5DFNcXsXOA/ZQ7/C8VnSKYkx58OI7Fh79g=
100-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 h1:PLFj+M2PgIDHG//hw3T0O0KLI4itVtAjtxrZx4AHPLg=
101-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5/go.mod h1:fV1AaS2gFc1tM0RCb015FJ0pvWVUfJZANzjwoO4YakM=
102-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12 h1:j0VqrjtgsY1Bx27tD0ysay36/K4kFMWRp9K3ieO9nLU=
103-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12/go.mod h1:00c7+ALdPh4YeEUPXJzyU0Yy01nPGOq2+9rUaz05z9g=
104-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 h1:gRW1ZisKc93EWEORNJRvy/ZydF3o6xLSveJHdi1Oa0U=
105-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5/go.mod h1:ZbkttHXaVn3bBo/wpJbQGiiIWR90eTBUVBrEHUEQlho=
106-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.5 h1:CvRAsgxd1BN5l961+xXfS0mEhhyJTMxqdoWpZQIJZt4=
107-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.5/go.mod h1:tnwCNkQvihXdRZ8Fyita7EJ0IeY46DcJWhgcWaquT+o=
108-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 h1:suAGD+RyiHWPPihZzY+jw4mCZlOFWgmdjb2AeTenz7c=
109-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7/go.mod h1:TFVe6Rr2joVLsYQ1ABACXgOC6lXip/qpX2x5jWg/A9w=
110-
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 h1:aYToU0/iazkMY67/BYLt3r6/LT/mUtarLAF5mGof1Kg=
111-
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6/go.mod h1:rP1rEOKAGZoXp4iGDxSXFvODAtXpm34Egf0lL0eshaQ=
112-
github.com/aws/smithy-go v1.11.2 h1:eG/N+CcUMAvsdffgMvjMKwfyDzIkjM6pfxMJ8Mzc6mE=
113-
github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM=
90+
github.com/aws/aws-sdk-go-v2 v1.16.5 h1:Ah9h1TZD9E2S1LzHpViBO3Jz9FPL5+rmflmb8hXirtI=
91+
github.com/aws/aws-sdk-go-v2 v1.16.5/go.mod h1:Wh7MEsmEApyL5hrWzpDkba4gwAPc5/piwLVLFnCxp48=
92+
github.com/aws/aws-sdk-go-v2/config v1.15.10 h1:0HSMRNGlR0/WlGbeKC9DbBphBwRIK5H4cKUbgqNTKcA=
93+
github.com/aws/aws-sdk-go-v2/config v1.15.10/go.mod h1:XL4DzwzWdwXBzKdwMdpLkMIaGEQCYRQyzA4UnJaUnNk=
94+
github.com/aws/aws-sdk-go-v2/credentials v1.12.5 h1:WNNCUTWA0vyMy5t8LfS4iB7QshsW0DsHS/VdhyCGZWM=
95+
github.com/aws/aws-sdk-go-v2/credentials v1.12.5/go.mod h1:DOcdLlkqUiNGyXnjWgspC3eIAdXhj8q0pO1LiSvrTI4=
96+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.6 h1:+NZzDh/RpcQTpo9xMFUgkseIam6PC+YJbdhbQp1NOXI=
97+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.6/go.mod h1:ClLMcuQA/wcHPmOIfNzNI4Y1Q0oDbmEkbYhMFOzHDh8=
98+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.12 h1:Zt7DDk5V7SyQULUUwIKzsROtVzp/kVvcz15uQx/Tkow=
99+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.12/go.mod h1:Afj/U8svX6sJ77Q+FPWMzabJ9QjbwP32YlopgKALUpg=
100+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.6 h1:eeXdGVtXEe+2Jc49+/vAzna3FAQnUD4AagAw8tzbmfc=
101+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.6/go.mod h1:FwpAKI+FBPIELJIdmQzlLtRe8LQSOreMcM2wBsPMvvc=
102+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.13 h1:L/l0WbIpIadRO7i44jZh1/XeXpNDX0sokFppb4ZnXUI=
103+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.13/go.mod h1:hiM/y1XPp3DoEPhoVEYc/CZcS58dP6RKJRDFp99wdX0=
104+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.6 h1:0ZxYAZ1cn7Swi/US55VKciCE6RhRHIwCKIWaMLdT6pg=
105+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.6/go.mod h1:DxAPjquoEHf3rUHh1b9+47RAaXB8/7cB6jkzCt/GOEI=
106+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.6 h1:QHv9AYaolQo8Tj+PIfIizQ/aD/EHrb7eOlNpeuEKyEU=
107+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.6/go.mod h1:M8WgODCojJa7pJRL7vx2bS4NO+NjcRtlvGDr9ls/MAI=
108+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.8 h1:GNIdO14AHW5CgnzMml3Tg5Fy/+NqPQvnh1HsC1zpcPo=
109+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.8/go.mod h1:UqRD9bBt15P0ofRyDZX6CfsIqPpzeHOhZKWzgSuAzpo=
110+
github.com/aws/aws-sdk-go-v2/service/sts v1.16.7 h1:HLzjwQM9975FQWSF3uENDGHT1gFQm/q3QXu2BYIcI08=
111+
github.com/aws/aws-sdk-go-v2/service/sts v1.16.7/go.mod h1:lVxTdiiSHY3jb1aeg+BBFtDzZGSUCv6qaNOyEGCJ1AY=
112+
github.com/aws/smithy-go v1.11.3 h1:DQixirEFM9IaKxX1olZ3ke3nvxRS2xMDteKIDWxozW8=
113+
github.com/aws/smithy-go v1.11.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
114114
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
115115
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
116116
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
@@ -315,7 +315,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
315315
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
316316
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
317317
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
318-
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
319318
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
320319
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
321320
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=

‎internal/k8s/validation_test.go‎

Lines changed: 42 additions & 0 deletions
+
"nginx.org/lb-method": "$least_time header",
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,48 @@ func TestValidateNginxIngressAnnotations(t *testing.T) {
252252
},
253253
msg: "invalid nginx.org/lb-method annotation, nginx plus only",
254254
},
255+
{
256+
annotations: map[string]string{
257+
"nginx.org/lb-method": "least_time header;",
258+
},
259+
specServices: map[string]bool{},
260+
isPlus: true,
261+
appProtectEnabled: false,
262+
appProtectDosEnabled: false,
263+
internalRoutesEnabled: false,
264+
expectedErrors: []string{
265+
`annotations.nginx.org/lb-method: Invalid value: "least_time header;": Invalid load balancing method: "least_time header;"`,
266+
},
267+
msg: "invalid nginx.org/lb-method annotation",
268+
},
269+
{
270+
annotations: map[string]string{
271+
"nginx.org/lb-method": "{least_time header}",
272+
},
273+
specServices: map[string]bool{},
274+
isPlus: true,
275+
appProtectEnabled: false,
276+
appProtectDosEnabled: false,
277+
internalRoutesEnabled: false,
278+
expectedErrors: []string{
279+
`annotations.nginx.org/lb-method: Invalid value: "{least_time header}": Invalid load balancing method: "{least_time header}"`,
280+
},
281+
msg: "invalid nginx.org/lb-method annotation",
282+
},
283+
{
284+
annotations: map[string]string{
285
286+
},
287+
specServices: map[string]bool{},
288+
isPlus: true,
289+
appProtectEnabled: false,
290+
appProtectDosEnabled: false,
291+
internalRoutesEnabled: false,
292+
expectedErrors: []string{
293+
`annotations.nginx.org/lb-method: Invalid value: "$least_time header": Invalid load balancing method: "$least_time header"`,
294+
},
295+
msg: "invalid nginx.org/lb-method annotation",
296+
},
255297
{
256298
annotations: map[string]string{
257299
"nginx.org/lb-method": "invalid_method",

0 commit comments

Comments
 (0)
0