chore: adapt to rebased API

Signed-off-by: Jiyong Huang <[email protected]>
lf-edge · Jul 19, 2024 · ce2c849 · ce2c849
1 parent 04d2648
commit ce2c849
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 48 deletions.
diff --git a/internal/conf/conf_test.go b/internal/conf/conf_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 EMQ Technologies Co., Ltd.
+// Copyright 2023-2024 EMQ Technologies Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -438,6 +438,7 @@ func TestSyslogConf_Validate(t *testing.T) {
 
 func TestLoad(t *testing.T) {
 	require.NoError(t, os.Setenv("KUIPER__RULE__RESTARTSTRATEGY__ATTEMPTS", "10"))
+	SetupEnv()
 	InitConf()
 	cpath, err := GetConfLoc()
 	require.NoError(t, err)

diff --git a/internal/io/memory/pubsub/manager.go b/internal/io/memory/pubsub/manager.go
@@ -25,8 +25,8 @@ import (
 const IdProperty = "topic"
 
 type pubConsumers struct {
-	count     int
-	consumers map[string]chan any // The consumer channel list [sourceId]chan, the value must be message or message list
+	count             int
+	consumers         map[string]chan any // The consumer channel list [sourceId]chan, the value must be message or message list
 	consumersReplaced map[string]int
 }
 

diff --git a/internal/io/memory/pubsub/manager_test.go b/internal/io/memory/pubsub/manager_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 EMQ Technologies Co., Ltd.
+// Copyright 2021-2024 EMQ Technologies Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -150,7 +150,6 @@ func TestCreateBeforeDelete(t *testing.T) {
 
 	CloseSourceConsumerChannel("test", "source1")
 	c3 := CreateSub("test", nil, "source1", 100)
-	chans = append(chans, c3)
 	expPub = map[string]*pubConsumers{
 		"test": {
 			count: 1,
@@ -163,7 +162,6 @@ func TestCreateBeforeDelete(t *testing.T) {
 	assert.Equal(t, expPub, pubTopics)
 
 	c4 := CreateSub("test", nil, "source1", 100)
-	chans = append(chans, c4)
 	CloseSourceConsumerChannel("test", "source1")
 
 	expPub = map[string]*pubConsumers{

diff --git a/internal/server/yaml_import_export.go b/internal/server/yaml_import_export.go
@@ -16,6 +16,7 @@ package server
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -417,7 +418,7 @@ func importUploads(m *MetaConfiguration) error {
 }
 
 func importByManager(want map[string]string, m ConfManager, typ string) error {
-	result := m.Import(want)
+	result := m.Import(context.Background(), want)
 	if len(result) < 1 {
 		return nil
 	}

diff --git a/internal/service/executors_test.go b/internal/service/executors_test.go
diff --git a/pkg/cast/time_test.go b/pkg/cast/time_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022-2023 EMQ Technologies Co., Ltd.
+// Copyright 2022-2024 EMQ Technologies Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -290,7 +290,7 @@ func TestConvertFormat(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, "2006-01-02T15:04:05.00Z-0700", s)
 
-	s, err = convertFormat("\\")
+	_, err = convertFormat("\\")
 	require.Error(t, err)
 
 	s, err = convertFormat("yyyy-MM-dd HH:mm:ssSSSSSSSXX")