knutsel closed pull request #2425: Change grove imports and other scripts/files from using 'incubator-trafficcontrol' URL: https://github.com/apache/trafficcontrol/pull/2425
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/grove/README.md b/grove/README.md index 80062d2d0..d258d25f4 100644 --- a/grove/README.md +++ b/grove/README.md @@ -39,13 +39,13 @@ go get golang.org/x/net/ipv6 * golang.org/x must be updated when the Go compiler is, so we treat it as part of the compiler, rather than vendoring it like other dependencies, to avoid breaking updating to newer compilers than we internally work with. If you know what you're doing, feel free to skip this step, or omit `rm` of old `go get` source and packages. 3. Clone this repository into your GOPATH. ```bash -mkdir -p $GOPATH/src/github.com/apache/incubator-trafficcontrol -cd $GOPATH/src/github.com/apache/incubator-trafficcontrol -git clone https://github.com/apache/incubator-trafficcontrol/grove +mkdir -p $GOPATH/src/github.com/apache/trafficcontrol +cd $GOPATH/src/github.com/apache/trafficcontrol +git clone https://github.com/apache/trafficcontrol/grove ``` 4. Build the application ```bash -cd $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove +cd $GOPATH/src/github.com/apache/trafficcontrol/grove go build ``` 6. Install and configure an RPM development environment @@ -103,7 +103,7 @@ The config file has the following fields: The remap rules file is specified in the [config file](#configuration). -Note there exists a tool for generating remap rules from [Traffic Control](https://github.com/apache/incubator-trafficcontrol), available [here](https://github.com/apache/incubator-trafficcontrol/grove/tree/master/grovetccfg). +Note there exists a tool for generating remap rules from [Traffic Control](https://github.com/apache/trafficcontrol), available [here](https://github.com/apache/trafficcontrol/grove/tree/master/grovetccfg). The remap rules file is JSON of the following form: diff --git a/grove/build/grove.spec b/grove/build/grove.spec index abe34d2ee..6ed87f095 100644 --- a/grove/build/grove.spec +++ b/grove/build/grove.spec @@ -18,7 +18,7 @@ License: Apache License, Version 2.0 Group: Base System/System Tools Prefix: /usr/sbin/%{name} Source: %{_sourcedir}/%{name}-%{version}.tgz -URL: https://github.com/apache/incubator-trafficcontrol/%{name} +URL: https://github.com/apache/trafficcontrol/%{name} Distribution: CentOS Linux Vendor: Apache Software Foundation BuildRoot: %{buildroot} diff --git a/grove/cache/handler.go b/grove/cache/handler.go index 0b4e15e49..a1ff499cd 100644 --- a/grove/cache/handler.go +++ b/grove/cache/handler.go @@ -22,17 +22,17 @@ import ( "time" "unsafe" - "github.com/apache/incubator-trafficcontrol/grove/cachedata" - "github.com/apache/incubator-trafficcontrol/grove/plugin" + "github.com/apache/trafficcontrol/grove/cachedata" + "github.com/apache/trafficcontrol/grove/plugin" - "github.com/apache/incubator-trafficcontrol/grove/remap" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/rfc" - "github.com/apache/incubator-trafficcontrol/grove/stat" - "github.com/apache/incubator-trafficcontrol/grove/thread" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/remap" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/rfc" + "github.com/apache/trafficcontrol/grove/stat" + "github.com/apache/trafficcontrol/grove/thread" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) type HandlerPointer struct { diff --git a/grove/cache/responder.go b/grove/cache/responder.go index a211f0ef2..60b9b39a9 100644 --- a/grove/cache/responder.go +++ b/grove/cache/responder.go @@ -18,13 +18,13 @@ import ( "net/http" "time" - "github.com/apache/incubator-trafficcontrol/grove/cachedata" - "github.com/apache/incubator-trafficcontrol/grove/plugin" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/stat" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/cachedata" + "github.com/apache/trafficcontrol/grove/plugin" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/stat" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) // Responder is an object encapsulating the cache's response to the client. It holds all the data necessary to respond, log the response, and add the stats. diff --git a/grove/cache/retryinggetter.go b/grove/cache/retryinggetter.go index 427e96f0b..48c82e68d 100644 --- a/grove/cache/retryinggetter.go +++ b/grove/cache/retryinggetter.go @@ -20,14 +20,14 @@ import ( "net/url" "time" - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" - "github.com/apache/incubator-trafficcontrol/grove/icache" - "github.com/apache/incubator-trafficcontrol/grove/remap" - "github.com/apache/incubator-trafficcontrol/grove/rfc" - "github.com/apache/incubator-trafficcontrol/grove/thread" - "github.com/apache/incubator-trafficcontrol/grove/web" - - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/icache" + "github.com/apache/trafficcontrol/grove/remap" + "github.com/apache/trafficcontrol/grove/rfc" + "github.com/apache/trafficcontrol/grove/thread" + "github.com/apache/trafficcontrol/grove/web" + + "github.com/apache/trafficcontrol/lib/go-log" ) const CodeConnectFailure = http.StatusBadGateway diff --git a/grove/cachedata/cachedata.go b/grove/cachedata/cachedata.go index d627b3c11..a036474c0 100644 --- a/grove/cachedata/cachedata.go +++ b/grove/cachedata/cachedata.go @@ -20,8 +20,8 @@ import ( "net/http" "time" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/web" ) // ParentResponseData contains data about the parent/origin response. diff --git a/grove/cacheobj/cacheobj.go b/grove/cacheobj/cacheobj.go index c05888fb9..f4c22f0a9 100644 --- a/grove/cacheobj/cacheobj.go +++ b/grove/cacheobj/cacheobj.go @@ -18,7 +18,7 @@ import ( "net/http" "time" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" ) type CacheObj struct { diff --git a/grove/config/config.go b/grove/config/config.go index 857d4f6e0..70e0903a8 100644 --- a/grove/config/config.go +++ b/grove/config/config.go @@ -18,7 +18,7 @@ import ( "encoding/json" "io/ioutil" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) const bytesPerGibibyte = 1024 * 1024 * 1024 diff --git a/grove/diskcache/diskcache.go b/grove/diskcache/diskcache.go index a8e1b30b3..eee99092e 100644 --- a/grove/diskcache/diskcache.go +++ b/grove/diskcache/diskcache.go @@ -21,10 +21,10 @@ import ( "sync/atomic" "time" - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" - "github.com/apache/incubator-trafficcontrol/grove/lru" + "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/lru" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" bolt "github.com/coreos/bbolt" ) diff --git a/grove/diskcache/multi.go b/grove/diskcache/multi.go index d877c2da1..4d300cef9 100644 --- a/grove/diskcache/multi.go +++ b/grove/diskcache/multi.go @@ -17,10 +17,10 @@ package diskcache import ( "errors" - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" - "github.com/apache/incubator-trafficcontrol/grove/config" + "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/config" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" "github.com/dchest/siphash" ) diff --git a/grove/grove.go b/grove/grove.go index 55dc2eea1..99ed55bb6 100644 --- a/grove/grove.go +++ b/grove/grove.go @@ -34,19 +34,19 @@ import ( "golang.org/x/net/http2" "golang.org/x/sys/unix" - "github.com/apache/incubator-trafficcontrol/lib/go-log" - - "github.com/apache/incubator-trafficcontrol/grove/cache" - "github.com/apache/incubator-trafficcontrol/grove/config" - "github.com/apache/incubator-trafficcontrol/grove/diskcache" - "github.com/apache/incubator-trafficcontrol/grove/icache" - "github.com/apache/incubator-trafficcontrol/grove/memcache" - "github.com/apache/incubator-trafficcontrol/grove/plugin" - "github.com/apache/incubator-trafficcontrol/grove/remap" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/stat" - "github.com/apache/incubator-trafficcontrol/grove/tiercache" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/lib/go-log" + + "github.com/apache/trafficcontrol/grove/cache" + "github.com/apache/trafficcontrol/grove/config" + "github.com/apache/trafficcontrol/grove/diskcache" + "github.com/apache/trafficcontrol/grove/icache" + "github.com/apache/trafficcontrol/grove/memcache" + "github.com/apache/trafficcontrol/grove/plugin" + "github.com/apache/trafficcontrol/grove/remap" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/stat" + "github.com/apache/trafficcontrol/grove/tiercache" + "github.com/apache/trafficcontrol/grove/web" ) const ShutdownTimeout = 60 * time.Second diff --git a/grove/grovetccfg/README.md b/grove/grovetccfg/README.md index a251a2170..9374a3061 100644 --- a/grove/grovetccfg/README.md +++ b/grove/grovetccfg/README.md @@ -27,13 +27,13 @@ Traffic Control configuration generator for the Grove HTTP caching proxy. * See https://golang.org/doc/install 2. Clone this repository into your GOPATH. ```bash -mkdir -p $GOPATH/src/github.com/apache/incubator-trafficcontrol -cd $GOPATH/src/github.com/apache/incubator-trafficcontrol -git clone https://github.com/apache/incubator-trafficcontrol/grove +mkdir -p $GOPATH/src/github.com/apache/trafficcontrol +cd $GOPATH/src/github.com/apache/trafficcontrol +git clone https://github.com/apache/trafficcontrol/grove ``` 3. Build the application ```bash -cd $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/grovetccfg +cd $GOPATH/src/github.com/apache/trafficcontrol/grove/grovetccfg go build ``` 5. Install and configure an RPM development environment diff --git a/grove/grovetccfg/build/build_rpm.sh b/grove/grovetccfg/build/build_rpm.sh index bb55aa9ae..bf03f1d67 100755 --- a/grove/grovetccfg/build/build_rpm.sh +++ b/grove/grovetccfg/build/build_rpm.sh @@ -22,7 +22,7 @@ mkdir -p $BUILDDIR/{BUILD,RPMS,SOURCES} echo "$BUILDDIR" > ~/.rpmmacros # get traffic_ops client -# godir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/client +# godir=src/github.com/apache/trafficcontrol/traffic_ops/client # ( mkdir -p "$godir" && \ # cd "$godir" && \ # cp -r ${GOPATH}/${godir}/* . && \ diff --git a/grove/grovetccfg/build/grovetccfg.spec b/grove/grovetccfg/build/grovetccfg.spec index 4deb440cd..ae654a39a 100644 --- a/grove/grovetccfg/build/grovetccfg.spec +++ b/grove/grovetccfg/build/grovetccfg.spec @@ -18,7 +18,7 @@ License: Apache License, Version 2.0 Group: Base System/System Tools Prefix: /usr/sbin/%{name} Source: %{_sourcedir}/%{name}-%{version}.tgz -URL: https://github.com/apache/incubator-trafficcontrol/%{name} +URL: https://github.com/apache/trafficcontrol/%{name} Distribution: CentOS Linux Vendor: Apache Software Foundation BuildRoot: %{buildroot} diff --git a/grove/grovetccfg/grovetccfg.go b/grove/grovetccfg/grovetccfg.go index 0e9db10ee..7e6897ccd 100644 --- a/grove/grovetccfg/grovetccfg.go +++ b/grove/grovetccfg/grovetccfg.go @@ -32,14 +32,14 @@ import ( "strings" "time" - "github.com/apache/incubator-trafficcontrol/lib/go-tc" - tcv13 "github.com/apache/incubator-trafficcontrol/lib/go-tc/v13" - to "github.com/apache/incubator-trafficcontrol/traffic_ops/client" - - "github.com/apache/incubator-trafficcontrol/grove/config" - "github.com/apache/incubator-trafficcontrol/grove/remap" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/lib/go-tc" + tcv13 "github.com/apache/trafficcontrol/lib/go-tc/v13" + to "github.com/apache/trafficcontrol/traffic_ops/client" + + "github.com/apache/trafficcontrol/grove/config" + "github.com/apache/trafficcontrol/grove/remap" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/web" ) // Duplicating Hdr and ModHdrs here for now... diff --git a/grove/icache/icache.go b/grove/icache/icache.go index 8a82dd1ad..373532148 100644 --- a/grove/icache/icache.go +++ b/grove/icache/icache.go @@ -15,7 +15,7 @@ package icache */ import ( - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/cacheobj" ) // TODO change to return errors diff --git a/grove/integration_test/compare_gets.go b/grove/integration_test/compare_gets.go index b88cb69d0..0cf7ac6d2 100644 --- a/grove/integration_test/compare_gets.go +++ b/grove/integration_test/compare_gets.go @@ -17,7 +17,7 @@ package main import ( "flag" "fmt" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" "io/ioutil" "log" "net/http" diff --git a/grove/integration_test/setup-and-run.sh b/grove/integration_test/setup-and-run.sh index f16612f05..c9132ba90 100644 --- a/grove/integration_test/setup-and-run.sh +++ b/grove/integration_test/setup-and-run.sh @@ -35,9 +35,9 @@ go get golang.org/x/net/ipv6 mkdir -p $GOPATH/src/github.com/apache/ cd $GOPATH/src/github.com/apache/ -#git clone https://github.com/apache/incubator-trafficcontrol +#git clone https://github.com/apache/trafficcontrol git clone $REPO -cd $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove +cd $GOPATH/src/github.com/apache/trafficcontrol/grove git checkout $BRANCH go build @@ -46,13 +46,13 @@ openssl req -newkey rsa:2048 -new -nodes -x509 -days 365 -keyout key.pem -out ce cp /remap-base-test.json /remap.json ls -l -${GOPATH}/src/github.com/apache/incubator-trafficcontrol/grove/grove -cfg grove.cfg & +${GOPATH}/src/github.com/apache/trafficcontrol/grove/grove -cfg grove.cfg & sleep 3 curl -H'Host: mem-test.cdn.kabletown.net' -Lsv -r 50000-50009 http://localhost:8080/10Mb.txt -#cd $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test +#cd $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test go build compare_gets.go #function run_test () { @@ -91,12 +91,12 @@ function run_test () { } export -f run_test -cp $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/modify_headers/remap.json /remap.json +cp $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test/tests/plugins/modify_headers/remap.json /remap.json pkill -HUP grove -bash $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/modify_headers/test.sh +bash $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test/tests/plugins/modify_headers/test.sh -cp $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/remap.json /remap.json +cp $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/remap.json /remap.json pkill -HUP grove -bash $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/test.sh +bash $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/test.sh diff --git a/grove/memcache/memcache.go b/grove/memcache/memcache.go index 29d0217ea..388be056d 100644 --- a/grove/memcache/memcache.go +++ b/grove/memcache/memcache.go @@ -18,10 +18,10 @@ import ( "sync" "sync/atomic" - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" - "github.com/apache/incubator-trafficcontrol/grove/lru" + "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/lru" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) // MemCache is a threadsafe memory cache with a soft byte limit, enforced via LRU. diff --git a/grove/plugin/ats_log.go b/grove/plugin/ats_log.go index 3b885f326..b40f7a40e 100644 --- a/grove/plugin/ats_log.go +++ b/grove/plugin/ats_log.go @@ -19,9 +19,9 @@ import ( "strings" "time" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) const NSPerSec = 1000000000 diff --git a/grove/plugin/hello_context.go b/grove/plugin/hello_context.go index 69ffce552..8071a5c6b 100644 --- a/grove/plugin/hello_context.go +++ b/grove/plugin/hello_context.go @@ -15,7 +15,7 @@ package plugin */ import ( - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/hello_world.go b/grove/plugin/hello_world.go index 6e3f8112d..ff3a1f8b9 100644 --- a/grove/plugin/hello_world.go +++ b/grove/plugin/hello_world.go @@ -15,7 +15,7 @@ package plugin */ import ( - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/http_cacheinspector.go b/grove/plugin/http_cacheinspector.go index 9409aee8c..9bb56d10c 100644 --- a/grove/plugin/http_cacheinspector.go +++ b/grove/plugin/http_cacheinspector.go @@ -23,11 +23,11 @@ import ( "strings" "code.cloudfoundry.org/bytefmt" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" "time" - "github.com/apache/incubator-trafficcontrol/grove/rfc" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/grove/rfc" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/http_callgc.go b/grove/plugin/http_callgc.go index 992513b2e..d5871dd53 100644 --- a/grove/plugin/http_callgc.go +++ b/grove/plugin/http_callgc.go @@ -20,9 +20,9 @@ import ( "strings" "time" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/http_memstats.go b/grove/plugin/http_memstats.go index 7a35a4749..61af74550 100644 --- a/grove/plugin/http_memstats.go +++ b/grove/plugin/http_memstats.go @@ -20,9 +20,9 @@ import ( "runtime" "strings" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/http_stats.go b/grove/plugin/http_stats.go index 8958696e0..b698d2ad6 100644 --- a/grove/plugin/http_stats.go +++ b/grove/plugin/http_stats.go @@ -25,10 +25,10 @@ import ( "strings" "unicode" - "github.com/apache/incubator-trafficcontrol/grove/stat" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/stat" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/if_modified_since.go b/grove/plugin/if_modified_since.go index be8ca050a..7f0d3de70 100644 --- a/grove/plugin/if_modified_since.go +++ b/grove/plugin/if_modified_since.go @@ -17,7 +17,7 @@ package plugin import ( "net/http" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" ) func init() { diff --git a/grove/plugin/modify_headers.go b/grove/plugin/modify_headers.go index 8146c2a9e..e0ae86f84 100644 --- a/grove/plugin/modify_headers.go +++ b/grove/plugin/modify_headers.go @@ -17,9 +17,9 @@ package plugin import ( "encoding/json" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/modify_parent_request_headers.go b/grove/plugin/modify_parent_request_headers.go index bcf876470..4822cdee0 100644 --- a/grove/plugin/modify_parent_request_headers.go +++ b/grove/plugin/modify_parent_request_headers.go @@ -17,9 +17,9 @@ package plugin import ( "encoding/json" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/modify_response_headers_global.go b/grove/plugin/modify_response_headers_global.go index 48de7924d..bedec392e 100644 --- a/grove/plugin/modify_response_headers_global.go +++ b/grove/plugin/modify_response_headers_global.go @@ -17,9 +17,9 @@ package plugin import ( "encoding/json" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func init() { diff --git a/grove/plugin/plugin.go b/grove/plugin/plugin.go index b084fefe2..d5f113ed7 100644 --- a/grove/plugin/plugin.go +++ b/grove/plugin/plugin.go @@ -25,12 +25,12 @@ import ( "strings" "time" - "github.com/apache/incubator-trafficcontrol/grove/cachedata" - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" - "github.com/apache/incubator-trafficcontrol/grove/config" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/stat" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/cachedata" + "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/config" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/stat" + "github.com/apache/trafficcontrol/grove/web" ) func AddPlugin(priority uint64, funcs Funcs) { diff --git a/grove/plugin/range_req_handler.go b/grove/plugin/range_req_handler.go index 2bc477483..d6e556d09 100644 --- a/grove/plugin/range_req_handler.go +++ b/grove/plugin/range_req_handler.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - "github.com/apache/incubator-trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/lib/go-log" ) type byteRange struct { diff --git a/grove/remap/remap.go b/grove/remap/remap.go index b21f27990..af0e825ba 100644 --- a/grove/remap/remap.go +++ b/grove/remap/remap.go @@ -25,14 +25,14 @@ import ( "strings" "time" - "github.com/apache/incubator-trafficcontrol/grove/chash" - "github.com/apache/incubator-trafficcontrol/grove/icache" - "github.com/apache/incubator-trafficcontrol/grove/plugin" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/rfc" - "github.com/apache/incubator-trafficcontrol/grove/web" - - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/grove/chash" + "github.com/apache/trafficcontrol/grove/icache" + "github.com/apache/trafficcontrol/grove/plugin" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/rfc" + "github.com/apache/trafficcontrol/grove/web" + + "github.com/apache/trafficcontrol/lib/go-log" ) type HTTPRequestRemapper interface { diff --git a/grove/remapdata/remapdata.go b/grove/remapdata/remapdata.go index 2961a0b4d..706c499ae 100644 --- a/grove/remapdata/remapdata.go +++ b/grove/remapdata/remapdata.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/apache/incubator-trafficcontrol/grove/chash" - "github.com/apache/incubator-trafficcontrol/grove/icache" + "github.com/apache/trafficcontrol/grove/chash" + "github.com/apache/trafficcontrol/grove/icache" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) type Reuse int diff --git a/grove/rfc/rules.go b/grove/rfc/rules.go index 1879bc791..15d3b855b 100644 --- a/grove/rfc/rules.go +++ b/grove/rfc/rules.go @@ -23,11 +23,11 @@ import ( "strings" "time" - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" "math" "strconv" ) diff --git a/grove/rfc/rules_test.go b/grove/rfc/rules_test.go index f364aadad..e4314b893 100644 --- a/grove/rfc/rules_test.go +++ b/grove/rfc/rules_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) func TestRules(t *testing.T) { diff --git a/grove/stat/stats.go b/grove/stat/stats.go index 7823f7270..360b03017 100644 --- a/grove/stat/stats.go +++ b/grove/stat/stats.go @@ -20,12 +20,12 @@ import ( "sync/atomic" "time" - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" - "github.com/apache/incubator-trafficcontrol/grove/icache" - "github.com/apache/incubator-trafficcontrol/grove/remapdata" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/icache" + "github.com/apache/trafficcontrol/grove/remapdata" + "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) type StatsSystem interface { diff --git a/grove/stat/stats_test.go b/grove/stat/stats_test.go index 805105b45..9f17d58e7 100644 --- a/grove/stat/stats_test.go +++ b/grove/stat/stats_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/apache/incubator-trafficcontrol/grove/remap" - "github.com/apache/incubator-trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/grove/remap" + "github.com/apache/trafficcontrol/grove/web" ) func StatsInc(m *web.ConnMap, num int, addrs *[]string) { diff --git a/grove/thread/getter.go b/grove/thread/getter.go index 63f53e8dd..849fd2bb9 100644 --- a/grove/thread/getter.go +++ b/grove/thread/getter.go @@ -17,7 +17,7 @@ package thread import ( "sync" - cacheobj "github.com/apache/incubator-trafficcontrol/grove/cacheobj" + cacheobj "github.com/apache/trafficcontrol/grove/cacheobj" ) type Getter interface { diff --git a/grove/tiercache/tiercache.go b/grove/tiercache/tiercache.go index 418d10ad1..ff844ffa3 100644 --- a/grove/tiercache/tiercache.go +++ b/grove/tiercache/tiercache.go @@ -15,10 +15,10 @@ package tiercache */ import ( - "github.com/apache/incubator-trafficcontrol/grove/cacheobj" - "github.com/apache/incubator-trafficcontrol/grove/icache" + "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/grove/icache" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) // TierCache wraps two icache.Caches and implements icache.Cache. Adding adds to both caches. Getting tries the first cache first, and if it isn't found, it then tries the second. Thus, the first should be smaller and faster (memory) and the second should be larger and slower (disk). diff --git a/grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE b/grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE index f49a4e16e..261eeb9e9 100644 --- a/grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE +++ b/grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE @@ -198,4 +198,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file + limitations under the License. diff --git a/grove/web/connmap.go b/grove/web/connmap.go index 01fea05cd..493df8301 100644 --- a/grove/web/connmap.go +++ b/grove/web/connmap.go @@ -17,7 +17,7 @@ package web import ( "net" "sync" - // "github.com/apache/incubator-trafficcontrol/traffic_monitor_golang/common/log" + // "github.com/apache/trafficcontrol/traffic_monitor_golang/common/log" ) type ConnMap struct { diff --git a/grove/web/listener.go b/grove/web/listener.go index f5316e5f8..15873bee7 100644 --- a/grove/web/listener.go +++ b/grove/web/listener.go @@ -24,7 +24,7 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) type InterceptListener struct { diff --git a/grove/web/util.go b/grove/web/util.go index 4d36e0886..306627401 100644 --- a/grove/web/util.go +++ b/grove/web/util.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/apache/incubator-trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/lib/go-log" ) type Hdr struct { ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
