Skip to content

Commit bac0e7e

Browse files
jsiriannijsirianni
authored
Test against v1.85.0 (#139)
* Test against v1.85.0 * fix make install tools * fix tests, add transform agent config options * Revert duplicate env * stop testing for agents, was not working anyway (wrong project) * revert change to bindplane version * use go.mod for go version * go back to bindplane 1.86 now that CI is passing
1 parent 6c25354 commit bac0e7e

File tree

11 files changed

+343
-411
lines changed

11 files changed

+343
-411
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Go
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: "1.21"
25+
go-version-file: go.mod
2626

2727
- name: Cache Tools
2828
id: tool-cache
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up Go
5555
uses: actions/setup-go@v5
5656
with:
57-
go-version: "1.21"
57+
go-version-file: go.mod
5858

5959
- name: Vet
6060
run: go vet ./...
@@ -78,7 +78,7 @@ jobs:
7878
- name: Set up Go
7979
uses: actions/setup-go@v5
8080
with:
81-
go-version: "1.21"
81+
go-version-file: go.mod
8282

8383
- name: Cache Tools
8484
id: tool-cache
@@ -109,7 +109,7 @@ jobs:
109109
- name: Set up Go
110110
uses: actions/setup-go@v5
111111
with:
112-
go-version: "1.21"
112+
go-version-file: go.mod
113113

114114
- name: Cache Tools
115115
id: tool-cache
@@ -140,7 +140,7 @@ jobs:
140140
- name: Set up Go
141141
uses: actions/setup-go@v5
142142
with:
143-
go-version: "1.21"
143+
go-version-file: go.mod
144144

145145
- name: Cache Tools
146146
id: tool-cache
@@ -171,7 +171,7 @@ jobs:
171171
- name: Set up Go
172172
uses: actions/setup-go@v5
173173
with:
174-
go-version: "1.21"
174+
go-version-file: go.mod
175175

176176
- name: Cache Tools
177177
id: tool-cache
@@ -193,9 +193,9 @@ jobs:
193193
bindplane_version:
194194
- "latest"
195195
- "module" # Use the current Go module version
196+
- "v1.85.0" # v2 config released as beta
196197
- "v1.84.0"
197198
- "v1.80.0"
198-
- "v1.77.0"
199199
- "v1.73.0"
200200
- "v1.71.0"
201201
- "v1.70.0" # Routes introduced. Older clients work against 1.70, but 1.70 client will not work against older bindplane
@@ -221,7 +221,7 @@ jobs:
221221
- name: Set up Go
222222
uses: actions/setup-go@v5
223223
with:
224-
go-version: "1.21"
224+
go-version-file: go.mod
225225

226226
- name: Cache Tools
227227
id: tool-cache
@@ -273,7 +273,7 @@ jobs:
273273
- name: Set up Go
274274
uses: actions/setup-go@v5
275275
with:
276-
go-version: "1.21"
276+
go-version-file: go.mod
277277

278278
- name: Cache Tools
279279
id: tool-cache
@@ -402,7 +402,7 @@ jobs:
402402
- name: Set up Go
403403
uses: actions/setup-go@v5
404404
with:
405-
go-version: "1.21"
405+
go-version-file: go.mod
406406

407407
- name: Cache Tools
408408
id: tool-cache

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Go
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: "1.21"
31+
go-version-file: go.mod
3232

3333
- name: Import GPG key
3434
id: import_gpg

‎client/integration_test.go‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,14 @@ func TestIntegration_http_config(t *testing.T) {
190190
}
191191

192192
env := map[string]string{
193-
"BINDPLANE_USERNAME": username,
194-
"BINDPLANE_PASSWORD": password,
195-
"BINDPLANE_SESSION_SECRET": "524abde2-d9f8-485c-b426-bac229686d13",
196-
"BINDPLANE_LOGGING_OUTPUT": "stdout",
197-
"BINDPLANE_ACCEPT_EULA": "true",
198-
"BINDPLANE_LICENSE": license,
193+
"BINDPLANE_USERNAME": username,
194+
"BINDPLANE_PASSWORD": password,
195+
"BINDPLANE_SESSION_SECRET": "524abde2-d9f8-485c-b426-bac229686d13",
196+
"BINDPLANE_LOGGING_OUTPUT": "stdout",
197+
"BINDPLANE_ACCEPT_EULA": "true",
198+
"BINDPLANE_LICENSE": license,
199+
"BINDPLANE_TRANSFORM_AGENT_ENABLE_REMOTE": "true",
200+
"BINDPLANE_TRANSFORM_AGENT_REMOTE_AGENTS": "transform:4568",
199201
}
200202

201203
container, version := bindplaneContainer(t, env)
@@ -376,12 +378,14 @@ func TestIntegration_invalidProtocol(t *testing.T) {
376378
}
377379

378380
env := map[string]string{
379-
"BINDPLANE_USERNAME": username,
380-
"BINDPLANE_PASSWORD": password,
381-
"BINDPLANE_SESSION_SECRET": "524abde2-d9f8-485c-b426-bac229686d13",
382-
"BINDPLANE_LOGGING_OUTPUT": "stdout",
383-
"BINDPLANE_ACCEPT_EULA": "true",
384-
"BINDPLANE_LICENSE": license,
381+
"BINDPLANE_USERNAME": username,
382+
"BINDPLANE_PASSWORD": password,
383+
"BINDPLANE_SESSION_SECRET": "524abde2-d9f8-485c-b426-bac229686d13",
384+
"BINDPLANE_LOGGING_OUTPUT": "stdout",
385+
"BINDPLANE_ACCEPT_EULA": "true",
386+
"BINDPLANE_LICENSE": license,
387+
"BINDPLANE_TRANSFORM_AGENT_ENABLE_REMOTE": "true",
388+
"BINDPLANE_TRANSFORM_AGENT_REMOTE_AGENTS": "transform:4568",
385389
}
386390

387391
container, version := bindplaneContainer(t, env)
@@ -421,14 +425,16 @@ func TestIntegration_https(t *testing.T) {
421425
}
422426

423427
env := map[string]string{
424-
"BINDPLANE_USERNAME": username,
425-
"BINDPLANE_PASSWORD": password,
426-
"BINDPLANE_TLS_CERT": "/tmp/bindplane.crt",
427-
"BINDPLANE_TLS_KEY": "/tmp/bindplane.key",
428-
"BINDPLANE_SESSION_SECRET": "524abde2-d9f8-485c-b426-bac229686d13",
429-
"BINDPLANE_LOGGING_OUTPUT": "stdout",
430-
"BINDPLANE_ACCEPT_EULA": "true",
431-
"BINDPLANE_LICENSE": license,
428+
"BINDPLANE_USERNAME": username,
429+
"BINDPLANE_PASSWORD": password,
430+
"BINDPLANE_TLS_CERT": "/tmp/bindplane.crt",
431+
"BINDPLANE_TLS_KEY": "/tmp/bindplane.key",
432+
"BINDPLANE_SESSION_SECRET": "524abde2-d9f8-485c-b426-bac229686d13",
433+
"BINDPLANE_LOGGING_OUTPUT": "stdout",
434+
"BINDPLANE_ACCEPT_EULA": "true",
435+
"BINDPLANE_LICENSE": license,
436+
"BINDPLANE_TRANSFORM_AGENT_ENABLE_REMOTE": "true",
437+
"BINDPLANE_TRANSFORM_AGENT_REMOTE_AGENTS": "transform:4568",
432438
}
433439

434440
container, version := bindplaneContainer(t, env)
@@ -468,15 +474,17 @@ func TestIntegration_mtls(t *testing.T) {
468474
}
469475

470476
env := map[string]string{
471-
"BINDPLANE_USERNAME": username,
472-
"BINDPLANE_PASSWORD": password,
473-
"BINDPLANE_TLS_CERT": "/tmp/bindplane.crt",
474-
"BINDPLANE_TLS_KEY": "/tmp/bindplane.key",
475-
"BINDPLANE_TLS_CA": "/tmp/bindplane-ca.crt",
476-
"BINDPLANE_SESSION_SECRET": "524abde2-d9f8-485c-b426-bac229686d13",
477-
"BINDPLANE_LOGGING_OUTPUT": "stdout",
478-
"BINDPLANE_ACCEPT_EULA": "true",
479-
"BINDPLANE_LICENSE": license,
477+
"BINDPLANE_USERNAME": username,
478+
"BINDPLANE_PASSWORD": password,
479+
"BINDPLANE_TLS_CERT": "/tmp/bindplane.crt",
480+
"BINDPLANE_TLS_KEY": "/tmp/bindplane.key",
481+
"BINDPLANE_TLS_CA": "/tmp/bindplane-ca.crt",
482+
"BINDPLANE_SESSION_SECRET": "524abde2-d9f8-485c-b426-bac229686d13",
483+
"BINDPLANE_LOGGING_OUTPUT": "stdout",
484+
"BINDPLANE_ACCEPT_EULA": "true",
485+
"BINDPLANE_LICENSE": license,
486+
"BINDPLANE_TRANSFORM_AGENT_ENABLE_REMOTE": "true",
487+
"BINDPLANE_TRANSFORM_AGENT_REMOTE_AGENTS": "transform:4568",
480488
}
481489

482490
container, version := bindplaneContainer(t, env)

0 commit comments

Comments
 (0)