Skip to content

Commit f9b7fb0

Browse files
alwittalwitt
committed
patch: Upgrade to Go 1.22
1 parent ddfa60e commit f9b7fb0

15 files changed

+183
-172
lines changed

‎.github/workflows/cicd.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v4
2121
with:
22-
go-version: "1.20"
22+
go-version: "1.22"
2323

2424
- name: Prepare UT mocks
2525
run: |
26-
go install github.com/vektra/mockery/v2@v2.38.0
26+
go install github.com/vektra/mockery/v2@v2.43.0
2727
mockery --dir db --name PersistenceManager
2828
mockery --dir db --name ConnectionManager
2929
mockery --dir utils --name SegmentReader
@@ -56,11 +56,11 @@ jobs:
5656
- name: Set up Go
5757
uses: actions/setup-go@v4
5858
with:
59-
go-version: "1.20"
59+
go-version: "1.22"
6060

6161
- name: Prepare UT mocks
6262
run: |
63-
go install github.com/vektra/mockery/v2@v2.38.0
63+
go install github.com/vektra/mockery/v2@v2.43.0
6464
mockery --dir db --name PersistenceManager
6565
mockery --dir db --name ConnectionManager
6666
mockery --dir utils --name SegmentReader
@@ -82,7 +82,7 @@ jobs:
8282
- name: golangci-lint
8383
uses: golangci/golangci-lint-action@v3
8484
with:
85-
version: v1.51.2
85+
version: v1.57.2
8686
args: --timeout 3m0s
8787

8888
test:
@@ -117,11 +117,11 @@ jobs:
117117
- name: Set up Go
118118
uses: actions/setup-go@v4
119119
with:
120-
go-version: "1.20"
120+
go-version: "1.22"
121121

122122
- name: Prepare UT mocks
123123
run: |
124-
go install github.com/vektra/mockery/v2@v2.38.0
124+
go install github.com/vektra/mockery/v2@v2.43.0
125125
mockery --dir db --name PersistenceManager
126126
mockery --dir db --name ConnectionManager
127127
mockery --dir utils --name SegmentReader

‎.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: golang:1.20.1
1+
image: golang:1.22.1
22

33
stages:
44
- test
@@ -53,7 +53,7 @@ cicd:
5353
UNITTEST_S3_ENDPOINT: minio:9000
5454

5555
script:
56-
- go install github.com/vektra/mockery/v2@v2.38.0
56+
- go install github.com/vektra/mockery/v2@v2.43.0
5757
- mockery --dir db --name PersistenceManager
5858
- mockery --dir db --name ConnectionManager
5959
- mockery --dir utils --name SegmentReader

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@ ts-sdk: .prepare ## Generate Javascript client
6767

6868
.PHONY: up
6969
up: ## Prepare the docker stack
70-
@docker-compose -f docker/docker-compose.yaml --project-directory $(BASE_DIR) up -d livemix-ctrl-node
70+
@docker compose -f docker/docker-compose.yaml --project-directory $(BASE_DIR) up -d livemix-ctrl-node
7171

7272
.PHONY: up-edge
7373
up-edge: ## Prepare the test edge node in the docker stack
74-
@docker-compose -f docker/docker-compose.yaml --project-directory $(BASE_DIR) up -d livemix-edge-node
74+
@docker compose -f docker/docker-compose.yaml --project-directory $(BASE_DIR) up -d livemix-edge-node
7575

7676
.PHONY: up-dev
7777
up-dev: ## Prepare the development docker stack
78-
@docker-compose -f docker/docker-compose.yaml --project-directory $(BASE_DIR) up -d livemix-ctrl-db livemix-memcached livemix-minio
78+
@docker compose -f docker/docker-compose.yaml --project-directory $(BASE_DIR) up -d livemix-ctrl-db livemix-memcached livemix-minio
7979

8080
.PHONY: down
8181
down: ## Take down docker stack
82-
@docker-compose -f docker/docker-compose.yaml --project-directory $(BASE_DIR) down
82+
@docker compose -f docker/docker-compose.yaml --project-directory $(BASE_DIR) down
8383

