Skip to content

Commit 76ac139

Browse files
ciarams87ciarams87
authored
Merge pull request #86 from nginxinc/fix-build
Fix virtual package error
2 parents 3b97e59 + 7843593 commit 76ac139

File tree

3 files changed

+38
-37
lines changed

3 files changed

+38
-37
lines changed

‎docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
1515
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl apt-transport-https \
1616
&& curl -sSL https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx_signing.gpg \
1717
&& curl -sSL -o /etc/apt/apt.conf.d/90pkgs-nginx https://cs.nginx.com/static/files/90pkgs-nginx \
18-
&& printf "%s\n" "deb https://pkgs.nginx.com/plus/debian buster nginx-plus" > /etc/apt/sources.list.d/nginx-plus.list \
18+
&& DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release) \
19+
&& 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 \
1920
&& apt-get update && apt-get install -y nginx-plus-${NGINX_PLUS_VERSION} \
2021
&& apt-get remove --purge --auto-remove -y gnupg \
2122
&& rm -rf /var/lib/apt/lists/* \

‎tests/client_no_stream_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestStatsNoStream(t *testing.T) {
2121

2222
stats, err := c.GetStats()
2323
if err != nil {
24-
t.Errorf("Error getting stats: %w", err)
24+
t.Errorf("Error getting stats: %v", err)
2525
}
2626

2727
if stats.Connections.Accepted < 1 {

‎tests/client_test.go

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestStreamClient(t *testing.T) {
6969

7070
streamServers, err := c.GetStreamServers(streamUpstream)
7171
if err != nil {
72-
t.Errorf("Error getting stream servers: %w", err)
72+
t.Errorf("Error getting stream servers: %v", err)
7373
}
7474
if len(streamServers) != 0 {
7575
t.Errorf("Expected 0 servers, got %v", streamServers)
@@ -275,7 +275,7 @@ func TestStreamUpstreamServer(t *testing.T) {
275275
}
276276
err = c.AddStreamServer(streamUpstream, streamServer)
277277
if err != nil {
278-
t.Errorf("Error adding upstream server: %w", err)
278+
t.Errorf("Error adding upstream server: %v", err)
279279
}
280280
servers, err := c.GetStreamServers(streamUpstream)
281281
if err != nil {
@@ -294,7 +294,7 @@ func TestStreamUpstreamServer(t *testing.T) {
294294
// remove stream upstream servers
295295
_, _, _, err = c.UpdateStreamServers(streamUpstream, []client.StreamUpstreamServer{})
296296
if err != nil {
297-
t.Errorf("Couldn't remove servers: %w", err)
297+
t.Errorf("Couldn't remove servers: %v", err)
298298
}
299299
}
300300

@@ -551,7 +551,7 @@ func TestUpstreamServer(t *testing.T) {
551551
}
552552
err = c.AddHTTPServer(upstream, server)
553553
if err != nil {
554-
t.Errorf("Error adding upstream server: %w", err)
554+
t.Errorf("Error adding upstream server: %v", err)
555555
}
556556
servers, err := c.GetHTTPServers(upstream)
557557
if err != nil {
@@ -570,7 +570,7 @@ func TestUpstreamServer(t *testing.T) {
570570
// remove upstream servers
571571
_, _, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
572572
if err != nil {
573-
t.Errorf("Couldn't remove servers: %w", err)
573+
t.Errorf("Couldn't remove servers: %v", err)
574574
}
575575
}
576576

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

592592
stats, err := c.GetStats()
593593
if err != nil {
594-
t.Errorf("Error getting stats: %w", err)
594+
t.Errorf("Error getting stats: %v", err)
595595
}
596596

597597
// NginxInfo
@@ -689,7 +689,7 @@ func TestStats(t *testing.T) {
689689
// cleanup upstream servers
690690
_, _, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
691691
if err != nil {
692-
t.Errorf("Couldn't remove servers: %w", err)
692+
t.Errorf("Couldn't remove servers: %v", err)
693693
}
694694
}
695695

@@ -720,7 +720,7 @@ func TestUpstreamServerDefaultParameters(t *testing.T) {
720720
}
721721
err = c.AddHTTPServer(upstream, server)
722722
if err != nil {
723-
t.Errorf("Error adding upstream server: %w", err)
723+
t.Errorf("Error adding upstream server: %v", err)
724724
}
725725
servers, err := c.GetHTTPServers(upstream)
726726
if err != nil {
@@ -739,7 +739,7 @@ func TestUpstreamServerDefaultParameters(t *testing.T) {
739739
// remove upstream servers
740740
_, _, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
741741
if err != nil {
742-
t.Errorf("Couldn't remove servers: %w", err)
742+
t.Errorf("Couldn't remove servers: %v", err)
743743
}
744744
}
745745

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

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

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

770770
stats, err := c.GetStats()
771771
if err != nil {
772-
t.Errorf("Error getting stats: %w", err)
772+
t.Errorf("Error getting stats: %v", err)
773773
}
774774

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

@@ -838,7 +838,7 @@ func TestStreamUpstreamServerDefaultParameters(t *testing.T) {
838838
}
839839
err = c.AddStreamServer(streamUpstream, streamServer)
840840
if err != nil {
841-
t.Errorf("Error adding upstream server: %w", err)
841+
t.Errorf("Error adding upstream server: %v", err)
842842
}
843843
streamServers, err := c.GetStreamServers(streamUpstream)
844844
if err != nil {
@@ -857,7 +857,7 @@ func TestStreamUpstreamServerDefaultParameters(t *testing.T) {
857857
// cleanup stream upstream servers
858858
_, _, _, err = c.UpdateStreamServers(streamUpstream, []client.StreamUpstreamServer{})
859859
if err != nil {
860-
t.Errorf("Couldn't remove stream servers: %w", err)
860+
t.Errorf("Couldn't remove stream servers: %v", err)
861861
}
862862
}
863863

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

872872
err = c.AddKeyValPair(zoneName, "key1", "val1")
873873
if err != nil {
874-
t.Errorf("Couldn't set keyvals: %w", err)
874+
t.Errorf("Couldn't set keyvals: %v", err)
875875
}
876876

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

889889
keyValuPairsByZone, err := c.GetAllKeyValPairs()
890890
if err != nil {
891-
t.Errorf("Couldn't get keyvals, %w", err)
891+
t.Errorf("Couldn't get keyvals, %v", err)
892892
}
893893
expectedKeyValPairsByZone := client.KeyValPairsByZone{
894894
zoneName: expectedKeyValPairs,
@@ -901,12 +901,12 @@ func TestKeyValue(t *testing.T) {
901901
expectedKeyValPairs["key1"] = "valModified1"
902902
err = c.ModifyKeyValPair(zoneName, "key1", "valModified1")
903903
if err != nil {
904-
t.Errorf("couldn't set keyval: %w", err)
904+
t.Errorf("couldn't set keyval: %v", err)
905905
}
906906

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

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

926926
err = c.DeleteKeyValuePair(zoneName, "key1")
@@ -933,20 +933,20 @@ func TestKeyValue(t *testing.T) {
933933
}
934934
keyValPairs, err = c.GetKeyValPairs(zoneName)
935935
if err != nil {
936-
t.Errorf("couldn't get keyval: %w", err)
936+
t.Errorf("couldn't get keyval: %v", err)
937937
}
938938
if !reflect.DeepEqual(keyValPairs, expectedKeyValPairs2) {
939939
t.Errorf("didn't delete key1 %+v", keyValPairs)
940940
}
941941

942942
err = c.DeleteKeyValPairs(zoneName)
943943
if err != nil {
944-
t.Errorf("couldn't delete all: %w", err)
944+
t.Errorf("couldn't delete all: %v", err)
945945
}
946946

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

970970
err = c.AddStreamKeyValPair(zoneName, "key1", "val1")
971971
if err != nil {
972-
t.Errorf("Couldn't set keyvals: %w", err)
972+
t.Errorf("Couldn't set keyvals: %v", err)
973973
}
974974

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

986986
keyValPairsByZone, err := c.GetAllStreamKeyValPairs()
987987
if err != nil {
988-
t.Errorf("Couldn't get keyvals, %w", err)
988+
t.Errorf("Couldn't get keyvals, %v", err)
989989
}
990990
expectedKeyValuePairsByZone := client.KeyValPairsByZone{
991991
zoneName: expectedKeyValPairs,
@@ -999,12 +999,12 @@ func TestKeyValueStream(t *testing.T) {
999999
expectedKeyValPairs["key1"] = "valModified1"
10001000
err = c.ModifyStreamKeyValPair(zoneName, "key1", "valModified1")
10011001
if err != nil {
1002-
t.Errorf("couldn't set keyval: %w", err)
1002+
t.Errorf("couldn't set keyval: %v", err)
10031003
}
10041004

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

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

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

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

10401040
err = c.DeleteStreamKeyValPairs(zoneName)
10411041
if err != nil {
1042-
t.Errorf("couldn't delete all: %w", err)
1042+
t.Errorf("couldn't delete all: %v", err)
10431043
}
10441044

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

10711071
err = c1.AddStreamKeyValPair(streamZoneSync, "key1", "val1")
10721072
if err != nil {
1073-
t.Errorf("Couldn't set keyvals: %w", err)
1073+
t.Errorf("Couldn't set keyvals: %v", err)
10741074
}
10751075

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

10791079
statsC1, err := c1.GetStats()
10801080
if err != nil {
1081-
t.Errorf("Error getting stats: %w", err)
1081+
t.Errorf("Error getting stats: %v", err)
10821082
}
10831083

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

11191119
statsC2, err := c2.GetStats()
11201120
if err != nil {
1121-
t.Errorf("Error getting stats: %w", err)
1121+
t.Errorf("Error getting stats: %v", err)
11221122
}
11231123

11241124
if statsC2.StreamZoneSync == nil {

0 commit comments

Comments
 (0)