From 2095385d61e340bf1d94ea9bf072a58d2b741b59 Mon Sep 17 00:00:00 2001 From: crusader Date: Mon, 4 Dec 2017 19:42:13 +0900 Subject: [PATCH] ing --- config/probe/probe.go | 2 +- modules/config/config.go | 1 + modules/config/model/Keys.go | 2 +- modules/discovery/model/DiscoveryService.go | 1 - modules/discovery/model/Service.go | 8 ++++---- modules/discovery/model/Zone.go | 10 +++++----- modules/noauthprobe/model/NoAuthProbe.go | 1 - 7 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 modules/config/config.go diff --git a/config/probe/probe.go b/config/probe/probe.go index aa7d996..a9bd366 100644 --- a/config/probe/probe.go +++ b/config/probe/probe.go @@ -2,4 +2,4 @@ package probe const ( ConfigFileName = "config.json" -) \ No newline at end of file +) diff --git a/modules/config/config.go b/modules/config/config.go new file mode 100644 index 0000000..d912156 --- /dev/null +++ b/modules/config/config.go @@ -0,0 +1 @@ +package config diff --git a/modules/config/model/Keys.go b/modules/config/model/Keys.go index decbd46..36e3534 100644 --- a/modules/config/model/Keys.go +++ b/modules/config/model/Keys.go @@ -3,4 +3,4 @@ package model type Keys struct { Metric string `json:"metric,omitempty"` Key string `json:"key,omitempty"` -} \ No newline at end of file +} diff --git a/modules/discovery/model/DiscoveryService.go b/modules/discovery/model/DiscoveryService.go index 4181550..e518e8e 100644 --- a/modules/discovery/model/DiscoveryService.go +++ b/modules/discovery/model/DiscoveryService.go @@ -1,6 +1,5 @@ package model - type DiscoveryService struct { IncludeServices []string `json:"includeServices,omitempty"` } diff --git a/modules/discovery/model/Service.go b/modules/discovery/model/Service.go index 5f67d86..4da841c 100644 --- a/modules/discovery/model/Service.go +++ b/modules/discovery/model/Service.go @@ -7,11 +7,11 @@ import ( ) type Service struct { - Port *Port `json:"port,omitempty"` + Port *Port `json:"port,omitempty"` - ID json.Number `json:"id,Number,omitempty"` - CryptoType string `json:"cryptoType,omitempty"` - ServiceName string `json:"serviceName,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + CryptoType string `json:"cryptoType,omitempty"` + ServiceName string `json:"serviceName,omitempty"` DiscoveredDate util.Timestamp `json:"discoveredDate,omitempty"` } diff --git a/modules/discovery/model/Zone.go b/modules/discovery/model/Zone.go index 0049cda..23d91ca 100644 --- a/modules/discovery/model/Zone.go +++ b/modules/discovery/model/Zone.go @@ -8,11 +8,11 @@ import ( ) type Zone struct { - ID json.Number `json:"id,Number,omitempty"` - Network string `json:"network,omitempty"` - IP string `json:"ip,omitempty"` - Iface string `json:"iface,omitempty"` - Mac string `json:"mac,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + Network string `json:"network,omitempty"` + IP string `json:"ip,omitempty"` + Iface string `json:"iface,omitempty"` + Mac string `json:"mac,omitempty"` DiscoveredDate util.Timestamp `json:"discoveredDate,omitempty"` diff --git a/modules/noauthprobe/model/NoAuthProbe.go b/modules/noauthprobe/model/NoAuthProbe.go index 0dc2183..fe3d6c7 100644 --- a/modules/noauthprobe/model/NoAuthProbe.go +++ b/modules/noauthprobe/model/NoAuthProbe.go @@ -19,4 +19,3 @@ type NoAuthProbe struct { Domain *domain.DomainMember `json:"domain,omitempty"` Probe *probe.Probe `json:"probe,omitempty"` } -