Skip to content

Commit

Permalink
operator: Run unit tests of API module as well (#11328)
Browse files Browse the repository at this point in the history
  • Loading branch information
@xperimental @pull
xperimental authored and pull[bot] committed Feb 6, 2024
1 parent f62a335 commit d8038cb
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 44 deletions.
12 changes: 11 additions & 1 deletion operator/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ deps: go.mod go.sum
go mod download
go mod verify

.PHONY: deps-api
deps-api: apis/loki/go.mod apis/loki/go.sum
@cd ./apis/loki/ && go mod tidy
@cd ./apis/loki/ && go mod download
@cd ./apis/loki/ && go mod verify

.PHONY: cli
cli: deps bin/loki-broker ## Build loki-broker CLI binary
bin/loki-broker: $(GO_FILES) | generate
Expand All @@ -152,10 +158,14 @@ manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
$(CONTROLLER_GEN) rbac:roleName=lokistack-manager crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases

.PHONY: test
test: deps generate go-generate lint lint-prometheus manifests ## Run tests
test: deps deps-api generate go-generate lint lint-prometheus manifests test-unit-api ## Run tests
test: $(GO_FILES)
go test ./... -coverprofile cover.out

.PHONY: test-unit-api
test-unit-api: $(GO_FILES)
@cd ./apis/loki/ && go test ./... -coverprofile cover.out

.PHONY: test-unit-prometheus
test-unit-prometheus: $(PROMTOOL) ## Run prometheus unit tests
@$(PROMTOOL) test rules ./internal/manifests/internal/alerts/testdata/test.yaml
Expand Down
6 changes: 1 addition & 5 deletions operator/apis/loki/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -55,11 +53,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand Down
70 changes: 32 additions & 38 deletions operator/apis/loki/v1beta1/lokistack_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ func TestConvertToV1_LokiStack(t *testing.T) {
Name: "test",
},
TLS: &v1.ObjectStorageTLSSpec{
CA: "test-ca",
CASpec: v1.CASpec{
CA: "test-ca",
},
},
},
StorageClassName: "standard",
Expand Down Expand Up @@ -380,16 +382,14 @@ func TestConvertToV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
},
},
Tenants: map[string]v1.LimitsTemplateSpec{
Tenants: map[string]v1.PerTenantLimitsTemplateSpec{
"tenant-a": {
IngestionLimits: &v1.IngestionLimitSpec{
IngestionRate: 100,
Expand All @@ -399,13 +399,13 @@ func TestConvertToV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
QueryLimits: &v1.PerTenantQueryLimitSpec{
QueryLimitSpec: v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
},
},
},
"tenant-b": {
Expand All @@ -417,13 +417,13 @@ func TestConvertToV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
QueryLimits: &v1.PerTenantQueryLimitSpec{
QueryLimitSpec: v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
},
},
},
},
Expand Down Expand Up @@ -683,7 +683,9 @@ func TestConvertFromV1_LokiStack(t *testing.T) {
Name: "test",
},
TLS: &v1.ObjectStorageTLSSpec{
CA: "test-ca",
CASpec: v1.CASpec{
CA: "test-ca",
},
},
},
StorageClassName: "standard",
Expand Down Expand Up @@ -711,16 +713,14 @@ func TestConvertFromV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
},
},
Tenants: map[string]v1.LimitsTemplateSpec{
Tenants: map[string]v1.PerTenantLimitsTemplateSpec{
"tenant-a": {
IngestionLimits: &v1.IngestionLimitSpec{
IngestionRate: 100,
Expand All @@ -730,13 +730,13 @@ func TestConvertFromV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
QueryLimits: &v1.PerTenantQueryLimitSpec{
QueryLimitSpec: v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
},
},
},
"tenant-b": {
Expand All @@ -748,13 +748,13 @@ func TestConvertFromV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
QueryLimits: &v1.PerTenantQueryLimitSpec{
QueryLimitSpec: v1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
MaxChunksPerQuery: 1000,
MaxQuerySeries: 10000,
},
},
},
},
Expand Down Expand Up @@ -1014,8 +1014,6 @@ func TestConvertFromV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1beta1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
Expand All @@ -1033,8 +1031,6 @@ func TestConvertFromV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1beta1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
Expand All @@ -1051,8 +1047,6 @@ func TestConvertFromV1_LokiStack(t *testing.T) {
MaxLabelNamesPerSeries: 1000,
MaxGlobalStreamsPerTenant: 10000,
MaxLineSize: 512,
PerStreamRateLimit: 10,
PerStreamRateLimitBurst: 20,
},
QueryLimits: &v1beta1.QueryLimitSpec{
MaxEntriesLimitPerQuery: 1000,
Expand Down

0 comments on commit d8038cb

Please sign in to comment.