diff --git a/admin/handlers/go.mod b/admin/handlers/go.mod index cb3c776e..2a67337a 100644 --- a/admin/handlers/go.mod +++ b/admin/handlers/go.mod @@ -6,18 +6,18 @@ require ( github.com/gorilla/mux v1.7.4 github.com/gorilla/sessions v1.2.0 // indirect github.com/jinzhu/gorm v1.9.12 - github.com/jmpsec/osctrl/admin/sessions v0.2.2 - github.com/jmpsec/osctrl/carves v0.2.2 - github.com/jmpsec/osctrl/environments v0.2.2 - github.com/jmpsec/osctrl/logging v0.2.2 - github.com/jmpsec/osctrl/metrics v0.2.2 - github.com/jmpsec/osctrl/nodes v0.2.2 - github.com/jmpsec/osctrl/queries v0.2.2 - github.com/jmpsec/osctrl/settings v0.2.2 + github.com/jmpsec/osctrl/admin/sessions v0.2.3 + github.com/jmpsec/osctrl/carves v0.2.3 + github.com/jmpsec/osctrl/environments v0.2.3 + github.com/jmpsec/osctrl/logging v0.2.3 + github.com/jmpsec/osctrl/metrics v0.2.3 + github.com/jmpsec/osctrl/nodes v0.2.3 + github.com/jmpsec/osctrl/queries v0.2.3 + github.com/jmpsec/osctrl/settings v0.2.3 github.com/jmpsec/osctrl/tags v0.0.0-20200527045717-0e3b5d71cf19 - github.com/jmpsec/osctrl/types v0.2.2 - github.com/jmpsec/osctrl/users v0.2.2 - github.com/jmpsec/osctrl/utils v0.2.2 + github.com/jmpsec/osctrl/types v0.2.3 + github.com/jmpsec/osctrl/users v0.2.3 + github.com/jmpsec/osctrl/utils v0.2.3 ) replace github.com/jmpsec/osctrl/carves => ../../carves diff --git a/admin/main.go b/admin/main.go index e79babf9..f83fdd87 100644 --- a/admin/main.go +++ b/admin/main.go @@ -34,7 +34,7 @@ const ( // Service name serviceName string = projectName + "-" + settings.ServiceAdmin // Service version - serviceVersion string = "0.2.2" + serviceVersion string = "0.2.3" // Service description serviceDescription string = "Admin service for osctrl" // Application description diff --git a/admin/settings.go b/admin/settings.go index de8e7171..790c9862 100644 --- a/admin/settings.go +++ b/admin/settings.go @@ -27,10 +27,10 @@ func loadingMetrics(mgr *settings.Settings) (*metrics.Metrics, error) { } _m, err := metrics.CreateMetrics(_mCfg.Protocol, _mCfg.Host, _mCfg.Port, serviceName) if err != nil { - return nil, fmt.Errorf("Failed to initialize metrics: %v", err) if err := mgr.SetBoolean(false, settings.ServiceAdmin, settings.ServiceMetrics); err != nil { return nil, fmt.Errorf("Failed to disable metrics: %v", err) } + return nil, fmt.Errorf("Failed to initialize metrics: %v", err) } return _m, nil } diff --git a/api/main.go b/api/main.go index 3a79a691..75a70b96 100644 --- a/api/main.go +++ b/api/main.go @@ -29,7 +29,7 @@ const ( // Service name serviceName string = projectName + "-" + settings.ServiceAPI // Service version - serviceVersion string = "0.2.2" + serviceVersion string = "0.2.3" // Service description serviceDescription string = "API service for osctrl" // Application description diff --git a/cli/main.go b/cli/main.go index 426cf017..0a213f07 100644 --- a/cli/main.go +++ b/cli/main.go @@ -25,7 +25,7 @@ const ( // Application name appName string = projectName + "-cli" // Application version - appVersion string = "0.2.2" + appVersion string = "0.2.3" // Application usage appUsage string = "CLI for " + projectName // Application description diff --git a/go.mod b/go.mod index d173d048..1f1c963b 100644 --- a/go.mod +++ b/go.mod @@ -8,21 +8,21 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gorilla/mux v1.7.4 github.com/jinzhu/gorm v1.9.12 - github.com/jmpsec/osctrl/admin/handlers v0.2.2 - github.com/jmpsec/osctrl/admin/sessions v0.2.2 - github.com/jmpsec/osctrl/backend v0.2.2 - github.com/jmpsec/osctrl/carves v0.2.2 - github.com/jmpsec/osctrl/environments v0.2.2 - github.com/jmpsec/osctrl/logging v0.2.2 - github.com/jmpsec/osctrl/metrics v0.2.2 - github.com/jmpsec/osctrl/nodes v0.2.2 - github.com/jmpsec/osctrl/queries v0.2.2 - github.com/jmpsec/osctrl/settings v0.2.2 - github.com/jmpsec/osctrl/tags v0.2.2 - github.com/jmpsec/osctrl/tls/handlers v0.2.2 - github.com/jmpsec/osctrl/types v0.2.2 - github.com/jmpsec/osctrl/users v0.2.2 - github.com/jmpsec/osctrl/utils v0.2.2 + github.com/jmpsec/osctrl/admin/handlers v0.2.3 + github.com/jmpsec/osctrl/admin/sessions v0.2.3 + github.com/jmpsec/osctrl/backend v0.2.3 + github.com/jmpsec/osctrl/carves v0.2.3 + github.com/jmpsec/osctrl/environments v0.2.3 + github.com/jmpsec/osctrl/logging v0.2.3 + github.com/jmpsec/osctrl/metrics v0.2.3 + github.com/jmpsec/osctrl/nodes v0.2.3 + github.com/jmpsec/osctrl/queries v0.2.3 + github.com/jmpsec/osctrl/settings v0.2.3 + github.com/jmpsec/osctrl/tags v0.2.3 + github.com/jmpsec/osctrl/tls/handlers v0.2.3 + github.com/jmpsec/osctrl/types v0.2.3 + github.com/jmpsec/osctrl/users v0.2.3 + github.com/jmpsec/osctrl/utils v0.2.3 github.com/olekukonko/tablewriter v0.0.4 github.com/russellhaering/goxmldsig v0.0.0-20180430223755-7acd5e4a6ef7 // indirect github.com/spf13/viper v1.6.2 diff --git a/tls/handlers/go.mod b/tls/handlers/go.mod index 9b4664c6..d084d967 100644 --- a/tls/handlers/go.mod +++ b/tls/handlers/go.mod @@ -4,16 +4,16 @@ go 1.14 require ( github.com/gorilla/mux v1.6.2 - github.com/jmpsec/osctrl/carves v0.2.2 - github.com/jmpsec/osctrl/environments v0.2.2 - github.com/jmpsec/osctrl/logging v0.2.2 - github.com/jmpsec/osctrl/metrics v0.2.2 - github.com/jmpsec/osctrl/nodes v0.2.2 - github.com/jmpsec/osctrl/queries v0.2.2 - github.com/jmpsec/osctrl/settings v0.2.2 + github.com/jmpsec/osctrl/carves v0.2.3 + github.com/jmpsec/osctrl/environments v0.2.3 + github.com/jmpsec/osctrl/logging v0.2.3 + github.com/jmpsec/osctrl/metrics v0.2.3 + github.com/jmpsec/osctrl/nodes v0.2.3 + github.com/jmpsec/osctrl/queries v0.2.3 + github.com/jmpsec/osctrl/settings v0.2.3 github.com/jmpsec/osctrl/tags v0.0.0-20200527045717-0e3b5d71cf19 - github.com/jmpsec/osctrl/types v0.2.2 - github.com/jmpsec/osctrl/utils v0.2.2 + github.com/jmpsec/osctrl/types v0.2.3 + github.com/jmpsec/osctrl/utils v0.2.3 github.com/segmentio/ksuid v1.0.2 github.com/stretchr/testify v1.5.1 ) diff --git a/tls/main.go b/tls/main.go index 614136a1..fe071925 100644 --- a/tls/main.go +++ b/tls/main.go @@ -30,7 +30,7 @@ const ( // Service name serviceName string = projectName + "-" + settings.ServiceTLS // Service version - serviceVersion string = "0.2.2" + serviceVersion string = "0.2.3" // Service description serviceDescription string = "TLS service for osctrl" // Application description