Skip to content

Commit

Permalink
Fix linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@ciarams87
ciarams87 committed Feb 7, 2022
1 parent b45b67c commit 72d2a86
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
&& curl -sSL https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx_signing.gpg \
&& curl -sSL -o /etc/apt/apt.conf.d/90pkgs-nginx https://cs.nginx.com/static/files/90pkgs-nginx \
&& DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release) \
&& printf "%s\n" "Acquire::https::pkgs.nginx.com::User-Agent \"k8s-ic-$IC_VERSION${BUILD_OS##debian-plus}-apt\";" >> /etc/apt/apt.conf.d/90pkgs-nginx \
&& printf "%s\n" "deb https://pkgs.nginx.com/plus/${NGINX_PLUS_VERSION^^}/debian ${DEBIAN_VERSION} nginx-plus" > /etc/apt/sources.list.d/nginx-plus.list \
&& printf "%s\n" "Acquire::https::pkgs.nginx.com::User-Agent \"k8s-ic-$IC_VERSION${BUILD_OS##debian-plus}-apt\";" >> /etc/apt/apt.conf.d/90pkgs-nginx \
&& printf "%s\n" "deb https://pkgs.nginx.com/plus/${NGINX_PLUS_VERSION^^}/debian ${DEBIAN_VERSION} nginx-plus" > /etc/apt/sources.list.d/nginx-plus.list \
&& apt-get update && apt-get install -y nginx-plus-${NGINX_PLUS_VERSION} \
&& apt-get remove --purge --auto-remove -y gnupg \
&& rm -rf /var/lib/apt/lists/* \
Expand Down
2 changes: 1 addition & 1 deletion tests/client_no_stream_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestStatsNoStream(t *testing.T) {

stats, err := c.GetStats()
if err != nil {
t.Errorf("Error getting stats: %w", err)
t.Errorf("Error getting stats: %v", err)
}

if stats.Connections.Accepted < 1 {
Expand Down
70 changes: 35 additions & 35 deletions tests/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func TestStreamClient(t *testing.T) {

streamServers, err := c.GetStreamServers(streamUpstream)
if err != nil {
t.Errorf("Error getting stream servers: %w", err)
t.Errorf("Error getting stream servers: %v", err)
}
if len(streamServers) != 0 {
t.Errorf("Expected 0 servers, got %v", streamServers)
Expand Down Expand Up @@ -275,7 +275,7 @@ func TestStreamUpstreamServer(t *testing.T) {
}
err = c.AddStreamServer(streamUpstream, streamServer)
if err != nil {
t.Errorf("Error adding upstream server: %w", err)
t.Errorf("Error adding upstream server: %v", err)
}
servers, err := c.GetStreamServers(streamUpstream)
if err != nil {
Expand All @@ -294,7 +294,7 @@ func TestStreamUpstreamServer(t *testing.T) {
// remove stream upstream servers
_, _, _, err = c.UpdateStreamServers(streamUpstream, []client.StreamUpstreamServer{})
if err != nil {
t.Errorf("Couldn't remove servers: %w", err)
t.Errorf("Couldn't remove servers: %v", err)
}
}

Expand Down Expand Up @@ -551,7 +551,7 @@ func TestUpstreamServer(t *testing.T) {
}
err = c.AddHTTPServer(upstream, server)
if err != nil {
t.Errorf("Error adding upstream server: %w", err)
t.Errorf("Error adding upstream server: %v", err)
}
servers, err := c.GetHTTPServers(upstream)
if err != nil {
Expand All @@ -570,7 +570,7 @@ func TestUpstreamServer(t *testing.T) {
// remove upstream servers
_, _, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
if err != nil {
t.Errorf("Couldn't remove servers: %w", err)
t.Errorf("Couldn't remove servers: %v", err)
}
}

Expand All @@ -586,12 +586,12 @@ func TestStats(t *testing.T) {
}
err = c.AddHTTPServer(upstream, server)
if err != nil {
t.Errorf("Error adding upstream server: %w", err)
t.Errorf("Error adding upstream server: %v", err)
}

stats, err := c.GetStats()
if err != nil {
t.Errorf("Error getting stats: %w", err)
t.Errorf("Error getting stats: %v", err)
}

// NginxInfo
Expand Down Expand Up @@ -689,7 +689,7 @@ func TestStats(t *testing.T) {
// cleanup upstream servers
_, _, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
if err != nil {
t.Errorf("Couldn't remove servers: %w", err)
t.Errorf("Couldn't remove servers: %v", err)
}
}

Expand Down Expand Up @@ -720,7 +720,7 @@ func TestUpstreamServerDefaultParameters(t *testing.T) {
}
err = c.AddHTTPServer(upstream, server)
if err != nil {
t.Errorf("Error adding upstream server: %w", err)
t.Errorf("Error adding upstream server: %v", err)
}
servers, err := c.GetHTTPServers(upstream)
if err != nil {
Expand All @@ -739,7 +739,7 @@ func TestUpstreamServerDefaultParameters(t *testing.T) {
// remove upstream servers
_, _, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
if err != nil {
t.Errorf("Couldn't remove servers: %w", err)
t.Errorf("Couldn't remove servers: %v", err)
}
}

Expand All @@ -755,21 +755,21 @@ func TestStreamStats(t *testing.T) {
}
err = c.AddStreamServer(streamUpstream, server)
if err != nil {
t.Errorf("Error adding stream upstream server: %w", err)
t.Errorf("Error adding stream upstream server: %v", err)
}

// make connection so we have stream server zone stats - ignore response
_, err = net.Dial("tcp", helpers.GetStreamAddress())
if err != nil {
t.Errorf("Error making tcp connection: %w", err)
t.Errorf("Error making tcp connection: %v", err)
}

// wait for health checks
time.Sleep(50 * time.Millisecond)

stats, err := c.GetStats()
if err != nil {
t.Errorf("Error getting stats: %w", err)
t.Errorf("Error getting stats: %v", err)
}

if stats.Connections.Active == 0 {
Expand Down Expand Up @@ -809,7 +809,7 @@ func TestStreamStats(t *testing.T) {
// cleanup stream upstream servers
_, _, _, err = c.UpdateStreamServers(streamUpstream, []client.StreamUpstreamServer{})
if err != nil {
t.Errorf("Couldn't remove stream servers: %w", err)
t.Errorf("Couldn't remove stream servers: %v", err)
}
}

Expand Down Expand Up @@ -838,7 +838,7 @@ func TestStreamUpstreamServerDefaultParameters(t *testing.T) {
}
err = c.AddStreamServer(streamUpstream, streamServer)
if err != nil {
t.Errorf("Error adding upstream server: %w", err)
t.Errorf("Error adding upstream server: %v", err)
}
streamServers, err := c.GetStreamServers(streamUpstream)
if err != nil {
Expand All @@ -857,7 +857,7 @@ func TestStreamUpstreamServerDefaultParameters(t *testing.T) {
// cleanup stream upstream servers
_, _, _, err = c.UpdateStreamServers(streamUpstream, []client.StreamUpstreamServer{})
if err != nil {
t.Errorf("Couldn't remove stream servers: %w", err)
t.Errorf("Couldn't remove stream servers: %v", err)
}
}

Expand All @@ -871,7 +871,7 @@ func TestKeyValue(t *testing.T) {

err = c.AddKeyValPair(zoneName, "key1", "val1")
if err != nil {
t.Errorf("Couldn't set keyvals: %w", err)
t.Errorf("Couldn't set keyvals: %v", err)
}

var keyValPairs client.KeyValPairs
Expand All @@ -888,7 +888,7 @@ func TestKeyValue(t *testing.T) {

keyValuPairsByZone, err := c.GetAllKeyValPairs()
if err != nil {
t.Errorf("Couldn't get keyvals, %w", err)
t.Errorf("Couldn't get keyvals, %v", err)
}
expectedKeyValPairsByZone := client.KeyValPairsByZone{
zoneName: expectedKeyValPairs,
Expand All @@ -901,12 +901,12 @@ func TestKeyValue(t *testing.T) {
expectedKeyValPairs["key1"] = "valModified1"
err = c.ModifyKeyValPair(zoneName, "key1", "valModified1")
if err != nil {
t.Errorf("couldn't set keyval: %w", err)
t.Errorf("couldn't set keyval: %v", err)
}

keyValPairs, err = c.GetKeyValPairs(zoneName)
if err != nil {
t.Errorf("couldn't get keyval: %w", err)
t.Errorf("couldn't get keyval: %v", err)
}
if !reflect.DeepEqual(expectedKeyValPairs, keyValPairs) {
t.Errorf("maps are not equal. expected: %+v, got: %+v", expectedKeyValPairs, keyValPairs)
Expand All @@ -920,7 +920,7 @@ func TestKeyValue(t *testing.T) {

err = c.AddKeyValPair(zoneName, "key2", "val2")
if err != nil {
t.Errorf("error adding another key/val pair: %w", err)
t.Errorf("error adding another key/val pair: %v", err)
}

err = c.DeleteKeyValuePair(zoneName, "key1")
Expand All @@ -933,20 +933,20 @@ func TestKeyValue(t *testing.T) {
}
keyValPairs, err = c.GetKeyValPairs(zoneName)
if err != nil {
t.Errorf("couldn't get keyval: %w", err)
t.Errorf("couldn't get keyval: %v", err)
}
if !reflect.DeepEqual(keyValPairs, expectedKeyValPairs2) {
t.Errorf("didn't delete key1 %+v", keyValPairs)
}

err = c.DeleteKeyValPairs(zoneName)
if err != nil {
t.Errorf("couldn't delete all: %w", err)
t.Errorf("couldn't delete all: %v", err)
}

keyValPairs, err = c.GetKeyValPairs(zoneName)
if err != nil {
t.Errorf("couldn't get keyval: %w", err)
t.Errorf("couldn't get keyval: %v", err)
}
if len(keyValPairs) > 0 {
t.Errorf("zone should be empty after bulk delete")
Expand All @@ -969,7 +969,7 @@ func TestKeyValueStream(t *testing.T) {

err = c.AddStreamKeyValPair(zoneName, "key1", "val1")
if err != nil {
t.Errorf("Couldn't set keyvals: %w", err)
t.Errorf("Couldn't set keyvals: %v", err)
}

keyValPairs, err := c.GetStreamKeyValPairs(zoneName)
Expand All @@ -985,7 +985,7 @@ func TestKeyValueStream(t *testing.T) {

keyValPairsByZone, err := c.GetAllStreamKeyValPairs()
if err != nil {
t.Errorf("Couldn't get keyvals, %w", err)
t.Errorf("Couldn't get keyvals, %v", err)
}
expectedKeyValuePairsByZone := client.KeyValPairsByZone{
zoneName: expectedKeyValPairs,
Expand All @@ -999,12 +999,12 @@ func TestKeyValueStream(t *testing.T) {
expectedKeyValPairs["key1"] = "valModified1"
err = c.ModifyStreamKeyValPair(zoneName, "key1", "valModified1")
if err != nil {
t.Errorf("couldn't set keyval: %w", err)
t.Errorf("couldn't set keyval: %v", err)
}

keyValPairs, err = c.GetStreamKeyValPairs(zoneName)
if err != nil {
t.Errorf("couldn't get keyval: %w", err)
t.Errorf("couldn't get keyval: %v", err)
}
if !reflect.DeepEqual(expectedKeyValPairs, keyValPairs) {
t.Errorf("maps are not equal. expected: %+v, got: %+v", expectedKeyValPairs, keyValPairs)
Expand All @@ -1018,7 +1018,7 @@ func TestKeyValueStream(t *testing.T) {

err = c.AddStreamKeyValPair(zoneName, "key2", "val2")
if err != nil {
t.Errorf("error adding another key/val pair: %w", err)
t.Errorf("error adding another key/val pair: %v", err)
}

err = c.DeleteStreamKeyValuePair(zoneName, "key1")
Expand All @@ -1028,7 +1028,7 @@ func TestKeyValueStream(t *testing.T) {

keyValPairs, err = c.GetStreamKeyValPairs(zoneName)
if err != nil {
t.Errorf("couldn't get keyval: %w", err)
t.Errorf("couldn't get keyval: %v", err)
}
expectedKeyValPairs2 := client.KeyValPairs{
"key2": "val2",
Expand All @@ -1039,12 +1039,12 @@ func TestKeyValueStream(t *testing.T) {

err = c.DeleteStreamKeyValPairs(zoneName)
if err != nil {
t.Errorf("couldn't delete all: %w", err)
t.Errorf("couldn't delete all: %v", err)
}

keyValPairs, err = c.GetStreamKeyValPairs(zoneName)
if err != nil {
t.Errorf("couldn't get keyval: %w", err)
t.Errorf("couldn't get keyval: %v", err)
}
if len(keyValPairs) > 0 {
t.Errorf("zone should be empty after bulk delete")
Expand All @@ -1070,15 +1070,15 @@ func TestStreamZoneSync(t *testing.T) {

err = c1.AddStreamKeyValPair(streamZoneSync, "key1", "val1")
if err != nil {
t.Errorf("Couldn't set keyvals: %w", err)
t.Errorf("Couldn't set keyvals: %v", err)
}

// wait for nodes to sync information of synced zones
time.Sleep(5 * time.Second)

statsC1, err := c1.GetStats()
if err != nil {
t.Errorf("Error getting stats: %w", err)
t.Errorf("Error getting stats: %v", err)
}

if statsC1.StreamZoneSync == nil {
Expand Down Expand Up @@ -1118,7 +1118,7 @@ func TestStreamZoneSync(t *testing.T) {

statsC2, err := c2.GetStats()
if err != nil {
t.Errorf("Error getting stats: %w", err)
t.Errorf("Error getting stats: %v", err)
}

if statsC2.StreamZoneSync == nil {
Expand Down

0 comments on commit 72d2a86

Please sign in to comment.