alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

cloudfront: rename vars that collided with type

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-04-30 15:27:42 +02:00
parent 85028a801b
commit 5301ae14bf
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
registry/storage/driver/middleware/cloudfront/s3filter_test.go
View file

@ -8,12 +8,11 @@ import (
"net" "net"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"reflect" // used as a replacement for testify
"testing" "testing"
"time" "time"
dcontext "github.com/distribution/distribution/v3/context" dcontext "github.com/distribution/distribution/v3/context"
"reflect" // used as a replacement for testify
) )
// Rather than pull in all of testify // Rather than pull in all of testify
@ -262,7 +261,7 @@ func TestUpdateCalledRegularly(t *testing.T) {
} }
func TestEligibleForS3(t *testing.T) { func TestEligibleForS3(t *testing.T) {
awsIPs := &awsIPs{ ips := &awsIPs{
ipv4: []net.IPNet{{ ipv4: []net.IPNet{{
IP: net.ParseIP("192.168.1.1"), IP: net.ParseIP("192.168.1.1"),
Mask: net.IPv4Mask(255, 255, 255, 0), Mask: net.IPv4Mask(255, 255, 255, 0),
@ -291,13 +290,13 @@ func TestEligibleForS3(t *testing.T) {
name := fmt.Sprintf("Client IP = %v", name := fmt.Sprintf("Client IP = %v",
testCase.Context.Value("http.request.ip")) testCase.Context.Value("http.request.ip"))
t.Run(name, func(t *testing.T) { t.Run(name, func(t *testing.T) {
assertEqual(t, testCase.Expected, eligibleForS3(testCase.Context, awsIPs)) assertEqual(t, testCase.Expected, eligibleForS3(testCase.Context, ips))
}) })
} }
} }
func TestEligibleForS3WithAWSIPNotInitialized(t *testing.T) { func TestEligibleForS3WithAWSIPNotInitialized(t *testing.T) {
awsIPs := &awsIPs{ ips := &awsIPs{
ipv4: []net.IPNet{{ ipv4: []net.IPNet{{
IP: net.ParseIP("192.168.1.1"), IP: net.ParseIP("192.168.1.1"),
Mask: net.IPv4Mask(255, 255, 255, 0), Mask: net.IPv4Mask(255, 255, 255, 0),
@ -326,7 +325,7 @@ func TestEligibleForS3WithAWSIPNotInitialized(t *testing.T) {
name := fmt.Sprintf("Client IP = %v", name := fmt.Sprintf("Client IP = %v",
testCase.Context.Value("http.request.ip")) testCase.Context.Value("http.request.ip"))
t.Run(name, func(t *testing.T) { t.Run(name, func(t *testing.T) {
assertEqual(t, testCase.Expected, eligibleForS3(testCase.Context, awsIPs)) assertEqual(t, testCase.Expected, eligibleForS3(testCase.Context, ips))
}) })
} }
} }
@ -364,8 +363,8 @@ func BenchmarkContainsRandom(b *testing.B) {
numNetworksPerType := 1000 // keep in sync with the above numNetworksPerType := 1000 // keep in sync with the above
// intentionally skip constructor when creating awsIPs, to avoid updater routine. // intentionally skip constructor when creating awsIPs, to avoid updater routine.
// This benchmark is only concerned with contains() performance. // This benchmark is only concerned with contains() performance.
awsIPs := awsIPs{} ips := awsIPs{}
populateRandomNetworks(b, &awsIPs, numNetworksPerType, numNetworksPerType) populateRandomNetworks(b, &ips, numNetworksPerType, numNetworksPerType)
ipv4 := make([][]byte, b.N) ipv4 := make([][]byte, b.N)
ipv6 := make([][]byte, b.N) ipv6 := make([][]byte, b.N)
@ -377,13 +376,13 @@ func BenchmarkContainsRandom(b *testing.B) {
} }
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
awsIPs.contains(ipv4[i]) ips.contains(ipv4[i])
awsIPs.contains(ipv6[i]) ips.contains(ipv6[i])
} }
} }
func BenchmarkContainsProd(b *testing.B) { func BenchmarkContainsProd(b *testing.B) {
awsIPs := newAWSIPs(defaultIPRangesURL, defaultUpdateFrequency, nil) ips := newAWSIPs(defaultIPRangesURL, defaultUpdateFrequency, nil)
ipv4 := make([][]byte, b.N) ipv4 := make([][]byte, b.N)
ipv6 := make([][]byte, b.N) ipv6 := make([][]byte, b.N)
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
@ -394,7 +393,7 @@ func BenchmarkContainsProd(b *testing.B) {
} }
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
awsIPs.contains(ipv4[i]) ips.contains(ipv4[i])
awsIPs.contains(ipv6[i]) ips.contains(ipv6[i])
} }
} }