Skip to content

fix api tests #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 21, 2023
Merged

fix api tests #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9aeb345
draft fix api tests
aphralG Feb 15, 2023
11c272e
merge main
aphralG Feb 15, 2023
1d45d6d
make deps
aphralG Feb 15, 2023
601f18f
change component test
aphralG Feb 15, 2023
a50ba0f
fix api integration test
aphralG Feb 15, 2023
727498b
merge main
aphralG Feb 15, 2023
b549aec
make deps
aphralG Feb 15, 2023
b3ee77a
Merge branch 'main' into fix-api-component-test
aphralG Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
355 changes: 355 additions & 0 deletions go.work.sum
View file
Open in desktop

Large diffs are not rendered by default.

66 changes: 48 additions & 18 deletions test/component/agent_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ package component

import (
"context"
"encoding/json"
"fmt"
"io"
"net/http"
"strconv"
"strings"
"testing"
"time"

"encoding/json"
"github.com/go-resty/resty/v2"

"github.com/nginx/agent/sdk/v2/proto"
"github.com/nginx/agent/v2/src/core"
Expand Down Expand Up @@ -62,18 +66,21 @@ func TestGetNginxInstances(t *testing.T) {
agentAPI := plugins.NewAgentAPI(conf, mockEnvironment, mockNginxBinary)
agentAPI.Init(core.NewMockMessagePipe(context.TODO()))

response, err := http.Get(fmt.Sprintf("http://localhost:%d/nginx/", port))
assert.Nil(t, err)
client := resty.New()
client.SetRetryCount(3).SetRetryWaitTime(50 * time.Millisecond).SetRetryMaxWaitTime(200 * time.Millisecond)

responseData, err := io.ReadAll(response.Body)
assert.Nil(t, err)
url := fmt.Sprintf("http://localhost:%d/nginx", port)
response, err := client.R().EnableTrace().Get(url)

assert.NoError(t, err)
assert.Equal(t, http.StatusOK, response.StatusCode())

var nginxDetailsResponse []*proto.NginxDetails
responseData := response.Body()
err = json.Unmarshal(responseData, &nginxDetailsResponse)
assert.Nil(t, err)

assert.Equal(t, http.StatusOK, response.StatusCode)
assert.True(t, json.Valid(responseData))

if tt.nginxDetails == nil {
assert.Equal(t, 0, len(nginxDetailsResponse))
} else {
Expand Down Expand Up @@ -101,12 +108,17 @@ func TestInvalidPath(t *testing.T) {
agentAPI := plugins.NewAgentAPI(conf, mockEnvironment, mockNginxBinary)
Copy link
Contributor

@Dean-Coakley Dean-Coakley Feb 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional:
I don't think asserting that /invalid/ 404s is valuable. I think func TestInvalidPath can be removed.

agentAPI.Init(core.NewMockMessagePipe(context.TODO()))

response, err := http.Get(fmt.Sprintf("http://localhost:%d/invalid/", port))
client := resty.New()
client.SetRetryCount(3).SetRetryWaitTime(50 * time.Millisecond).SetRetryMaxWaitTime(200 * time.Millisecond)

url := fmt.Sprintf("http://localhost:%d/invalid/", port)
response, err := client.R().EnableTrace().Get(url)

assert.Nil(t, err)

agentAPI.Close()

assert.Equal(t, http.StatusNotFound, response.StatusCode)
assert.Equal(t, http.StatusNotFound, response.StatusCode())
}

func TestMetrics(t *testing.T) {
Expand Down Expand Up @@ -144,22 +156,40 @@ func TestMetrics(t *testing.T) {
Name: "system.cpu.idle",
Value: 12,
},
{
Name: "nginx.workers.count",
Value: 6,
},
},
},
},
}))

response, err := http.Get(fmt.Sprintf("http://localhost:%d/metrics", port))
assert.Nil(t, err)
client := resty.New()

assert.Equal(t, http.StatusOK, response.StatusCode)
url := fmt.Sprintf("http://localhost:%d/metrics", port)
client.SetRetryCount(3).SetRetryWaitTime(50 * time.Millisecond).SetRetryMaxWaitTime(200 * time.Millisecond)

responseData, err := io.ReadAll(response.Body)
response, err := client.R().EnableTrace().Get(url)
assert.Nil(t, err)

assert.Equal(t, http.StatusOK, response.StatusCode())
assert.Contains(t, response.String(), "# HELP system_cpu_idle")
assert.Contains(t, response.String(), "# TYPE system_cpu_idle gauge")
agentAPI.Close()

