Skip to content

kolide: fix system-test mock pagination origins with stream .request.host #20521

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

Open
andrewkroh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

kolide: fix system-test mock pagination origins with stream .request.host #20521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions packages/kolide/data_stream/audit/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
version: '2.3'
services:
kolide-audit:
image: docker.elastic.co/observability/stream:v0.20.0
image: docker.elastic.co/observability/stream:v0.23.0
hostname: kolide-audit
ports:
- 8090
volumes:
- ./files:/files:ro
environment:
PORT: '8090'
command:
- http-server
- --addr=:8090
Expand Down
4 changes: 2 additions & 2 deletions packages/kolide/data_stream/audit/_dev/deploy/docker/files/config-audit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/audit_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"next": "http://{{ .request.host }}/audit_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"current_cursor": "",
"next_cursor": "CURSORPAGE2",
"count": 1
Expand Down Expand Up @@ -85,7 +85,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/audit_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
"next": "http://{{ .request.host }}/audit_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
"current_cursor": "CURSORPAGE2",
"next_cursor": "CURSORPAGE3",
"count": 1
Expand Down
4 changes: 1 addition & 3 deletions packages/kolide/data_stream/auth/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
version: '2.3'
services:
kolide-auth:
image: docker.elastic.co/observability/stream:v0.20.0
image: docker.elastic.co/observability/stream:v0.23.0
hostname: kolide-auth
ports:
- 8090
volumes:
- ./files:/files:ro
environment:
PORT: '8090'
command:
- http-server
- --addr=:8090
Expand Down
4 changes: 2 additions & 2 deletions packages/kolide/data_stream/auth/_dev/deploy/docker/files/config-auth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/auth_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"next": "http://{{ .request.host }}/auth_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"current_cursor": "",
"next_cursor": "CURSORPAGE2",
"count": 1
Expand Down Expand Up @@ -119,7 +119,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/auth_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
"next": "http://{{ .request.host }}/auth_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
"current_cursor": "CURSORPAGE2",
"next_cursor": "CURSORPAGE3",
"count": 1
Expand Down
4 changes: 1 addition & 3 deletions packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
version: '2.3'
services:
kolide-deprovisioned-person:
image: docker.elastic.co/observability/stream:v0.20.0
image: docker.elastic.co/observability/stream:v0.23.0
hostname: kolide-deprovisioned-person
ports:
- 8090
volumes:
- ./files:/files:ro
environment:
PORT: '8090'
command:
- http-server
- --addr=:8090
Expand Down
2 changes: 1 addition & 1 deletion ...data_stream/deprovisioned_person/_dev/deploy/docker/files/config-deprovisioned-person.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/deprovisioned_people?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"next": "http://{{ .request.host }}/deprovisioned_people?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"current_cursor": "",
"next_cursor": "CURSORPAGE2",
"count": 1
Expand Down
4 changes: 1 addition & 3 deletions packages/kolide/data_stream/device/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
version: '2.3'
services:
kolide-device:
image: docker.elastic.co/observability/stream:v0.20.0
image: docker.elastic.co/observability/stream:v0.23.0
hostname: kolide-device
ports:
- 8090
volumes:
- ./files:/files:ro
environment:
PORT: '8090'
command:
- http-server
- --addr=:8090
Expand Down
4 changes: 2 additions & 2 deletions packages/kolide/data_stream/device/_dev/deploy/docker/files/config-device.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/devices?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
"next": "http://{{ .request.host }}/devices?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
"current_cursor": "CURSORPAGE2",
"next_cursor": "CURSORPAGE3",
"count": 1
Expand Down Expand Up @@ -134,7 +134,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/devices?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"next": "http://{{ .request.host }}/devices?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"current_cursor": "",
"next_cursor": "CURSORPAGE2",
"count": 1
Expand Down
4 changes: 1 addition & 3 deletions packages/kolide/data_stream/issues/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
version: '2.3'
services:
kolide-issues:
image: docker.elastic.co/observability/stream:v0.20.0
image: docker.elastic.co/observability/stream:v0.23.0
hostname: kolide-issues
ports:
- 8090
volumes:
- ./files:/files:ro
environment:
PORT: '8090'
command:
- http-server
- --addr=:8090
Expand Down
6 changes: 3 additions & 3 deletions packages/kolide/data_stream/issues/_dev/deploy/docker/files/config-issues.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"next": "http://{{ .request.host }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"current_cursor": "",
"next_cursor": "CURSORPAGE2",
"count": 1
Expand Down Expand Up @@ -108,7 +108,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
"next": "http://{{ .request.host }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
"current_cursor": "CURSORPAGE2",
"next_cursor": "CURSORPAGE3",
"count": 1
Expand Down Expand Up @@ -149,7 +149,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE4",
"next": "http://{{ .request.host }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE4",
"current_cursor": "CURSORPAGE3",
"next_cursor": "CURSORPAGE4",
"count": 1
Expand Down
4 changes: 1 addition & 3 deletions packages/kolide/data_stream/people/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
version: '2.3'
services:
kolide-people:
image: docker.elastic.co/observability/stream:v0.20.0
image: docker.elastic.co/observability/stream:v0.23.0
hostname: kolide-people
ports:
- 8090
volumes:
- ./files:/files:ro
environment:
PORT: '8090'
command:
- http-server
- --addr=:8090
Expand Down
2 changes: 1 addition & 1 deletion packages/kolide/data_stream/people/_dev/deploy/docker/files/config-people.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ rules:
}
],
"pagination": {
"next": "http://{{ hostname }}:{{ env "PORT" }}/people?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"next": "http://{{ .request.host }}/people?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
"current_cursor": "",
"next_cursor": "CURSORPAGE2",
"count": 1
Expand Down
8 changes: 2 additions & 6 deletions packages/kolide/data_stream/request/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
version: '2.3'
services:
kolide-request:
image: docker.elastic.co/observability/stream:v0.20.0
image: docker.elastic.co/observability/stream:v0.23.0
hostname: kolide-request
ports:
- 8090
volumes:
- ./files:/files:ro
environment:
PORT: '8090'
command:
- http-server
- --addr=:8090
- --config=/files/config-request.yml
kolide-request-empty-registration:
image: docker.elastic.co/observability/stream:v0.20.0
image: docker.elastic.co/observability/stream:v0.23.0
hostname: kolide-request-empty-registration
ports:
- 8090
volumes:
- ./files:/files:ro
environment:
PORT: '8090'
command:
- http-server
- --addr=:8090
Expand Down
Loading