diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-12-21 21:54:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 21:54:04 +0800 |
| commit | 3325bf925a7cedc220215dd0c4debac26f1a4318 (patch) | |
| tree | ae8fdcb2dee1255a9b02bb8c5bfcfb386d8a6307 /staging | |
| parent | Merge pull request #5313 from Windrow14/bugfix/metaserver_panic_when_handling... (diff) | |
| parent | fix mapper framework dockerfile (diff) | |
| download | kubeedge-3325bf925a7cedc220215dd0c4debac26f1a4318.tar.gz | |
Merge pull request #5288 from wbc6080/fix-mapper-dockerfile
fix mapper framework generate.sh to build image successfully
Diffstat (limited to 'staging')
| -rw-r--r-- | staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go | 8 | ||||
| -rwxr-xr-x | staging/src/github.com/kubeedge/mapper-framework/hack/make-rules/generate.sh | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go index 551f435e8..ac213d1fe 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go +++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/tdengine/client.go @@ -4,12 +4,14 @@ import ( "database/sql" "encoding/json" "fmt" - "github.com/kubeedge/Template/pkg/common" - _ "github.com/taosdata/driver-go/v3/taosRestful" - "k8s.io/klog/v2" "os" "strings" "time" + + _ "github.com/taosdata/driver-go/v3/taosRestful" + "k8s.io/klog/v2" + + "github.com/kubeedge/Template/pkg/common" ) var ( diff --git a/staging/src/github.com/kubeedge/mapper-framework/hack/make-rules/generate.sh b/staging/src/github.com/kubeedge/mapper-framework/hack/make-rules/generate.sh index 086ddb5a5..5e6901a2f 100755 --- a/staging/src/github.com/kubeedge/mapper-framework/hack/make-rules/generate.sh +++ b/staging/src/github.com/kubeedge/mapper-framework/hack/make-rules/generate.sh @@ -28,6 +28,8 @@ function entry() { sed -i "s/Template/${mapperVar}/g" `grep Template -rl ${mapperPath}` sed -i "s/kubeedge\/${mapperVar}/kubeedge\/${mapperNameLowercase}/g" `grep "kubeedge\/${mapperVar}" -rl $mapperPath` + cd ${mapperPath} && go mod tidy + empty_file_path="${MAPPER_DIR}/.empty" if [ -f "$empty_file_path" ]; then rm "$empty_file_path" @@ -36,4 +38,4 @@ function entry() { } -entry "$@"
\ No newline at end of file +entry "$@" |