sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-25 19:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix snyk hopefully

Browse Source
This commit is contained in:
aliamerj
2025-08-29 16:13:00 +03:00
parent a9c179ee61
commit e953089f0b
4 changed files with 8 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/management/http/api/generate.sh
View File

@@ -12,6 +12,5 @@ old_pwd=$(pwd)
script_path=$(dirname $(realpath "$0"))
cd "$script_path"
go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest
go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@4a1477f6a8ba6ca8115cc23bb2fb67f0b9fca18e
oapi-codegen --config cfg.yaml openapi.yml
cd "$old_pwd"

8
shared/management/http/api/types.gen.go
View File

@@ -1,6 +1,6 @@
// Package api provides primitives to interact with the openapi HTTP API.
//
// Code generated by github.com/deepmap/oapi-codegen version v1.11.1-0.20220912230023-4a1477f6a8ba DO NOT EDIT.
// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.5.0 DO NOT EDIT.
package api
import (
@@ -8,7 +8,7 @@ import (
"errors"
"time"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/oapi-codegen/runtime"
)
const (
@@ -2070,7 +2070,7 @@ func (t *WorkloadRequest) MergeBundleWorkloadRequest(v BundleWorkloadRequest) er
return err
}
merged, err := runtime.JsonMerge(b, t.union)
merged, err := runtime.JSONMerge(t.union, b)
t.union = merged
return err
}
@@ -2129,7 +2129,7 @@ func (t *WorkloadResponse) MergeBundleWorkloadResponse(v BundleWorkloadResponse)
return err
}
merged, err := runtime.JsonMerge(b, t.union)
merged, err := runtime.JSONMerge(t.union, b)
t.union = merged
return err
}