8484
.PHONY: ctrl
8585
ctrl: build ## Run local development system control node application

‎control/control_to_edge_rr_test.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestControlToEdgeGetVideoSourceInfoResponse(t *testing.T) {
3333
var requestInject goutils.ReqRespMessageHandler
3434
mockRRClient.On(
3535
"SetInboundRequestHandler",
36-
mock.AnythingOfType("*context.emptyCtx"),
36+
mock.AnythingOfType("context.backgroundCtx"),
3737
mock.AnythingOfType("goutils.ReqRespMessageHandler"),
3838
).Run(func(args mock.Arguments) {
3939
requestInject = args.Get(1).(goutils.ReqRespMessageHandler)
@@ -82,12 +82,12 @@ func TestControlToEdgeGetVideoSourceInfoResponse(t *testing.T) {
8282

8383
mockSystem.On(
8484
"GetVideoSourceByName",
85-
mock.AnythingOfType("*context.emptyCtx"),
85+
mock.AnythingOfType("context.backgroundCtx"),
8686
"video-00",
8787
).Return(videoInfo, nil).Once()
8888
mockRRClient.On(
8989
"Respond",
90-
mock.AnythingOfType("*context.emptyCtx"),
90+
mock.AnythingOfType("context.backgroundCtx"),
9191
mock.AnythingOfType("goutils.ReqRespMessage"),
9292
mock.AnythingOfType("[]uint8"),
9393
mock.AnythingOfType("map[string]string"),
@@ -115,12 +115,12 @@ func TestControlToEdgeGetVideoSourceInfoResponse(t *testing.T) {
115115

116116
mockSystem.On(
117117
"GetVideoSourceByName",
118-
mock.AnythingOfType("*context.emptyCtx"),
118+
mock.AnythingOfType("context.backgroundCtx"),
119119
"video-00",
120120
).Return(videoInfo, fmt.Errorf("dummy error")).Once()
121121
mockRRClient.On(
122122
"Respond",
123-
mock.AnythingOfType("*context.emptyCtx"),
123+
mock.AnythingOfType("context.backgroundCtx"),
124124
mock.AnythingOfType("goutils.ReqRespMessage"),
125125
mock.AnythingOfType("[]uint8"),
126126
mock.AnythingOfType("map[string]string"),
@@ -159,7 +159,7 @@ func TestControlToEdgeListActiveRecordingOfSource(t *testing.T) {
159159
var requestInject goutils.ReqRespMessageHandler
160160
mockRRClient.On(
161161
"SetInboundRequestHandler",
162-
mock.AnythingOfType("*context.emptyCtx"),
162+
mock.AnythingOfType("context.backgroundCtx"),
163163
mock.AnythingOfType("goutils.ReqRespMessageHandler"),
164164
).Run(func(args mock.Arguments) {
165165
requestInject = args.Get(1).(goutils.ReqRespMessageHandler)
@@ -208,13 +208,13 @@ func TestControlToEdgeListActiveRecordingOfSource(t *testing.T) {
208208

209209
mockSystem.On(
210210
"ListRecordingSessionsOfSource",
211-
mock.AnythingOfType("*context.emptyCtx"),
211+
mock.AnythingOfType("context.backgroundCtx"),
212212
testSourceID,
213213
true,
214214
).Return(recordings, nil).Once()
215215
mockRRClient.On(
216216
"Respond",
217-
mock.AnythingOfType("*context.emptyCtx"),
217+
mock.AnythingOfType("context.backgroundCtx"),
218218
mock.AnythingOfType("goutils.ReqRespMessage"),
219219
mock.AnythingOfType("[]uint8"),
220220
mock.AnythingOfType("map[string]string"),
@@ -246,13 +246,13 @@ func TestControlToEdgeListActiveRecordingOfSource(t *testing.T) {
246246

247247
mockSystem.On(
248248
"ListRecordingSessionsOfSource",
249-
mock.AnythingOfType("*context.emptyCtx"),
249+
mock.AnythingOfType("context.backgroundCtx"),
250250
testSourceID,
251251
true,
252252
).Return(recordings, fmt.Errorf("dummy error")).Once()
253253
mockRRClient.On(
254254
"Respond",
255-
mock.AnythingOfType("*context.emptyCtx"),
255+
mock.AnythingOfType("context.backgroundCtx"),
256256
mock.AnythingOfType("goutils.ReqRespMessage"),
257257
mock.AnythingOfType("[]uint8"),
258258
mock.AnythingOfType("map[string]string"),
@@ -289,7 +289,7 @@ func TestControlToEdgeChangeVideoStreamingState(t *testing.T) {
289289

290290
mockRRClient.On(
291291
"SetInboundRequestHandler",
292-
mock.AnythingOfType("*context.emptyCtx"),
292+
mock.AnythingOfType("context.backgroundCtx"),
293293
mock.AnythingOfType("goutils.ReqRespMessageHandler"),
294294
).Return(nil).Once()
295295

@@ -313,7 +313,7 @@ func TestControlToEdgeChangeVideoStreamingState(t *testing.T) {
313313
// Prepare mocks for request
314314
mockRRClient.On(
315315
"Request",
316-
mock.AnythingOfType("*context.emptyCtx"),
316+
mock.AnythingOfType("context.backgroundCtx"),
317317
targetReqRespID,
318318
mock.AnythingOfType("[]uint8"),
319319
mock.AnythingOfType("map[string]string"),
@@ -356,7 +356,7 @@ func TestControlToEdgeStartRecording(t *testing.T) {
356356

357357
mockRRClient.On(
358358
"SetInboundRequestHandler",
359-
mock.AnythingOfType("*context.emptyCtx"),
359+
mock.AnythingOfType("context.backgroundCtx"),
360360
mock.AnythingOfType("goutils.ReqRespMessageHandler"),
361361
).Return(nil).Once()
362362

@@ -376,7 +376,7 @@ func TestControlToEdgeStartRecording(t *testing.T) {
376376
// Prepare mocks for request
377377
mockRRClient.On(
378378
"Request",
379-
mock.AnythingOfType("*context.emptyCtx"),
379+
mock.AnythingOfType("context.backgroundCtx"),
380380
testRRTargetID,
381381
mock.AnythingOfType("[]uint8"),
382382
mock.AnythingOfType("map[string]string"),
@@ -414,7 +414,7 @@ func TestControlToEdgeStartRecording(t *testing.T) {
414414
// Prepare mocks for request
415415
mockRRClient.On(
416416
"Request",
417-
mock.AnythingOfType("*context.emptyCtx"),
417+
mock.AnythingOfType("context.backgroundCtx"),
418418
testRRTargetID,
419419
mock.AnythingOfType("[]uint8"),
420420
mock.AnythingOfType("map[string]string"),
@@ -455,7 +455,7 @@ func TestControlToEdgeStopRecording(t *testing.T) {
455455

456456
mockRRClient.On(
457457
"SetInboundRequestHandler",
458-
mock.AnythingOfType("*context.emptyCtx"),
458+
mock.AnythingOfType("context.backgroundCtx"),
459459
mock.AnythingOfType("goutils.ReqRespMessageHandler"),
460460
).Return(nil).Once()
461461

@@ -476,7 +476,7 @@ func TestControlToEdgeStopRecording(t *testing.T) {
476476
// Prepare mocks for request
477477
mockRRClient.On(
478478
"Request",
479-
mock.AnythingOfType("*context.emptyCtx"),
479+
mock.AnythingOfType("context.backgroundCtx"),
480480
testRRTargetID,
481481
mock.AnythingOfType("[]uint8"),
482482
mock.AnythingOfType("map[string]string"),
@@ -514,7 +514,7 @@ func TestControlToEdgeStopRecording(t *testing.T) {
514514
// Prepare mocks for request
515515
mockRRClient.On(
516516
"Request",
517-
mock.AnythingOfType("*context.emptyCtx"),
517+
mock.AnythingOfType("context.backgroundCtx"),
518518
testRRTargetID,
519519
mock.AnythingOfType("[]uint8"),
520520
mock.AnythingOfType("map[string]string"),

0 commit comments

Comments
 (0)