From fca20905c1bd0dc2edf326b792b57e42cfb27af0 Mon Sep 17 00:00:00 2001 From: Abhishek Kondur Date: Wed, 11 Jan 2023 07:29:33 +0530 Subject: [PATCH] remove bson tags,go mod update --- go.mod | 55 ----------------------------------------------- models/host.go | 8 +++---- models/structs.go | 4 ++-- 3 files changed, 6 insertions(+), 61 deletions(-) diff --git a/go.mod b/go.mod index c31afa4c..218e34af 100644 --- a/go.mod +++ b/go.mod @@ -52,64 +52,9 @@ require ( require ( cloud.google.com/go/compute/metadata v0.2.1 // indirect - github.com/Microsoft/go-winio v0.5.2 // indirect - github.com/bep/debounce v1.2.1 // indirect - github.com/cloverstd/tcping v0.1.1 // indirect - github.com/devilcove/httpclient v0.6.0 // indirect - github.com/docker/distribution v2.8.1+incompatible // indirect - github.com/docker/docker v20.10.17+incompatible // indirect - github.com/docker/go-connections v0.4.0 // indirect - github.com/docker/go-units v0.4.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/gopacket v1.1.19 // indirect - github.com/guumaster/hostctl v1.1.3 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect - github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect - github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect - github.com/kr/pretty v0.3.1 // indirect - github.com/kr/text v0.2.0 // indirect - github.com/labstack/echo/v4 v4.9.0 // indirect - github.com/labstack/gommon v0.3.1 // indirect - github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/gosod v1.0.3 // indirect - github.com/leaanthony/slicer v1.5.0 // indirect - github.com/magiconair/properties v1.8.6 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect - github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect - github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect - github.com/samber/lo v1.27.1 // indirect - github.com/spf13/afero v1.9.2 // indirect - github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.14.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect - github.com/tkrajina/go-reflector v0.5.5 // indirect - github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasttemplate v1.2.1 // indirect - github.com/vishvananda/netlink v1.1.0 // indirect - github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect - github.com/wailsapp/mimetype v1.4.1 // indirect - github.com/wailsapp/wails/v2 v2.3.1 // indirect - golang.design/x/clipboard v0.6.3 // indirect - golang.org/x/exp/shiny v0.0.0-20221208044002-44028be4359e // indirect - golang.org/x/image v0.0.0-20220601225756-64ec528b34cd // indirect - golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee // indirect - golang.org/x/term v0.2.0 // indirect - golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect - golang.zx2c4.com/wireguard/windows v0.5.3 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect ) require ( diff --git a/models/host.go b/models/host.go index 8b630a6e..da24dbe2 100644 --- a/models/host.go +++ b/models/host.go @@ -34,10 +34,10 @@ type Host struct { TrafficKeyPublic []byte `json:"traffickeypublic" yaml:"trafficekeypublic"` InternetGateway net.UDPAddr `json:"internetgateway" yaml:"internetgateway"` Nodes []string `json:"nodes" yaml:"nodes"` - IsRelayed bool `json:"isrelayed" bson:"isrelayed" yaml:"isrelayed"` - RelayedBy string `json:"relayed_by" bson:"relayed_by" yaml:"relayed_by"` - IsRelay bool `json:"isrelay" bson:"isrelay" yaml:"isrelay"` - RelayedHosts []string `json:"relay_hosts" bson:"relay_hosts" yaml:"relay_hosts"` + IsRelayed bool `json:"isrelayed" yaml:"isrelayed"` + RelayedBy string `json:"relayed_by" yaml:"relayed_by"` + IsRelay bool `json:"isrelay" yaml:"isrelay"` + RelayedHosts []string `json:"relay_hosts" yaml:"relay_hosts"` Interfaces []Iface `json:"interfaces" yaml:"interfaces"` EndpointIP net.IP `json:"endpointip" yaml:"endpointip"` ProxyEnabled bool `json:"proxy_enabled" yaml:"proxy_enabled"` diff --git a/models/structs.go b/models/structs.go index b64da9b5..a3257111 100644 --- a/models/structs.go +++ b/models/structs.go @@ -174,8 +174,8 @@ type RelayRequest struct { // HostRelayRequest - struct for host relay creation type HostRelayRequest struct { - HostID string `json:"host_id" bson:"host_id"` - RelayedHosts []string `json:"relayed_hosts" bson:"relayed_hosts"` + HostID string `json:"host_id"` + RelayedHosts []string `json:"relayed_hosts"` } // ServerUpdateData - contains data to configure server