assert.Contains(t, string(responseData), "# HELP system_cpu_idle")
assert.Contains(t, string(responseData), "# TYPE system_cpu_idle gauge")
assert.Contains(t, string(responseData), "system_cpu_idle{hostname=\"example.com\",system_tags=\"\"} 12")
responseData := tutils.ProcessResponse(response)

for _, m := range responseData {
metric := strings.Split(m, " ")
switch {
case strings.Contains(metric[0], "system_cpu_idle"):
value, _ := strconv.ParseFloat(metric[1], 64)
assert.Equal(t, float64(12), value)
case strings.Contains(metric[0], "nginx_workers_count"):
value, _ := strconv.ParseFloat(metric[1], 64)
assert.Equal(t, float64(6), value)
}

}

}
46 changes: 13 additions & 33 deletions test/integration/api/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package api

import (
"context"
"encoding/json"
"fmt"
"net/http"
"os"
Expand All @@ -11,6 +12,8 @@ import (
"time"

"github.com/go-resty/resty/v2"
"github.com/nginx/agent/sdk/v2/proto"
tutils "github.com/nginx/agent/v2/test/utils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/testcontainers/testcontainers-go/modules/compose"
Expand Down Expand Up @@ -55,25 +58,19 @@ func TestAPI_Nginx(t *testing.T) {
assert.Contains(t, resp.String(), "nginx_id")
assert.NotContains(t, resp.String(), "test_fail_nginx")

nginxDetails := strings.Split(resp.String(), " ")
var nginxDetailsResponse []*proto.NginxDetails

for _, detail := range nginxDetails {
detail := strings.Split(detail, ":")
responseData := resp.Body()
err = json.Unmarshal(responseData, &nginxDetailsResponse)

switch {
case strings.Contains(detail[0], "nginx_id"):
assert.NotNil(t, detail[1])

case strings.Contains(detail[0], "version"):
assert.NotNil(t, detail[1])
assert.Nil(t, err)
assert.True(t, json.Valid(responseData))

case strings.Contains(detail[0], "runtime_modules"):
assert.Equal(t, detail[1], "http_stub_status_module")
assert.NotNil(t, nginxDetailsResponse[0].NginxId)
assert.NotNil(t, nginxDetailsResponse[0].Version)
assert.Contains(t, nginxDetailsResponse[0].RuntimeModules, "http_stub_status_module")
assert.Equal(t, "/etc/nginx/nginx.conf", nginxDetailsResponse[0].ConfPath)

case strings.Contains(detail[0], "conf_path"):
assert.Equal(t, detail[1], "/usr/local/nginx/conf/nginx.conf")
}
}
}

func TestAPI_Metrics(t *testing.T) {
Expand All @@ -94,7 +91,7 @@ func TestAPI_Metrics(t *testing.T) {
assert.Contains(t, resp.String(), "system_cpu_system")
assert.NotContains(t, resp.String(), "test_fail_metric")

metrics := processResponse(resp)
metrics := tutils.ProcessResponse(resp)

for _, m := range metrics {
metric := strings.Split(m, " ")
Expand All @@ -118,20 +115,3 @@ func TestAPI_Metrics(t *testing.T) {
}
}
}

func processResponse(resp *resty.Response) []string {
metrics := strings.Split(resp.String(), "\n")

i := 0

for _, metric := range metrics {
if metric[0:1] != "#" {
metrics[i] = metric
i++
}
}

metrics = metrics[:i]

return metrics
}
21 changes: 19 additions & 2 deletions test/integration/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.19

require (
github.com/go-resty/resty/v2 v2.7.0
github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000
github.com/nginx/agent/v2 v2.22.0
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/sirupsen/logrus v1.9.0
Expand All @@ -14,7 +15,6 @@ require (
)

require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/AlecAivazis/survey/v2 v2.3.6 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
Expand All @@ -41,6 +41,7 @@ require (
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fvbommel/sortorder v1.0.2 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -62,13 +63,15 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/compress v1.15.15 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
Expand All @@ -89,29 +92,40 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/nginxinc/nginx-go-crossplane v0.4.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/opencontainers/runc v1.1.3 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/orcaman/concurrent-map v1.0.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
github.com/shirou/gopsutil/v3 v3.22.7 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.15.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/theupdateframework/notary v0.7.0 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/tonistiigi/fsutil v0.0.0-20220930225714-4638ad635be5 // indirect
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
github.com/vardius/message-bus v1.1.5 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
Expand Down Expand Up @@ -143,6 +157,7 @@ require (
google.golang.org/grpc v1.52.0 // indirect
google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.24.1 // indirect
Expand Down Expand Up @@ -170,3 +185,5 @@ replace (
k8s.io/client-go => k8s.io/client-go v0.22.4

)

replace github.com/nginx/agent/sdk/v2 => ./../../sdk
Loading