You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2018/03/13 19:17:44 UTC
[incubator-trafficcontrol] 05/05: move about endpoint to about
package
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 09aaab5d91234780f410f6c8179d64907e9519ac
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Tue Mar 13 13:09:04 2018 -0600
move about endpoint to about package
---
traffic_ops/traffic_ops_golang/{utils => about}/about.go | 2 +-
traffic_ops/traffic_ops_golang/{utils => about}/about_test.go | 2 +-
traffic_ops/traffic_ops_golang/routes.go | 4 ++--
traffic_ops/traffic_ops_golang/traffic_ops_golang.go | 6 +++---
traffic_ops/traffic_ops_golang/wrappers.go | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/traffic_ops/traffic_ops_golang/utils/about.go b/traffic_ops/traffic_ops_golang/about/about.go
similarity index 99%
rename from traffic_ops/traffic_ops_golang/utils/about.go
rename to traffic_ops/traffic_ops_golang/about/about.go
index d55b03c..3670365 100644
--- a/traffic_ops/traffic_ops_golang/utils/about.go
+++ b/traffic_ops/traffic_ops_golang/about/about.go
@@ -1,4 +1,4 @@
-package utils
+package about
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/traffic_ops/traffic_ops_golang/utils/about_test.go b/traffic_ops/traffic_ops_golang/about/about_test.go
similarity index 99%
rename from traffic_ops/traffic_ops_golang/utils/about_test.go
rename to traffic_ops/traffic_ops_golang/about/about_test.go
index bcbc444..19f5a0c 100644
--- a/traffic_ops/traffic_ops_golang/utils/about_test.go
+++ b/traffic_ops/traffic_ops_golang/about/about_test.go
@@ -1,4 +1,4 @@
-package utils
+package about
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/traffic_ops/traffic_ops_golang/routes.go b/traffic_ops/traffic_ops_golang/routes.go
index fbe0f7f..2ecef92 100644
--- a/traffic_ops/traffic_ops_golang/routes.go
+++ b/traffic_ops/traffic_ops_golang/routes.go
@@ -29,6 +29,7 @@ import (
"time"
tclog "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/about"
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/api"
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/asn"
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/auth"
@@ -45,7 +46,6 @@ import (
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/status"
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/systeminfo"
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/types"
- "github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/utils"
"github.com/basho/riak-go-client"
)
@@ -68,7 +68,7 @@ func Routes(d ServerData) ([]Route, http.Handler, error) {
routes := []Route{
//About
- {1.3, http.MethodGet, `about/?(\.json)?$`, utils.AboutHandler(), auth.PrivLevelReadOnly, Authenticated, nil},
+ {1.3, http.MethodGet, `about/?(\.json)?$`, about.AboutHandler(), auth.PrivLevelReadOnly, Authenticated, nil},
// Proxied routes
//CDNs
diff --git a/traffic_ops/traffic_ops_golang/traffic_ops_golang.go b/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
index 56edf91..dfd5f27 100644
--- a/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
+++ b/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
@@ -29,7 +29,7 @@ import (
"time"
"github.com/apache/incubator-trafficcontrol/lib/go-log"
- "github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/utils"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/about"
"github.com/jmoiron/sqlx"
_ "github.com/lib/pq"
@@ -39,7 +39,7 @@ import (
var version = "development"
func init() {
- utils.About.TrafficOpsRPMVersion = version
+ about.About.TrafficOpsRPMVersion = version
}
func main() {
@@ -50,7 +50,7 @@ func main() {
flag.Parse()
if *showVersion {
- fmt.Println(utils.About.TrafficOpsRPMVersion)
+ fmt.Println(about.About.TrafficOpsRPMVersion)
os.Exit(0)
}
if len(os.Args) < 2 {
diff --git a/traffic_ops/traffic_ops_golang/wrappers.go b/traffic_ops/traffic_ops_golang/wrappers.go
index a65eb6e..6f5cb04 100644
--- a/traffic_ops/traffic_ops_golang/wrappers.go
+++ b/traffic_ops/traffic_ops_golang/wrappers.go
@@ -35,14 +35,14 @@ import (
"github.com/apache/incubator-trafficcontrol/lib/go-log"
tc "github.com/apache/incubator-trafficcontrol/lib/go-tc"
+ "github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/about"
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/auth"
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/tocookie"
- "github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/utils"
"github.com/jmoiron/sqlx"
)
// ServerName - the server identifier
-var ServerName = "traffic_ops_golang" + "/" + utils.About.TrafficOpsVersion
+var ServerName = "traffic_ops_golang" + "/" + about.About.TrafficOpsVersion
// AuthBase ...
type AuthBase struct {
--
To stop receiving notification emails like this one, please contact
dewrich@apache.org.