From 7afc8f8e67e924f7605f21acd43323af922cc436 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 20 Oct 2021 17:10:44 -0600 Subject: [PATCH 1/5] Use :atc-godoc: role instead of pkg.go.dev URLs --- docs/source/admin/traffic_ops.rst | 6 +++--- docs/source/development/traffic_ops.rst | 6 +++--- docs/source/overview/cache_groups.rst | 2 +- docs/source/overview/delivery_services.rst | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/admin/traffic_ops.rst b/docs/source/admin/traffic_ops.rst index 91fb8e05c9..123ffac100 100644 --- a/docs/source/admin/traffic_ops.rst +++ b/docs/source/admin/traffic_ops.rst @@ -411,9 +411,9 @@ This file deals with the configuration parameters of running Traffic Ops itself. .. deprecated:: 3.0 Future versions of Traffic Ops will not support this legacy configuration option, and will always use the global "tm.url" :term:`Parameter`. - :db_conn_max_lifetime_seconds: An optional field that sets the maximum lifetime in seconds of any given connection to the Traffic Ops Database. If set to zero, connections are held open until explicitly closed. Default if not specified is the value of `DBConnMaxLifetimeSecondsDefault `_. - :db_max_idle_connections: An optional limit on the number of connections to the Traffic Ops Database to keep alive while idle. If this is less than ``max_db_connections``, that number will be used instead - *even if this field is unset and using its default*. Default if not specified is the value of `DBMaxIdleConnectionsDefault `_. - :db_query_timeout_seconds: An optional field specifying a timeout on database *transactions* (not actually single queries in most cases) within API route handlers. Effectively this is a timeout on a single handler's ability to interact with the Traffic Ops Database. Default if not specified is the value of `DefaultDBQueryTimeoutSecs `_. + :db_conn_max_lifetime_seconds: An optional field that sets the maximum lifetime in seconds of any given connection to the Traffic Ops Database. If set to zero, connections are held open until explicitly closed. Default if not specified is the value of :atc-godoc:`traffic_ops/traffic_ops_golang/config.DBConnMaxLifetimeSecondsDefault`. + :db_max_idle_connections: An optional limit on the number of connections to the Traffic Ops Database to keep alive while idle. If this is less than ``max_db_connections``, that number will be used instead - *even if this field is unset and using its default*. Default if not specified is the value of :atc-godoc:`traffic_ops/traffic_ops_golang/config.DBMaxIdleConnectionsDefault`. + :db_query_timeout_seconds: An optional field specifying a timeout on database *transactions* (not actually single queries in most cases) within API route handlers. Effectively this is a timeout on a single handler's ability to interact with the Traffic Ops Database. Default if not specified is the value of :atc-godoc:`traffic_ops/traffic_ops_golang/config.DefaultDBQueryTimeoutSecs`. :idle_timeout: An optional timeout in seconds for idle client connections to Traffic Ops. If set to zero, the value of ``read_timeout`` will be used instead. If both are zero, then the value of ``read_header_timeout`` will be used. If all three fields are zero, there is no timeout and connections will be kept alive indefinitely - **not** recommended. Default if not specified is zero. :insecure: An optional boolean which, if set to ``true`` will cause Traffic Ops to skip verification of client certificates whenever necessary/possible. If set to ``false``, the normal verification behavior is exhibited. Default if not specified is ``false``. diff --git a/docs/source/development/traffic_ops.rst b/docs/source/development/traffic_ops.rst index f79ce8d709..7ef96f8c67 100644 --- a/docs/source/development/traffic_ops.rst +++ b/docs/source/development/traffic_ops.rst @@ -147,13 +147,13 @@ Traffic Ops Project Tree Overview - ort/ - Contains :term:`ORT` and :abbr:`ATS (Apache Traffic Server)` configuration file-generation logic and tooling - testing/ - Holds utilities for testing the :ref:`to-api` - - api/ - Integration testing for the `Traffic Ops Go client `_ and Traffic Ops + - api/ - Integration testing for the Traffic Ops Go client (:atc-godoc:`traffic_ops/v4-client`) and Traffic Ops - traffic_ops_golang/ - The root of the Go implementation's code-base .. note:: The vast majority of subdirectories of :atc-file:`traffic_ops/traffic_ops_golang/` contain handlers for the :ref:`to-api`, and are named according to the endpoint they handle. What follows is a list of subdirectories of interest that have a special role (i.e. don't handle a :ref:`to-api` endpoint). - .. seealso:: `The GoDoc documentation for this package `_ + .. seealso:: The GoDoc documentation for this package: :atc-godoc:`/` - api/ - A library for use by :ref:`to-api` handlers that provides helpful utilities for common tasks like obtaining a database transaction handle or accessing Traffic Ops configuration - auth/ - Contains definitions of privilege levels and access control code used in routing and provides a library for dealing with password and token-based authentication @@ -570,7 +570,7 @@ The configuration file for the tests (defined by :option:`--cfg`) is a JSON-enco :default: An object containing sub-objects relating to default configuration settings for connecting to external resources during testing - :logLocations: An object containing key/value pairs where the keys are log levels and each associated value is the file location to which logs of that level will be written. The allowed values respect the `reserved special names used by the github.com/apache/trafficcontrol/lib/go-log package `_. Omitted keys are treated as though their values were ``null``, in which case that level is written to `/dev/null`. The allowed keys are: + :logLocations: An object containing key/value pairs where the keys are log levels and each associated value is the file location to which logs of that level will be written. The allowed values respect the reserved special names used by the :atc-godoc:`lib/go-log` package. Omitted keys are treated as though their values were ``null``, in which case that level is written to `/dev/null`. The allowed keys are: - debug - error diff --git a/docs/source/overview/cache_groups.rst b/docs/source/overview/cache_groups.rst index ffdfe9317a..e240c0a2cb 100644 --- a/docs/source/overview/cache_groups.rst +++ b/docs/source/overview/cache_groups.rst @@ -53,7 +53,7 @@ A Cache Group is a logical grouping of cache servers, that don't have to be in t Properties ========== -Cache Groups are modeled several times over, in the Traffic Ops database, in Traffic Portal forms and tables, and several times for various :ref:`to-api` versions in the new Go Traffic Ops codebase. Go-specific data structures can be found in `the project's GoDoc documentation `_. Rather than application-specific definitions, what follows is an attempt at consolidating all of the different properties and names of properties of Cache Group objects throughout the :abbr:`ATC (Apache Traffic Control)` suite. The names of these fields are typically chosen as the most human-readable and/or most commonly-used names for the fields, and when reading please note that in many cases these names will appear camelCased or snake_cased to be machine-readable. Any aliases of these fields that are not merely case transformations of the indicated, canonical names will be noted in a table of aliases. +Cache Groups are modeled several times over, in the Traffic Ops database, in Traffic Portal forms and tables, and several times for various :ref:`to-api` versions in the new Go Traffic Ops codebase. Go-specific data structures can be found at :atc-godoc:`lib/go-tc.CacheGroupNullable`. Rather than application-specific definitions, what follows is an attempt at consolidating all of the different properties and names of properties of Cache Group objects throughout the :abbr:`ATC (Apache Traffic Control)` suite. The names of these fields are typically chosen as the most human-readable and/or most commonly-used names for the fields, and when reading please note that in many cases these names will appear camelCased or snake_cased to be machine-readable. Any aliases of these fields that are not merely case transformations of the indicated, canonical names will be noted in a table of aliases. .. seealso:: The API reference for Cache Group-related endpoints such as :ref:`to-api-cachegroups` contains definitions of the Cache Group object(s) returned and/or accepted by those endpoints. diff --git a/docs/source/overview/delivery_services.rst b/docs/source/overview/delivery_services.rst index 1f3367169f..cda8b4d5ea 100644 --- a/docs/source/overview/delivery_services.rst +++ b/docs/source/overview/delivery_services.rst @@ -23,7 +23,7 @@ Delivery Services ***************** "Delivery Services" are a very important construct in :abbr:`ATC (Apache Traffic Control)`. At their most basic, they are a source of content and a set of :term:`cache servers` and configuration options used to distribute that content. -Delivery Services are modeled several times over, in the Traffic Ops database, in Traffic Portal forms and tables, and several times for various :ref:`to-api` versions in the new Go Traffic Ops codebase. Go-specific data structures can be found in `the project's GoDoc documentation `_. Rather than application-specific definitions, what follows is an attempt at consolidating all of the different properties and names of properties of Delivery Service objects throughout the :abbr:`ATC (Apache Traffic Control)` suite. The names of these fields are typically chosen as the most human-readable and/or most commonly-used names for the fields, and when reading please note that in many cases these names will appear camelCased or snake_cased to be machine-readable. Any aliases of these fields that are not merely case transformations of the indicated, canonical names will be noted in a table of aliases. +Delivery Services are modeled several times over, in the Traffic Ops database, in Traffic Portal forms and tables, and several times for various :ref:`to-api` versions in the new Go Traffic Ops codebase. Go-specific data structures can be found at :atc-godoc:`lib/go-tc.DeliveryServiceV4`. Rather than application-specific definitions, what follows is an attempt at consolidating all of the different properties and names of properties of Delivery Service objects throughout the :abbr:`ATC (Apache Traffic Control)` suite. The names of these fields are typically chosen as the most human-readable and/or most commonly-used names for the fields, and when reading please note that in many cases these names will appear camelCased or snake_cased to be machine-readable. Any aliases of these fields that are not merely case transformations of the indicated, canonical names will be noted in a table of aliases. .. seealso:: The API reference for Delivery Service-related endpoints such as :ref:`to-api-deliveryservices` contains definitions of the Delivery Service object(s) returned and/or accepted by those endpoints. .. seealso:: :ref:`delivery-service-requests` From e2ee435ee0b9383c1844774c0d949623f7e2f702 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 1 Mar 2023 11:58:07 -0700 Subject: [PATCH 2/5] Update module path to v7 in non-golang files git ls-files | grep -vE '^CHANGELOG|^vendor|\.go$' | xargs grep -lE '[^/]github\.com/apache/trafficcontrol/' | xargs sed -Ei 's|([^/]github\.com/apache/trafficcontrol/)|\1v7/|g' --- Makefile | 2 +- blueprints/tr-load-tests.md | 2 +- cache-config/Makefile | 22 ++++++------ docs/source/_ext/atc.py | 2 +- experimental/traffic_router_golang/README.md | 34 +++++++++---------- test/fakeOrigin/README.md | 2 +- .../traffic_ops_golang/trafficvault/README.md | 2 +- traffic_ops/v3-client/README.md | 6 ++-- traffic_ops/v4-client/README.md | 6 ++-- traffic_ops/v5-client/README.md | 6 ++-- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index c6f563785f..44cf234dda 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ lint: golangci-lint run ./... cache-config/t3c-check-refs/t3c-check-refs: cache-config/t3c-check-refs/config/config.go cache-config/t3c-check-refs/t3c-check-refs.go - go build "github.com/apache/trafficcontrol/cache-config/t3c-check-refs" + go build "github.com/apache/trafficcontrol/v7/cache-config/t3c-check-refs" mv -f t3c-check-refs $@ unit: cache-config/t3c-check-refs/t3c-check-refs diff --git a/blueprints/tr-load-tests.md b/blueprints/tr-load-tests.md index 6292fa5aa9..fba3facb4e 100644 --- a/blueprints/tr-load-tests.md +++ b/blueprints/tr-load-tests.md @@ -86,7 +86,7 @@ No Traffic Ops REST API impact is anticipated. If new endpoints are required, will corresponding client methods be added? --> -Clients importing the `github.com/apache/trafficcontrol/lib/go-tc` package will optionally be able to import a constant for `X-MM-Client-IP`, a request header Traffic Router to specify to Traffic Router the IP address to use to geolocate that client: +Clients importing the `github.com/apache/trafficcontrol/v7/lib/go-tc` package will optionally be able to import a constant for `X-MM-Client-IP`, a request header Traffic Router to specify to Traffic Router the IP address to use to geolocate that client: https://github.com/apache/trafficcontrol/blob/1ed2964d16618aeebef142b01a538336a44d07dd/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/HTTPRequest.java#L29 Additionally, a struct used to unmarshall a Coverage Zone File could be placed in `lib/go-tc`. diff --git a/cache-config/Makefile b/cache-config/Makefile index 475190f822..af6fd40071 100644 --- a/cache-config/Makefile +++ b/cache-config/Makefile @@ -64,27 +64,27 @@ clean: $(RM) $(MANPAGES) $(RST) $(TARGETS) t3c/t3c: $(wildcard t3c/**/*.go) $(wildcard t3c/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-apply/t3c-apply: $(wildcard t3c-apply/**/*.go) $(wildcard t3c-apply/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-check/t3c-check: $(wildcard t3c-check/**/*.go) $(wildcard t3c-check/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-check-refs/t3c-check-refs: $(wildcard t3c-check-refs/**/*.go) $(wildcard t3c-check-refs/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-check-reload/t3c-check-reload: $(wildcard t3c-check-reload/**/*.go) $(wildcard t3c-check-reload/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-diff/t3c-diff: $(wildcard t3c-diff/**/*.go) $(wildcard t3c-diff/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-generate/t3c-generate: $(wildcard t3c-generate/**/*.go) $(wildcard t3c-generate/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-preprocess/t3c-preprocess: $(wildcard t3c-preprocess/**/*.go) $(wildcard t3c-preprocess/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-request/t3c-request: $(wildcard t3c-request/**/*.go) $(wildcard t3c-request/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-tail/t3c-tail: $(wildcard t3c-tail/**/*.go) $(wildcard t3c-tail/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) t3c-update/t3c-update: $(wildcard t3c-update/**/*.go) $(wildcard t3c-update/*.go) - go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/cache-config/$(dir $@) + go build -o $@ $(GO_FLAGS) github.com/apache/trafficcontrol/v7/cache-config/$(dir $@) debug: GO_FLAGS=--gcflags "all=-N -l" debug: $(TARGETS) diff --git a/docs/source/_ext/atc.py b/docs/source/_ext/atc.py index f13f4e0700..1ffbc086fa 100644 --- a/docs/source/_ext/atc.py +++ b/docs/source/_ext/atc.py @@ -154,7 +154,7 @@ def godoc_role(unused_typ, return [refnode], [] # -- GoDoc role (atc-relative) ---------------------------------------------- -ATC_GODOC_PREFIX = "github.com/apache/trafficcontrol/" +ATC_GODOC_PREFIX = "github.com/apache/trafficcontrol/v7/" ATC_GODOC_URI = GODOC_URI + ATC_GODOC_PREFIX def atc_godoc_role(unused_typ, unused_rawtext, diff --git a/experimental/traffic_router_golang/README.md b/experimental/traffic_router_golang/README.md index 6a705e257a..d2f7ff30e0 100644 --- a/experimental/traffic_router_golang/README.md +++ b/experimental/traffic_router_golang/README.md @@ -47,21 +47,21 @@ Compile and generate binary: - Run `go test ./...` from traffic_router_golang directory ```$ go test ./... - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/availableservers [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/cgsrch [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/config [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/coveragezone [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfig [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfigdsservers [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfigpoller [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfigregex [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/crstates [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/crstatespoller [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/fetch [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/httpsrvr [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/ipmap [no test files] - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/nextcache [no test files] - ok github.com/apache/trafficcontrol/experimental/traffic_router_golang/quadtree 1.190s - ? github.com/apache/trafficcontrol/experimental/traffic_router_golang/toutil [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/availableservers [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/cgsrch [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/config [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/coveragezone [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfig [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfigdsservers [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfigpoller [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfigregex [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crstates [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crstatespoller [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/fetch [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/httpsrvr [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/ipmap [no test files] + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/nextcache [no test files] + ok github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/quadtree 1.190s + ? github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/toutil [no test files] ``` diff --git a/test/fakeOrigin/README.md b/test/fakeOrigin/README.md index fde1e40864..953e609d25 100644 --- a/test/fakeOrigin/README.md +++ b/test/fakeOrigin/README.md @@ -42,7 +42,7 @@ Local build pre-requesites: and/or just a modern version of Docker & docker-compose -If you're building locally, just run ```go install github.com/apache/trafficcontrol/test/fakeOrigin@latest``` +If you're building locally, just run ```go install github.com/apache/trafficcontrol/v7/test/fakeOrigin@latest``` If you're just using docker, clone this repository. diff --git a/traffic_ops/traffic_ops_golang/trafficvault/README.md b/traffic_ops/traffic_ops_golang/trafficvault/README.md index bd46bbcd98..27cea3e19f 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/README.md +++ b/traffic_ops/traffic_ops_golang/trafficvault/README.md @@ -61,7 +61,7 @@ func init() { 7. In `./backends/backends.go`, import your new package: ```go import ( - _ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/foo" + _ "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/foo" ) ``` This is required for the package `init()` function to run and register the new backend. diff --git a/traffic_ops/v3-client/README.md b/traffic_ops/v3-client/README.md index 233130311b..f9013d756f 100644 --- a/traffic_ops/v3-client/README.md +++ b/traffic_ops/v3-client/README.md @@ -3,7 +3,7 @@ ## Getting Started 1. Obtain the latest version of the library -`go get github.com/apache/trafficcontrol/traffic_ops/v3-client` +`go get github.com/apache/trafficcontrol/v7/traffic_ops/v3-client` 2. Get a basic TO session started and fetch a list of CDNs ```go @@ -14,8 +14,8 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - toclient "github.com/apache/trafficcontrol/traffic_ops/v3-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v3-client" ) const TOURL = "http://localhost" diff --git a/traffic_ops/v4-client/README.md b/traffic_ops/v4-client/README.md index 0f6b5989cf..5fc657a910 100644 --- a/traffic_ops/v4-client/README.md +++ b/traffic_ops/v4-client/README.md @@ -3,7 +3,7 @@ ## Getting Started 1. Obtain the latest version of the library -`go get github.com/apache/trafficcontrol/traffic_ops/v4-client` +`go get github.com/apache/trafficcontrol/v7/traffic_ops/v4-client` 2. Get a basic TO session started and fetch a list of CDNs ```go @@ -14,8 +14,8 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) const TOURL = "http://localhost" diff --git a/traffic_ops/v5-client/README.md b/traffic_ops/v5-client/README.md index 790ab40bc7..8178a65e39 100644 --- a/traffic_ops/v5-client/README.md +++ b/traffic_ops/v5-client/README.md @@ -3,7 +3,7 @@ ## Getting Started 1. Obtain the latest version of the library -`go get github.com/apache/trafficcontrol/traffic_ops/v5-client` +`go get github.com/apache/trafficcontrol/v7/traffic_ops/v5-client` 2. Get a basic TO session started and fetch a list of CDNs ```go @@ -14,8 +14,8 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) const TOURL = "http://localhost" From 987b9d6b382b94493460dd9e68a1f61dedd44124 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 1 Mar 2023 12:01:03 -0700 Subject: [PATCH 3/5] Update module path to v7 in golang sources git ls-files '**.go' | grep -vE ^vendor | xargs grep -lE '[^/]github\.com/apache/trafficcontrol/' | xargs sed -Ei 's|([^/]github\.com/apache/trafficcontrol/)|\1v7/|g' --- cache-config/t3c-apply/config/config.go | 4 +- cache-config/t3c-apply/t3c-apply.go | 12 +- cache-config/t3c-apply/torequest/cmd.go | 10 +- cache-config/t3c-apply/torequest/torequest.go | 8 +- .../t3c-apply/torequest/torequest_test.go | 4 +- cache-config/t3c-apply/util/gitutil.go | 2 +- cache-config/t3c-apply/util/util.go | 6 +- cache-config/t3c-check-refs/config/config.go | 4 +- cache-config/t3c-check-refs/t3c-check-refs.go | 8 +- .../t3c-check-reload/t3c-check-reload.go | 2 +- cache-config/t3c-check/t3c-check.go | 4 +- cache-config/t3c-diff/t3c-diff.go | 4 +- cache-config/t3c-generate/cfgfile/all.go | 8 +- .../t3c-generate/cfgfile/cfgfile_test.go | 12 +- cache-config/t3c-generate/cfgfile/routing.go | 8 +- cache-config/t3c-generate/cfgfile/sslkeys.go | 8 +- cache-config/t3c-generate/cfgfile/varnish.go | 6 +- cache-config/t3c-generate/cfgfile/wrappers.go | 8 +- cache-config/t3c-generate/config/config.go | 6 +- .../t3c-generate/plugin/hello_world.go | 2 +- cache-config/t3c-generate/plugin/plugin.go | 6 +- .../t3c-generate/plugin/plugin_test.go | 6 +- cache-config/t3c-generate/t3c-generate.go | 10 +- .../update-to-client/update-to-client.go | 6 +- cache-config/t3c-preprocess/t3c-preprocess.go | 8 +- .../t3c-preprocess/t3c-preprocess_test.go | 6 +- cache-config/t3c-preprocess/util/util.go | 2 +- cache-config/t3c-request/config/config.go | 4 +- cache-config/t3c-request/t3c-request.go | 10 +- cache-config/t3c-tail/t3c-tail.go | 4 +- cache-config/t3c-update/config/config.go | 4 +- cache-config/t3c-update/t3c-update.go | 12 +- cache-config/t3c/t3c.go | 4 +- cache-config/t3cutil/actionlog.go | 2 +- cache-config/t3cutil/getdata.go | 10 +- cache-config/t3cutil/getdatacfg.go | 12 +- cache-config/t3cutil/t3cutil.go | 2 +- cache-config/t3cutil/toreq/client.go | 12 +- cache-config/t3cutil/toreq/client_test.go | 2 +- cache-config/t3cutil/toreq/clientfuncs.go | 14 +- cache-config/t3cutil/toreq/clienthlp.go | 6 +- cache-config/t3cutil/toreq/conversions.go | 8 +- cache-config/t3cutil/toreq/toreqold/client.go | 6 +- .../t3cutil/toreq/toreqold/clientfuncs.go | 12 +- .../t3cutil/toreq/toreqold/clienthlp.go | 6 +- .../t3cutil/toreq/toreqold/conversions.go | 4 +- .../t3cutil/toreq/torequtil/torequtil.go | 4 +- .../testing/ort-tests/config/config.go | 6 +- .../testing/ort-tests/t3c-action-log_test.go | 4 +- .../testing/ort-tests/t3c-apply-diff_test.go | 4 +- .../ort-tests/t3c-apply-unset-update_test.go | 6 +- .../t3c-apply-wait-for-parents_test.go | 12 +- .../ort-tests/t3c-check-reload_test.go | 2 +- .../ort-tests/t3c-create-empty-file_test.go | 4 +- .../t3c-create-metadata-file_test.go | 6 +- .../testing/ort-tests/t3c-dirs_test.go | 2 +- .../ort-tests/t3c-dns-local-bind_test.go | 2 +- .../testing/ort-tests/t3c-fail-log_test.go | 2 +- .../testing/ort-tests/t3c-git_test.go | 4 +- .../testing/ort-tests/t3c-ims_test.go | 12 +- .../testing/ort-tests/t3c-ip-origin_test.go | 4 +- .../testing/ort-tests/t3c-jobs_test.go | 8 +- .../testing/ort-tests/t3c-lockfile_test.go | 2 +- .../ort-tests/t3c-no-outgoing-ip-flag_test.go | 4 +- .../ort-tests/t3c-os-hostname-short_test.go | 4 +- .../testing/ort-tests/t3c-reload_test.go | 4 +- .../testing/ort-tests/t3c-tail_test.go | 2 +- .../testing/ort-tests/t3c_mode_test.go | 4 +- .../ort-tests/t3c_update_to_flags_test.go | 4 +- .../testing/ort-tests/tcdata/cachegroups.go | 116 +++++++ .../tcdata/cachegroups_parameters.go | 103 +++++++ .../ort-tests/tcdata/deliveryservices.go | 90 ++++++ .../deliveryservices_required_capabilities.go | 212 +++++++++++++ .../tcdata/deliveryservicesregexes.go | 107 +++++++ .../ort-tests/tcdata/federation_resolvers.go | 118 ++++++++ .../testing/ort-tests/tcdata/fixtures.go | 2 +- .../testing/ort-tests/tcdata/parameters.go | 89 ++++++ .../ort-tests/tcdata/profile_parameters.go | 104 +++++++ .../testing/ort-tests/tcdata/profiles.go | 120 ++++++++ .../testing/ort-tests/tcdata/roles.go | 71 +++++ .../ort-tests/tcdata/servercheckextension.go | 125 ++++++++ .../testing/ort-tests/tcdata/serverchecks.go | 85 ++++++ .../testing/ort-tests/tcdata/servers.go | 4 +- .../tcdata/serverservercapability.go | 286 ++++++++++++++++++ .../testing/ort-tests/tcdata/session.go | 2 +- .../ort-tests/tcdata/steeringtargets.go | 145 +++++++++ .../testing/ort-tests/tcdata/tcdata.go | 4 +- cache-config/testing/ort-tests/tcdata/todb.go | 4 +- .../testing/ort-tests/tcdata/topologies.go | 76 +++++ .../testing/ort-tests/tcdata/withobjs.go | 10 +- .../testing/ort-tests/to_requester_test.go | 6 +- .../testing/ort-tests/to_updater_test.go | 6 +- .../testing/ort-tests/traffic_ops_ort_test.go | 6 +- .../availableservers/availableservers.go | 2 +- .../traffic_router_golang/cgsrch/cgsrch.go | 4 +- .../traffic_router_golang/config/config.go | 2 +- .../coveragezone/coveragezone.go | 2 +- .../crconfig/crconfigths.go | 2 +- .../crconfigdsservers/crconfigdsservers.go | 2 +- .../crconfigpoller/crconfigpoller.go | 12 +- .../crconfigregex/crconfigregex.go | 2 +- .../crstates/crstatesths.go | 2 +- .../crstatespoller/crstatespoller.go | 10 +- .../httpsrvr/httpsrvr.go | 18 +- .../traffic_router_golang/ipmap/ipmap.go | 4 +- .../nextcache/nextcache.go | 2 +- .../quadtree/quadtree.go | 2 +- .../traffic_router_golang/toutil/toutil.go | 4 +- .../traffic_router_golang.go | 22 +- grove/cache/handler.go | 16 +- grove/cache/responder.go | 12 +- grove/cache/retryinggetter.go | 16 +- grove/cachedata/cachedata.go | 4 +- grove/cacheobj/cacheobj.go | 4 +- grove/config/config.go | 2 +- grove/diskcache/diskcache.go | 6 +- grove/diskcache/multi.go | 6 +- grove/grove.go | 26 +- grove/grovetccfg/grovetccfg.go | 12 +- grove/icache/icache.go | 2 +- grove/integration_test/compare_gets.go | 2 +- grove/memcache/memcache.go | 6 +- grove/plugin/ats_log.go | 4 +- grove/plugin/hello_context.go | 2 +- grove/plugin/hello_world.go | 2 +- grove/plugin/http_cacheinspector.go | 6 +- grove/plugin/http_callgc.go | 4 +- grove/plugin/http_memstats.go | 4 +- grove/plugin/http_stats.go | 6 +- grove/plugin/if_modified_since.go | 2 +- grove/plugin/modify_headers.go | 4 +- grove/plugin/modify_parent_request_headers.go | 4 +- .../plugin/modify_response_headers_global.go | 4 +- grove/plugin/plugin.go | 12 +- grove/plugin/range_req_handler.go | 4 +- grove/remap/remap.go | 16 +- grove/remapdata/remapdata.go | 6 +- grove/stat/stats.go | 10 +- grove/stat/stats_test.go | 6 +- grove/thread/getter.go | 2 +- grove/tiercache/tiercache.go | 6 +- grove/web/connmap.go | 2 +- grove/web/listener.go | 2 +- grove/web/util.go | 2 +- .../cdn-in-a-box/enroller/enroller.go | 6 +- lib/go-atscfg/astatsdotconfig.go | 2 +- lib/go-atscfg/atscfg.go | 2 +- lib/go-atscfg/atscfg_test.go | 4 +- lib/go-atscfg/atsdotrules.go | 2 +- lib/go-atscfg/atsdotrules_test.go | 2 +- lib/go-atscfg/cachedotconfig.go | 2 +- lib/go-atscfg/cachedotconfig_test.go | 2 +- lib/go-atscfg/chkconfig.go | 2 +- lib/go-atscfg/chkconfig_test.go | 2 +- lib/go-atscfg/dropqstringdotconfig.go | 2 +- lib/go-atscfg/dropqstringdotconfig_test.go | 2 +- lib/go-atscfg/headerrewritedotconfig.go | 2 +- lib/go-atscfg/headerrewritedotconfig_test.go | 4 +- lib/go-atscfg/hostingdotconfig.go | 2 +- lib/go-atscfg/hostingdotconfig_test.go | 4 +- lib/go-atscfg/ipallowdotconfig.go | 4 +- lib/go-atscfg/ipallowdotconfig_test.go | 4 +- lib/go-atscfg/ipallowdotyaml.go | 4 +- lib/go-atscfg/ipallowdotyaml_test.go | 4 +- lib/go-atscfg/loggingdotconfig.go | 2 +- lib/go-atscfg/loggingdotyaml.go | 2 +- lib/go-atscfg/logsdotxml.go | 2 +- lib/go-atscfg/meta.go | 2 +- lib/go-atscfg/meta_test.go | 4 +- lib/go-atscfg/packages.go | 2 +- lib/go-atscfg/parentdotconfig.go | 4 +- lib/go-atscfg/parentdotconfig_test.go | 4 +- lib/go-atscfg/plugindotconfig.go | 2 +- lib/go-atscfg/recordsdotconfig.go | 2 +- lib/go-atscfg/regexremapdotconfig.go | 2 +- lib/go-atscfg/regexremapdotconfig_test.go | 2 +- lib/go-atscfg/regexrevalidatedotconfig.go | 2 +- .../regexrevalidatedotconfig_test.go | 2 +- lib/go-atscfg/remapdotconfig.go | 6 +- lib/go-atscfg/remapdotconfig_test.go | 4 +- lib/go-atscfg/servercachedotconfig.go | 2 +- lib/go-atscfg/servercachedotconfig_test.go | 4 +- lib/go-atscfg/serverunknown.go | 2 +- lib/go-atscfg/snidotyaml.go | 2 +- lib/go-atscfg/snidotyaml_test.go | 4 +- lib/go-atscfg/sslmulticertdotconfig.go | 4 +- lib/go-atscfg/sslmulticertdotconfig_test.go | 2 +- lib/go-atscfg/sslservernamedotyaml.go | 2 +- lib/go-atscfg/sslservernamedotyaml_test.go | 4 +- lib/go-atscfg/storagedotconfig.go | 2 +- lib/go-atscfg/strategiesdotconfig.go | 4 +- lib/go-atscfg/strategiesdotconfig_test.go | 4 +- lib/go-atscfg/sysctldotconf.go | 2 +- lib/go-atscfg/urisigningconfig.go | 2 +- lib/go-atscfg/urisigningconfig_test.go | 2 +- lib/go-atscfg/urlsigconfig.go | 2 +- lib/go-atscfg/urlsigconfig_test.go | 2 +- lib/go-atscfg/volumedotconfig.go | 2 +- lib/go-llog/llog.go | 4 +- lib/go-log/log.go | 2 +- lib/go-rfc/http.go | 2 +- lib/go-tc/acme_account.go | 4 +- lib/go-tc/cachegroups.go | 2 +- lib/go-tc/cdn_notification.go | 4 +- lib/go-tc/cdns_dnssec.go | 8 +- lib/go-tc/deliveryservice_requests.go | 4 +- lib/go-tc/deliveryservice_requests_test.go | 2 +- lib/go-tc/deliveryservice_servers.go | 2 +- lib/go-tc/deliveryservice_ssl_keys.go | 10 +- lib/go-tc/deliveryservices.go | 4 +- lib/go-tc/deliveryservicesslkeys_test.go | 2 +- lib/go-tc/federation.go | 14 +- lib/go-tc/federation_resolver.go | 2 +- lib/go-tc/invalidationjobs.go | 2 +- lib/go-tc/invalidationjobs_test.go | 2 +- lib/go-tc/log.go | 2 +- lib/go-tc/parameters.go | 10 +- lib/go-tc/profiles.go | 8 +- lib/go-tc/roles.go | 4 +- lib/go-tc/roles_test.go | 2 +- lib/go-tc/servercheckextensions.go | 4 +- lib/go-tc/serverchecks.go | 4 +- lib/go-tc/servers.go | 2 +- lib/go-tc/stats_summary.go | 8 +- lib/go-tc/steeringtarget.go | 4 +- lib/go-tc/toextension.go | 4 +- lib/go-tc/totest/asns.go | 4 +- .../totest/cachegroup_deliveryservices.go | 4 +- lib/go-tc/totest/cachegroups.go | 6 +- lib/go-tc/totest/cdns.go | 4 +- lib/go-tc/totest/coordinates.go | 4 +- lib/go-tc/totest/deliveryservice_regexes.go | 6 +- .../deliveryservice_request_comments.go | 4 +- lib/go-tc/totest/deliveryservice_requests.go | 6 +- lib/go-tc/totest/deliveryservices.go | 6 +- .../deliveryservices_required_capabilities.go | 6 +- lib/go-tc/totest/divisions.go | 4 +- lib/go-tc/totest/federation_resolvers.go | 6 +- lib/go-tc/totest/federation_users.go | 8 +- lib/go-tc/totest/federations.go | 6 +- lib/go-tc/totest/jobs.go | 4 +- lib/go-tc/totest/origins.go | 4 +- lib/go-tc/totest/parameters.go | 4 +- lib/go-tc/totest/physlocations.go | 4 +- lib/go-tc/totest/profile_parameters.go | 6 +- lib/go-tc/totest/profiles.go | 4 +- lib/go-tc/totest/regions.go | 4 +- lib/go-tc/totest/roles.go | 4 +- lib/go-tc/totest/server_capabilities.go | 4 +- lib/go-tc/totest/server_check_extensions.go | 4 +- lib/go-tc/totest/server_checks.go | 4 +- .../totest/server_server_capabilities.go | 4 +- lib/go-tc/totest/servers.go | 4 +- lib/go-tc/totest/service_categories.go | 4 +- lib/go-tc/totest/static_dns_entries.go | 4 +- lib/go-tc/totest/statuses.go | 4 +- lib/go-tc/totest/steering_targets.go | 6 +- lib/go-tc/totest/tenants.go | 4 +- lib/go-tc/totest/topologies.go | 4 +- lib/go-tc/totest/traffic_control.go | 2 +- lib/go-tc/totest/types.go | 4 +- lib/go-tc/totest/users.go | 4 +- lib/go-tc/totestv4/asns.go | 4 +- .../totestv4/cachegroup_deliveryservices.go | 4 +- lib/go-tc/totestv4/cachegroups.go | 6 +- lib/go-tc/totestv4/cdns.go | 4 +- lib/go-tc/totestv4/coordinates.go | 4 +- lib/go-tc/totestv4/deliveryservice_regexes.go | 6 +- .../deliveryservice_request_comments.go | 4 +- .../totestv4/deliveryservice_requests.go | 6 +- lib/go-tc/totestv4/deliveryservices.go | 4 +- .../deliveryservices_required_capabilities.go | 6 +- lib/go-tc/totestv4/divisions.go | 4 +- lib/go-tc/totestv4/federation_resolvers.go | 6 +- lib/go-tc/totestv4/federation_users.go | 8 +- lib/go-tc/totestv4/federations.go | 6 +- lib/go-tc/totestv4/jobs.go | 4 +- lib/go-tc/totestv4/origins.go | 4 +- lib/go-tc/totestv4/parameters.go | 4 +- lib/go-tc/totestv4/physlocations.go | 4 +- lib/go-tc/totestv4/profile_parameters.go | 6 +- lib/go-tc/totestv4/profiles.go | 4 +- lib/go-tc/totestv4/regions.go | 4 +- lib/go-tc/totestv4/roles.go | 4 +- lib/go-tc/totestv4/server_capabilities.go | 4 +- lib/go-tc/totestv4/server_check_extensions.go | 4 +- lib/go-tc/totestv4/server_checks.go | 4 +- .../totestv4/server_server_capabilities.go | 4 +- lib/go-tc/totestv4/servers.go | 4 +- lib/go-tc/totestv4/service_categories.go | 4 +- lib/go-tc/totestv4/static_dns_entries.go | 4 +- lib/go-tc/totestv4/statuses.go | 4 +- lib/go-tc/totestv4/steering_targets.go | 6 +- lib/go-tc/totestv4/tenants.go | 4 +- lib/go-tc/totestv4/topologies.go | 4 +- lib/go-tc/totestv4/traffic_control.go | 2 +- lib/go-tc/totestv4/types.go | 4 +- lib/go-tc/totestv4/users.go | 4 +- lib/go-tc/tovalidate/db.go | 2 +- lib/go-tc/traffic_monitor_test.go | 2 +- lib/go-tc/traffic_stats.go | 2 +- lib/go-tc/users.go | 8 +- lib/go-util/net.go | 2 +- lib/varnishcfg/access_control.go | 4 +- lib/varnishcfg/access_control_test.go | 8 +- lib/varnishcfg/backends.go | 4 +- lib/varnishcfg/backends_test.go | 2 +- lib/varnishcfg/cache_control.go | 4 +- lib/varnishcfg/cache_control_test.go | 6 +- lib/varnishcfg/hitch.go | 2 +- lib/varnishcfg/hitch_test.go | 4 +- lib/varnishcfg/vclbuilder.go | 4 +- tc-health-client/config/config.go | 6 +- tc-health-client/config/config_test.go | 2 +- tc-health-client/sar/multisar.go | 2 +- tc-health-client/sar/sar.go | 2 +- tc-health-client/tc-health-client.go | 8 +- .../testing/tests/health-client-main_test.go | 8 +- .../tests/health-client-startup_test.go | 6 +- tc-health-client/tmagent/markdownservice.go | 8 +- tc-health-client/tmagent/parenthealth.go | 6 +- .../tmagent/parenthealthservice.go | 4 +- .../tmagent/parentservicehealth.go | 6 +- tc-health-client/tmagent/tmagent.go | 10 +- tc-health-client/tmagent/tmagent_test.go | 4 +- tc-health-client/tmagent/tmhealthservice.go | 8 +- test/fakeOrigin/fakeOrigin.go | 6 +- test/fakeOrigin/httpService/handler.go | 4 +- test/fakeOrigin/httpService/httpService.go | 6 +- test/fakeOrigin/httpService/ssl.keygen.go | 2 +- test/fakeOrigin/transcode/transcode.go | 2 +- test/router/client/client.go | 2 +- test/router/dnssec/dnssec_suite_test.go | 2 +- test/router/dnssec/dnssec_test.go | 2 +- test/router/load/load.go | 4 +- test/router/server/server.go | 4 +- .../fill_expiration_and_provider.go | 4 +- traffic_monitor/cache/astats-dsnames.go | 8 +- traffic_monitor/cache/astats.go | 10 +- traffic_monitor/cache/astats_csv.go | 4 +- traffic_monitor/cache/astats_test.go | 8 +- traffic_monitor/cache/cache.go | 8 +- traffic_monitor/cache/cache_test.go | 10 +- traffic_monitor/cache/data.go | 2 +- traffic_monitor/cache/data_test.go | 6 +- traffic_monitor/cache/noop.go | 2 +- traffic_monitor/cache/stats_over_http.go | 8 +- traffic_monitor/cache/stats_over_http_test.go | 2 +- traffic_monitor/cache/stats_types.go | 4 +- traffic_monitor/cache/vstats.go | 4 +- traffic_monitor/config/config.go | 2 +- traffic_monitor/datareq/bandwidth.go | 6 +- traffic_monitor/datareq/bandwidthcapacity.go | 2 +- .../datareq/cacheavailablecount.go | 4 +- traffic_monitor/datareq/cachecount.go | 2 +- traffic_monitor/datareq/cachedowncount.go | 6 +- traffic_monitor/datareq/cachestat.go | 6 +- traffic_monitor/datareq/cachestate.go | 10 +- traffic_monitor/datareq/cachestate_test.go | 8 +- traffic_monitor/datareq/cachestatfilter.go | 4 +- traffic_monitor/datareq/configdoc.go | 2 +- traffic_monitor/datareq/crconfig.go | 4 +- traffic_monitor/datareq/crconfighist.go | 2 +- traffic_monitor/datareq/crstate.go | 12 +- traffic_monitor/datareq/crstate_test.go | 8 +- traffic_monitor/datareq/datareq.go | 18 +- traffic_monitor/datareq/datareq_test.go | 10 +- traffic_monitor/datareq/dsstat.go | 4 +- traffic_monitor/datareq/dsstatfilter.go | 4 +- traffic_monitor/datareq/eventlog.go | 2 +- traffic_monitor/datareq/monitorconfig.go | 2 +- traffic_monitor/datareq/peerstate.go | 10 +- traffic_monitor/datareq/peerstatefilter.go | 2 +- traffic_monitor/datareq/stat.go | 10 +- traffic_monitor/datareq/statsummary.go | 14 +- traffic_monitor/datareq/trafficopsuri.go | 2 +- traffic_monitor/datareq/version.go | 2 +- traffic_monitor/ds/stat.go | 16 +- traffic_monitor/ds/stat_test.go | 18 +- traffic_monitor/dsdata/stat.go | 4 +- traffic_monitor/health/cache.go | 16 +- traffic_monitor/health/cache_test.go | 12 +- traffic_monitor/health/event.go | 2 +- traffic_monitor/manager/distributedpeer.go | 8 +- traffic_monitor/manager/health.go | 16 +- traffic_monitor/manager/manager.go | 20 +- traffic_monitor/manager/monitorconfig.go | 18 +- traffic_monitor/manager/monitorconfig_test.go | 2 +- traffic_monitor/manager/opsconfig.go | 22 +- traffic_monitor/manager/peer.go | 6 +- traffic_monitor/manager/stat.go | 18 +- traffic_monitor/manager/statecombiner.go | 10 +- traffic_monitor/manager/statecombiner_test.go | 8 +- traffic_monitor/peer/crstates.go | 2 +- traffic_monitor/peer/peer.go | 4 +- traffic_monitor/peer/peer_test.go | 2 +- traffic_monitor/poller/cache.go | 6 +- traffic_monitor/poller/monitorconfig.go | 8 +- traffic_monitor/poller/peer.go | 6 +- traffic_monitor/poller/poller_type_http.go | 4 +- traffic_monitor/poller/poller_types.go | 2 +- traffic_monitor/srvhttp/srvhttp.go | 6 +- .../tests/_integration/config/config.go | 2 +- .../tests/_integration/kbps_test.go | 4 +- .../_integration/traffic_monitor_test.go | 6 +- .../threadsafe/cacheavailablestatus.go | 2 +- traffic_monitor/threadsafe/cachemaxkbpses.go | 2 +- traffic_monitor/threadsafe/dsstats.go | 2 +- traffic_monitor/threadsafe/durationmap.go | 2 +- traffic_monitor/threadsafe/lastkbpsstats.go | 2 +- traffic_monitor/threadsafe/monitorconfig.go | 2 +- traffic_monitor/threadsafe/opsconfig.go | 2 +- traffic_monitor/threadsafe/polledcaches.go | 8 +- traffic_monitor/threadsafe/resulthistory.go | 2 +- .../threadsafe/resultstathistory.go | 8 +- .../threadsafe/resultstathistory_test.go | 8 +- traffic_monitor/tmcheck/dsstats.go | 6 +- traffic_monitor/tmcheck/offlinestates.go | 4 +- traffic_monitor/tmcheck/peerpoller.go | 4 +- traffic_monitor/tmcheck/queryinterval.go | 4 +- traffic_monitor/tmcheck/tmcheck.go | 8 +- traffic_monitor/tmclient/tmclient.go | 12 +- traffic_monitor/todata/todata.go | 6 +- traffic_monitor/todata/todata_test.go | 2 +- .../nagios-validate-deliveryservices.go | 6 +- .../nagios-validate-offline.go | 6 +- .../nagios-validate-peerpoller.go | 6 +- .../nagios-validate-queryinterval.go | 6 +- .../tools/testcaches/fakesrvr/cmd.go | 2 +- .../tools/testcaches/fakesrvr/fakesrvr.go | 2 +- .../tools/testcaches/fakesrvr/server.go | 4 +- .../tools/testcaches/testcaches.go | 2 +- traffic_monitor/tools/testto/testto.go | 4 +- .../validator-service/validator-service.go | 6 +- traffic_monitor/towrap/towrap.go | 10 +- traffic_monitor/towrap/towrap_test.go | 2 +- traffic_monitor/traffic_monitor.go | 6 +- .../checks/DnssecRefresh/ToDnssecRefresh.go | 4 +- .../bin/checks/DnssecRefresh/config/config.go | 2 +- traffic_ops/app/db/admin.go | 2 +- traffic_ops/app/db/reencrypt/reencrypt.go | 2 +- .../app/db/traffic_vault_migrate/postgres.go | 6 +- .../app/db/traffic_vault_migrate/riak.go | 6 +- .../traffic_vault_migrate.go | 4 +- .../traffic_vault_migrate_test.go | 6 +- traffic_ops/testing/api/config/config.go | 2 +- traffic_ops/testing/api/utils/utils.go | 12 +- traffic_ops/testing/api/v3/about_test.go | 4 +- traffic_ops/testing/api/v3/asns_test.go | 10 +- .../api/v3/cachegroups_parameters_test.go | 4 +- .../testing/api/v3/cachegroups_test.go | 12 +- .../v3/cachegroupsdeliveryservices_test.go | 8 +- .../testing/api/v3/capabilities_test.go | 4 +- .../testing/api/v3/cdn_domains_test.go | 6 +- .../testing/api/v3/cdn_federations_test.go | 12 +- .../v3/cdns_name_configs_monitoring_test.go | 8 +- .../api/v3/cdns_name_snapshot_new_test.go | 8 +- .../testing/api/v3/cdns_name_snapshot_test.go | 4 +- traffic_ops/testing/api/v3/cdns_test.go | 10 +- traffic_ops/testing/api/v3/cookie_test.go | 4 +- .../testing/api/v3/coordinates_test.go | 10 +- .../deliveryservice_request_comments_test.go | 10 +- .../api/v3/deliveryservice_requests_test.go | 10 +- .../api/v3/deliveryservices_keys_test.go | 6 +- ...veryservices_required_capabilities_test.go | 12 +- .../testing/api/v3/deliveryservices_test.go | 10 +- .../api/v3/deliveryserviceservers_test.go | 8 +- .../api/v3/deliveryservicesideligible_test.go | 4 +- .../api/v3/deliveryservicesregexes_test.go | 6 +- traffic_ops/testing/api/v3/divisions_test.go | 10 +- .../v3/federation_deliveryservices_test.go | 8 +- .../federation_federation_resolvers_test.go | 6 +- .../api/v3/federation_resolvers_test.go | 12 +- .../testing/api/v3/federation_users_test.go | 10 +- .../testing/api/v3/federations_test.go | 10 +- traffic_ops/testing/api/v3/fixtures_test.go | 2 +- traffic_ops/testing/api/v3/iso_test.go | 4 +- traffic_ops/testing/api/v3/jobs_test.go | 8 +- traffic_ops/testing/api/v3/loginfail_test.go | 4 +- traffic_ops/testing/api/v3/logs_test.go | 4 +- traffic_ops/testing/api/v3/monitoring_test.go | 2 +- traffic_ops/testing/api/v3/origins_test.go | 12 +- traffic_ops/testing/api/v3/parameters_test.go | 10 +- .../testing/api/v3/phys_locations_test.go | 10 +- traffic_ops/testing/api/v3/ping_test.go | 4 +- .../testing/api/v3/profile_parameters_test.go | 8 +- .../testing/api/v3/profiles_export_test.go | 8 +- .../testing/api/v3/profiles_import_test.go | 10 +- .../testing/api/v3/profiles_name_copy_test.go | 4 +- traffic_ops/testing/api/v3/profiles_test.go | 10 +- traffic_ops/testing/api/v3/regions_test.go | 10 +- traffic_ops/testing/api/v3/roles_test.go | 12 +- .../api/v3/server_capabilities_test.go | 8 +- .../api/v3/server_server_capabilities_test.go | 12 +- .../api/v3/servercheckextension_test.go | 8 +- .../testing/api/v3/serverchecks_test.go | 10 +- .../v3/servers_hostname_update_status_test.go | 4 +- .../v3/servers_id_deliveryservices_test.go | 10 +- .../api/v3/servers_id_queue_update_test.go | 10 +- .../testing/api/v3/servers_id_status_test.go | 10 +- traffic_ops/testing/api/v3/servers_test.go | 10 +- .../testing/api/v3/servicecategories_test.go | 10 +- traffic_ops/testing/api/v3/session_test.go | 2 +- traffic_ops/testing/api/v3/snapshot_test.go | 8 +- .../testing/api/v3/staticdnsentries_test.go | 10 +- .../testing/api/v3/stats_summary_test.go | 8 +- traffic_ops/testing/api/v3/statuses_test.go | 10 +- traffic_ops/testing/api/v3/steering_test.go | 8 +- .../testing/api/v3/steeringtargets_test.go | 12 +- traffic_ops/testing/api/v3/tenants_test.go | 10 +- traffic_ops/testing/api/v3/todb_test.go | 4 +- .../api/v3/topologies_queue_update_test.go | 8 +- traffic_ops/testing/api/v3/topologies_test.go | 8 +- .../testing/api/v3/traffic_control_test.go | 2 +- .../testing/api/v3/traffic_ops_test.go | 4 +- traffic_ops/testing/api/v3/types_test.go | 12 +- .../testing/api/v3/user_current_test.go | 8 +- .../testing/api/v3/users_register_test.go | 10 +- traffic_ops/testing/api/v3/users_test.go | 10 +- traffic_ops/testing/api/v4/about_test.go | 6 +- traffic_ops/testing/api/v4/acme_test.go | 4 +- traffic_ops/testing/api/v4/asns_test.go | 14 +- .../testing/api/v4/cachegroups_test.go | 16 +- .../v4/cachegroupsdeliveryservices_test.go | 12 +- .../testing/api/v4/cdn_dnsseckeys_test.go | 8 +- .../testing/api/v4/cdn_domains_test.go | 6 +- .../testing/api/v4/cdn_federations_test.go | 16 +- traffic_ops/testing/api/v4/cdn_locks_test.go | 14 +- .../testing/api/v4/cdn_queue_updates_test.go | 12 +- .../testing/api/v4/cdnnotifications_test.go | 10 +- .../v4/cdns_name_configs_monitoring_test.go | 10 +- .../api/v4/cdns_name_snapshot_new_test.go | 10 +- .../testing/api/v4/cdns_name_snapshot_test.go | 4 +- traffic_ops/testing/api/v4/cdns_test.go | 14 +- traffic_ops/testing/api/v4/cookie_test.go | 4 +- .../testing/api/v4/coordinates_test.go | 12 +- .../deliveryservice_request_comments_test.go | 12 +- .../api/v4/deliveryservice_requests_test.go | 12 +- .../api/v4/deliveryservices_keys_test.go | 10 +- ...veryservices_required_capabilities_test.go | 16 +- .../testing/api/v4/deliveryservices_test.go | 14 +- .../api/v4/deliveryserviceservers_test.go | 10 +- .../api/v4/deliveryservicesideligible_test.go | 6 +- .../api/v4/deliveryservicesregexes_test.go | 10 +- traffic_ops/testing/api/v4/divisions_test.go | 12 +- .../v4/federation_deliveryservices_test.go | 14 +- .../federation_federation_resolvers_test.go | 10 +- .../api/v4/federation_resolvers_test.go | 16 +- .../testing/api/v4/federation_users_test.go | 16 +- .../testing/api/v4/federations_test.go | 12 +- traffic_ops/testing/api/v4/fixtures_test.go | 2 +- traffic_ops/testing/api/v4/iso_test.go | 6 +- traffic_ops/testing/api/v4/jobs_test.go | 12 +- traffic_ops/testing/api/v4/loginfail_test.go | 6 +- traffic_ops/testing/api/v4/logs_test.go | 10 +- traffic_ops/testing/api/v4/monitoring_test.go | 4 +- .../v4/multiple_server_capabilities_test.go | 12 +- traffic_ops/testing/api/v4/origins_test.go | 16 +- traffic_ops/testing/api/v4/parameters_test.go | 12 +- .../testing/api/v4/phys_locations_test.go | 12 +- traffic_ops/testing/api/v4/ping_test.go | 4 +- .../testing/api/v4/profile_parameters_test.go | 12 +- .../testing/api/v4/profiles_export_test.go | 12 +- .../testing/api/v4/profiles_import_test.go | 12 +- .../testing/api/v4/profiles_name_copy_test.go | 6 +- traffic_ops/testing/api/v4/profiles_test.go | 14 +- traffic_ops/testing/api/v4/regions_test.go | 12 +- traffic_ops/testing/api/v4/roles_test.go | 12 +- .../api/v4/server_capabilities_test.go | 12 +- .../api/v4/server_server_capabilities_test.go | 16 +- .../api/v4/servercheckextension_test.go | 8 +- .../testing/api/v4/serverchecks_test.go | 14 +- .../v4/servers_hostname_update_status_test.go | 4 +- .../api/v4/servers_hostname_update_test.go | 12 +- .../v4/servers_id_deliveryservices_test.go | 14 +- .../api/v4/servers_id_queue_update_test.go | 14 +- .../testing/api/v4/servers_id_status_test.go | 14 +- traffic_ops/testing/api/v4/servers_test.go | 14 +- .../testing/api/v4/servicecategories_test.go | 12 +- traffic_ops/testing/api/v4/session_test.go | 2 +- traffic_ops/testing/api/v4/snapshot_test.go | 12 +- .../testing/api/v4/sslkey_expirations_test.go | 6 +- .../testing/api/v4/staticdnsentries_test.go | 12 +- .../testing/api/v4/stats_summary_test.go | 10 +- traffic_ops/testing/api/v4/statuses_test.go | 12 +- traffic_ops/testing/api/v4/steering_test.go | 10 +- .../testing/api/v4/steeringtargets_test.go | 16 +- traffic_ops/testing/api/v4/tenants_test.go | 12 +- traffic_ops/testing/api/v4/todb_test.go | 4 +- .../api/v4/topologies_queue_update_test.go | 12 +- traffic_ops/testing/api/v4/topologies_test.go | 12 +- .../testing/api/v4/traffic_ops_test.go | 6 +- .../testing/api/v4/traffic_vault_ping_test.go | 4 +- traffic_ops/testing/api/v4/types_test.go | 12 +- .../testing/api/v4/user_current_test.go | 8 +- .../testing/api/v4/users_register_test.go | 12 +- traffic_ops/testing/api/v4/users_test.go | 16 +- traffic_ops/testing/api/v4/withobjs_test.go | 10 +- traffic_ops/testing/api/v5/about_test.go | 6 +- traffic_ops/testing/api/v5/acme_test.go | 4 +- traffic_ops/testing/api/v5/asns_test.go | 12 +- .../testing/api/v5/cachegroups_test.go | 14 +- .../v5/cachegroupsdeliveryservices_test.go | 10 +- .../testing/api/v5/cdn_dnsseckeys_test.go | 8 +- .../testing/api/v5/cdn_domains_test.go | 6 +- .../testing/api/v5/cdn_federations_test.go | 14 +- traffic_ops/testing/api/v5/cdn_locks_test.go | 12 +- .../testing/api/v5/cdn_queue_updates_test.go | 10 +- .../testing/api/v5/cdnnotifications_test.go | 10 +- .../v5/cdns_name_configs_monitoring_test.go | 10 +- .../api/v5/cdns_name_snapshot_new_test.go | 10 +- .../testing/api/v5/cdns_name_snapshot_test.go | 4 +- traffic_ops/testing/api/v5/cdns_test.go | 12 +- traffic_ops/testing/api/v5/cookie_test.go | 4 +- .../testing/api/v5/coordinates_test.go | 12 +- .../deliveryservice_request_comments_test.go | 12 +- .../api/v5/deliveryservice_requests_test.go | 12 +- .../api/v5/deliveryservices_keys_test.go | 10 +- ...veryservices_required_capabilities_test.go | 10 +- .../testing/api/v5/deliveryservices_test.go | 12 +- .../api/v5/deliveryserviceservers_test.go | 10 +- .../api/v5/deliveryservicesideligible_test.go | 4 +- .../api/v5/deliveryservicesregexes_test.go | 8 +- traffic_ops/testing/api/v5/divisions_test.go | 12 +- .../v5/federation_deliveryservices_test.go | 12 +- .../federation_federation_resolvers_test.go | 8 +- .../api/v5/federation_resolvers_test.go | 14 +- .../testing/api/v5/federation_users_test.go | 14 +- .../testing/api/v5/federations_test.go | 12 +- traffic_ops/testing/api/v5/fixtures_test.go | 2 +- traffic_ops/testing/api/v5/iso_test.go | 6 +- traffic_ops/testing/api/v5/jobs_test.go | 10 +- traffic_ops/testing/api/v5/loginfail_test.go | 6 +- traffic_ops/testing/api/v5/logs_test.go | 10 +- traffic_ops/testing/api/v5/monitoring_test.go | 4 +- .../v5/multiple_server_capabilities_test.go | 10 +- traffic_ops/testing/api/v5/origins_test.go | 14 +- traffic_ops/testing/api/v5/parameters_test.go | 12 +- .../testing/api/v5/phys_locations_test.go | 12 +- traffic_ops/testing/api/v5/ping_test.go | 4 +- .../testing/api/v5/profile_parameters_test.go | 10 +- .../testing/api/v5/profiles_export_test.go | 10 +- .../testing/api/v5/profiles_import_test.go | 12 +- .../testing/api/v5/profiles_name_copy_test.go | 6 +- traffic_ops/testing/api/v5/profiles_test.go | 12 +- traffic_ops/testing/api/v5/regions_test.go | 12 +- traffic_ops/testing/api/v5/roles_test.go | 12 +- .../api/v5/server_capabilities_test.go | 12 +- .../api/v5/server_server_capabilities_test.go | 14 +- .../api/v5/servercheckextension_test.go | 10 +- .../testing/api/v5/serverchecks_test.go | 12 +- .../v5/servers_hostname_update_status_test.go | 4 +- .../api/v5/servers_hostname_update_test.go | 12 +- .../v5/servers_id_deliveryservices_test.go | 12 +- .../api/v5/servers_id_queue_update_test.go | 12 +- .../testing/api/v5/servers_id_status_test.go | 12 +- traffic_ops/testing/api/v5/servers_test.go | 12 +- .../testing/api/v5/servicecategories_test.go | 12 +- traffic_ops/testing/api/v5/session_test.go | 2 +- traffic_ops/testing/api/v5/snapshot_test.go | 10 +- .../testing/api/v5/sslkey_expirations_test.go | 6 +- .../testing/api/v5/staticdnsentries_test.go | 14 +- .../testing/api/v5/stats_summary_test.go | 10 +- traffic_ops/testing/api/v5/statuses_test.go | 14 +- traffic_ops/testing/api/v5/steering_test.go | 10 +- .../testing/api/v5/steeringtargets_test.go | 14 +- traffic_ops/testing/api/v5/tenants_test.go | 14 +- traffic_ops/testing/api/v5/todb_test.go | 4 +- .../api/v5/topologies_queue_update_test.go | 10 +- traffic_ops/testing/api/v5/topologies_test.go | 12 +- .../testing/api/v5/traffic_control_test.go | 2 +- .../testing/api/v5/traffic_ops_test.go | 4 +- .../testing/api/v5/traffic_vault_ping_test.go | 4 +- traffic_ops/testing/api/v5/types_test.go | 12 +- .../testing/api/v5/user_current_test.go | 8 +- .../testing/api/v5/users_register_test.go | 12 +- traffic_ops/testing/api/v5/users_test.go | 14 +- traffic_ops/toclientlib/toclientlib.go | 4 +- .../traffic_ops_golang/acme/acme_account.go | 4 +- traffic_ops/traffic_ops_golang/api/api.go | 20 +- .../traffic_ops_golang/api/api_test.go | 4 +- .../traffic_ops_golang/api/async_status.go | 2 +- .../traffic_ops_golang/api/change_log.go | 6 +- .../traffic_ops_golang/api/change_log_test.go | 2 +- .../traffic_ops_golang/api/generic_crud.go | 12 +- .../traffic_ops_golang/api/shared_handlers.go | 6 +- .../api/shared_handlers_test.go | 10 +- .../api/shared_interfaces.go | 6 +- .../apicapability/api_capabilities.go | 10 +- .../apicapability/api_capabilities_test.go | 2 +- .../traffic_ops_golang/apitenant/tenant.go | 18 +- .../apitenant/tenant_test.go | 6 +- traffic_ops/traffic_ops_golang/asn/asns.go | 16 +- .../traffic_ops_golang/asn/asns_test.go | 8 +- .../traffic_ops_golang/auth/authorize.go | 4 +- .../traffic_ops_golang/auth/certificate.go | 4 +- traffic_ops/traffic_ops_golang/auth/ldap.go | 4 +- .../traffic_ops_golang/auth/password_check.go | 2 +- .../traffic_ops_golang/auth/usercache.go | 2 +- .../traffic_ops_golang/auth/usercache_test.go | 2 +- .../cachegroup/cachegroups.go | 16 +- .../cachegroup/cachegroups_test.go | 8 +- .../traffic_ops_golang/cachegroup/dspost.go | 12 +- .../cachegroup/queueupdate.go | 6 +- .../cachegroupparameter/parameters.go | 16 +- .../cachegroupparameter/parameters_test.go | 4 +- .../cachesstats/cachesstats.go | 10 +- .../cachesstats/cachesstats_test.go | 4 +- .../capabilities/capabilities.go | 10 +- .../traffic_ops_golang/cdn/capacity.go | 10 +- .../traffic_ops_golang/cdn/capacity_test.go | 2 +- traffic_ops/traffic_ops_golang/cdn/cdns.go | 16 +- .../traffic_ops_golang/cdn/cdns_test.go | 10 +- traffic_ops/traffic_ops_golang/cdn/dnssec.go | 12 +- .../traffic_ops_golang/cdn/dnssecrefresh.go | 16 +- traffic_ops/traffic_ops_golang/cdn/domains.go | 8 +- traffic_ops/traffic_ops_golang/cdn/genksk.go | 10 +- traffic_ops/traffic_ops_golang/cdn/health.go | 8 +- .../traffic_ops_golang/cdn/namedelete.go | 6 +- traffic_ops/traffic_ops_golang/cdn/queue.go | 8 +- traffic_ops/traffic_ops_golang/cdn/sslkeys.go | 2 +- .../traffic_ops_golang/cdn_lock/cdn_lock.go | 10 +- .../cdnfederation/cdnfederations.go | 16 +- .../cdnfederation/cdnfederations_test.go | 12 +- .../traffic_ops_golang/cdni/capacity.go | 4 +- traffic_ops/traffic_ops_golang/cdni/shared.go | 8 +- .../traffic_ops_golang/cdni/telemetry.go | 4 +- .../cdnnotification/cdnnotifications.go | 8 +- .../traffic_ops_golang/config/config.go | 6 +- .../coordinate/coordinates.go | 16 +- .../coordinate/coordinates_test.go | 8 +- .../traffic_ops_golang/crconfig/config.go | 4 +- .../crconfig/config_test.go | 6 +- .../traffic_ops_golang/crconfig/crconfig.go | 6 +- .../crconfig/deliveryservice.go | 4 +- .../crconfig/deliveryservice_test.go | 6 +- .../crconfig/edgelocations.go | 2 +- .../crconfig/edgelocations_test.go | 4 +- .../traffic_ops_golang/crconfig/handler.go | 14 +- .../traffic_ops_golang/crconfig/servers.go | 6 +- .../crconfig/servers_test.go | 8 +- .../traffic_ops_golang/crconfig/snapshot.go | 6 +- .../crconfig/snapshot_test.go | 4 +- .../traffic_ops_golang/crconfig/stats.go | 2 +- .../traffic_ops_golang/crconfig/stats_test.go | 6 +- .../traffic_ops_golang/crstats/cdnrouting.go | 4 +- .../traffic_ops_golang/crstats/dsrouting.go | 8 +- .../traffic_ops_golang/crstats/routing.go | 4 +- .../crstats/routing_test.go | 2 +- .../traffic_ops_golang/dbdump/dbdump.go | 6 +- .../dbhelpers/db_helpers.go | 6 +- .../dbhelpers/db_helpers_test.go | 4 +- .../deliveryservice/acme.go | 20 +- .../deliveryservice/acme_renew.go | 16 +- .../deliveryservice/acme_test.go | 6 +- .../deliveryservice/autorenewcerts.go | 18 +- .../deliveryservice/capacity.go | 14 +- .../consistenthash/consistenthash.go | 2 +- .../deliveryservice/deleteoldcerts.go | 10 +- .../deliveryservice/deliveryservices.go | 46 +-- .../deliveryservices_required_capabilities.go | 16 +- ...veryservices_required_capabilities_test.go | 8 +- .../deliveryservice/deliveryservices_test.go | 8 +- .../deliveryservice/dnssec.go | 4 +- .../deliveryservice/dnssec_test.go | 2 +- .../deliveryservice/eligible.go | 10 +- .../deliveryservice/eligible_test.go | 4 +- .../deliveryservice/gencert.go | 2 +- .../deliveryservice/health.go | 12 +- .../deliveryservice/health_test.go | 4 +- .../deliveryservice/keys.go | 10 +- .../letsencrypt_dns_challenge.go | 6 +- .../deliveryservice/request/assign.go | 8 +- .../request/comment/comments.go | 14 +- .../request/comment/comments_test.go | 8 +- .../deliveryservice/request/requests.go | 22 +- .../deliveryservice/request/requests_test.go | 8 +- .../deliveryservice/request/status.go | 8 +- .../deliveryservice/request/validate.go | 10 +- .../deliveryservice/request/validate_test.go | 4 +- .../deliveryservice/safe.go | 10 +- .../deliveryservice/safe_test.go | 4 +- .../deliveryservice/servers/delete.go | 10 +- .../deliveryservice/servers/servers.go | 22 +- .../deliveryservice/servers/servers_test.go | 8 +- .../deliveryservice/sslkeys.go | 14 +- .../deliveryservice/urlkey.go | 8 +- .../deliveryservicerequests.go | 8 +- .../deliveryservicesregexes.go | 12 +- .../deliveryservicesregexes_test.go | 2 +- .../traffic_ops_golang/division/divisions.go | 16 +- .../division/divisions_test.go | 6 +- .../federation_resolvers.go | 14 +- .../federations/allfederations.go | 8 +- .../traffic_ops_golang/federations/ds.go | 6 +- .../federations/federation_resolvers.go | 6 +- .../federations/federations.go | 16 +- .../federations/federations_test.go | 4 +- .../traffic_ops_golang/federations/user.go | 6 +- .../invalidationjobs/invalidationjobs.go | 16 +- traffic_ops/traffic_ops_golang/iso/iso.go | 10 +- .../traffic_ops_golang/iso/iso_test.go | 6 +- .../traffic_ops_golang/iso/osversions.go | 6 +- .../traffic_ops_golang/iso/osversions_test.go | 2 +- traffic_ops/traffic_ops_golang/login/login.go | 14 +- .../traffic_ops_golang/login/login_test.go | 4 +- .../traffic_ops_golang/login/logout.go | 8 +- .../traffic_ops_golang/login/logout_test.go | 12 +- .../traffic_ops_golang/login/register.go | 12 +- .../traffic_ops_golang/login/register_test.go | 2 +- traffic_ops/traffic_ops_golang/logs/log.go | 8 +- .../monitoring/monitoring.go | 8 +- .../monitoring/monitoring_test.go | 8 +- .../traffic_ops_golang/origin/origins.go | 20 +- .../traffic_ops_golang/origin/origins_test.go | 10 +- .../parameter/parameters.go | 18 +- .../parameter/parameters_test.go | 8 +- .../physlocation/phys_locations.go | 16 +- .../physlocation/phys_locations_test.go | 8 +- traffic_ops/traffic_ops_golang/ping/ping.go | 4 +- traffic_ops/traffic_ops_golang/ping/vault.go | 2 +- .../traffic_ops_golang/plugin/hello_config.go | 2 +- .../plugin/hello_context.go | 2 +- .../plugin/hello_middleware.go | 2 +- .../plugin/hello_shared_config.go | 2 +- .../plugin/hello_startup.go | 2 +- .../traffic_ops_golang/plugin/plugin.go | 4 +- .../traffic_ops_golang/plugin/proxy.go | 4 +- .../traffic_ops_golang/plugins/plugins.go | 8 +- .../traffic_ops_golang/profile/copy.go | 10 +- .../traffic_ops_golang/profile/copy_test.go | 14 +- .../profile/profile_export.go | 8 +- .../profile/profile_export_test.go | 2 +- .../profile/profile_import.go | 6 +- .../profile/profile_import_test.go | 2 +- .../traffic_ops_golang/profile/profiles.go | 20 +- .../profile/profiles_test.go | 8 +- .../profileparameter/parameterprofilebyid.go | 4 +- .../parameterprofilebyname.go | 4 +- .../profileparameter/postparameterprofile.go | 6 +- .../profileparameter/postprofileparameter.go | 6 +- .../postprofileparametersbyid.go | 6 +- .../postprofileparametersbyname.go | 6 +- .../profileparameter/profile_parameters.go | 14 +- .../profile_parameters_test.go | 6 +- .../traffic_ops_golang/region/regions.go | 14 +- .../traffic_ops_golang/region/regions_test.go | 6 +- traffic_ops/traffic_ops_golang/role/roles.go | 14 +- .../traffic_ops_golang/role/roles_test.go | 16 +- .../routing/middleware/wrappers.go | 16 +- .../routing/middleware/wrappers_test.go | 12 +- .../traffic_ops_golang/routing/routes.go | 124 ++++---- .../traffic_ops_golang/routing/routing.go | 14 +- .../routing/routing_test.go | 8 +- .../traffic_ops_golang/server/detail.go | 12 +- .../traffic_ops_golang/server/detail_test.go | 8 +- .../traffic_ops_golang/server/put_status.go | 8 +- .../server/put_status_test.go | 2 +- .../traffic_ops_golang/server/queue_update.go | 8 +- .../traffic_ops_golang/server/servers.go | 22 +- .../server/servers_assignment.go | 14 +- .../server/servers_assignment_test.go | 6 +- .../server/servers_server_capability.go | 14 +- .../server/servers_server_capability_test.go | 8 +- .../traffic_ops_golang/server/servers_test.go | 8 +- .../server/servers_update_status.go | 6 +- .../server/servers_update_status_test.go | 4 +- .../traffic_ops_golang/server/update.go | 6 +- .../servercapability/servercapability.go | 14 +- .../servercapability/servercapability_test.go | 6 +- .../servercheck/extensions/extension.go | 10 +- .../servercheck/servercheck.go | 8 +- .../servicecategory/servicecategories.go | 16 +- .../servicecategory/servicecategories_test.go | 2 +- .../staticdnsentry/staticdnsentry.go | 14 +- .../staticdnsentry/staticdnsentry_test.go | 6 +- .../traffic_ops_golang/status/statuses.go | 10 +- .../status/statuses_test.go | 8 +- .../traffic_ops_golang/steering/steering.go | 6 +- .../steeringtargets/steeringtargets.go | 18 +- .../steeringtargets/steeringtargets_test.go | 6 +- .../swaggerdocs/v13/alerts.go | 2 +- .../swaggerdocs/v13/asns.go | 2 +- .../swaggerdocs/v13/cdns.go | 2 +- .../swaggerdocs/v13/divisions.go | 2 +- .../swaggerdocs/v13/physlocations.go | 2 +- .../swaggerdocs/v13/profileparameters.go | 2 +- .../swaggerdocs/v13/profiles.go | 2 +- .../swaggerdocs/v13/regions.go | 2 +- .../swaggerdocs/v13/statuses.go | 2 +- .../systeminfo/system_info.go | 6 +- .../systeminfo/system_info_test.go | 6 +- .../traffic_ops_golang/tenant/tenancy.go | 8 +- .../tocookie/cookie_test.go | 2 +- .../topology/cycle_detection.go | 2 +- .../topology/queue_update.go | 10 +- .../traffic_ops_golang/topology/snapshot.go | 4 +- .../topology/snapshot_test.go | 4 +- .../traffic_ops_golang/topology/topologies.go | 22 +- .../topology_validation.go | 2 +- .../traffic_ops_golang/topology/validation.go | 6 +- .../traffic_ops_golang/traffic_ops_golang.go | 22 +- .../traffic_ops_golang/trafficstats/cache.go | 8 +- .../traffic_ops_golang/trafficstats/cdn.go | 6 +- .../trafficstats/deliveryservice.go | 10 +- .../traffic_ops_golang/trafficstats/series.go | 4 +- .../trafficstats/stats_summary.go | 8 +- .../trafficstats/stats_summary_test.go | 2 +- .../trafficstats/summary.go | 4 +- .../traffic_ops_golang/trafficstats/util.go | 8 +- .../trafficstats/util_test.go | 6 +- .../trafficvault/backends/backends.go | 2 +- .../backends/disabled/disabled.go | 2 +- .../trafficvault/backends/postgres/encrypt.go | 2 +- .../postgres/hashicorpvault/client.go | 4 +- .../backends/postgres/postgres.go | 12 +- .../backends/postgres/uri_signing_keys.go | 2 +- .../backends/postgres/url_sig_keys.go | 4 +- .../trafficvault/backends/riaksvc/dsutil.go | 6 +- .../trafficvault/backends/riaksvc/riak.go | 8 +- .../backends/riaksvc/riak_services.go | 4 +- .../trafficvault/trafficvault.go | 2 +- traffic_ops/traffic_ops_golang/types/types.go | 16 +- .../traffic_ops_golang/types/types_test.go | 8 +- .../urisigning/urisigning.go | 10 +- .../urisigning/urisigning_test.go | 2 +- .../traffic_ops_golang/user/current.go | 14 +- .../traffic_ops_golang/user/current_test.go | 6 +- traffic_ops/traffic_ops_golang/user/user.go | 20 +- .../traffic_ops_golang/user/user_test.go | 4 +- .../traffic_ops_golang/util/ims/ims.go | 6 +- .../util/monitorhlp/monitorhlp.go | 4 +- .../traffic_ops_golang/vault/bucket.go | 4 +- traffic_ops/v3-client/about.go | 2 +- traffic_ops/v3-client/api_capability.go | 4 +- traffic_ops/v3-client/asn.go | 4 +- traffic_ops/v3-client/cachegroup.go | 4 +- .../v3-client/cachegroup_parameters.go | 4 +- traffic_ops/v3-client/capability.go | 4 +- traffic_ops/v3-client/cdn.go | 4 +- traffic_ops/v3-client/cdn_domains.go | 4 +- traffic_ops/v3-client/cdnfederations.go | 4 +- traffic_ops/v3-client/coordinate.go | 4 +- traffic_ops/v3-client/crconfig.go | 4 +- traffic_ops/v3-client/deliveryservice.go | 6 +- .../v3-client/deliveryservice_regexes.go | 4 +- .../deliveryservice_request_comments.go | 4 +- .../v3-client/deliveryservice_requests.go | 4 +- .../deliveryservices_required_capabilities.go | 4 +- .../v3-client/deliveryserviceserver.go | 6 +- traffic_ops/v3-client/division.go | 4 +- traffic_ops/v3-client/dsuser.go | 2 +- traffic_ops/v3-client/federation.go | 4 +- .../federation_federation_resolver.go | 4 +- traffic_ops/v3-client/federation_resolver.go | 4 +- traffic_ops/v3-client/iso.go | 4 +- traffic_ops/v3-client/job.go | 4 +- traffic_ops/v3-client/log.go | 4 +- traffic_ops/v3-client/origin.go | 4 +- traffic_ops/v3-client/parameter.go | 4 +- traffic_ops/v3-client/phys_location.go | 4 +- traffic_ops/v3-client/ping.go | 2 +- traffic_ops/v3-client/profile.go | 4 +- traffic_ops/v3-client/profile_parameter.go | 4 +- traffic_ops/v3-client/region.go | 4 +- traffic_ops/v3-client/role.go | 4 +- traffic_ops/v3-client/server.go | 4 +- .../v3-client/server_server_capabilities.go | 4 +- traffic_ops/v3-client/server_update_status.go | 4 +- traffic_ops/v3-client/servercapability.go | 4 +- traffic_ops/v3-client/servercheck.go | 4 +- .../v3-client/servercheckextensions.go | 4 +- traffic_ops/v3-client/serviceCategory.go | 4 +- traffic_ops/v3-client/session.go | 2 +- traffic_ops/v3-client/staticdnsentry.go | 4 +- traffic_ops/v3-client/stats_summary.go | 4 +- traffic_ops/v3-client/status.go | 4 +- traffic_ops/v3-client/steering.go | 4 +- traffic_ops/v3-client/steeringtarget.go | 4 +- traffic_ops/v3-client/tenant.go | 4 +- traffic_ops/v3-client/topology.go | 4 +- .../v3-client/topology_queue_updates.go | 4 +- traffic_ops/v3-client/traffic_monitor.go | 4 +- traffic_ops/v3-client/traffic_stats.go | 4 +- traffic_ops/v3-client/type.go | 4 +- traffic_ops/v3-client/user.go | 6 +- traffic_ops/v4-client/about.go | 2 +- traffic_ops/v4-client/acme.go | 4 +- traffic_ops/v4-client/asn.go | 4 +- traffic_ops/v4-client/async_status.go | 4 +- traffic_ops/v4-client/cachegroup.go | 4 +- traffic_ops/v4-client/cdn.go | 4 +- traffic_ops/v4-client/cdn_dnssec.go | 4 +- traffic_ops/v4-client/cdn_domains.go | 4 +- traffic_ops/v4-client/cdn_lock.go | 4 +- traffic_ops/v4-client/cdn_notifications.go | 4 +- traffic_ops/v4-client/cdnfederations.go | 4 +- traffic_ops/v4-client/coordinate.go | 4 +- traffic_ops/v4-client/crconfig.go | 4 +- traffic_ops/v4-client/deliveryservice.go | 6 +- .../v4-client/deliveryservice_regexes.go | 4 +- .../deliveryservice_request_comments.go | 4 +- .../v4-client/deliveryservice_requests.go | 4 +- .../deliveryservices_required_capabilities.go | 4 +- .../v4-client/deliveryserviceserver.go | 6 +- traffic_ops/v4-client/division.go | 4 +- traffic_ops/v4-client/federation.go | 4 +- .../federation_federation_resolver.go | 4 +- traffic_ops/v4-client/federation_resolver.go | 4 +- traffic_ops/v4-client/iso.go | 4 +- traffic_ops/v4-client/job.go | 4 +- traffic_ops/v4-client/log.go | 4 +- traffic_ops/v4-client/origin.go | 4 +- traffic_ops/v4-client/parameter.go | 4 +- traffic_ops/v4-client/phys_location.go | 4 +- traffic_ops/v4-client/ping.go | 4 +- traffic_ops/v4-client/profile.go | 4 +- traffic_ops/v4-client/profile_parameter.go | 4 +- traffic_ops/v4-client/region.go | 4 +- traffic_ops/v4-client/role.go | 4 +- traffic_ops/v4-client/server.go | 4 +- .../v4-client/server_server_capabilities.go | 4 +- traffic_ops/v4-client/server_update_status.go | 4 +- traffic_ops/v4-client/servercapability.go | 4 +- traffic_ops/v4-client/servercheck.go | 4 +- .../v4-client/servercheckextensions.go | 4 +- traffic_ops/v4-client/serviceCategory.go | 4 +- traffic_ops/v4-client/session.go | 2 +- traffic_ops/v4-client/sslkey_expirations.go | 4 +- traffic_ops/v4-client/staticdnsentry.go | 4 +- traffic_ops/v4-client/stats_summary.go | 4 +- traffic_ops/v4-client/status.go | 4 +- traffic_ops/v4-client/steering.go | 4 +- traffic_ops/v4-client/steeringtarget.go | 4 +- traffic_ops/v4-client/tenant.go | 4 +- traffic_ops/v4-client/topology.go | 4 +- .../v4-client/topology_queue_updates.go | 4 +- traffic_ops/v4-client/traffic_monitor.go | 4 +- traffic_ops/v4-client/traffic_stats.go | 4 +- traffic_ops/v4-client/type.go | 4 +- traffic_ops/v4-client/user.go | 6 +- traffic_ops/v4-client/vault.go | 4 +- traffic_ops/v5-client/about.go | 2 +- traffic_ops/v5-client/acme.go | 4 +- traffic_ops/v5-client/asn.go | 4 +- traffic_ops/v5-client/async_status.go | 4 +- traffic_ops/v5-client/cachegroup.go | 4 +- traffic_ops/v5-client/cdn.go | 4 +- traffic_ops/v5-client/cdn_dnssec.go | 4 +- traffic_ops/v5-client/cdn_domains.go | 4 +- traffic_ops/v5-client/cdn_lock.go | 4 +- traffic_ops/v5-client/cdn_notifications.go | 4 +- traffic_ops/v5-client/cdnfederations.go | 4 +- traffic_ops/v5-client/coordinate.go | 4 +- traffic_ops/v5-client/crconfig.go | 4 +- traffic_ops/v5-client/deliveryservice.go | 6 +- .../v5-client/deliveryservice_regexes.go | 4 +- .../deliveryservice_request_comments.go | 4 +- .../v5-client/deliveryservice_requests.go | 4 +- .../deliveryservices_required_capabilities.go | 4 +- .../v5-client/deliveryserviceserver.go | 6 +- traffic_ops/v5-client/division.go | 4 +- traffic_ops/v5-client/federation.go | 4 +- .../federation_federation_resolver.go | 4 +- traffic_ops/v5-client/federation_resolver.go | 4 +- traffic_ops/v5-client/iso.go | 4 +- traffic_ops/v5-client/job.go | 4 +- traffic_ops/v5-client/log.go | 4 +- traffic_ops/v5-client/origin.go | 4 +- traffic_ops/v5-client/parameter.go | 4 +- traffic_ops/v5-client/phys_location.go | 4 +- traffic_ops/v5-client/ping.go | 4 +- traffic_ops/v5-client/profile.go | 4 +- traffic_ops/v5-client/profile_parameter.go | 4 +- traffic_ops/v5-client/region.go | 4 +- traffic_ops/v5-client/role.go | 4 +- traffic_ops/v5-client/server.go | 4 +- .../v5-client/server_server_capabilities.go | 4 +- traffic_ops/v5-client/server_update_status.go | 4 +- traffic_ops/v5-client/servercapability.go | 4 +- traffic_ops/v5-client/servercheck.go | 4 +- .../v5-client/servercheckextensions.go | 4 +- traffic_ops/v5-client/serviceCategory.go | 4 +- traffic_ops/v5-client/session.go | 2 +- traffic_ops/v5-client/sslkey_expirations.go | 4 +- traffic_ops/v5-client/staticdnsentry.go | 4 +- traffic_ops/v5-client/stats_summary.go | 4 +- traffic_ops/v5-client/status.go | 4 +- traffic_ops/v5-client/steering.go | 4 +- traffic_ops/v5-client/steeringtarget.go | 4 +- traffic_ops/v5-client/tenant.go | 4 +- traffic_ops/v5-client/topology.go | 4 +- .../v5-client/topology_queue_updates.go | 4 +- traffic_ops/v5-client/traffic_monitor.go | 4 +- traffic_ops/v5-client/traffic_stats.go | 4 +- traffic_ops/v5-client/type.go | 4 +- traffic_ops/v5-client/user.go | 6 +- traffic_ops/v5-client/vault.go | 4 +- .../ultimate-test-harness/http_test.go | 8 +- .../ultimate-test-harness/main_test.go | 6 +- .../ultimate-test-harness/traffic_ops_test.go | 2 +- .../create/create_ts_databases.go | 2 +- .../influxdb_tools/sync/sync_test.go | 2 +- .../influxdb_tools/sync/sync_ts_databases.go | 2 +- traffic_stats/traffic_stats.go | 8 +- traffic_stats/traffic_stats_test.go | 4 +- 1106 files changed, 5479 insertions(+), 3632 deletions(-) create mode 100644 cache-config/testing/ort-tests/tcdata/cachegroups.go create mode 100644 cache-config/testing/ort-tests/tcdata/cachegroups_parameters.go create mode 100644 cache-config/testing/ort-tests/tcdata/deliveryservices.go create mode 100644 cache-config/testing/ort-tests/tcdata/deliveryservices_required_capabilities.go create mode 100644 cache-config/testing/ort-tests/tcdata/deliveryservicesregexes.go create mode 100644 cache-config/testing/ort-tests/tcdata/federation_resolvers.go create mode 100644 cache-config/testing/ort-tests/tcdata/parameters.go create mode 100644 cache-config/testing/ort-tests/tcdata/profile_parameters.go create mode 100644 cache-config/testing/ort-tests/tcdata/profiles.go create mode 100644 cache-config/testing/ort-tests/tcdata/roles.go create mode 100644 cache-config/testing/ort-tests/tcdata/servercheckextension.go create mode 100644 cache-config/testing/ort-tests/tcdata/serverchecks.go create mode 100644 cache-config/testing/ort-tests/tcdata/serverservercapability.go create mode 100644 cache-config/testing/ort-tests/tcdata/steeringtargets.go create mode 100644 cache-config/testing/ort-tests/tcdata/topologies.go diff --git a/cache-config/t3c-apply/config/config.go b/cache-config/t3c-apply/config/config.go index 3797c80061..8885f4f319 100644 --- a/cache-config/t3c-apply/config/config.go +++ b/cache-config/t3c-apply/config/config.go @@ -31,8 +31,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3c-apply/t3c-apply.go b/cache-config/t3c-apply/t3c-apply.go index 905cc1a6f1..0b7256f878 100644 --- a/cache-config/t3c-apply/t3c-apply.go +++ b/cache-config/t3c-apply/t3c-apply.go @@ -27,12 +27,12 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/config" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/torequest" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/util" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" - tcutil "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/torequest" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/util" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" + tcutil "github.com/apache/trafficcontrol/v7/lib/go-util" ) // Version is the application version. diff --git a/cache-config/t3c-apply/torequest/cmd.go b/cache-config/t3c-apply/torequest/cmd.go index 597d19f358..2563135378 100644 --- a/cache-config/t3c-apply/torequest/cmd.go +++ b/cache-config/t3c-apply/torequest/cmd.go @@ -38,11 +38,11 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ( diff --git a/cache-config/t3c-apply/torequest/torequest.go b/cache-config/t3c-apply/torequest/torequest.go index 6da59c2657..5bf864c990 100644 --- a/cache-config/t3c-apply/torequest/torequest.go +++ b/cache-config/t3c-apply/torequest/torequest.go @@ -31,10 +31,10 @@ import ( "syscall" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/config" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/util" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/util" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) type UpdateStatus int diff --git a/cache-config/t3c-apply/torequest/torequest_test.go b/cache-config/t3c-apply/torequest/torequest_test.go index 437faef2fb..e92bbdf879 100644 --- a/cache-config/t3c-apply/torequest/torequest_test.go +++ b/cache-config/t3c-apply/torequest/torequest_test.go @@ -22,8 +22,8 @@ package torequest import ( "testing" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" ) var testCfg config.Cfg = config.Cfg{ diff --git a/cache-config/t3c-apply/util/gitutil.go b/cache-config/t3c-apply/util/gitutil.go index c85d546e1e..8f270aeee0 100644 --- a/cache-config/t3c-apply/util/gitutil.go +++ b/cache-config/t3c-apply/util/gitutil.go @@ -30,7 +30,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/config" ) // EnsureConfigDirIsGitRepo ensures the ATS config directory is a git repo. diff --git a/cache-config/t3c-apply/util/util.go b/cache-config/t3c-apply/util/util.go index bb63be4683..073cb50c0f 100644 --- a/cache-config/t3c-apply/util/util.go +++ b/cache-config/t3c-apply/util/util.go @@ -37,9 +37,9 @@ import ( "github.com/gofrs/flock" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) const OneWeek = 604800 diff --git a/cache-config/t3c-check-refs/config/config.go b/cache-config/t3c-check-refs/config/config.go index b7d4ea48b7..2e377434e2 100644 --- a/cache-config/t3c-check-refs/config/config.go +++ b/cache-config/t3c-check-refs/config/config.go @@ -25,8 +25,8 @@ import ( "os" "strings" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3c-check-refs/t3c-check-refs.go b/cache-config/t3c-check-refs/t3c-check-refs.go index 835719bca0..6f5d230ef8 100644 --- a/cache-config/t3c-check-refs/t3c-check-refs.go +++ b/cache-config/t3c-check-refs/t3c-check-refs.go @@ -31,10 +31,10 @@ import ( "regexp" "strings" - "github.com/apache/trafficcontrol/cache-config/t3c-check-refs/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-check-refs/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // Version is the application version. diff --git a/cache-config/t3c-check-reload/t3c-check-reload.go b/cache-config/t3c-check-reload/t3c-check-reload.go index f0607ed6c2..d5acf04c44 100644 --- a/cache-config/t3c-check-reload/t3c-check-reload.go +++ b/cache-config/t3c-check-reload/t3c-check-reload.go @@ -25,7 +25,7 @@ import ( "os" "strings" - "github.com/apache/trafficcontrol/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3c-check/t3c-check.go b/cache-config/t3c-check/t3c-check.go index 47d69b880c..da0f08ee08 100644 --- a/cache-config/t3c-check/t3c-check.go +++ b/cache-config/t3c-check/t3c-check.go @@ -25,8 +25,8 @@ import ( "path/filepath" "syscall" // TODO change to x/unix ? - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3c-diff/t3c-diff.go b/cache-config/t3c-diff/t3c-diff.go index e80eb39a4b..394809f9c5 100644 --- a/cache-config/t3c-diff/t3c-diff.go +++ b/cache-config/t3c-diff/t3c-diff.go @@ -27,8 +27,8 @@ import ( "regexp" "strings" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/kylelemons/godebug/diff" "github.com/pborman/getopt/v2" diff --git a/cache-config/t3c-generate/cfgfile/all.go b/cache-config/t3c-generate/cfgfile/all.go index 7e7a446b4d..850c922df7 100644 --- a/cache-config/t3c-generate/cfgfile/all.go +++ b/cache-config/t3c-generate/cfgfile/all.go @@ -27,10 +27,10 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // GetAllConfigs gets all config files for cfg.CacheHostName. diff --git a/cache-config/t3c-generate/cfgfile/cfgfile_test.go b/cache-config/t3c-generate/cfgfile/cfgfile_test.go index a441b740ed..65b5677114 100644 --- a/cache-config/t3c-generate/cfgfile/cfgfile_test.go +++ b/cache-config/t3c-generate/cfgfile/cfgfile_test.go @@ -25,12 +25,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" ) func TestWriteConfigs(t *testing.T) { diff --git a/cache-config/t3c-generate/cfgfile/routing.go b/cache-config/t3c-generate/cfgfile/routing.go index 57216c4483..0fb13dd1ce 100644 --- a/cache-config/t3c-generate/cfgfile/routing.go +++ b/cache-config/t3c-generate/cfgfile/routing.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // # DO NOT EDIT - Generated for odol-atsec-sea-22 by Traffic Ops (https://trafficops.comcast.net/) on Mon Oct 26 16:22:19 UTC 2020 diff --git a/cache-config/t3c-generate/cfgfile/sslkeys.go b/cache-config/t3c-generate/cfgfile/sslkeys.go index 4f3cb58ed0..128dfb971b 100644 --- a/cache-config/t3c-generate/cfgfile/sslkeys.go +++ b/cache-config/t3c-generate/cfgfile/sslkeys.go @@ -24,10 +24,10 @@ import ( "encoding/base64" "errors" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func GetSSLCertsAndKeyFiles(toData *t3cutil.ConfigData) ([]t3cutil.ATSConfigFile, error) { diff --git a/cache-config/t3c-generate/cfgfile/varnish.go b/cache-config/t3c-generate/cfgfile/varnish.go index 07a33273e0..04fc46fb2d 100644 --- a/cache-config/t3c-generate/cfgfile/varnish.go +++ b/cache-config/t3c-generate/cfgfile/varnish.go @@ -23,9 +23,9 @@ import ( "errors" "path/filepath" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/varnishcfg" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/varnishcfg" ) // GetVarnishConfigs returns varnish configuration files diff --git a/cache-config/t3c-generate/cfgfile/wrappers.go b/cache-config/t3c-generate/cfgfile/wrappers.go index 3ed9dd8ebf..110c3fe8bb 100644 --- a/cache-config/t3c-generate/cfgfile/wrappers.go +++ b/cache-config/t3c-generate/cfgfile/wrappers.go @@ -20,10 +20,10 @@ package cfgfile */ import ( - "github.com/apache/trafficcontrol/cache-config/t3c-generate/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // This file has wrappers that turn lib/go-atscfg Make funcs into ConfigFileFunc types. diff --git a/cache-config/t3c-generate/config/config.go b/cache-config/t3c-generate/config/config.go index 47814756eb..03c31db2a1 100644 --- a/cache-config/t3c-generate/config/config.go +++ b/cache-config/t3c-generate/config/config.go @@ -26,9 +26,9 @@ import ( "os" "strings" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3c-generate/plugin/hello_world.go b/cache-config/t3c-generate/plugin/hello_world.go index c2a6559b8c..2dfd795bb8 100644 --- a/cache-config/t3c-generate/plugin/hello_world.go +++ b/cache-config/t3c-generate/plugin/hello_world.go @@ -15,7 +15,7 @@ package plugin */ import ( - "github.com/apache/trafficcontrol/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" ) func init() { diff --git a/cache-config/t3c-generate/plugin/plugin.go b/cache-config/t3c-generate/plugin/plugin.go index 50c6d97423..050c928e77 100644 --- a/cache-config/t3c-generate/plugin/plugin.go +++ b/cache-config/t3c-generate/plugin/plugin.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // List returns the list of plugins compiled into the calling executable. diff --git a/cache-config/t3c-generate/plugin/plugin_test.go b/cache-config/t3c-generate/plugin/plugin_test.go index ae11144477..64e7ccd52c 100644 --- a/cache-config/t3c-generate/plugin/plugin_test.go +++ b/cache-config/t3c-generate/plugin/plugin_test.go @@ -22,9 +22,9 @@ package plugin import ( "testing" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" ) func TestPlugin(t *testing.T) { diff --git a/cache-config/t3c-generate/t3c-generate.go b/cache-config/t3c-generate/t3c-generate.go index 6e005c0b53..1713f40761 100644 --- a/cache-config/t3c-generate/t3c-generate.go +++ b/cache-config/t3c-generate/t3c-generate.go @@ -28,11 +28,11 @@ import ( "sort" "strings" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/cfgfile" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/config" - "github.com/apache/trafficcontrol/cache-config/t3c-generate/plugin" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/cfgfile" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-generate/plugin" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // Version is the application version. diff --git a/cache-config/t3c-generate/update-to-client/update-to-client.go b/cache-config/t3c-generate/update-to-client/update-to-client.go index d2d5e98ac9..78d99b115b 100644 --- a/cache-config/t3c-generate/update-to-client/update-to-client.go +++ b/cache-config/t3c-generate/update-to-client/update-to-client.go @@ -22,7 +22,7 @@ package main import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" "io/ioutil" "os" "os/exec" @@ -71,8 +71,8 @@ Be aware! It can and will modify all .go files in the given directory! Back up a Also be aware! This is very specific to the current code. If symbols or patterns are changed around how the master vs vendored client are used, this script will have to be updated. Expecations: -- t3c-generate is at github.com/apache/trafficcontrol/cache-config/t3c-generate -- The master TO client is at github.com/apache/trafficcontrol/traffic_ops/v4-client +- t3c-generate is at github.com/apache/trafficcontrol/v7/cache-config/t3c-generate +- The master TO client is at github.com/apache/trafficcontrol/v7/traffic_ops/v4-client - The previous major version client is vendored at t3c-generate/toreq/vendor - The master client wrapper for t3c-generate is at t3c-generate/toreqnew - The clients are stored in config.TCCfg.TOClient and config.TCCfg.TOClientNew diff --git a/cache-config/t3c-preprocess/t3c-preprocess.go b/cache-config/t3c-preprocess/t3c-preprocess.go index ff1355c477..5ea28890f4 100644 --- a/cache-config/t3c-preprocess/t3c-preprocess.go +++ b/cache-config/t3c-preprocess/t3c-preprocess.go @@ -30,10 +30,10 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/cache-config/t3c-preprocess/util" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-preprocess/util" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3c-preprocess/t3c-preprocess_test.go b/cache-config/t3c-preprocess/t3c-preprocess_test.go index bf5ec28b22..2a97e9b50b 100644 --- a/cache-config/t3c-preprocess/t3c-preprocess_test.go +++ b/cache-config/t3c-preprocess/t3c-preprocess_test.go @@ -22,9 +22,9 @@ package main import ( "testing" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestPreprocessConfigFile(t *testing.T) { diff --git a/cache-config/t3c-preprocess/util/util.go b/cache-config/t3c-preprocess/util/util.go index d723fd547e..5fccf3db3a 100644 --- a/cache-config/t3c-preprocess/util/util.go +++ b/cache-config/t3c-preprocess/util/util.go @@ -24,7 +24,7 @@ import ( "errors" "io" - "github.com/apache/trafficcontrol/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" ) func WriteConfigs(configs []t3cutil.ATSConfigFile, output io.Writer) error { diff --git a/cache-config/t3c-request/config/config.go b/cache-config/t3c-request/config/config.go index 779f1a8aab..c2dac1447f 100644 --- a/cache-config/t3c-request/config/config.go +++ b/cache-config/t3c-request/config/config.go @@ -28,8 +28,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3c-request/t3c-request.go b/cache-config/t3c-request/t3c-request.go index 0d4142219b..f374e308c8 100644 --- a/cache-config/t3c-request/t3c-request.go +++ b/cache-config/t3c-request/t3c-request.go @@ -23,11 +23,11 @@ import ( "fmt" "os" - "github.com/apache/trafficcontrol/cache-config/t3c-request/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq/torequtil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-request/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq/torequtil" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // Version is the application version. diff --git a/cache-config/t3c-tail/t3c-tail.go b/cache-config/t3c-tail/t3c-tail.go index 1979de686c..ac45558a20 100644 --- a/cache-config/t3c-tail/t3c-tail.go +++ b/cache-config/t3c-tail/t3c-tail.go @@ -25,8 +25,8 @@ import ( "regexp" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/nxadm/tail" "github.com/pborman/getopt/v2" diff --git a/cache-config/t3c-update/config/config.go b/cache-config/t3c-update/config/config.go index 05df10afd5..88c9ef86d8 100644 --- a/cache-config/t3c-update/config/config.go +++ b/cache-config/t3c-update/config/config.go @@ -26,8 +26,8 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3c-update/t3c-update.go b/cache-config/t3c-update/t3c-update.go index 6fe515e99f..49252a6b16 100644 --- a/cache-config/t3c-update/t3c-update.go +++ b/cache-config/t3c-update/t3c-update.go @@ -21,15 +21,15 @@ package main import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "os" "time" - "github.com/apache/trafficcontrol/cache-config/t3c-update/config" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq/torequtil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-update/config" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq/torequtil" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // Version is the application version. diff --git a/cache-config/t3c/t3c.go b/cache-config/t3c/t3c.go index 774a5bb932..02a3f52148 100644 --- a/cache-config/t3c/t3c.go +++ b/cache-config/t3c/t3c.go @@ -25,8 +25,8 @@ import ( "path/filepath" "syscall" // TODO change to x/unix ? - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/cache-config/t3cutil/actionlog.go b/cache-config/t3cutil/actionlog.go index 0ba79aa065..962eaa5a8e 100644 --- a/cache-config/t3cutil/actionlog.go +++ b/cache-config/t3cutil/actionlog.go @@ -20,7 +20,7 @@ package t3cutil */ import ( - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // ActionLogAction is an action t3c performs which affects the state of the machine. diff --git a/cache-config/t3cutil/getdata.go b/cache-config/t3cutil/getdata.go index 04e5b156e7..d1bfaefb8e 100644 --- a/cache-config/t3cutil/getdata.go +++ b/cache-config/t3cutil/getdata.go @@ -27,11 +27,11 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq/torequtil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq/torequtil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) type TCCfg struct { diff --git a/cache-config/t3cutil/getdatacfg.go b/cache-config/t3cutil/getdatacfg.go index e0912d2bad..34f8a6a46c 100644 --- a/cache-config/t3cutil/getdatacfg.go +++ b/cache-config/t3cutil/getdatacfg.go @@ -28,12 +28,12 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) const TrafficOpsProxyParameterName = `tm.rev_proxy.url` diff --git a/cache-config/t3cutil/t3cutil.go b/cache-config/t3cutil/t3cutil.go index e48985f1e0..0c3f6a2406 100644 --- a/cache-config/t3cutil/t3cutil.go +++ b/cache-config/t3cutil/t3cutil.go @@ -35,7 +35,7 @@ import ( "strings" "syscall" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) type ATSConfigFile struct { diff --git a/cache-config/t3cutil/toreq/client.go b/cache-config/t3cutil/toreq/client.go index 68e42ae7f3..04c161bb41 100644 --- a/cache-config/t3cutil/toreq/client.go +++ b/cache-config/t3cutil/toreq/client.go @@ -38,12 +38,12 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq/toreqold" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq/torequtil" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq/toreqold" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq/torequtil" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) type TOClient struct { diff --git a/cache-config/t3cutil/toreq/client_test.go b/cache-config/t3cutil/toreq/client_test.go index e98a44cd32..3bd5e0fc26 100644 --- a/cache-config/t3cutil/toreq/client_test.go +++ b/cache-config/t3cutil/toreq/client_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestRequestInfoStr(t *testing.T) { diff --git a/cache-config/t3cutil/toreq/clientfuncs.go b/cache-config/t3cutil/toreq/clientfuncs.go index c994f67069..e085bf1c38 100644 --- a/cache-config/t3cutil/toreq/clientfuncs.go +++ b/cache-config/t3cutil/toreq/clientfuncs.go @@ -31,13 +31,13 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq/torequtil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq/torequtil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) /*func (cl *TOClient) GetProfileByName(profileName string, reqHdr http.Header) (tc.Profile, toclientlib.ReqInf, error) { diff --git a/cache-config/t3cutil/toreq/clienthlp.go b/cache-config/t3cutil/toreq/clienthlp.go index d1dd9fcd5b..86677facb8 100644 --- a/cache-config/t3cutil/toreq/clienthlp.go +++ b/cache-config/t3cutil/toreq/clienthlp.go @@ -25,9 +25,9 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) // GetProfileByName returns the profile with the given name from Traffic Ops. diff --git a/cache-config/t3cutil/toreq/conversions.go b/cache-config/t3cutil/toreq/conversions.go index f9634d0df0..d59b64dc4a 100644 --- a/cache-config/t3cutil/toreq/conversions.go +++ b/cache-config/t3cutil/toreq/conversions.go @@ -27,10 +27,10 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func serversToLatest(svs tc.ServersV5Response) ([]atscfg.Server, error) { diff --git a/cache-config/t3cutil/toreq/toreqold/client.go b/cache-config/t3cutil/toreq/toreqold/client.go index f2b5b4ac9f..ffb6b82380 100644 --- a/cache-config/t3cutil/toreq/toreqold/client.go +++ b/cache-config/t3cutil/toreq/toreqold/client.go @@ -31,9 +31,9 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq/torequtil" - "github.com/apache/trafficcontrol/lib/go-log" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq/torequtil" + "github.com/apache/trafficcontrol/v7/lib/go-log" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) type TOClient struct { diff --git a/cache-config/t3cutil/toreq/toreqold/clientfuncs.go b/cache-config/t3cutil/toreq/toreqold/clientfuncs.go index 011d51e90e..8a38d829dc 100644 --- a/cache-config/t3cutil/toreq/toreqold/clientfuncs.go +++ b/cache-config/t3cutil/toreq/toreqold/clientfuncs.go @@ -28,12 +28,12 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq/torequtil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq/torequtil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) /*func (cl *TOClient) GetProfileByName(profileName string) (tc.Profile, toclientlib.ReqInf, error) { diff --git a/cache-config/t3cutil/toreq/toreqold/clienthlp.go b/cache-config/t3cutil/toreq/toreqold/clienthlp.go index 039f2856cb..09f5b97441 100644 --- a/cache-config/t3cutil/toreq/toreqold/clienthlp.go +++ b/cache-config/t3cutil/toreq/toreqold/clienthlp.go @@ -21,9 +21,9 @@ package toreqold import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" "net/http" "net/url" ) diff --git a/cache-config/t3cutil/toreq/toreqold/conversions.go b/cache-config/t3cutil/toreq/toreqold/conversions.go index 9d512505af..23edc026e9 100644 --- a/cache-config/t3cutil/toreq/toreqold/conversions.go +++ b/cache-config/t3cutil/toreq/toreqold/conversions.go @@ -20,8 +20,8 @@ package toreqold */ import ( - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // serversToLatest converts a []tc.Server to []tc.ServerV30. diff --git a/cache-config/t3cutil/toreq/torequtil/torequtil.go b/cache-config/t3cutil/toreq/torequtil/torequtil.go index a741215a07..ee8a82d33a 100644 --- a/cache-config/t3cutil/toreq/torequtil/torequtil.go +++ b/cache-config/t3cutil/toreq/torequtil/torequtil.go @@ -32,8 +32,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const CookieCacheDir = `/var/lib/trafficcontrol-cache-config/` diff --git a/cache-config/testing/ort-tests/config/config.go b/cache-config/testing/ort-tests/config/config.go index 4679e1baf1..abbc2febb2 100644 --- a/cache-config/testing/ort-tests/config/config.go +++ b/cache-config/testing/ort-tests/config/config.go @@ -28,12 +28,12 @@ import ( "reflect" "strings" - log "github.com/apache/trafficcontrol/lib/go-log" + log "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/kelseyhightower/envconfig" ) // Config reflects the structure of the test-to-api.conf file. It also -// implements github.com/apache/trafficcontrol/lib/go-log.Config for logging. +// implements github.com/apache/trafficcontrol/v7/lib/go-log.Config for logging. type Config struct { TrafficOps TrafficOps `json:"trafficOps"` TrafficOpsDB TrafficOpsDB `json:"trafficOpsDB"` @@ -170,7 +170,7 @@ type Session struct { } // Locations is a set of logging locations as defined by the -// github.com/apache/trafficcontrol/lib/go-log package. +// github.com/apache/trafficcontrol/v7/lib/go-log package. type Locations struct { Debug string `json:"debug"` Event string `json:"event"` diff --git a/cache-config/testing/ort-tests/t3c-action-log_test.go b/cache-config/testing/ort-tests/t3c-action-log_test.go index 3c1cfe8b20..71804233dd 100644 --- a/cache-config/testing/ort-tests/t3c-action-log_test.go +++ b/cache-config/testing/ort-tests/t3c-action-log_test.go @@ -18,8 +18,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" ) func TestT3cActionLog(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-apply-diff_test.go b/cache-config/testing/ort-tests/t3c-apply-diff_test.go index f7613bc68e..4eeeab10e7 100644 --- a/cache-config/testing/ort-tests/t3c-apply-diff_test.go +++ b/cache-config/testing/ort-tests/t3c-apply-diff_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/util" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/util" ) func TestApplyDiff(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-apply-unset-update_test.go b/cache-config/testing/ort-tests/t3c-apply-unset-update_test.go index f99be68e7c..872a0af615 100644 --- a/cache-config/testing/ort-tests/t3c-apply-unset-update_test.go +++ b/cache-config/testing/ort-tests/t3c-apply-unset-update_test.go @@ -22,9 +22,9 @@ import ( "path/filepath" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" ) func verifyUpdateStatusIsFalse() error { diff --git a/cache-config/testing/ort-tests/t3c-apply-wait-for-parents_test.go b/cache-config/testing/ort-tests/t3c-apply-wait-for-parents_test.go index 3d46cddcef..803f171f91 100644 --- a/cache-config/testing/ort-tests/t3c-apply-wait-for-parents_test.go +++ b/cache-config/testing/ort-tests/t3c-apply-wait-for-parents_test.go @@ -24,12 +24,12 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - testutil "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/util" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + testutil "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/util" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) const childCacheHostName = DefaultCacheHostName diff --git a/cache-config/testing/ort-tests/t3c-check-reload_test.go b/cache-config/testing/ort-tests/t3c-check-reload_test.go index 0eb2b39782..95ecb7e285 100644 --- a/cache-config/testing/ort-tests/t3c-check-reload_test.go +++ b/cache-config/testing/ort-tests/t3c-check-reload_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" ) func TestCheckReload(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-create-empty-file_test.go b/cache-config/testing/ort-tests/t3c-create-empty-file_test.go index 6477fee93e..f29eca619e 100644 --- a/cache-config/testing/ort-tests/t3c-create-empty-file_test.go +++ b/cache-config/testing/ort-tests/t3c-create-empty-file_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/util" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/util" ) func TestT3cCreateEmptyFile(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-create-metadata-file_test.go b/cache-config/testing/ort-tests/t3c-create-metadata-file_test.go index 86c4e95893..8274eefeef 100644 --- a/cache-config/testing/ort-tests/t3c-create-metadata-file_test.go +++ b/cache-config/testing/ort-tests/t3c-create-metadata-file_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/util" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/util" ) func TestT3cCreateMetaDataFile(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-dirs_test.go b/cache-config/testing/ort-tests/t3c-dirs_test.go index 481e425500..974cc51268 100644 --- a/cache-config/testing/ort-tests/t3c-dirs_test.go +++ b/cache-config/testing/ort-tests/t3c-dirs_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - "github.com/apache/trafficcontrol/cache-config/t3c-apply/util" + "github.com/apache/trafficcontrol/v7/cache-config/t3c-apply/util" ) // TestDirs tests that the t3c rpm creates directories that t3c-apply requires to run. diff --git a/cache-config/testing/ort-tests/t3c-dns-local-bind_test.go b/cache-config/testing/ort-tests/t3c-dns-local-bind_test.go index 3ce0b12e70..ee5788d5a4 100644 --- a/cache-config/testing/ort-tests/t3c-dns-local-bind_test.go +++ b/cache-config/testing/ort-tests/t3c-dns-local-bind_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" ) func TestT3CDNSLocalBind(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-fail-log_test.go b/cache-config/testing/ort-tests/t3c-fail-log_test.go index 47a6a3014c..b732de0d9e 100644 --- a/cache-config/testing/ort-tests/t3c-fail-log_test.go +++ b/cache-config/testing/ort-tests/t3c-fail-log_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" ) func TestT3cApplyFailMsg(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-git_test.go b/cache-config/testing/ort-tests/t3c-git_test.go index a535b83d9f..706e6730ad 100644 --- a/cache-config/testing/ort-tests/t3c-git_test.go +++ b/cache-config/testing/ort-tests/t3c-git_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/util" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/util" ) func TestT3cGit(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-ims_test.go b/cache-config/testing/ort-tests/t3c-ims_test.go index bf5c624fb9..a688506c98 100644 --- a/cache-config/testing/ort-tests/t3c-ims_test.go +++ b/cache-config/testing/ort-tests/t3c-ims_test.go @@ -20,12 +20,12 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - testutil "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/util" - "github.com/apache/trafficcontrol/lib/go-tc" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + testutil "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestIMS(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-ip-origin_test.go b/cache-config/testing/ort-tests/t3c-ip-origin_test.go index 9343215f6a..aac575e54c 100644 --- a/cache-config/testing/ort-tests/t3c-ip-origin_test.go +++ b/cache-config/testing/ort-tests/t3c-ip-origin_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestT3CIPOrigin(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-jobs_test.go b/cache-config/testing/ort-tests/t3c-jobs_test.go index 7708c0cc1c..6e3f5b5dad 100644 --- a/cache-config/testing/ort-tests/t3c-jobs_test.go +++ b/cache-config/testing/ort-tests/t3c-jobs_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestT3CJobs(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-lockfile_test.go b/cache-config/testing/ort-tests/t3c-lockfile_test.go index 6f06a8ff2b..b8b4a01c4a 100644 --- a/cache-config/testing/ort-tests/t3c-lockfile_test.go +++ b/cache-config/testing/ort-tests/t3c-lockfile_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" ) func TestLockfile(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-no-outgoing-ip-flag_test.go b/cache-config/testing/ort-tests/t3c-no-outgoing-ip-flag_test.go index 42042eec9d..293499a1a1 100644 --- a/cache-config/testing/ort-tests/t3c-no-outgoing-ip-flag_test.go +++ b/cache-config/testing/ort-tests/t3c-no-outgoing-ip-flag_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) const outgoingIPToBind = "outgoing_ip_to_bind" diff --git a/cache-config/testing/ort-tests/t3c-os-hostname-short_test.go b/cache-config/testing/ort-tests/t3c-os-hostname-short_test.go index 63c414aabf..b844924c64 100644 --- a/cache-config/testing/ort-tests/t3c-os-hostname-short_test.go +++ b/cache-config/testing/ort-tests/t3c-os-hostname-short_test.go @@ -18,8 +18,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" ) func TestT3cApplyOSHostnameShort(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-reload_test.go b/cache-config/testing/ort-tests/t3c-reload_test.go index 35d9abfca5..8abca4049f 100644 --- a/cache-config/testing/ort-tests/t3c-reload_test.go +++ b/cache-config/testing/ort-tests/t3c-reload_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" ) func TestT3cReload(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c-tail_test.go b/cache-config/testing/ort-tests/t3c-tail_test.go index 986a46d92a..aeecada1d0 100644 --- a/cache-config/testing/ort-tests/t3c-tail_test.go +++ b/cache-config/testing/ort-tests/t3c-tail_test.go @@ -20,7 +20,7 @@ import ( "os/exec" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" ) func TestT3cTail(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c_mode_test.go b/cache-config/testing/ort-tests/t3c_mode_test.go index 702e14e8e9..6337eba1c7 100644 --- a/cache-config/testing/ort-tests/t3c_mode_test.go +++ b/cache-config/testing/ort-tests/t3c_mode_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/util" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/util" ) func verifyPluginConfigs(t *testing.T) { diff --git a/cache-config/testing/ort-tests/t3c_update_to_flags_test.go b/cache-config/testing/ort-tests/t3c_update_to_flags_test.go index 54cc706f36..8a046a78d1 100644 --- a/cache-config/testing/ort-tests/t3c_update_to_flags_test.go +++ b/cache-config/testing/ort-tests/t3c_update_to_flags_test.go @@ -18,8 +18,8 @@ import ( "encoding/json" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" ) func TestT3cTOUpdates(t *testing.T) { diff --git a/cache-config/testing/ort-tests/tcdata/cachegroups.go b/cache-config/testing/ort-tests/tcdata/cachegroups.go new file mode 100644 index 0000000000..78672768f3 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/cachegroups.go @@ -0,0 +1,116 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +func (r *TCData) CreateTestCacheGroups(t *testing.T) { + + var err error + var resp *tc.CacheGroupDetailResponse + + for _, cg := range r.TestData.CacheGroups { + + resp, _, err = TOSession.CreateCacheGroupNullable(cg) + if err != nil { + t.Errorf("could not CREATE cachegroups: %v, request: %v", err, cg) + continue + } + + // Testing 'join' fields during create + if cg.ParentName != nil && resp.Response.ParentName == nil { + t.Error("Parent cachegroup is null in response when it should have a value") + } + if cg.SecondaryParentName != nil && resp.Response.SecondaryParentName == nil { + t.Error("Secondary parent cachegroup is null in response when it should have a value") + } + if cg.Type != nil && resp.Response.Type == nil { + t.Error("Type is null in response when it should have a value") + } + if resp.Response.LocalizationMethods == nil { + t.Error("Localization methods are null") + } + if resp.Response.Fallbacks == nil { + t.Error("Fallbacks are null") + } + + } +} + +func (r *TCData) DeleteTestCacheGroups(t *testing.T) { + var parentlessCacheGroups []tc.CacheGroupNullable + + // delete the edge caches. + for _, cg := range r.TestData.CacheGroups { + // Retrieve the CacheGroup by name so we can get the id for the Update + resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name) + if err != nil { + t.Errorf("cannot GET CacheGroup by name: %s - %v", *cg.Name, err) + } + cg = resp[0] + + // Cachegroups that are parents (usually mids but sometimes edges) + // need to be deleted only after the children cachegroups are deleted. + if cg.ParentCachegroupID == nil && cg.SecondaryParentCachegroupID == nil { + parentlessCacheGroups = append(parentlessCacheGroups, cg) + continue + } + if len(resp) > 0 { + respCG := resp[0] + _, _, err := TOSession.DeleteCacheGroupByID(*respCG.ID) + if err != nil { + t.Errorf("cannot DELETE CacheGroup by name: '%s' %v", *respCG.Name, err) + } + // Retrieve the CacheGroup to see if it got deleted + cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name) + if err != nil { + t.Errorf("error deleting CacheGroup by name: %v", err) + } + if len(cgs) > 0 { + t.Errorf("expected CacheGroup name: %s to be deleted", *cg.Name) + } + } + } + + // now delete the parentless cachegroups + for _, cg := range parentlessCacheGroups { + // Retrieve the CacheGroup by name so we can get the id for the Update + resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name) + if err != nil { + t.Errorf("cannot GET CacheGroup by name: %s - %v", *cg.Name, err) + } + if len(resp) > 0 { + respCG := resp[0] + _, _, err := TOSession.DeleteCacheGroupByID(*respCG.ID) + if err != nil { + t.Errorf("cannot DELETE CacheGroup by name: '%s' %v", *respCG.Name, err) + } + + // Retrieve the CacheGroup to see if it got deleted + cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name) + if err != nil { + t.Errorf("error deleting CacheGroup name: %v", err) + } + if len(cgs) > 0 { + t.Errorf("expected CacheGroup name: %s to be deleted", *cg.Name) + } + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/cachegroups_parameters.go b/cache-config/testing/ort-tests/tcdata/cachegroups_parameters.go new file mode 100644 index 0000000000..467bdbe124 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/cachegroups_parameters.go @@ -0,0 +1,103 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "fmt" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +func (r *TCData) CreateTestCacheGroupParameters(t *testing.T) { + // Get Cache Group to assign parameter to + firstCacheGroup := r.TestData.CacheGroups[0] + cacheGroupResp, _, err := TOSession.GetCacheGroupNullableByName(*firstCacheGroup.Name) + if err != nil { + t.Errorf("cannot GET Cache Group by name: %s - %v", *firstCacheGroup.Name, err) + } + if cacheGroupResp == nil { + t.Fatal("Cache Groups response should not be nil") + } + + // Get Parameter to assign to Cache Group + firstParameter := r.TestData.Parameters[0] + paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name) + if err != nil { + t.Errorf("cannot GET Parameter by name: %s - %v", firstParameter.Name, err) + } + if paramResp == nil { + t.Fatal("Parameter response should not be nil") + } + + // Assign Parameter to Cache Group + cacheGroupID := cacheGroupResp[0].ID + parameterID := paramResp[0].ID + resp, _, err := TOSession.CreateCacheGroupParameter(*cacheGroupID, parameterID) + if err != nil { + t.Errorf("could not CREATE cache group parameter: %v", err) + } + if resp == nil { + t.Fatal("Cache Group Parameter response should not be nil") + } + r.TestData.CacheGroupParameterRequests = append(r.TestData.CacheGroupParameterRequests, resp.Response...) +} + +func (r *TCData) DeleteTestCacheGroupParameters(t *testing.T) { + for _, cgp := range r.TestData.CacheGroupParameterRequests { + DeleteTestCacheGroupParameter(t, cgp) + } +} + +func DeleteTestCacheGroupParameter(t *testing.T, cgp tc.CacheGroupParameterRequest) { + + delResp, _, err := TOSession.DeleteCacheGroupParameter(cgp.CacheGroupID, cgp.ParameterID) + if err != nil { + t.Fatalf("cannot DELETE Parameter by cache group: %v - %v", err, delResp) + } + + // Retrieve the Cache Group Parameter to see if it got deleted + queryParams := fmt.Sprintf("?parameterId=%d", cgp.ParameterID) + + parameters, _, err := TOSession.GetCacheGroupParametersByQueryParams(cgp.CacheGroupID, queryParams) + if err != nil { + t.Errorf("error deleting Parameter name: %v", err) + } + if parameters == nil { + t.Fatal("Cache Group Parameters response should not be nil") + } + if len(parameters) > 0 { + t.Errorf("expected Parameter: %d to be to be disassociated from Cache Group: %d", cgp.ParameterID, cgp.CacheGroupID) + } + + // Attempt to delete it again and it should return an error now + _, _, err = TOSession.DeleteCacheGroupParameter(cgp.CacheGroupID, cgp.ParameterID) + if err == nil { + t.Error("expected error when deleting unassociated cache group parameter") + } + + // Attempt to delete using a non existing cache group + _, _, err = TOSession.DeleteCacheGroupParameter(-1, cgp.ParameterID) + if err == nil { + t.Error("expected error when deleting cache group parameter with non existing cache group") + } + + // Attempt to delete using a non existing parameter + _, _, err = TOSession.DeleteCacheGroupParameter(cgp.CacheGroupID, -1) + if err == nil { + t.Error("expected error when deleting cache group parameter with non existing parameter") + } +} diff --git a/cache-config/testing/ort-tests/tcdata/deliveryservices.go b/cache-config/testing/ort-tests/tcdata/deliveryservices.go new file mode 100644 index 0000000000..16afaa4140 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/deliveryservices.go @@ -0,0 +1,90 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "net/url" + "strconv" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +func (r *TCData) CreateTestDeliveryServices(t *testing.T) { + pl := tc.Parameter{ + ConfigFile: "remap.config", + Name: "location", + Value: "/remap/config/location/parameter/", + } + _, _, err := TOSession.CreateParameter(pl) + if err != nil { + t.Errorf("cannot create parameter: %v", err) + } + for _, ds := range r.TestData.DeliveryServices { + _, _, err = TOSession.CreateDeliveryServiceV30(ds) + if err != nil { + t.Errorf("could not CREATE delivery service '%s': %v", *ds.XMLID, err) + } + } +} + +func (r *TCData) DeleteTestDeliveryServices(t *testing.T) { + dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil) + if err != nil { + t.Errorf("cannot GET deliveryservices: %v", err) + } + for _, testDS := range r.TestData.DeliveryServices { + var ds tc.DeliveryServiceNullableV30 + found := false + for _, realDS := range dses { + if realDS.XMLID != nil && *realDS.XMLID == *testDS.XMLID { + ds = realDS + found = true + break + } + } + if !found { + t.Errorf("DeliveryService not found in Traffic Ops: %s", *ds.XMLID) + continue + } + + delResp, err := TOSession.DeleteDeliveryService(strconv.Itoa(*ds.ID)) + if err != nil { + t.Errorf("cannot DELETE DeliveryService by ID: %v - %v", err, delResp) + continue + } + + // Retrieve the Server to see if it got deleted + params := url.Values{} + params.Set("id", strconv.Itoa(*ds.ID)) + foundDS, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, params) + if err != nil { + t.Errorf("Unexpected error deleting Delivery Service '%s': %v", *ds.XMLID, err) + } + if len(foundDS) > 0 { + t.Errorf("expected Delivery Service: %s to be deleted, but %d exist with same ID (#%d)", *ds.XMLID, len(foundDS), *ds.ID) + } + } + + // clean up parameter created in CreateTestDeliveryServices() + params, _, err := TOSession.GetParameterByNameAndConfigFile("location", "remap.config") + for _, param := range params { + deleted, _, err := TOSession.DeleteParameterByID(param.ID) + if err != nil { + t.Errorf("cannot DELETE parameter by ID (%d): %v - %v", param.ID, err, deleted) + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/deliveryservices_required_capabilities.go b/cache-config/testing/ort-tests/tcdata/deliveryservices_required_capabilities.go new file mode 100644 index 0000000000..fdbef07b6c --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/deliveryservices_required_capabilities.go @@ -0,0 +1,212 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "fmt" + "net/http" + "strings" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" +) + +func (r *TCData) CreateTestTopologyBasedDeliveryServicesRequiredCapabilities(t *testing.T) { + for _, td := range r.TestData.TopologyBasedDeliveryServicesRequiredCapabilities { + + c := tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: helperGetDeliveryServiceID(t, td.XMLID), + RequiredCapability: td.RequiredCapability, + } + + _, _, err := TOSession.CreateDeliveryServicesRequiredCapability(c) + if err != nil { + t.Fatalf("cannot create delivery service required capability: %v", err) + } + } + + invalid := tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: helperGetDeliveryServiceID(t, util.StrPtr("ds-top-req-cap")), + RequiredCapability: util.StrPtr("asdf"), + } + _, reqInf, err := TOSession.CreateDeliveryServicesRequiredCapability(invalid) + if err == nil { + t.Fatal("when adding delivery service required capability to a delivery service with a topology that " + + "doesn't have cachegroups with at least one server with the required capabilities - expected: error, actual: nil") + } + if reqInf.StatusCode != http.StatusBadRequest { + t.Fatalf("when adding delivery service required capability to a delivery service with a topology that "+ + "doesn't have cachegroups with at least one server with the required capabilities - expected status code: "+ + "%d, actual: %d", http.StatusBadRequest, reqInf.StatusCode) + } +} + +func (r *TCData) CreateTestDeliveryServicesRequiredCapabilities(t *testing.T) { + data := r.TestData.DeliveryServicesRequiredCapabilities + if len(data) == 0 { + t.Fatal("there must be at least one test ds required capability defined") + } + ds1 := helperGetDeliveryServiceID(t, data[0].XMLID) + amDS := helperGetDeliveryServiceID(t, util.StrPtr("anymap-ds")) + testCases := []struct { + description string + capability tc.DeliveryServicesRequiredCapability + }{ + { + description: fmt.Sprintf("re-assign a deliveryservice to a required capability; deliveryServiceID: %d, requiredCapability: %s", *ds1, *data[0].RequiredCapability), + capability: tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: ds1, + RequiredCapability: data[0].RequiredCapability, + }, + }, + { + description: fmt.Sprintf("assign a deliveryservice to a required capability with no delivery service id; deliveryServiceID: 0, requiredCapability: %s", *data[0].RequiredCapability), + capability: tc.DeliveryServicesRequiredCapability{ + RequiredCapability: data[0].RequiredCapability, + }, + }, + { + description: fmt.Sprintf("assign a deliveryservice to a required capability with no requiredCapability; deliveryServiceID: %d, requiredCapability: 0", *ds1), + capability: tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: ds1, + }, + }, + { + description: fmt.Sprintf("assign a deliveryservice to a required capability with an invalid required capability; deliveryServiceID: %d, requiredCapability: bogus", *ds1), + capability: tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: ds1, + RequiredCapability: util.StrPtr("bogus"), + }, + }, + { + description: fmt.Sprintf("assign a deliveryservice to a required capability with an invalid delivery service id; deliveryServiceID: -1, requiredCapability: %s", *data[0].RequiredCapability), + capability: tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: util.IntPtr(-1), + RequiredCapability: data[0].RequiredCapability, + }, + }, + { + description: "assign a deliveryservice to a required capability with an invalid deliveryservice type", + capability: tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: amDS, + RequiredCapability: data[0].RequiredCapability, + }, + }, + } + + // Assign all required capability to delivery services listed in `tc-fixtures.json`. + for _, td := range r.TestData.DeliveryServicesRequiredCapabilities { + var dsID int + if td.DeliveryServiceID != nil { + dsID = *td.DeliveryServiceID + } + + var capability string + if td.RequiredCapability != nil { + capability = *td.RequiredCapability + } + + t.Run(fmt.Sprintf("assign a deliveryservice to a required capability; deliveryServiceID: %d, requiredCapability: %s", dsID, capability), func(t *testing.T) { + cap := tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: helperGetDeliveryServiceID(t, td.XMLID), + RequiredCapability: td.RequiredCapability, + } + + _, _, err := TOSession.CreateDeliveryServicesRequiredCapability(cap) + if err != nil { + t.Fatalf("failed to associate a capability with a Delivery Service: %v", err) + } + }) + } + + for _, tc := range testCases { + t.Run(tc.description, func(t *testing.T) { + _, _, err := TOSession.CreateDeliveryServicesRequiredCapability(tc.capability) + if err == nil { + t.Fatalf("%s; expected err", tc.description) + } + }) + } +} + +func (r *TCData) DeleteTestDeliveryServicesRequiredCapabilities(t *testing.T) { + // Get Required Capabilities to delete them + capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilitiesWithHdr(nil, nil, nil, nil) + if err != nil { + t.Fatalf("failed to fetch associations between Capabilities and the Delivery Services that require them: %v", err) + } + if len(capabilities) < 1 { + t.Fatal("no delivery services returned") + } + + type testCase struct { + description string + capability tc.DeliveryServicesRequiredCapability + err string + } + + testCases := []testCase{ + testCase{ + description: fmt.Sprintf("delete a deliveryservices required capability with an invalid delivery service id; deliveryServiceID: -1, requiredCapability: %s", *capabilities[0].RequiredCapability), + capability: tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: util.IntPtr(-1), + RequiredCapability: capabilities[0].RequiredCapability, + }, + err: "no deliveryservice.RequiredCapability with that key found", + }, + testCase{ + description: fmt.Sprintf("delete a deliveryservices required capability with an invalid required capability; deliveryServiceID: %d, requiredCapability: bogus", *capabilities[0].DeliveryServiceID), + capability: tc.DeliveryServicesRequiredCapability{ + DeliveryServiceID: capabilities[0].DeliveryServiceID, + RequiredCapability: util.StrPtr("bogus"), + }, + err: "no deliveryservice.RequiredCapability with that key found", + }, + } + + for _, c := range capabilities { + t := testCase{ + description: fmt.Sprintf("delete a deliveryservices required capability; deliveryServiceID: %d, requiredCapability: %s", *c.DeliveryServiceID, *c.RequiredCapability), + capability: c, + } + testCases = append(testCases, t) + } + + for _, c := range testCases { + t.Run(c.description, func(t *testing.T) { + _, _, err := TOSession.DeleteDeliveryServicesRequiredCapability(*c.capability.DeliveryServiceID, *c.capability.RequiredCapability) + if err != nil && !strings.Contains(err.Error(), c.err) { + t.Fatalf("%s; got err= %s; expected err= %s", c.description, err, c.err) + } + }) + } +} + +func helperGetDeliveryServiceID(t *testing.T, xmlID *string) *int { + t.Helper() + if xmlID == nil { + t.Fatal("xml id must not be nil") + } + ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullableWithHdr(*xmlID, nil) + if err != nil { + t.Fatal(err) + } + if len(ds) < 1 { + t.Fatalf("cannot GET deliveyservice by xml id: %s, response did not include record", *xmlID) + } + return ds[0].ID +} diff --git a/cache-config/testing/ort-tests/tcdata/deliveryservicesregexes.go b/cache-config/testing/ort-tests/tcdata/deliveryservicesregexes.go new file mode 100644 index 0000000000..f499f2512f --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/deliveryservicesregexes.go @@ -0,0 +1,107 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "fmt" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +func (r *TCData) CreateTestDeliveryServicesRegexes(t *testing.T) { + db, err := r.OpenConnection() + if err != nil { + t.Fatal("cannot open db") + } + defer func() { + err := db.Close() + if err != nil { + t.Errorf("unable to close connection to db, error: %v", err) + } + }() + + dbRegexInsertTemplate := "INSERT INTO regex (pattern, type) VALUES ('%s', %d);" + dbRegexQueryTemplate := "SELECT id FROM regex order by id desc limit 1;" + dbDSRegexInsertTemplate := "INSERT INTO deliveryservice_regex (deliveryservice, regex, set_number) VALUES (%d, %d, %d);" + + for i, regex := range r.TestData.DeliveryServicesRegexes { + loadDSRegexIDs(t, ®ex) + + err = execSQL(db, fmt.Sprintf(dbRegexInsertTemplate, regex.Pattern, regex.Type)) + if err != nil { + t.Fatalf("unable to create regex: %v", err) + } + + row := db.QueryRow(dbRegexQueryTemplate) + err = row.Scan(®ex.ID) + if err != nil { + t.Fatalf("unable to query regex: %v", err) + } + + err = execSQL(db, fmt.Sprintf(dbDSRegexInsertTemplate, regex.DSID, regex.ID, regex.SetNumber)) + if err != nil { + t.Fatalf("unable to create ds regex %v", err) + } + + r.TestData.DeliveryServicesRegexes[i] = regex + } +} + +func loadDSRegexIDs(t *testing.T, test *tc.DeliveryServiceRegexesTest) { + dsTypes, _, err := TOSession.GetTypeByName(test.TypeName) + if err != nil { + t.Fatalf("unable to get type by name %s: %v", test.TypeName, err) + } + if len(dsTypes) < 1 { + t.Fatalf("could not find any types by name %s", test.TypeName) + } + test.Type = dsTypes[0].ID + + dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(test.DSName) + if err != nil { + t.Fatalf("unable to ds by xmlid %s: %v", test.DSName, err) + } + if len(dses) != 1 { + t.Fatalf("unable to find ds by xmlid %s", test.DSName) + } + test.DSID = *dses[0].ID +} + +func (r *TCData) DeleteTestDeliveryServicesRegexes(t *testing.T) { + db, err := r.OpenConnection() + if err != nil { + t.Fatal("cannot open db") + } + defer func() { + err := db.Close() + if err != nil { + t.Errorf("unable to close connection to db, error: %v", err) + } + }() + + for _, regex := range r.TestData.DeliveryServicesRegexes { + err = execSQL(db, fmt.Sprintf("DELETE FROM deliveryservice_regex WHERE deliveryservice = '%v' and regex ='%v';", regex.DSID, regex.ID)) + if err != nil { + t.Fatalf("unable to delete deliveryservice_regex by regex %d and ds %d: %v", regex.ID, regex.DSID, err) + } + + err := execSQL(db, fmt.Sprintf("DELETE FROM regex WHERE id = %d;", regex.ID)) + if err != nil { + t.Fatalf("unable to delete regex %d: %v", regex.ID, err) + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/federation_resolvers.go b/cache-config/testing/ort-tests/tcdata/federation_resolvers.go new file mode 100644 index 0000000000..3d710d6e19 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/federation_resolvers.go @@ -0,0 +1,118 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" +) + +func (r *TCData) CreateTestFederationResolvers(t *testing.T) { + for _, fr := range r.TestData.FederationResolvers { + if fr.Type == nil { + t.Fatal("testData Federation Resolver has nil Type") + } + + tid, _, err := TOSession.GetTypeByName(*fr.Type) + if err != nil { + t.Fatalf("Couldn't get an ID for type %s", *fr.Type) + } + if len(tid) != 1 { + t.Fatalf("Expected exactly one Type by name %s, got %d", *fr.Type, len(tid)) + } + + fr.TypeID = util.UIntPtr(uint(tid[0].ID)) + + alerts, _, err := TOSession.CreateFederationResolver(fr) + if err != nil { + t.Fatalf("failed to create Federation resolver %+v: %v - alerts: %+v", fr, err, alerts) + } + for _, a := range alerts.Alerts { + if a.Level != tc.SuccessLevel.String() { + t.Errorf("Unexpected %s creating a federation resolver: %s", a.Level, a.Text) + } else { + t.Logf("Received expected success creating federation resolver: %s", a.Text) + } + } + } + + var invalidFR tc.FederationResolver + alerts, _, err := TOSession.CreateFederationResolver(invalidFR) + if err == nil { + t.Error("Expected an error creating a bad Federation Resolver, but didn't get one") + } + for _, a := range alerts.Alerts { + if a.Level == tc.SuccessLevel.String() { + t.Errorf("Unexpected success creating a bad Federation Resolver: %s", a.Text) + } else { + t.Logf("Received expected %s creating federation resolver: %s", a.Level, a.Text) + } + } + + invalidFR.TypeID = util.UIntPtr(1) + invalidFR.IPAddress = util.StrPtr("not a valid IP address") + alerts, _, err = TOSession.CreateFederationResolver(invalidFR) + if err == nil { + t.Error("Expected an error creating a bad Federation Resolver, but didn't get one") + } + for _, a := range alerts.Alerts { + if a.Level == tc.SuccessLevel.String() { + t.Errorf("Unexpected success creating a bad Federation Resolver: %s", a.Text) + } else { + t.Logf("Received expected %s creating a bad federation resolver: %s", a.Level, a.Text) + } + } +} + +func (r *TCData) DeleteTestFederationResolvers(t *testing.T) { + frs, _, err := TOSession.GetFederationResolvers() + if err != nil { + t.Errorf("Unexpected error getting Federation Resolvers: %v", err) + } + if len(frs) < 1 { + t.Fatal("Found no Federation Resolvers to delete") + } + for _, fr := range frs { + if fr.ID == nil { + t.Fatalf("Malformed Federation Resolver: %+v", fr) + } + alerts, _, err := TOSession.DeleteFederationResolver(*fr.ID) + if err != nil { + t.Fatalf("failed to delete Federation Resolver %+v: %v - alerts: %+v", fr, err, alerts) + } + for _, a := range alerts.Alerts { + if a.Level != tc.SuccessLevel.String() { + t.Errorf("Unexpected %s deleting a federation resolver: %s", a.Level, a.Text) + } else { + t.Logf("Received expected success deleting federation resolver: %s", a.Text) + } + } + } + + alerts, _, err := TOSession.DeleteFederationResolver(0) + if err == nil { + t.Error("Expected an error deleting a non-existent Federation Resolver, but didn't get one") + } + for _, a := range alerts.Alerts { + if a.Level == tc.SuccessLevel.String() { + t.Errorf("Unexpected success deleting a non-existent Federation Resolver: %s", a.Text) + } else { + t.Logf("Received expected %s deleting a non-existent federation resolver: %s", a.Level, a.Text) + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/fixtures.go b/cache-config/testing/ort-tests/tcdata/fixtures.go index 04239ea92f..d928e254e1 100644 --- a/cache-config/testing/ort-tests/tcdata/fixtures.go +++ b/cache-config/testing/ort-tests/tcdata/fixtures.go @@ -23,7 +23,7 @@ import ( "encoding/json" "os" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // LoadFixtures ... diff --git a/cache-config/testing/ort-tests/tcdata/parameters.go b/cache-config/testing/ort-tests/tcdata/parameters.go new file mode 100644 index 0000000000..1aeb8905cf --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/parameters.go @@ -0,0 +1,89 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "sync" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +func (r *TCData) CreateTestParameters(t *testing.T) { + + for _, pl := range r.TestData.Parameters { + resp, _, err := TOSession.CreateParameter(pl) + t.Log("Response: ", resp) + if err != nil { + t.Errorf("could not CREATE parameters: %v", err) + } + } + +} + +func (r *TCData) DeleteTestParametersParallel(t *testing.T) { + + var wg sync.WaitGroup + for _, pl := range r.TestData.Parameters { + + wg.Add(1) + go func(p tc.Parameter) { + defer wg.Done() + DeleteTestParameter(t, p) + }(pl) + + } + wg.Wait() +} + +func (r *TCData) DeleteTestParameters(t *testing.T) { + + for _, pl := range r.TestData.Parameters { + DeleteTestParameter(t, pl) + } +} + +func DeleteTestParameter(t *testing.T, pl tc.Parameter) { + + // Retrieve the Parameter by name so we can get the id for the Update + resp, _, err := TOSession.GetParameterByNameAndConfigFile(pl.Name, pl.ConfigFile) + if err != nil { + t.Errorf("cannot GET Parameter by name %s: %v", pl.Name, err) + } + + if len(resp) == 0 { + // TODO This fails for the ProfileParameters test; determine a way to check this, even for ProfileParameters + // t.Errorf("DeleteTestParameter got no params for %s %s", pl.Name, pl.ConfigFile) + } else if len(resp) > 1 { + // TODO figure out why this happens, and be more precise about deleting things where created. + // t.Errorf("DeleteTestParameter params for %s %s expected 1, actual %d", pl.Name, pl.ConfigFile, len(resp)) + } + for _, respParameter := range resp { + delResp, _, err := TOSession.DeleteParameterByID(respParameter.ID) + if err != nil { + t.Errorf("cannot DELETE Parameter by ID: %v - %v", err, delResp) + } + + // Retrieve the Parameter to see if it got deleted + pls, _, err := TOSession.GetParameterByID(pl.ID) + if err != nil { + t.Errorf("error deleting Parameter name: %v", err) + } + if len(pls) > 0 { + t.Errorf("expected Parameter Name: %s and ConfigFile: %s to be deleted", pl.Name, pl.ConfigFile) + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/profile_parameters.go b/cache-config/testing/ort-tests/tcdata/profile_parameters.go new file mode 100644 index 0000000000..494129c5e7 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/profile_parameters.go @@ -0,0 +1,104 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "fmt" + "sync" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +const queryParamFormat = "?profileId=%d¶meterId=%d" + +func (r *TCData) CreateTestProfileParameters(t *testing.T) { + + firstProfile := r.TestData.Profiles[0] + profileResp, _, err := TOSession.GetProfileByName(firstProfile.Name) + if err != nil { + t.Errorf("cannot GET Profile by name: %s - %v", firstProfile.Name, err) + } + + firstParameter := r.TestData.Parameters[0] + paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name) + if err != nil { + t.Errorf("cannot GET Parameter by name: %s - %v", firstParameter.Name, err) + } + + profileID := profileResp[0].ID + parameterID := paramResp[0].ID + + pp := tc.ProfileParameter{ + ProfileID: profileID, + ParameterID: parameterID, + } + resp, _, err := TOSession.CreateProfileParameter(pp) + t.Log("Response: ", resp) + if err != nil { + t.Errorf("could not CREATE profile parameters: %v", err) + } + +} + +func (r *TCData) DeleteTestProfileParametersParallel(t *testing.T) { + + var wg sync.WaitGroup + for _, pp := range r.TestData.ProfileParameters { + + wg.Add(1) + go func(p tc.ProfileParameter) { + defer wg.Done() + DeleteTestProfileParameter(t, p) + }(pp) + + } + wg.Wait() +} + +func (r *TCData) DeleteTestProfileParameters(t *testing.T) { + + for _, pp := range r.TestData.ProfileParameters { + DeleteTestProfileParameter(t, pp) + } +} + +func DeleteTestProfileParameter(t *testing.T, pp tc.ProfileParameter) { + + queryParams := fmt.Sprintf(queryParamFormat, pp.ProfileID, pp.ParameterID) + // Retrieve the PtofileParameter by profile so we can get the id for the Update + resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams) + if err != nil { + t.Errorf("cannot GET Parameter by profile: %s - %v", pp.Profile, err) + } + if len(resp) > 0 { + respPP := resp[0] + + delResp, _, err := TOSession.DeleteParameterByProfileParameter(respPP.ProfileID, respPP.ParameterID) + if err != nil { + t.Errorf("cannot DELETE Parameter by profile: %v - %v", err, delResp) + } + + // Retrieve the Parameter to see if it got deleted + pps, _, err := TOSession.GetProfileParameterByQueryParams(queryParams) + if err != nil { + t.Errorf("error deleting Parameter name: %v", err) + } + if len(pps) > 0 { + t.Errorf("expected Parameter Name: %s and ConfigFile: %s to be deleted", pp.Profile, pp.Parameter) + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/profiles.go b/cache-config/testing/ort-tests/tcdata/profiles.go new file mode 100644 index 0000000000..07e149e2a3 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/profiles.go @@ -0,0 +1,120 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "strings" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +func (r *TCData) CreateTestProfiles(t *testing.T) { + + for _, pr := range r.TestData.Profiles { + resp, _, err := TOSession.CreateProfile(pr) + + t.Log("Response: ", resp) + if err != nil { + t.Errorf("could not CREATE profiles with name: %s %v", pr.Name, err) + } + profiles, _, err := TOSession.GetProfileByName(pr.Name) + if err != nil { + t.Errorf("could not GET profile with name: %s %v", pr.Name, err) + } + if len(profiles) == 0 { + t.Errorf("could not GET profile %+v: not found", pr) + } + profileID := profiles[0].ID + + for _, param := range pr.Parameters { + if param.Name == nil || param.Value == nil || param.ConfigFile == nil { + t.Errorf("invalid parameter specification: %+v", param) + continue + } + _, _, err := TOSession.CreateParameter(tc.Parameter{Name: *param.Name, Value: *param.Value, ConfigFile: *param.ConfigFile}) + if err != nil { + // ok if already exists + if !strings.Contains(err.Error(), "already exists") { + t.Errorf("could not CREATE parameter %+v: %v", param, err) + continue + } + } + p, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(*param.Name, *param.ConfigFile, *param.Value) + if err != nil { + t.Errorf("could not GET parameter %+v: %v", param, err) + } + if len(p) == 0 { + t.Errorf("could not GET parameter %+v: not found", param) + } + _, _, err = TOSession.CreateProfileParameter(tc.ProfileParameter{ProfileID: profileID, ParameterID: p[0].ID}) + if err != nil { + t.Errorf("could not CREATE profile_parameter %+v: %v", param, err) + } + } + + } +} + +func (r *TCData) DeleteTestProfiles(t *testing.T) { + + for _, pr := range r.TestData.Profiles { + // Retrieve the Profile by name so we can get the id for the Update + resp, _, err := TOSession.GetProfileByName(pr.Name) + if err != nil { + t.Errorf("cannot GET Profile by name: %s - %v", pr.Name, err) + continue + } + if len(resp) == 0 { + t.Errorf("cannot GET Profile by name: not found - %s", pr.Name) + continue + } + + profileID := resp[0].ID + // query by name does not retrieve associated parameters. But query by id does. + resp, _, err = TOSession.GetProfileByID(profileID) + if err != nil { + t.Errorf("cannot GET Profile by id: %v - %v", err, resp) + } + // delete any profile_parameter associations first + // the parameter is what's being deleted, but the delete is cascaded to profile_parameter + for _, param := range resp[0].Parameters { + _, _, err := TOSession.DeleteParameterByID(*param.ID) + if err != nil { + t.Errorf("cannot DELETE parameter with parameterID %d: %v", *param.ID, err) + } + } + delResp, _, err := TOSession.DeleteProfileByID(profileID) + if err != nil { + t.Errorf("cannot DELETE Profile by name: %v - %v", err, delResp) + } + + // Retrieve the Profile to see if it got deleted + prs, _, err := TOSession.GetProfileByName(pr.Name) + if err != nil { + t.Errorf("error deleting Profile name: %v", err) + } + if len(prs) > 0 { + t.Errorf("expected Profile Name: %s to be deleted", pr.Name) + } + + // Attempt to export Profile + _, _, err = TOSession.ExportProfile(profileID) + if err == nil { + t.Errorf("expected Profile: %s to be nil on export", pr.Name) + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/roles.go b/cache-config/testing/ort-tests/tcdata/roles.go new file mode 100644 index 0000000000..15531abcf7 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/roles.go @@ -0,0 +1,71 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +const ( + roleGood = 0 + roleInvalidCap = 1 + roleNeedCap = 2 + roleBadPrivLevel = 3 +) + +func (r *TCData) CreateTestRoles(t *testing.T) { + for _, role := range r.TestData.Roles { + var alerts tc.Alerts + alerts, _, status, err := TOSession.CreateRole(role) + t.Log("Status Code: ", status) + t.Log("Response: ", alerts) + if err != nil { + t.Errorf("creating Role failed: %v", err) + } + } +} + +func (r *TCData) DeleteTestRoles(t *testing.T) { + + role := r.TestData.Roles[roleGood] + // Retrieve the Role by name so we can get the id + resp, _, status, err := TOSession.GetRoleByName(*role.Name) + t.Log("Status Code: ", status) + if err != nil { + t.Errorf("cannot GET Role by name: %s - %v", *role.Name, err) + } + respRole := resp[0] + + delResp, _, status, err := TOSession.DeleteRoleByID(*respRole.ID) + t.Log("Status Code: ", status) + + if err != nil { + t.Errorf("cannot DELETE Role by role: %v - %v", err, delResp) + } + + // Retrieve the Role to see if it got deleted + roleResp, _, status, err := TOSession.GetRoleByName(*role.Name) + t.Log("Status Code: ", status) + + if err != nil { + t.Errorf("error deleting Role role: %v", err) + } + if len(roleResp) > 0 { + t.Errorf("expected Role : %s to be deleted", *role.Name) + } +} diff --git a/cache-config/testing/ort-tests/tcdata/servercheckextension.go b/cache-config/testing/ort-tests/tcdata/servercheckextension.go new file mode 100644 index 0000000000..76a2c9b12b --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/servercheckextension.go @@ -0,0 +1,125 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "testing" + "time" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" +) + +func (r *TCData) CreateTestServerCheckExtensions(t *testing.T) { + toReqTimeout := time.Second * time.Duration(r.Config.Default.Session.TimeoutInSecs) + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword) + + for _, ext := range r.TestData.ServerCheckExtensions { + resp, _, err := TOSession.CreateServerCheckExtension(ext) + t.Logf("Response: %s %v", *ext.Name, resp) + if err != nil { + t.Errorf("could not create to_extension %s: %v", *ext.Name, err) + } + } + + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword) +} + +func (r *TCData) CreateTestInvalidServerCheckExtensions(t *testing.T) { + toReqTimeout := time.Second * time.Duration(r.Config.Default.Session.TimeoutInSecs) + // Fail Attempt to Create ServerCheckExtension as non extension user + _, _, err := TOSession.CreateServerCheckExtension(r.TestData.ServerCheckExtensions[0]) + if err == nil { + t.Error("expected to receive error with non extension user") + } + + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword) + + // Attempt to create another valid ServerCheckExtension and it should fail as there is no open slots + toExt := tc.ServerCheckExtensionNullable{ + Name: util.StrPtr("MEM_CHECKER"), + Version: util.StrPtr("3.0.3"), + InfoURL: util.StrPtr("-"), + ScriptFile: util.StrPtr("mem.py"), + ServercheckShortName: util.StrPtr("MC"), + Type: util.StrPtr("CHECK_EXTENSION_MEM"), + } + _, _, err = TOSession.CreateServerCheckExtension(toExt) + if err == nil { + t.Error("expected to receive error with no open slots left") + } + + // Attempt to create a TO Extension with an invalid type + toExt.Type = util.StrPtr("INVALID_TYPE") + _, _, err = TOSession.CreateServerCheckExtension(toExt) + if err == nil { + t.Error("expected to receive error with invalid TO extension type") + } + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword) + +} + +func (r *TCData) DeleteTestServerCheckExtensions(t *testing.T) { + toReqTimeout := time.Second * time.Duration(r.Config.Default.Session.TimeoutInSecs) + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword) + + extensions, _, err := TOSession.GetServerCheckExtensions() + if err != nil { + t.Fatalf("could not get to_extensions: %v", err) + } + + ids := []int{} + for _, ext := range r.TestData.ServerCheckExtensions { + found := false + for _, respTOExt := range extensions.Response { + if *ext.Name == *respTOExt.Name { + ids = append(ids, *respTOExt.ID) + found = true + continue + } + } + if !found { + t.Errorf("expected to find to_extension %s", *ext.Name) + } + } + + for _, id := range ids { + resp, _, err := TOSession.DeleteServerCheckExtension(id) + t.Logf("Response: %d %v", id, resp) + if err != nil { + t.Errorf("cannot delete to_extension: %d - %v", id, err) + } + } + extensions, _, err = TOSession.GetServerCheckExtensions() + if err != nil { + t.Fatalf("could not get to_extensions: %v", err) + } + + for _, ext := range r.TestData.ServerCheckExtensions { + found := false + for _, respTOExt := range extensions.Response { + if *ext.Name == *respTOExt.Name { + found = true + continue + } + } + if found { + t.Errorf("to_extension %s should have been deleted", *ext.Name) + } + } + + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword) +} diff --git a/cache-config/testing/ort-tests/tcdata/serverchecks.go b/cache-config/testing/ort-tests/tcdata/serverchecks.go new file mode 100644 index 0000000000..8f2667546b --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/serverchecks.go @@ -0,0 +1,85 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "testing" + "time" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" +) + +func (r *TCData) CreateTestServerChecks(t *testing.T) { + toReqTimeout := time.Second * time.Duration(r.Config.Default.Session.TimeoutInSecs) + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword) + + for _, servercheck := range r.TestData.Serverchecks { + resp, _, err := TOSession.InsertServerCheckStatus(servercheck) + t.Logf("Response: %s host_name %s check %v", *servercheck.HostName, *servercheck.Name, resp) + if err != nil { + t.Errorf("could not CREATE servercheck: %v", err) + } + } + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword) +} + +func (r *TCData) CreateTestInvalidServerChecks(t *testing.T) { + toReqTimeout := time.Second * time.Duration(r.Config.Default.Session.TimeoutInSecs) + + _, _, err := TOSession.InsertServerCheckStatus(r.TestData.Serverchecks[0]) + if err == nil { + t.Error("expected to receive error with non extension user") + } + + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword) + + invalidServerCheck := tc.ServercheckRequestNullable{ + Name: util.StrPtr("BOGUS"), + Value: util.IntPtr(1), + ID: util.IntPtr(-1), + HostName: util.StrPtr("bogus_hostname"), + } + + // Attempt to create a ServerCheck with invalid server ID + _, _, err = TOSession.InsertServerCheckStatus(invalidServerCheck) + if err == nil { + t.Error("expected to receive error with invalid id") + } + + invalidServerCheck.ID = nil + // Attempt to create a ServerCheck with invalid host name + _, _, err = TOSession.InsertServerCheckStatus(invalidServerCheck) + if err == nil { + t.Error("expected to receive error with invalid host name") + } + + // get valid name to get past host check + invalidServerCheck.Name = r.TestData.Serverchecks[0].Name + + // Attempt to create a ServerCheck with invalid servercheck name + _, _, err = TOSession.InsertServerCheckStatus(invalidServerCheck) + if err == nil { + t.Error("expected to receive error with invalid servercheck name") + } + r.SwitchSession(toReqTimeout, r.Config.TrafficOps.URL, r.Config.TrafficOps.Users.Extension, r.Config.TrafficOps.UserPassword, r.Config.TrafficOps.Users.Admin, r.Config.TrafficOps.UserPassword) +} + +// Need to define no-op function as TCObj interface expects a delete function +// There is no delete path for serverchecks +func (r *TCData) DeleteTestServerChecks(t *testing.T) { + return +} diff --git a/cache-config/testing/ort-tests/tcdata/servers.go b/cache-config/testing/ort-tests/tcdata/servers.go index cfb8cdf7b1..2f069cfe64 100644 --- a/cache-config/testing/ort-tests/tcdata/servers.go +++ b/cache-config/testing/ort-tests/tcdata/servers.go @@ -18,8 +18,8 @@ package tcdata import ( "fmt" - "github.com/apache/trafficcontrol/cache-config/t3cutil/toreq" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil/toreq" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func (r *TCData) QueueUpdatesForServer(hostname string, queue bool) error { diff --git a/cache-config/testing/ort-tests/tcdata/serverservercapability.go b/cache-config/testing/ort-tests/tcdata/serverservercapability.go new file mode 100644 index 0000000000..b5f99b8a17 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/serverservercapability.go @@ -0,0 +1,286 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "net/http" + "net/url" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" +) + +func (r *TCData) CreateTestServerServerCapabilities(t *testing.T) { + // Valid POSTs + + // loop through server ServerCapabilities, assign FKs and create + params := url.Values{} + for _, ssc := range r.TestData.ServerServerCapabilities { + if ssc.Server == nil { + t.Fatalf("server-server-capability structure had nil server") + } + params.Set("hostName", *ssc.Server) + resp, _, err := TOSession.GetServersWithHdr(¶ms, nil) + if err != nil { + t.Fatalf("cannot GET Server by hostname '%s': %v - %v", *ssc.Server, err, resp.Alerts) + } + servResp := resp.Response + if len(servResp) != 1 { + t.Fatalf("cannot GET Server by hostname: %s. Response did not include record.", *ssc.Server) + } + server := servResp[0] + ssc.ServerID = server.ID + createResp, _, err := TOSession.CreateServerServerCapability(ssc) + if err != nil { + t.Errorf("could not POST the server capability %s to server %s: %v", *ssc.ServerCapability, *ssc.Server, err) + } + t.Logf("Response: %s %+v", *ssc.Server, createResp) + } + + // Invalid POSTs + + ssc := r.TestData.ServerServerCapabilities[0] + + // Attempt to assign already assigned server capability + _, _, err := TOSession.CreateServerServerCapability(ssc) + if err == nil { + t.Error("expected to receive error when assigning a already assigned server capability") + } + + // Attempt to assign a server capability with no ID + sscNilID := tc.ServerServerCapability{ + ServerCapability: ssc.ServerCapability, + } + _, _, err = TOSession.CreateServerServerCapability(sscNilID) + if err == nil { + t.Error("expected to receive error when assigning a server capability without a server ID") + } + + // Attempt to assign a server capability with no server capability + sscNilCapability := tc.ServerServerCapability{ + ServerID: ssc.ServerID, + } + _, _, err = TOSession.CreateServerServerCapability(sscNilCapability) + if err == nil { + t.Error("expected to receive error when assigning a server capability to a server without a server capability") + } + + // Attempt to assign a server capability with invalid server capability + sscInvalidCapability := tc.ServerServerCapability{ + ServerID: ssc.ServerID, + ServerCapability: util.StrPtr("bogus"), + } + _, _, err = TOSession.CreateServerServerCapability(sscInvalidCapability) + if err == nil { + t.Error("expected to receive error when assigning a non existent server capability to a server") + } + + // Attempt to assign a server capability with invalid server capability + sscInvalidID := tc.ServerServerCapability{ + ServerID: util.IntPtr(-1), + ServerCapability: ssc.ServerCapability, + } + _, _, err = TOSession.CreateServerServerCapability(sscInvalidID) + if err == nil { + t.Error("expected to receive error when assigning a server capability to a non existent server ID") + } + + // Attempt to assign a server capability to a non MID/EDGE server + // TODO: DON'T hard-code server hostnames! + params.Set("hostName", "trafficvault") + resp, _, err := TOSession.GetServersWithHdr(¶ms, nil) + if err != nil { + t.Fatalf("cannot GET Server by hostname 'trafficvault': %v - alerts: %+v", err, resp.Alerts) + } + servers := resp.Response + if len(servers) < 1 { + t.Fatal("need at least one server to test invalid server type assignment") + } + + sscInvalidType := tc.ServerServerCapability{ + ServerID: servers[0].ID, + ServerCapability: ssc.ServerCapability, + } + _, _, err = TOSession.CreateServerServerCapability(sscInvalidType) + if err == nil { + t.Error("expected to receive error when assigning a server capability to a server with incorrect type") + } +} + +func (r *TCData) DeleteTestServerServerCapabilities(t *testing.T) { + // Get Server Capabilities to delete them + sscs, _, err := TOSession.GetServerServerCapabilitiesWithHdr(nil, nil, nil, nil) + if err != nil { + t.Fatalf("cannot GET server capabilities assigned to servers: %v", err) + } + if sscs == nil { + t.Fatal("returned server capabilities assigned to servers was nil") + } + + dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil) + if err != nil { + t.Fatalf("cannot GET delivery services: %v", err) + } + dsIDtoDS := make(map[int]tc.DeliveryServiceNullableV30, len(dses)) + for _, ds := range dses { + dsIDtoDS[*ds.ID] = ds + } + + // Assign servers to DSes that have the capability required + // Used to make sure we block server server_capability DELETE in that case + dsServers := []tc.DeliveryServiceServer{} + assignedServers := make(map[int]bool) + for _, ssc := range sscs { + + dsReqCapResp, _, err := TOSession.GetDeliveryServicesRequiredCapabilitiesWithHdr(nil, nil, ssc.ServerCapability, nil) + if err != nil { + t.Fatalf("cannot GET delivery service required capabilities: %v", err) + } + if len(dsReqCapResp) == 0 { + // capability is not required by any delivery service + continue + } + var dsReqCap tc.DeliveryServicesRequiredCapability + for _, dsrc := range dsReqCapResp { + if dsIDtoDS[*dsrc.DeliveryServiceID].Topology == nil { + dsReqCap = dsrc + break + } + } + if dsReqCap.DeliveryServiceID == nil { + // didn't find a non-topology-based dsReqCap for this ssc + continue + } + + // Assign server to ds + _, _, err = TOSession.CreateDeliveryServiceServers(*dsReqCap.DeliveryServiceID, []int{*ssc.ServerID}, false) + if err != nil { + t.Fatalf("cannot CREATE server delivery service assignment: %v", err) + } + dsServers = append(dsServers, tc.DeliveryServiceServer{ + Server: ssc.ServerID, + DeliveryService: dsReqCap.DeliveryServiceID, + }) + assignedServers[*ssc.ServerID] = true + } + if len(dsServers) == 0 { + t.Fatalf("test requires at least one server with a capability that is required by at least one delivery service") + } + + // Delete should fail as their delivery services now require the capabilities + for _, ssc := range sscs { + if assignedServers[*ssc.ServerID] { + _, _, err := TOSession.DeleteServerServerCapability(*ssc.ServerID, *ssc.ServerCapability) + if err == nil { + t.Fatalf("should have gotten error when using DELETE on the server capability %s from server %s as it is required by associated dses", *ssc.ServerCapability, *ssc.Server) + } + } + } + + for _, dsServer := range dsServers { + _, _, err := TOSession.DeleteDeliveryServiceServer(*dsServer.DeliveryService, *dsServer.Server) + if err != nil { + t.Fatalf("could not DELETE the server %d from ds %d: %v", *dsServer.Server, *dsServer.DeliveryService, err) + } + } + + // Remove the requirement so we can actually delete them + + for _, ssc := range sscs { + _, _, err := TOSession.DeleteServerServerCapability(*ssc.ServerID, *ssc.ServerCapability) + if err != nil { + t.Errorf("could not DELETE the server capability %s from server %s: %v", *ssc.ServerCapability, *ssc.Server, err) + } + } + +} + +func DeleteTestServerServerCapabilitiesForTopologiesValidation(t *testing.T) { + // dtrc-edge-01 and dtrc-edge-02 (capabilities = ram, disk) are assigned to + // ds-top-req-cap (topology = top-for-ds-req; required capabilities = ram, disk) and + // ds-top-req-cap2 (topology = top-for-ds-req2; required capabilities = ram) + var edge1 tc.ServerV30 + var edge2 tc.ServerV30 + + servers, _, err := TOSession.GetServersWithHdr(nil, nil) + if err != nil { + t.Fatalf("cannot GET servers: %v", err) + } + for _, s := range servers.Response { + if *s.HostName == "dtrc-edge-01" { + edge1 = s + } + if *s.HostName == "dtrc-edge-02" { + edge2 = s + } + } + if edge1.HostName == nil || edge2.HostName == nil { + t.Fatalf("expected servers with hostName dtrc-edge-01 and dtrc-edge-02") + } + + // delete should succeed because dtrc-edge-02 still has the required capabilities + // for ds-top-req-cap and ds-top-req-cap2 within the cachegroup + _, _, err = TOSession.DeleteServerServerCapability(*edge1.ID, "ram") + if err != nil { + t.Fatalf("when deleting server server capability, expected: nil error, actual: %v", err) + } + + // delete should fail because dtrc-edge-02 is the last server in the cachegroup that + // has ds-top-req-cap's required capabilities + _, reqInf, err := TOSession.DeleteServerServerCapability(*edge2.ID, "ram") + if err == nil { + t.Fatalf("when deleting server server capability, expected: error, actual: nil") + } + if reqInf.StatusCode != http.StatusBadRequest { + t.Errorf("when deleting server server capability, expected status code: %d, actual: %d", http.StatusBadRequest, reqInf.StatusCode) + } + + // delete should fail because dtrc-edge-02 is the last server in the cachegroup that + // has ds-top-req-cap's required capabilities + _, r, err := TOSession.DeleteServerServerCapability(*edge2.ID, "disk") + if err == nil { + t.Fatalf("when deleting required server server capability, expected: error, actual: nil") + } + if r.StatusCode != http.StatusBadRequest { + t.Errorf("when deleting required server server capability, expected status code: %d, actual: %d", http.StatusBadRequest, reqInf.StatusCode) + } + + // delete should succeed because dtrc-edge-02 still has the required capabilities + // for ds-top-req-cap and ds-top-req-cap2 within the cachegroup + _, _, err = TOSession.DeleteServerServerCapability(*edge1.ID, "disk") + if err != nil { + t.Fatalf("when deleting server server capability, expected: nil error, actual: %v", err) + } +} + +func DeleteTestServerServerCapabilitiesForTopologies(t *testing.T) { + // Get Server Capabilities to delete them + sscs, _, err := TOSession.GetServerServerCapabilitiesWithHdr(nil, nil, nil, nil) + if err != nil { + t.Fatalf("cannot GET server capabilities assigned to servers: %v", err) + } + if sscs == nil { + t.Fatal("returned server capabilities assigned to servers was nil") + } + + for _, ssc := range sscs { + _, _, err := TOSession.DeleteServerServerCapability(*ssc.ServerID, *ssc.ServerCapability) + if err != nil { + t.Errorf("could not DELETE the server capability %s from server %s: %v", *ssc.ServerCapability, *ssc.Server, err) + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/session.go b/cache-config/testing/ort-tests/tcdata/session.go index 5b01391a51..135a834c39 100644 --- a/cache-config/testing/ort-tests/tcdata/session.go +++ b/cache-config/testing/ort-tests/tcdata/session.go @@ -18,7 +18,7 @@ package tcdata import ( "time" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" _ "github.com/lib/pq" ) diff --git a/cache-config/testing/ort-tests/tcdata/steeringtargets.go b/cache-config/testing/ort-tests/tcdata/steeringtargets.go new file mode 100644 index 0000000000..203202ecdd --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/steeringtargets.go @@ -0,0 +1,145 @@ +package tcdata + +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. +*/ + +import ( + "testing" + "time" + + "github.com/apache/trafficcontrol/v7/lib/go-util" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v3-client" +) + +var SteeringUserSession *client.Session + +func (r *TCData) CreateTestSteeringTargets(t *testing.T) { + for _, st := range r.TestData.SteeringTargets { + if st.Type == nil { + t.Fatal("creating steering target: test data missing type") + } + if st.DeliveryService == nil { + t.Fatal("creating steering target: test data missing ds") + } + if st.Target == nil { + t.Fatal("creating steering target: test data missing target") + } + + { + respTypes, _, err := SteeringUserSession.GetTypeByName(*st.Type) + if err != nil { + t.Fatalf("creating steering target: getting type: %v", err) + } else if len(respTypes) < 1 { + t.Fatal("creating steering target: getting type: not found") + } + st.TypeID = util.IntPtr(respTypes[0].ID) + } + { + respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullableWithHdr(string(*st.DeliveryService), nil) + if err != nil { + t.Fatalf("creating steering target: getting ds: %v", err) + } else if len(respDS) < 1 { + t.Fatal("creating steering target: getting ds: not found") + } else if respDS[0].ID == nil { + t.Fatal("creating steering target: getting ds: nil ID returned") + } + dsID := uint64(*respDS[0].ID) + st.DeliveryServiceID = &dsID + } + { + respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullableWithHdr(string(*st.Target), nil) + if err != nil { + t.Fatalf("creating steering target: getting target ds: %v", err) + } else if len(respTarget) < 1 { + t.Fatal("creating steering target: getting target ds: not found") + } else if respTarget[0].ID == nil { + t.Fatal("creating steering target: getting target ds: nil ID returned") + } + targetID := uint64(*respTarget[0].ID) + st.TargetID = &targetID + } + + resp, _, err := SteeringUserSession.CreateSteeringTarget(st) + t.Log("Response: ", resp) + if err != nil { + t.Fatalf("creating steering target: %v", err) + } + } +} + +func (r *TCData) DeleteTestSteeringTargets(t *testing.T) { + dsIDs := []uint64{} + for _, st := range r.TestData.SteeringTargets { + if st.DeliveryService == nil { + t.Fatal("deleting steering target: test data missing ds") + } + if st.Target == nil { + t.Fatal("deleting steering target: test data missing target") + } + + respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullableWithHdr(string(*st.DeliveryService), nil) + if err != nil { + t.Fatalf("deleting steering target: getting ds: %v", err) + } else if len(respDS) < 1 { + t.Fatal("deleting steering target: getting ds: not found") + } else if respDS[0].ID == nil { + t.Fatal("deleting steering target: getting ds: nil ID returned") + } + dsID := uint64(*respDS[0].ID) + st.DeliveryServiceID = &dsID + + dsIDs = append(dsIDs, dsID) + + respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullableWithHdr(string(*st.Target), nil) + if err != nil { + t.Fatalf("deleting steering target: getting target ds: %v", err) + } else if len(respTarget) < 1 { + t.Fatal("deleting steering target: getting target ds: not found") + } else if respTarget[0].ID == nil { + t.Fatal("deleting steering target: getting target ds: not found") + } + targetID := uint64(*respTarget[0].ID) + st.TargetID = &targetID + + _, _, err = SteeringUserSession.DeleteSteeringTarget(int(*st.DeliveryServiceID), int(*st.TargetID)) + if err != nil { + t.Fatalf("deleting steering target: deleting: %v", err) + } + } + + for _, dsID := range dsIDs { + sts, _, err := SteeringUserSession.GetSteeringTargets(int(dsID)) + if err != nil { + t.Fatalf("deleting steering targets: getting steering target: %v", err) + } + if len(sts) != 0 { + t.Fatalf("deleting steering targets: after delete, getting steering target: expected 0 actual %d", len(sts)) + } + } +} + +// SetupSteeringTargets calls the CreateSteeringTargets test. It also sets the steering user session +// with the logged in steering user. SteeringUserSession is used by steering target test functions. +// Running this function depends on CreateTestUsers. +func (r *TCData) SetupSteeringTargets(t *testing.T) { + var err error + toReqTimeout := time.Second * time.Duration(r.Config.Default.Session.TimeoutInSecs) + SteeringUserSession, _, err = client.LoginWithAgent(TOSession.URL, "steering", "pa$$word", true, "to-api-v1-client-tests/steering", true, toReqTimeout) + if err != nil { + t.Fatalf("failed to get log in with steering user: %v", err) + } + + r.CreateTestSteeringTargets(t) +} diff --git a/cache-config/testing/ort-tests/tcdata/tcdata.go b/cache-config/testing/ort-tests/tcdata/tcdata.go index f793cf8668..5ae8763d56 100644 --- a/cache-config/testing/ort-tests/tcdata/tcdata.go +++ b/cache-config/testing/ort-tests/tcdata/tcdata.go @@ -20,8 +20,8 @@ package tcdata */ import ( - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/config" - "github.com/apache/trafficcontrol/lib/go-tc/totest" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/config" + "github.com/apache/trafficcontrol/v7/lib/go-tc/totest" ) type TCData struct { diff --git a/cache-config/testing/ort-tests/tcdata/todb.go b/cache-config/testing/ort-tests/tcdata/todb.go index b526c0416c..ef69a7604a 100644 --- a/cache-config/testing/ort-tests/tcdata/todb.go +++ b/cache-config/testing/ort-tests/tcdata/todb.go @@ -19,8 +19,8 @@ import ( "database/sql" "fmt" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" ) var ( diff --git a/cache-config/testing/ort-tests/tcdata/topologies.go b/cache-config/testing/ort-tests/tcdata/topologies.go new file mode 100644 index 0000000000..a57e3e2640 --- /dev/null +++ b/cache-config/testing/ort-tests/tcdata/topologies.go @@ -0,0 +1,76 @@ +package tcdata + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software 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. + */ + +import ( + "reflect" + "strings" + "testing" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" +) + +type topologyTestCase struct { + testCaseDescription string + tc.Topology +} + +func (r *TCData) CreateTestTopologies(t *testing.T) { + var ( + postResponse *tc.TopologyResponse + err error + ) + for _, topology := range r.TestData.Topologies { + if postResponse, _, err = TOSession.CreateTopology(topology); err != nil { + t.Fatalf("could not CREATE topology: %v", err) + } + postResponse.Response.LastUpdated = nil + if !reflect.DeepEqual(topology, postResponse.Response) { + t.Fatalf("Topology in response should be the same as the one POSTed. expected: %v, actual: %v", topology, postResponse.Response) + } + } +} + +func (r *TCData) DeleteTestTopologies(t *testing.T) { + for _, top := range r.TestData.Topologies { + delResp, _, err := TOSession.DeleteTopology(top.Name) + if err != nil { + t.Fatalf("cannot DELETE topology: %v - %v", err, delResp) + } + deleteLog, _, err := TOSession.GetLogsByLimit(1) + if err != nil { + t.Fatalf("unable to get latest audit log entry") + } + if len(deleteLog) != 1 { + t.Fatalf("log entry length - expected: 1, actual: %d", len(deleteLog)) + } + if !strings.Contains(*deleteLog[0].Message, top.Name) { + t.Errorf("topology deletion audit log entry - expected: message containing topology name '%s', actual: %s", top.Name, *deleteLog[0].Message) + } + + topology, _, err := TOSession.GetTopology(top.Name) + if err == nil { + t.Fatalf("expected error trying to GET deleted topology: %s, actual: nil", top.Name) + } + if topology != nil { + t.Fatalf("expected nil trying to GET deleted topology: %s, actual: non-nil", top.Name) + } + } +} diff --git a/cache-config/testing/ort-tests/tcdata/withobjs.go b/cache-config/testing/ort-tests/tcdata/withobjs.go index c5014e27ae..9b774b8894 100644 --- a/cache-config/testing/ort-tests/tcdata/withobjs.go +++ b/cache-config/testing/ort-tests/tcdata/withobjs.go @@ -19,11 +19,11 @@ import ( "database/sql" "testing" - "github.com/apache/trafficcontrol/lib/go-tc/totest" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc/totest" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) type TCObj int diff --git a/cache-config/testing/ort-tests/to_requester_test.go b/cache-config/testing/ort-tests/to_requester_test.go index 982ba47923..e1bf2a5ec2 100644 --- a/cache-config/testing/ort-tests/to_requester_test.go +++ b/cache-config/testing/ort-tests/to_requester_test.go @@ -22,9 +22,9 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) type Package struct { diff --git a/cache-config/testing/ort-tests/to_updater_test.go b/cache-config/testing/ort-tests/to_updater_test.go index 3329189bd2..b8cfdf5800 100644 --- a/cache-config/testing/ort-tests/to_updater_test.go +++ b/cache-config/testing/ort-tests/to_updater_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestTOUpdater(t *testing.T) { diff --git a/cache-config/testing/ort-tests/traffic_ops_ort_test.go b/cache-config/testing/ort-tests/traffic_ops_ort_test.go index dc85c5151e..a364d61db7 100644 --- a/cache-config/testing/ort-tests/traffic_ops_ort_test.go +++ b/cache-config/testing/ort-tests/traffic_ops_ort_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/config" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/config" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) var ( diff --git a/experimental/traffic_router_golang/availableservers/availableservers.go b/experimental/traffic_router_golang/availableservers/availableservers.go index 78a0722190..f84e0db30b 100644 --- a/experimental/traffic_router_golang/availableservers/availableservers.go +++ b/experimental/traffic_router_golang/availableservers/availableservers.go @@ -25,7 +25,7 @@ import ( "fmt" "sync" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) type AvailableServersMap map[tc.DeliveryServiceName]map[tc.CacheGroupName][]tc.CacheName diff --git a/experimental/traffic_router_golang/cgsrch/cgsrch.go b/experimental/traffic_router_golang/cgsrch/cgsrch.go index 70677cce85..c25b085535 100644 --- a/experimental/traffic_router_golang/cgsrch/cgsrch.go +++ b/experimental/traffic_router_golang/cgsrch/cgsrch.go @@ -24,9 +24,9 @@ import ( "errors" "sync" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/quadtree" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/quadtree" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // CGSearcher is the interface that wraps the Nearest method. diff --git a/experimental/traffic_router_golang/config/config.go b/experimental/traffic_router_golang/config/config.go index f4ce45a1f5..a71bc33070 100644 --- a/experimental/traffic_router_golang/config/config.go +++ b/experimental/traffic_router_golang/config/config.go @@ -28,7 +28,7 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) type Cfg struct { diff --git a/experimental/traffic_router_golang/coveragezone/coveragezone.go b/experimental/traffic_router_golang/coveragezone/coveragezone.go index 95a4efd752..f231e616b9 100644 --- a/experimental/traffic_router_golang/coveragezone/coveragezone.go +++ b/experimental/traffic_router_golang/coveragezone/coveragezone.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "net" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TODO put in lib/go-tc diff --git a/experimental/traffic_router_golang/crconfig/crconfigths.go b/experimental/traffic_router_golang/crconfig/crconfigths.go index 793475d2c5..f428b0bec0 100644 --- a/experimental/traffic_router_golang/crconfig/crconfigths.go +++ b/experimental/traffic_router_golang/crconfig/crconfigths.go @@ -21,7 +21,7 @@ package crconfig */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) type ThsT *tc.CRConfig diff --git a/experimental/traffic_router_golang/crconfigdsservers/crconfigdsservers.go b/experimental/traffic_router_golang/crconfigdsservers/crconfigdsservers.go index 01e440a56e..9a9adc5e35 100644 --- a/experimental/traffic_router_golang/crconfigdsservers/crconfigdsservers.go +++ b/experimental/traffic_router_golang/crconfigdsservers/crconfigdsservers.go @@ -1,7 +1,7 @@ package crconfigdsservers import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) /* diff --git a/experimental/traffic_router_golang/crconfigpoller/crconfigpoller.go b/experimental/traffic_router_golang/crconfigpoller/crconfigpoller.go index c3e4e112d5..29671410d0 100644 --- a/experimental/traffic_router_golang/crconfigpoller/crconfigpoller.go +++ b/experimental/traffic_router_golang/crconfigpoller/crconfigpoller.go @@ -28,13 +28,13 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/cgsrch" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfig" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfigregex" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/fetch" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/nextcache" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/cgsrch" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfig" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfigregex" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/fetch" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/nextcache" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func valid(new *tc.CRConfig, old *tc.CRConfig) error { diff --git a/experimental/traffic_router_golang/crconfigregex/crconfigregex.go b/experimental/traffic_router_golang/crconfigregex/crconfigregex.go index 1ce49cd5d5..3c6b25c790 100644 --- a/experimental/traffic_router_golang/crconfigregex/crconfigregex.go +++ b/experimental/traffic_router_golang/crconfigregex/crconfigregex.go @@ -25,7 +25,7 @@ import ( "regexp" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TODO remove duplication with Traffic Monitor diff --git a/experimental/traffic_router_golang/crstates/crstatesths.go b/experimental/traffic_router_golang/crstates/crstatesths.go index 1a31e20f12..060af771cd 100644 --- a/experimental/traffic_router_golang/crstates/crstatesths.go +++ b/experimental/traffic_router_golang/crstates/crstatesths.go @@ -21,7 +21,7 @@ package crstates */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) type ThsT *tc.CRStates diff --git a/experimental/traffic_router_golang/crstatespoller/crstatespoller.go b/experimental/traffic_router_golang/crstatespoller/crstatespoller.go index d250ed8dbc..300d699df9 100644 --- a/experimental/traffic_router_golang/crstatespoller/crstatespoller.go +++ b/experimental/traffic_router_golang/crstatespoller/crstatespoller.go @@ -26,12 +26,12 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/availableservers" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfig" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/crstates" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/fetch" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/availableservers" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfig" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crstates" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/fetch" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func updateAvailableServers(crcThs crconfig.Ths, crsThs crstates.Ths, as availableservers.AvailableServers) { diff --git a/experimental/traffic_router_golang/httpsrvr/httpsrvr.go b/experimental/traffic_router_golang/httpsrvr/httpsrvr.go index 785ce2deee..3b9ec81195 100644 --- a/experimental/traffic_router_golang/httpsrvr/httpsrvr.go +++ b/experimental/traffic_router_golang/httpsrvr/httpsrvr.go @@ -27,15 +27,15 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/availableservers" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/cgsrch" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/coveragezone" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfigregex" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/nextcache" - - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/availableservers" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/cgsrch" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/coveragezone" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfigregex" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/nextcache" + + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TODO config diff --git a/experimental/traffic_router_golang/ipmap/ipmap.go b/experimental/traffic_router_golang/ipmap/ipmap.go index b5e962b887..f07ad27ea3 100644 --- a/experimental/traffic_router_golang/ipmap/ipmap.go +++ b/experimental/traffic_router_golang/ipmap/ipmap.go @@ -24,9 +24,9 @@ import ( "errors" "net" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/coveragezone" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/coveragezone" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TODO implement, with Coverage Zone File + Maxmind DB diff --git a/experimental/traffic_router_golang/nextcache/nextcache.go b/experimental/traffic_router_golang/nextcache/nextcache.go index 0825de7ef7..dcb837743d 100644 --- a/experimental/traffic_router_golang/nextcache/nextcache.go +++ b/experimental/traffic_router_golang/nextcache/nextcache.go @@ -23,7 +23,7 @@ package nextcache import ( "sync/atomic" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // New creates and returns a new NextCacher. The returned NextCacher is safe for use by multiple goroutines. diff --git a/experimental/traffic_router_golang/quadtree/quadtree.go b/experimental/traffic_router_golang/quadtree/quadtree.go index a020a442b5..ab9083660c 100644 --- a/experimental/traffic_router_golang/quadtree/quadtree.go +++ b/experimental/traffic_router_golang/quadtree/quadtree.go @@ -23,7 +23,7 @@ package quadtree import ( "math" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) type ObjT tc.CacheGroupName diff --git a/experimental/traffic_router_golang/toutil/toutil.go b/experimental/traffic_router_golang/toutil/toutil.go index 2094b6778d..f551f09d4a 100644 --- a/experimental/traffic_router_golang/toutil/toutil.go +++ b/experimental/traffic_router_golang/toutil/toutil.go @@ -25,8 +25,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - client "github.com/apache/trafficcontrol/traffic_ops/v3-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v3-client" ) // MonitorAvailableStatuses returns a set of the status names that indicate a diff --git a/experimental/traffic_router_golang/traffic_router_golang.go b/experimental/traffic_router_golang/traffic_router_golang.go index 72740eb031..984f07c8b1 100644 --- a/experimental/traffic_router_golang/traffic_router_golang.go +++ b/experimental/traffic_router_golang/traffic_router_golang.go @@ -27,17 +27,17 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/availableservers" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/config" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/coveragezone" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/crconfigpoller" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/crstatespoller" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/fetch" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/httpsrvr" - "github.com/apache/trafficcontrol/experimental/traffic_router_golang/toutil" - - "github.com/apache/trafficcontrol/lib/go-log" - to "github.com/apache/trafficcontrol/traffic_ops/v3-client" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/availableservers" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/config" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/coveragezone" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crconfigpoller" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/crstatespoller" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/fetch" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/httpsrvr" + "github.com/apache/trafficcontrol/v7/experimental/traffic_router_golang/toutil" + + "github.com/apache/trafficcontrol/v7/lib/go-log" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v3-client" ) // Version is the utility's version. diff --git a/grove/cache/handler.go b/grove/cache/handler.go index afdfce482d..35d5b7c45d 100644 --- a/grove/cache/handler.go +++ b/grove/cache/handler.go @@ -22,16 +22,16 @@ import ( "time" "unsafe" - "github.com/apache/trafficcontrol/grove/cachedata" - "github.com/apache/trafficcontrol/grove/plugin" + "github.com/apache/trafficcontrol/v7/grove/cachedata" + "github.com/apache/trafficcontrol/v7/grove/plugin" - "github.com/apache/trafficcontrol/grove/remap" - "github.com/apache/trafficcontrol/grove/stat" - "github.com/apache/trafficcontrol/grove/thread" - "github.com/apache/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/remap" + "github.com/apache/trafficcontrol/v7/grove/stat" + "github.com/apache/trafficcontrol/v7/grove/thread" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) type HandlerPointer struct { diff --git a/grove/cache/responder.go b/grove/cache/responder.go index 2babfe7ea9..a151f2c00a 100644 --- a/grove/cache/responder.go +++ b/grove/cache/responder.go @@ -17,13 +17,13 @@ package cache import ( "net/http" - "github.com/apache/trafficcontrol/grove/cachedata" - "github.com/apache/trafficcontrol/grove/plugin" - "github.com/apache/trafficcontrol/grove/stat" - "github.com/apache/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/cachedata" + "github.com/apache/trafficcontrol/v7/grove/plugin" + "github.com/apache/trafficcontrol/v7/grove/stat" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) // 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 bdd526cf61..a8a40742eb 100644 --- a/grove/cache/retryinggetter.go +++ b/grove/cache/retryinggetter.go @@ -20,14 +20,14 @@ import ( "net/url" "time" - "github.com/apache/trafficcontrol/grove/cacheobj" - "github.com/apache/trafficcontrol/grove/icache" - "github.com/apache/trafficcontrol/grove/remap" - "github.com/apache/trafficcontrol/grove/thread" - "github.com/apache/trafficcontrol/grove/web" - - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/grove/cacheobj" + "github.com/apache/trafficcontrol/v7/grove/icache" + "github.com/apache/trafficcontrol/v7/grove/remap" + "github.com/apache/trafficcontrol/v7/grove/thread" + "github.com/apache/trafficcontrol/v7/grove/web" + + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) const CodeConnectFailure = http.StatusBadGateway diff --git a/grove/cachedata/cachedata.go b/grove/cachedata/cachedata.go index 963ee46367..8eb8042876 100644 --- a/grove/cachedata/cachedata.go +++ b/grove/cachedata/cachedata.go @@ -20,8 +20,8 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/grove/web" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) // ParentResponseData contains data about the parent/origin response. diff --git a/grove/cacheobj/cacheobj.go b/grove/cacheobj/cacheobj.go index 771e849ea5..deaec683de 100644 --- a/grove/cacheobj/cacheobj.go +++ b/grove/cacheobj/cacheobj.go @@ -18,7 +18,7 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) type CacheObj struct { @@ -65,7 +65,7 @@ func New(reqHeader http.Header, bytes []byte, code int, originCode int, proxyURL } // CanReuse is a helper wrapping -// github.com/apache/trafficcontrol/lib/go-rfc.CanReuseStored, returning a +// github.com/apache/trafficcontrol/v7/lib/go-rfc.CanReuseStored, returning a // boolean rather than an enumerated "Reuse" value, for when it's known whether // MustRevalidate can be used. func CanReuse( diff --git a/grove/config/config.go b/grove/config/config.go index a621830b86..94ba1b4280 100644 --- a/grove/config/config.go +++ b/grove/config/config.go @@ -18,7 +18,7 @@ import ( "encoding/json" "io/ioutil" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) const bytesPerGibibyte = 1024 * 1024 * 1024 diff --git a/grove/diskcache/diskcache.go b/grove/diskcache/diskcache.go index 8af71bba5e..885430dfe4 100644 --- a/grove/diskcache/diskcache.go +++ b/grove/diskcache/diskcache.go @@ -21,10 +21,10 @@ import ( "sync/atomic" "time" - "github.com/apache/trafficcontrol/grove/cacheobj" - "github.com/apache/trafficcontrol/grove/lru" + "github.com/apache/trafficcontrol/v7/grove/cacheobj" + "github.com/apache/trafficcontrol/v7/grove/lru" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" bolt "go.etcd.io/bbolt" ) diff --git a/grove/diskcache/multi.go b/grove/diskcache/multi.go index 4d300cef92..63ec367450 100644 --- a/grove/diskcache/multi.go +++ b/grove/diskcache/multi.go @@ -17,10 +17,10 @@ package diskcache import ( "errors" - "github.com/apache/trafficcontrol/grove/cacheobj" - "github.com/apache/trafficcontrol/grove/config" + "github.com/apache/trafficcontrol/v7/grove/cacheobj" + "github.com/apache/trafficcontrol/v7/grove/config" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/dchest/siphash" ) diff --git a/grove/grove.go b/grove/grove.go index 3b1fda9663..1d76918f53 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/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" + "github.com/apache/trafficcontrol/v7/lib/go-log" + + "github.com/apache/trafficcontrol/v7/grove/cache" + "github.com/apache/trafficcontrol/v7/grove/config" + "github.com/apache/trafficcontrol/v7/grove/diskcache" + "github.com/apache/trafficcontrol/v7/grove/icache" + "github.com/apache/trafficcontrol/v7/grove/memcache" + "github.com/apache/trafficcontrol/v7/grove/plugin" + "github.com/apache/trafficcontrol/v7/grove/remap" + "github.com/apache/trafficcontrol/v7/grove/remapdata" + "github.com/apache/trafficcontrol/v7/grove/stat" + "github.com/apache/trafficcontrol/v7/grove/tiercache" + "github.com/apache/trafficcontrol/v7/grove/web" ) const ShutdownTimeout = 60 * time.Second diff --git a/grove/grovetccfg/grovetccfg.go b/grove/grovetccfg/grovetccfg.go index 07128fbf25..1ec11a47b9 100644 --- a/grove/grovetccfg/grovetccfg.go +++ b/grove/grovetccfg/grovetccfg.go @@ -34,13 +34,13 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - to "github.com/apache/trafficcontrol/traffic_ops/v3-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v3-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" + "github.com/apache/trafficcontrol/v7/grove/config" + "github.com/apache/trafficcontrol/v7/grove/remap" + "github.com/apache/trafficcontrol/v7/grove/remapdata" + "github.com/apache/trafficcontrol/v7/grove/web" ) const Version = "0.2" diff --git a/grove/icache/icache.go b/grove/icache/icache.go index 373532148d..369c06e661 100644 --- a/grove/icache/icache.go +++ b/grove/icache/icache.go @@ -15,7 +15,7 @@ package icache */ import ( - "github.com/apache/trafficcontrol/grove/cacheobj" + "github.com/apache/trafficcontrol/v7/grove/cacheobj" ) // TODO change to return errors diff --git a/grove/integration_test/compare_gets.go b/grove/integration_test/compare_gets.go index 0cf7ac6d2e..07f6b30b7f 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/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/web" "io/ioutil" "log" "net/http" diff --git a/grove/memcache/memcache.go b/grove/memcache/memcache.go index 388be056dc..7e3d4b59e3 100644 --- a/grove/memcache/memcache.go +++ b/grove/memcache/memcache.go @@ -18,10 +18,10 @@ import ( "sync" "sync/atomic" - "github.com/apache/trafficcontrol/grove/cacheobj" - "github.com/apache/trafficcontrol/grove/lru" + "github.com/apache/trafficcontrol/v7/grove/cacheobj" + "github.com/apache/trafficcontrol/v7/grove/lru" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/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 9cfc393ace..7c9748f6c2 100644 --- a/grove/plugin/ats_log.go +++ b/grove/plugin/ats_log.go @@ -19,9 +19,9 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) const NSPerSec = 1000000000 diff --git a/grove/plugin/hello_context.go b/grove/plugin/hello_context.go index 8071a5c6b0..96943e06bd 100644 --- a/grove/plugin/hello_context.go +++ b/grove/plugin/hello_context.go @@ -15,7 +15,7 @@ package plugin */ import ( - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/grove/plugin/hello_world.go b/grove/plugin/hello_world.go index ff3a1f8b92..31f3e6396b 100644 --- a/grove/plugin/hello_world.go +++ b/grove/plugin/hello_world.go @@ -15,7 +15,7 @@ package plugin */ import ( - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/grove/plugin/http_cacheinspector.go b/grove/plugin/http_cacheinspector.go index 39234bb4e6..1cea144c61 100644 --- a/grove/plugin/http_cacheinspector.go +++ b/grove/plugin/http_cacheinspector.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" "code.cloudfoundry.org/bytefmt" ) diff --git a/grove/plugin/http_callgc.go b/grove/plugin/http_callgc.go index d5871dd534..ce2447a8e5 100644 --- a/grove/plugin/http_callgc.go +++ b/grove/plugin/http_callgc.go @@ -20,9 +20,9 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/grove/plugin/http_memstats.go b/grove/plugin/http_memstats.go index 61af745502..b26dc61d65 100644 --- a/grove/plugin/http_memstats.go +++ b/grove/plugin/http_memstats.go @@ -20,9 +20,9 @@ import ( "runtime" "strings" - "github.com/apache/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/grove/plugin/http_stats.go b/grove/plugin/http_stats.go index b698d2ad68..bdb4f35d23 100644 --- a/grove/plugin/http_stats.go +++ b/grove/plugin/http_stats.go @@ -25,10 +25,10 @@ import ( "strings" "unicode" - "github.com/apache/trafficcontrol/grove/stat" - "github.com/apache/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/stat" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/grove/plugin/if_modified_since.go b/grove/plugin/if_modified_since.go index b14ae027f1..15128136e8 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/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) func init() { diff --git a/grove/plugin/modify_headers.go b/grove/plugin/modify_headers.go index e0ae86f842..b327c5f5f0 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/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/grove/plugin/modify_parent_request_headers.go b/grove/plugin/modify_parent_request_headers.go index 4822cdee0e..3e728da878 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/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/grove/plugin/modify_response_headers_global.go b/grove/plugin/modify_response_headers_global.go index bedec392ef..3abdfc8e82 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/trafficcontrol/grove/web" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/grove/plugin/plugin.go b/grove/plugin/plugin.go index d5f113ed78..0fba0fdf6c 100644 --- a/grove/plugin/plugin.go +++ b/grove/plugin/plugin.go @@ -25,12 +25,12 @@ import ( "strings" "time" - "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" + "github.com/apache/trafficcontrol/v7/grove/cachedata" + "github.com/apache/trafficcontrol/v7/grove/cacheobj" + "github.com/apache/trafficcontrol/v7/grove/config" + "github.com/apache/trafficcontrol/v7/grove/remapdata" + "github.com/apache/trafficcontrol/v7/grove/stat" + "github.com/apache/trafficcontrol/v7/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 638f50b845..3af3b5b6c2 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/trafficcontrol/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/grove/web" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) type byteRange struct { diff --git a/grove/remap/remap.go b/grove/remap/remap.go index ed8ab4d5db..585942f58b 100644 --- a/grove/remap/remap.go +++ b/grove/remap/remap.go @@ -25,14 +25,14 @@ import ( "strings" "time" - "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/web" - - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/grove/chash" + "github.com/apache/trafficcontrol/v7/grove/icache" + "github.com/apache/trafficcontrol/v7/grove/plugin" + "github.com/apache/trafficcontrol/v7/grove/remapdata" + "github.com/apache/trafficcontrol/v7/grove/web" + + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) type HTTPRequestRemapper interface { diff --git a/grove/remapdata/remapdata.go b/grove/remapdata/remapdata.go index 873b26eaca..0e1b970e93 100644 --- a/grove/remapdata/remapdata.go +++ b/grove/remapdata/remapdata.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/grove/chash" - "github.com/apache/trafficcontrol/grove/icache" + "github.com/apache/trafficcontrol/v7/grove/chash" + "github.com/apache/trafficcontrol/v7/grove/icache" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // ParentSelectionType is the algorithm to use for selecting parents. diff --git a/grove/stat/stats.go b/grove/stat/stats.go index 360b03017b..72877c4c95 100644 --- a/grove/stat/stats.go +++ b/grove/stat/stats.go @@ -20,12 +20,12 @@ import ( "sync/atomic" "time" - "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/trafficcontrol/v7/grove/cacheobj" + "github.com/apache/trafficcontrol/v7/grove/icache" + "github.com/apache/trafficcontrol/v7/grove/remapdata" + "github.com/apache/trafficcontrol/v7/grove/web" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) type StatsSystem interface { diff --git a/grove/stat/stats_test.go b/grove/stat/stats_test.go index 3eedea5472..ab9178b104 100644 --- a/grove/stat/stats_test.go +++ b/grove/stat/stats_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/grove/remapdata" - "github.com/apache/trafficcontrol/grove/web" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/grove/remapdata" + "github.com/apache/trafficcontrol/v7/grove/web" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" ) func StatsInc(m *web.ConnMap, num int, addrs *[]string) { diff --git a/grove/thread/getter.go b/grove/thread/getter.go index 849fd2bb90..efc6e519be 100644 --- a/grove/thread/getter.go +++ b/grove/thread/getter.go @@ -17,7 +17,7 @@ package thread import ( "sync" - cacheobj "github.com/apache/trafficcontrol/grove/cacheobj" + cacheobj "github.com/apache/trafficcontrol/v7/grove/cacheobj" ) type Getter interface { diff --git a/grove/tiercache/tiercache.go b/grove/tiercache/tiercache.go index ff844ffa32..f02554a3f2 100644 --- a/grove/tiercache/tiercache.go +++ b/grove/tiercache/tiercache.go @@ -15,10 +15,10 @@ package tiercache */ import ( - "github.com/apache/trafficcontrol/grove/cacheobj" - "github.com/apache/trafficcontrol/grove/icache" + "github.com/apache/trafficcontrol/v7/grove/cacheobj" + "github.com/apache/trafficcontrol/v7/grove/icache" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/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/web/connmap.go b/grove/web/connmap.go index 493df83013..7c3889799a 100644 --- a/grove/web/connmap.go +++ b/grove/web/connmap.go @@ -17,7 +17,7 @@ package web import ( "net" "sync" - // "github.com/apache/trafficcontrol/traffic_monitor_golang/common/log" + // "github.com/apache/trafficcontrol/v7/traffic_monitor_golang/common/log" ) type ConnMap struct { diff --git a/grove/web/listener.go b/grove/web/listener.go index ab6cb3a48e..1fa22b41e4 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/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) type InterceptListener struct { diff --git a/grove/web/util.go b/grove/web/util.go index b4f02a2ce2..f8ee5e3875 100644 --- a/grove/web/util.go +++ b/grove/web/util.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) type Hdr struct { diff --git a/infrastructure/cdn-in-a-box/enroller/enroller.go b/infrastructure/cdn-in-a-box/enroller/enroller.go index 7af02ccd9d..6ceb8c8630 100644 --- a/infrastructure/cdn-in-a-box/enroller/enroller.go +++ b/infrastructure/cdn-in-a-box/enroller/enroller.go @@ -32,9 +32,9 @@ import ( "strings" "time" - log "github.com/apache/trafficcontrol/lib/go-log" - tc "github.com/apache/trafficcontrol/lib/go-tc" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + log "github.com/apache/trafficcontrol/v7/lib/go-log" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" "github.com/fsnotify/fsnotify" "github.com/kelseyhightower/envconfig" diff --git a/lib/go-atscfg/astatsdotconfig.go b/lib/go-atscfg/astatsdotconfig.go index 033a067b56..cc68c10ddc 100644 --- a/lib/go-atscfg/astatsdotconfig.go +++ b/lib/go-atscfg/astatsdotconfig.go @@ -20,7 +20,7 @@ package atscfg */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const AstatsSeparator = "=" diff --git a/lib/go-atscfg/atscfg.go b/lib/go-atscfg/atscfg.go index 8f65096f16..8e22b6a464 100644 --- a/lib/go-atscfg/atscfg.go +++ b/lib/go-atscfg/atscfg.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const InvalidID = -1 diff --git a/lib/go-atscfg/atscfg_test.go b/lib/go-atscfg/atscfg_test.go index 2bc0ee043d..027e774c04 100644 --- a/lib/go-atscfg/atscfg_test.go +++ b/lib/go-atscfg/atscfg_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestGenericHeaderComment(t *testing.T) { diff --git a/lib/go-atscfg/atsdotrules.go b/lib/go-atscfg/atsdotrules.go index 7111d5307e..f9ec61ee61 100644 --- a/lib/go-atscfg/atsdotrules.go +++ b/lib/go-atscfg/atsdotrules.go @@ -22,7 +22,7 @@ package atscfg import ( "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ATSDotRulesFileName = StorageFileName diff --git a/lib/go-atscfg/atsdotrules_test.go b/lib/go-atscfg/atsdotrules_test.go index f88526088d..7decd74985 100644 --- a/lib/go-atscfg/atsdotrules_test.go +++ b/lib/go-atscfg/atsdotrules_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestMakeATSDotRules(t *testing.T) { diff --git a/lib/go-atscfg/cachedotconfig.go b/lib/go-atscfg/cachedotconfig.go index e18a37f1ba..79aca7669b 100644 --- a/lib/go-atscfg/cachedotconfig.go +++ b/lib/go-atscfg/cachedotconfig.go @@ -24,7 +24,7 @@ import ( "sort" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ContentTypeCacheDotConfig = ContentTypeTextASCII diff --git a/lib/go-atscfg/cachedotconfig_test.go b/lib/go-atscfg/cachedotconfig_test.go index 88f6e9793d..821d14743a 100644 --- a/lib/go-atscfg/cachedotconfig_test.go +++ b/lib/go-atscfg/cachedotconfig_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeCacheDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/chkconfig.go b/lib/go-atscfg/chkconfig.go index 55086850fa..0492471740 100644 --- a/lib/go-atscfg/chkconfig.go +++ b/lib/go-atscfg/chkconfig.go @@ -23,7 +23,7 @@ import ( "encoding/json" "sort" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ChkconfigFileName = `chkconfig` diff --git a/lib/go-atscfg/chkconfig_test.go b/lib/go-atscfg/chkconfig_test.go index 05df9ddf0f..2b41404925 100644 --- a/lib/go-atscfg/chkconfig_test.go +++ b/lib/go-atscfg/chkconfig_test.go @@ -23,7 +23,7 @@ import ( "encoding/json" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestMakeChkconfig(t *testing.T) { diff --git a/lib/go-atscfg/dropqstringdotconfig.go b/lib/go-atscfg/dropqstringdotconfig.go index cdeec72168..7508b86bc7 100644 --- a/lib/go-atscfg/dropqstringdotconfig.go +++ b/lib/go-atscfg/dropqstringdotconfig.go @@ -20,7 +20,7 @@ package atscfg */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const DropQStringDotConfigFileName = "drop_qstring.config" diff --git a/lib/go-atscfg/dropqstringdotconfig_test.go b/lib/go-atscfg/dropqstringdotconfig_test.go index 93eee53743..e467eef977 100644 --- a/lib/go-atscfg/dropqstringdotconfig_test.go +++ b/lib/go-atscfg/dropqstringdotconfig_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestMakeDropQStringDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/headerrewritedotconfig.go b/lib/go-atscfg/headerrewritedotconfig.go index cf1cb6e05c..a161b035c3 100644 --- a/lib/go-atscfg/headerrewritedotconfig.go +++ b/lib/go-atscfg/headerrewritedotconfig.go @@ -27,7 +27,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const HeaderRewritePrefix = "hdr_rw_" diff --git a/lib/go-atscfg/headerrewritedotconfig_test.go b/lib/go-atscfg/headerrewritedotconfig_test.go index f3bea110ac..ee15256a24 100644 --- a/lib/go-atscfg/headerrewritedotconfig_test.go +++ b/lib/go-atscfg/headerrewritedotconfig_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeHeaderRewriteDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/hostingdotconfig.go b/lib/go-atscfg/hostingdotconfig.go index 01dcc525cd..da8e3b0f90 100644 --- a/lib/go-atscfg/hostingdotconfig.go +++ b/lib/go-atscfg/hostingdotconfig.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const HostingConfigFileName = `hosting.config` diff --git a/lib/go-atscfg/hostingdotconfig_test.go b/lib/go-atscfg/hostingdotconfig_test.go index c55f69a9a1..a3be69d631 100644 --- a/lib/go-atscfg/hostingdotconfig_test.go +++ b/lib/go-atscfg/hostingdotconfig_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeHostingDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/ipallowdotconfig.go b/lib/go-atscfg/ipallowdotconfig.go index c87cf47cc4..535b7a9b4c 100644 --- a/lib/go-atscfg/ipallowdotconfig.go +++ b/lib/go-atscfg/ipallowdotconfig.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) const IPAllowConfigFileName = `ip_allow.config` diff --git a/lib/go-atscfg/ipallowdotconfig_test.go b/lib/go-atscfg/ipallowdotconfig_test.go index 4f77330dc5..910cc0c18f 100644 --- a/lib/go-atscfg/ipallowdotconfig_test.go +++ b/lib/go-atscfg/ipallowdotconfig_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeIPAllowDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/ipallowdotyaml.go b/lib/go-atscfg/ipallowdotyaml.go index 386fcbe9ed..771a4b031b 100644 --- a/lib/go-atscfg/ipallowdotyaml.go +++ b/lib/go-atscfg/ipallowdotyaml.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) const IPAllowYamlFileName = `ip_allow.yaml` diff --git a/lib/go-atscfg/ipallowdotyaml_test.go b/lib/go-atscfg/ipallowdotyaml_test.go index 32c29cb131..4d0aa07fcc 100644 --- a/lib/go-atscfg/ipallowdotyaml_test.go +++ b/lib/go-atscfg/ipallowdotyaml_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeIPAllowDotYAML(t *testing.T) { diff --git a/lib/go-atscfg/loggingdotconfig.go b/lib/go-atscfg/loggingdotconfig.go index 29f26d29ad..c7f2b80bb9 100644 --- a/lib/go-atscfg/loggingdotconfig.go +++ b/lib/go-atscfg/loggingdotconfig.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const MaxLogObjects = 10 diff --git a/lib/go-atscfg/loggingdotyaml.go b/lib/go-atscfg/loggingdotyaml.go index 07cd0c5dba..ff33f103ef 100644 --- a/lib/go-atscfg/loggingdotyaml.go +++ b/lib/go-atscfg/loggingdotyaml.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const LoggingYAMLFileName = "logging.yaml" diff --git a/lib/go-atscfg/logsdotxml.go b/lib/go-atscfg/logsdotxml.go index af4af4f53f..99257efd9b 100644 --- a/lib/go-atscfg/logsdotxml.go +++ b/lib/go-atscfg/logsdotxml.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const LogsXMLFileName = "logs_xml.config" diff --git a/lib/go-atscfg/meta.go b/lib/go-atscfg/meta.go index b57bf2e8b2..0837d039a2 100644 --- a/lib/go-atscfg/meta.go +++ b/lib/go-atscfg/meta.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) type CfgMeta struct { diff --git a/lib/go-atscfg/meta_test.go b/lib/go-atscfg/meta_test.go index 9d3f0f4313..903a23c227 100644 --- a/lib/go-atscfg/meta_test.go +++ b/lib/go-atscfg/meta_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeMetaConfig(t *testing.T) { diff --git a/lib/go-atscfg/packages.go b/lib/go-atscfg/packages.go index 53c9147acd..c635c5e2ef 100644 --- a/lib/go-atscfg/packages.go +++ b/lib/go-atscfg/packages.go @@ -23,7 +23,7 @@ import ( "encoding/json" "sort" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const PackagesFileName = `packages` diff --git a/lib/go-atscfg/parentdotconfig.go b/lib/go-atscfg/parentdotconfig.go index 8bf91ce338..948c468e47 100644 --- a/lib/go-atscfg/parentdotconfig.go +++ b/lib/go-atscfg/parentdotconfig.go @@ -28,8 +28,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) const ContentTypeParentDotConfig = ContentTypeTextASCII diff --git a/lib/go-atscfg/parentdotconfig_test.go b/lib/go-atscfg/parentdotconfig_test.go index ba061dc1e3..ab3023ee16 100644 --- a/lib/go-atscfg/parentdotconfig_test.go +++ b/lib/go-atscfg/parentdotconfig_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeParentDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/plugindotconfig.go b/lib/go-atscfg/plugindotconfig.go index 989c19f7dc..31ba2d3424 100644 --- a/lib/go-atscfg/plugindotconfig.go +++ b/lib/go-atscfg/plugindotconfig.go @@ -20,7 +20,7 @@ package atscfg */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const PluginSeparator = " " diff --git a/lib/go-atscfg/recordsdotconfig.go b/lib/go-atscfg/recordsdotconfig.go index b9c509ae06..cfb0fe9733 100644 --- a/lib/go-atscfg/recordsdotconfig.go +++ b/lib/go-atscfg/recordsdotconfig.go @@ -23,7 +23,7 @@ import ( "os/exec" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const RecordsSeparator = " " diff --git a/lib/go-atscfg/regexremapdotconfig.go b/lib/go-atscfg/regexremapdotconfig.go index b80cec7c8d..b7d8416caf 100644 --- a/lib/go-atscfg/regexremapdotconfig.go +++ b/lib/go-atscfg/regexremapdotconfig.go @@ -22,7 +22,7 @@ package atscfg import ( "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ContentTypeRegexRemapDotConfig = ContentTypeTextASCII diff --git a/lib/go-atscfg/regexremapdotconfig_test.go b/lib/go-atscfg/regexremapdotconfig_test.go index bd0172db5f..169f170a83 100644 --- a/lib/go-atscfg/regexremapdotconfig_test.go +++ b/lib/go-atscfg/regexremapdotconfig_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeRegexRemapDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/regexrevalidatedotconfig.go b/lib/go-atscfg/regexrevalidatedotconfig.go index 67bb68556a..7344e28ee0 100644 --- a/lib/go-atscfg/regexrevalidatedotconfig.go +++ b/lib/go-atscfg/regexrevalidatedotconfig.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const RegexRemapPrefix = "regex_remap_" diff --git a/lib/go-atscfg/regexrevalidatedotconfig_test.go b/lib/go-atscfg/regexrevalidatedotconfig_test.go index 9715ae7f90..0affa6867e 100644 --- a/lib/go-atscfg/regexrevalidatedotconfig_test.go +++ b/lib/go-atscfg/regexrevalidatedotconfig_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestMakeRegexRevalidateDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/remapdotconfig.go b/lib/go-atscfg/remapdotconfig.go index 2033c13d87..a4731902c6 100644 --- a/lib/go-atscfg/remapdotconfig.go +++ b/lib/go-atscfg/remapdotconfig.go @@ -27,9 +27,9 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/cbroglie/mustache" ) diff --git a/lib/go-atscfg/remapdotconfig_test.go b/lib/go-atscfg/remapdotconfig_test.go index 3fb86c09d0..dff3703e2b 100644 --- a/lib/go-atscfg/remapdotconfig_test.go +++ b/lib/go-atscfg/remapdotconfig_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func makeTestRemapServer() *Server { diff --git a/lib/go-atscfg/servercachedotconfig.go b/lib/go-atscfg/servercachedotconfig.go index 6f5bb39c82..79e3532706 100644 --- a/lib/go-atscfg/servercachedotconfig.go +++ b/lib/go-atscfg/servercachedotconfig.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ServerCacheDotConfigIncludeInactiveDSes = false diff --git a/lib/go-atscfg/servercachedotconfig_test.go b/lib/go-atscfg/servercachedotconfig_test.go index f818dc5ffb..19e9807e2e 100644 --- a/lib/go-atscfg/servercachedotconfig_test.go +++ b/lib/go-atscfg/servercachedotconfig_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeServerCacheDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/serverunknown.go b/lib/go-atscfg/serverunknown.go index 383ebd303e..426db45477 100644 --- a/lib/go-atscfg/serverunknown.go +++ b/lib/go-atscfg/serverunknown.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ContentTypeServerUnknownConfig = ContentTypeTextASCII diff --git a/lib/go-atscfg/snidotyaml.go b/lib/go-atscfg/snidotyaml.go index f8d23ecafe..b0e4dad7fd 100644 --- a/lib/go-atscfg/snidotyaml.go +++ b/lib/go-atscfg/snidotyaml.go @@ -22,7 +22,7 @@ package atscfg import ( "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const SNIDotYAMLFileName = "sni.yaml" diff --git a/lib/go-atscfg/snidotyaml_test.go b/lib/go-atscfg/snidotyaml_test.go index 2f4f11fe2f..c091f008e9 100644 --- a/lib/go-atscfg/snidotyaml_test.go +++ b/lib/go-atscfg/snidotyaml_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeSNIDotYAMLH2(t *testing.T) { diff --git a/lib/go-atscfg/sslmulticertdotconfig.go b/lib/go-atscfg/sslmulticertdotconfig.go index d651ce3fcd..3d4d08ab24 100644 --- a/lib/go-atscfg/sslmulticertdotconfig.go +++ b/lib/go-atscfg/sslmulticertdotconfig.go @@ -23,8 +23,8 @@ import ( "sort" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ContentTypeSSLMultiCertDotConfig = ContentTypeTextASCII diff --git a/lib/go-atscfg/sslmulticertdotconfig_test.go b/lib/go-atscfg/sslmulticertdotconfig_test.go index b2ae17b2f2..cedf1d5a4d 100644 --- a/lib/go-atscfg/sslmulticertdotconfig_test.go +++ b/lib/go-atscfg/sslmulticertdotconfig_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeSSLMultiCertDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/sslservernamedotyaml.go b/lib/go-atscfg/sslservernamedotyaml.go index 0bc68d0d64..4a178803c8 100644 --- a/lib/go-atscfg/sslservernamedotyaml.go +++ b/lib/go-atscfg/sslservernamedotyaml.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ContentTypeYAML = "application/yaml; charset=us-ascii" // Note YAML has no IANA standard mime type. This is one of several common usages, and is likely to be the standardized value. If you're reading this, please check IANA to see if YAML has been added, and change this to the IANA definition if so. Also note we include 'charset=us-ascii' because YAML is commonly UTF-8, but ATS is likely to be unable to handle UTF. diff --git a/lib/go-atscfg/sslservernamedotyaml_test.go b/lib/go-atscfg/sslservernamedotyaml_test.go index 82a114e2da..30d8b242f0 100644 --- a/lib/go-atscfg/sslservernamedotyaml_test.go +++ b/lib/go-atscfg/sslservernamedotyaml_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeSSLServerNameYAML(t *testing.T) { diff --git a/lib/go-atscfg/storagedotconfig.go b/lib/go-atscfg/storagedotconfig.go index 6b5f01e837..77e5f8dd68 100644 --- a/lib/go-atscfg/storagedotconfig.go +++ b/lib/go-atscfg/storagedotconfig.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const StorageFileName = "storage.config" diff --git a/lib/go-atscfg/strategiesdotconfig.go b/lib/go-atscfg/strategiesdotconfig.go index a9d82775c9..9e7ca63b09 100644 --- a/lib/go-atscfg/strategiesdotconfig.go +++ b/lib/go-atscfg/strategiesdotconfig.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - // "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + // "github.com/apache/trafficcontrol/v7/lib/go-util" ) const ContentTypeStrategiesDotYAML = ContentTypeYAML diff --git a/lib/go-atscfg/strategiesdotconfig_test.go b/lib/go-atscfg/strategiesdotconfig_test.go index 9c0e3a5e36..0f0ad8109b 100644 --- a/lib/go-atscfg/strategiesdotconfig_test.go +++ b/lib/go-atscfg/strategiesdotconfig_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestMakeStrategiesDotConfig(t *testing.T) { diff --git a/lib/go-atscfg/sysctldotconf.go b/lib/go-atscfg/sysctldotconf.go index 40e56732fb..8ac553a1e2 100644 --- a/lib/go-atscfg/sysctldotconf.go +++ b/lib/go-atscfg/sysctldotconf.go @@ -20,7 +20,7 @@ package atscfg */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const SysctlSeparator = " = " diff --git a/lib/go-atscfg/urisigningconfig.go b/lib/go-atscfg/urisigningconfig.go index 3566b0f5e4..a637308583 100644 --- a/lib/go-atscfg/urisigningconfig.go +++ b/lib/go-atscfg/urisigningconfig.go @@ -22,7 +22,7 @@ package atscfg import ( "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ContentTypeURISigningDotConfig = `application/json; charset=us-ascii` diff --git a/lib/go-atscfg/urisigningconfig_test.go b/lib/go-atscfg/urisigningconfig_test.go index 260e92baa4..4072d34cf5 100644 --- a/lib/go-atscfg/urisigningconfig_test.go +++ b/lib/go-atscfg/urisigningconfig_test.go @@ -22,7 +22,7 @@ package atscfg import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestMakeURISigningConfig(t *testing.T) { diff --git a/lib/go-atscfg/urlsigconfig.go b/lib/go-atscfg/urlsigconfig.go index 12759a149e..17594d4dc3 100644 --- a/lib/go-atscfg/urlsigconfig.go +++ b/lib/go-atscfg/urlsigconfig.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ContentTypeURLSig = ContentTypeTextASCII diff --git a/lib/go-atscfg/urlsigconfig_test.go b/lib/go-atscfg/urlsigconfig_test.go index 1347a8d03f..e23528711a 100644 --- a/lib/go-atscfg/urlsigconfig_test.go +++ b/lib/go-atscfg/urlsigconfig_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestMakeURLSigConfig(t *testing.T) { diff --git a/lib/go-atscfg/volumedotconfig.go b/lib/go-atscfg/volumedotconfig.go index 4f68956dc7..9f62ff5774 100644 --- a/lib/go-atscfg/volumedotconfig.go +++ b/lib/go-atscfg/volumedotconfig.go @@ -22,7 +22,7 @@ package atscfg import ( "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const VolumeFileName = StorageFileName diff --git a/lib/go-llog/llog.go b/lib/go-llog/llog.go index cc72135004..2cd41ad792 100644 --- a/lib/go-llog/llog.go +++ b/lib/go-llog/llog.go @@ -97,9 +97,9 @@ func Nop() Log { return &loggers{} } // errLog := log.New(os.Stdout, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile) // mylib.MyFunc(liblog.New(errLog, nil, nil, nil), myArg) // -// github.com/apache/trafficcontrol/lib/go-log example: +// github.com/apache/trafficcontrol/v7/lib/go-log example: // -// import("github.com/apache/trafficcontrol/lib/go-log") +// import("github.com/apache/trafficcontrol/v7/lib/go-log") // // log.Init(nil, os.Stderr, os.Stderr, nil, nil) // diff --git a/lib/go-log/log.go b/lib/go-log/log.go index 314783116e..9aadaabde8 100644 --- a/lib/go-log/log.go +++ b/lib/go-log/log.go @@ -27,7 +27,7 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/lib/go-llog" + "github.com/apache/trafficcontrol/v7/lib/go-llog" ) var ( diff --git a/lib/go-rfc/http.go b/lib/go-rfc/http.go index ffa2876e9a..ad4013b8e3 100644 --- a/lib/go-rfc/http.go +++ b/lib/go-rfc/http.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // These are the names of HTTP Headers, for convenience and so that typos are diff --git a/lib/go-tc/acme_account.go b/lib/go-tc/acme_account.go index e2a46c9b2e..a34f8543bf 100644 --- a/lib/go-tc/acme_account.go +++ b/lib/go-tc/acme_account.go @@ -22,8 +22,8 @@ package tc import ( "database/sql" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" diff --git a/lib/go-tc/cachegroups.go b/lib/go-tc/cachegroups.go index baf01a57f2..f9bb095095 100644 --- a/lib/go-tc/cachegroups.go +++ b/lib/go-tc/cachegroups.go @@ -22,7 +22,7 @@ package tc import ( "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // CacheGroupsResponse is a list of CacheGroups as a response. diff --git a/lib/go-tc/cdn_notification.go b/lib/go-tc/cdn_notification.go index f922e81360..39d2b8990f 100644 --- a/lib/go-tc/cdn_notification.go +++ b/lib/go-tc/cdn_notification.go @@ -23,8 +23,8 @@ import ( "database/sql" "time" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/go-ozzo/ozzo-validation" ) diff --git a/lib/go-tc/cdns_dnssec.go b/lib/go-tc/cdns_dnssec.go index bf67a9f28b..326cf909b2 100644 --- a/lib/go-tc/cdns_dnssec.go +++ b/lib/go-tc/cdns_dnssec.go @@ -20,8 +20,8 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" ) @@ -107,7 +107,7 @@ type DNSSECKey struct { // A DNSSECKeyV11 represents a DNSSEC Key (Key-Signing or Zone-Signing) as it // appeared in Traffic Ops API version 1.1. This structure still exists because // it is used by modern structures, but in general should not be used on its -// own, and github.com/apache/trafficcontrol/lib/go-tc.DNSSECKey should usually +// own, and github.com/apache/trafficcontrol/v7/lib/go-tc.DNSSECKey should usually // be used instead. type DNSSECKeyV11 struct { InceptionDateUnix int64 `json:"inceptionDate"` @@ -188,7 +188,7 @@ type CDNDNSSECGenerateReq struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (r CDNDNSSECGenerateReq) Validate(tx *sql.Tx) error { validateErrs := validation.Errors{ diff --git a/lib/go-tc/deliveryservice_requests.go b/lib/go-tc/deliveryservice_requests.go index f335769256..71c1fd48ab 100644 --- a/lib/go-tc/deliveryservice_requests.go +++ b/lib/go-tc/deliveryservice_requests.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" @@ -1212,7 +1212,7 @@ type StatusChangeRequest struct { } // Validate satisfies the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (*StatusChangeRequest) Validate(*sql.Tx) error { return nil diff --git a/lib/go-tc/deliveryservice_requests_test.go b/lib/go-tc/deliveryservice_requests_test.go index b011e715c8..9d82cacaa8 100644 --- a/lib/go-tc/deliveryservice_requests_test.go +++ b/lib/go-tc/deliveryservice_requests_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestStatus(t *testing.T) { diff --git a/lib/go-tc/deliveryservice_servers.go b/lib/go-tc/deliveryservice_servers.go index 2be994a7fe..fe46af6764 100644 --- a/lib/go-tc/deliveryservice_servers.go +++ b/lib/go-tc/deliveryservice_servers.go @@ -18,7 +18,7 @@ package tc import ( "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // DeliveryServiceServerV5 is the struct used to represent a delivery service server, in the latest minor version for diff --git a/lib/go-tc/deliveryservice_ssl_keys.go b/lib/go-tc/deliveryservice_ssl_keys.go index e40173f679..25f647c941 100644 --- a/lib/go-tc/deliveryservice_ssl_keys.go +++ b/lib/go-tc/deliveryservice_ssl_keys.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/lestrrat-go/jwx/jwk" ) @@ -204,7 +204,7 @@ type DeliveryServiceAddSSLKeysReq struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (r *DeliveryServiceAddSSLKeysReq) Validate(tx *sql.Tx) error { r.Sanitize() @@ -237,7 +237,7 @@ type DeliveryServiceGenSSLKeysReq struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (r *DeliveryServiceGenSSLKeysReq) Validate(tx *sql.Tx) error { r.Sanitize() @@ -273,7 +273,7 @@ type DeliveryServiceAcmeSSLKeysReq struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (r *DeliveryServiceAcmeSSLKeysReq) Validate(tx *sql.Tx) error { r.Sanitize() @@ -358,7 +358,7 @@ type CDNGenerateKSKReq struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (r *CDNGenerateKSKReq) Validate(tx *sql.Tx) error { r.Sanitize() diff --git a/lib/go-tc/deliveryservices.go b/lib/go-tc/deliveryservices.go index 103a1ea772..eee8d80fe3 100644 --- a/lib/go-tc/deliveryservices.go +++ b/lib/go-tc/deliveryservices.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // DefaultRoutingName is the Routing Name given to Delivery Services upon @@ -1174,7 +1174,7 @@ type DeliveryServiceSafeUpdateRequest struct { LongDesc1 *string `json:"longDesc1,omitempty"` } -// Validate implements the github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// Validate implements the github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (r *DeliveryServiceSafeUpdateRequest) Validate(*sql.Tx) error { if r.DisplayName == nil { diff --git a/lib/go-tc/deliveryservicesslkeys_test.go b/lib/go-tc/deliveryservicesslkeys_test.go index c39126be89..5746e90cbb 100644 --- a/lib/go-tc/deliveryservicesslkeys_test.go +++ b/lib/go-tc/deliveryservicesslkeys_test.go @@ -23,7 +23,7 @@ import ( "encoding/json" "testing" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // - Perl: 2018-08-21+14:26:06 diff --git a/lib/go-tc/federation.go b/lib/go-tc/federation.go index b565f3fb97..c0d4f1dcde 100644 --- a/lib/go-tc/federation.go +++ b/lib/go-tc/federation.go @@ -26,7 +26,7 @@ import ( "net" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" ) @@ -159,7 +159,7 @@ type ResolverMapping struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (r *ResolverMapping) Validate(tx *sql.Tx) error { errs := []error{} @@ -222,7 +222,7 @@ type FederationDSPost struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (f *FederationDSPost) Validate(tx *sql.Tx) error { return nil @@ -252,7 +252,7 @@ type FederationUserPost struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (f *FederationUserPost) Validate(tx *sql.Tx) error { return validation.ValidateStruct(f, @@ -268,7 +268,7 @@ type DeliveryServiceFederationResolverMapping struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (d *DeliveryServiceFederationResolverMapping) Validate(tx *sql.Tx) error { return d.Mappings.Validate(tx) @@ -281,7 +281,7 @@ type LegacyDeliveryServiceFederationResolverMappingRequest struct { Federations []DeliveryServiceFederationResolverMapping `json:"federations"` } -// Validate implements the github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// Validate implements the github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (req *LegacyDeliveryServiceFederationResolverMappingRequest) Validate(tx *sql.Tx) error { if len(req.Federations) < 1 { @@ -296,7 +296,7 @@ func (req *LegacyDeliveryServiceFederationResolverMappingRequest) Validate(tx *s // only with API versions 1.4 and newer. type DeliveryServiceFederationResolverMappingRequest []DeliveryServiceFederationResolverMapping -// Validate implements the github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// Validate implements the github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (req *DeliveryServiceFederationResolverMappingRequest) Validate(tx *sql.Tx) error { if len(*req) < 1 { diff --git a/lib/go-tc/federation_resolver.go b/lib/go-tc/federation_resolver.go index 2e2f74be06..c0b3dcad88 100644 --- a/lib/go-tc/federation_resolver.go +++ b/lib/go-tc/federation_resolver.go @@ -81,7 +81,7 @@ type FederationResolverResponseV50 struct { Response FederationResolverV5 `json:"response"` } -// Validate implements the github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// Validate implements the github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (fr *FederationResolver) Validate(tx *sql.Tx) error { return validation.ValidateStruct(fr, diff --git a/lib/go-tc/invalidationjobs.go b/lib/go-tc/invalidationjobs.go index f58b3fa5c9..bc1464c040 100644 --- a/lib/go-tc/invalidationjobs.go +++ b/lib/go-tc/invalidationjobs.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" diff --git a/lib/go-tc/invalidationjobs_test.go b/lib/go-tc/invalidationjobs_test.go index 652315ca38..cacb314ed6 100644 --- a/lib/go-tc/invalidationjobs_test.go +++ b/lib/go-tc/invalidationjobs_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestInvalidationJobGetTTL(t *testing.T) { diff --git a/lib/go-tc/log.go b/lib/go-tc/log.go index e11dec1677..81f3cd0015 100644 --- a/lib/go-tc/log.go +++ b/lib/go-tc/log.go @@ -1,7 +1,7 @@ package tc import ( - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" "time" ) diff --git a/lib/go-tc/parameters.go b/lib/go-tc/parameters.go index fc2c60fa48..eb4499a22e 100644 --- a/lib/go-tc/parameters.go +++ b/lib/go-tc/parameters.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/lib/pq" ) @@ -155,7 +155,7 @@ type ProfileParameterByNamePost struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (p *ProfileParameterByNamePost) Validate(tx *sql.Tx) []error { return validateProfileParamPostFields(p.ConfigFile, p.Name, p.Value, p.Secure) @@ -205,7 +205,7 @@ func (pp *ProfileParametersByNamePost) UnmarshalJSON(bts []byte) error { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (pp *ProfileParametersByNamePost) Validate(tx *sql.Tx) error { errs := []error{} @@ -257,7 +257,7 @@ func (pp *PostProfileParam) Sanitize(tx *sql.Tx) { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (pp *PostProfileParam) Validate(tx *sql.Tx) error { pp.Sanitize(tx) @@ -300,7 +300,7 @@ func (pp *PostParamProfile) Sanitize(tx *sql.Tx) { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (pp *PostParamProfile) Validate(tx *sql.Tx) error { pp.Sanitize(tx) diff --git a/lib/go-tc/profiles.go b/lib/go-tc/profiles.go index 73d97c6d17..db2d2e0b32 100644 --- a/lib/go-tc/profiles.go +++ b/lib/go-tc/profiles.go @@ -27,9 +27,9 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" "github.com/lib/pq" @@ -192,7 +192,7 @@ type ProfileImportResponseObj struct { } // Validate validates an profile import request, implementing the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (profileImport *ProfileImportRequest) Validate(tx *sql.Tx) error { diff --git a/lib/go-tc/roles.go b/lib/go-tc/roles.go index b2f5dc5bd2..39d694b3f8 100644 --- a/lib/go-tc/roles.go +++ b/lib/go-tc/roles.go @@ -22,8 +22,8 @@ package tc import ( "time" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/lib/go-tc/roles_test.go b/lib/go-tc/roles_test.go index 878128cc93..34bb986831 100644 --- a/lib/go-tc/roles_test.go +++ b/lib/go-tc/roles_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestDowngrade(t *testing.T) { diff --git a/lib/go-tc/servercheckextensions.go b/lib/go-tc/servercheckextensions.go index 3f2b837ec6..15bb3d3708 100644 --- a/lib/go-tc/servercheckextensions.go +++ b/lib/go-tc/servercheckextensions.go @@ -24,8 +24,8 @@ import ( "errors" "regexp" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/lib/go-tc/serverchecks.go b/lib/go-tc/serverchecks.go index be061c1997..ad6c6a59b5 100644 --- a/lib/go-tc/serverchecks.go +++ b/lib/go-tc/serverchecks.go @@ -24,7 +24,7 @@ import ( "errors" "strings" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // ServerchecksResponse is a list of Serverchecks as a response. @@ -145,7 +145,7 @@ type ServercheckRequestNullable struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidate +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidate // interface. func (scp ServercheckRequestNullable) Validate(tx *sql.Tx) error { errs := []string{} diff --git a/lib/go-tc/servers.go b/lib/go-tc/servers.go index 642c8f5313..4d5bb284eb 100644 --- a/lib/go-tc/servers.go +++ b/lib/go-tc/servers.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // ServersV4Response is the format of a response to a GET request for API v4.x /servers. diff --git a/lib/go-tc/stats_summary.go b/lib/go-tc/stats_summary.go index bee02eba19..c95aeb9a6d 100644 --- a/lib/go-tc/stats_summary.go +++ b/lib/go-tc/stats_summary.go @@ -26,8 +26,8 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" ) @@ -55,7 +55,7 @@ type StatsSummary struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (ss StatsSummary) Validate(tx *sql.Tx) error { errs := tovalidate.ToErrors(validation.Errors{ @@ -204,7 +204,7 @@ type StatsSummaryV50 struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (ss StatsSummaryV5) Validate(tx *sql.Tx) error { errs := tovalidate.ToErrors(validation.Errors{ diff --git a/lib/go-tc/steeringtarget.go b/lib/go-tc/steeringtarget.go index dbc836225b..5c594526ad 100644 --- a/lib/go-tc/steeringtarget.go +++ b/lib/go-tc/steeringtarget.go @@ -24,7 +24,7 @@ import ( "errors" "strings" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // A SteeringTarget is a relationship between a Steering Delivery Service and @@ -56,7 +56,7 @@ type SteeringTargetNullable struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (st SteeringTargetNullable) Validate(tx *sql.Tx) (error, error) { errs := []string{} diff --git a/lib/go-tc/toextension.go b/lib/go-tc/toextension.go index 67447a869c..f6e3edaaec 100644 --- a/lib/go-tc/toextension.go +++ b/lib/go-tc/toextension.go @@ -24,8 +24,8 @@ import ( "errors" "regexp" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/lib/go-tc/totest/asns.go b/lib/go-tc/totest/asns.go index 81e3bdf73f..5bd41d9284 100644 --- a/lib/go-tc/totest/asns.go +++ b/lib/go-tc/totest/asns.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestASNs(t *testing.T, cl *toclient.Session, dat TrafficControl) { diff --git a/lib/go-tc/totest/cachegroup_deliveryservices.go b/lib/go-tc/totest/cachegroup_deliveryservices.go index e5feca9ea2..6f2cdb0595 100644 --- a/lib/go-tc/totest/cachegroup_deliveryservices.go +++ b/lib/go-tc/totest/cachegroup_deliveryservices.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestCachegroupsDeliveryServices(t *testing.T, cl *toclient.Session) { diff --git a/lib/go-tc/totest/cachegroups.go b/lib/go-tc/totest/cachegroups.go index f6d0122f9a..7539440427 100644 --- a/lib/go-tc/totest/cachegroups.go +++ b/lib/go-tc/totest/cachegroups.go @@ -22,9 +22,9 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestCacheGroups(t *testing.T, cl *toclient.Session, dat TrafficControl) { diff --git a/lib/go-tc/totest/cdns.go b/lib/go-tc/totest/cdns.go index f89130eafa..96ea1af36a 100644 --- a/lib/go-tc/totest/cdns.go +++ b/lib/go-tc/totest/cdns.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func GetCDNID(t *testing.T, cl *toclient.Session, cdnName string) func() int { diff --git a/lib/go-tc/totest/coordinates.go b/lib/go-tc/totest/coordinates.go index 195c88a52c..51a986c739 100644 --- a/lib/go-tc/totest/coordinates.go +++ b/lib/go-tc/totest/coordinates.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestCoordinates(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/deliveryservice_regexes.go b/lib/go-tc/totest/deliveryservice_regexes.go index 65a46fe051..96cae9efb6 100644 --- a/lib/go-tc/totest/deliveryservice_regexes.go +++ b/lib/go-tc/totest/deliveryservice_regexes.go @@ -24,9 +24,9 @@ import ( "fmt" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestDeliveryServicesRegexes(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/deliveryservice_request_comments.go b/lib/go-tc/totest/deliveryservice_request_comments.go index 47c13b6e2c..ed60a76074 100644 --- a/lib/go-tc/totest/deliveryservice_request_comments.go +++ b/lib/go-tc/totest/deliveryservice_request_comments.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestDeliveryServiceRequestComments(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/deliveryservice_requests.go b/lib/go-tc/totest/deliveryservice_requests.go index c48dd803b3..b50dde3c83 100644 --- a/lib/go-tc/totest/deliveryservice_requests.go +++ b/lib/go-tc/totest/deliveryservice_requests.go @@ -23,9 +23,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) // this resets the IDs of things attached to a DS, which needs to be done diff --git a/lib/go-tc/totest/deliveryservices.go b/lib/go-tc/totest/deliveryservices.go index 36c180ec0c..ba53eb7173 100644 --- a/lib/go-tc/totest/deliveryservices.go +++ b/lib/go-tc/totest/deliveryservices.go @@ -23,9 +23,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestDeliveryServices(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/deliveryservices_required_capabilities.go b/lib/go-tc/totest/deliveryservices_required_capabilities.go index 65b4336db8..77a7480e4a 100644 --- a/lib/go-tc/totest/deliveryservices_required_capabilities.go +++ b/lib/go-tc/totest/deliveryservices_required_capabilities.go @@ -22,9 +22,9 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestDeliveryServicesRequiredCapabilities(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/divisions.go b/lib/go-tc/totest/divisions.go index 3c43722a73..949d6b275f 100644 --- a/lib/go-tc/totest/divisions.go +++ b/lib/go-tc/totest/divisions.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestDivisions(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/federation_resolvers.go b/lib/go-tc/totest/federation_resolvers.go index 1b5c17b464..fde66181ad 100644 --- a/lib/go-tc/totest/federation_resolvers.go +++ b/lib/go-tc/totest/federation_resolvers.go @@ -23,9 +23,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestFederationResolvers(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/federation_users.go b/lib/go-tc/totest/federation_users.go index 21961f22a3..c75d5d1d1e 100644 --- a/lib/go-tc/totest/federation_users.go +++ b/lib/go-tc/totest/federation_users.go @@ -22,10 +22,10 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestFederationUsers(t *testing.T, cl *toclient.Session) { diff --git a/lib/go-tc/totest/federations.go b/lib/go-tc/totest/federations.go index 9f90efab36..a5d4cb88bc 100644 --- a/lib/go-tc/totest/federations.go +++ b/lib/go-tc/totest/federations.go @@ -23,9 +23,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) // TODO fix/remove globals diff --git a/lib/go-tc/totest/jobs.go b/lib/go-tc/totest/jobs.go index eef4ad6a4a..a87232b23d 100644 --- a/lib/go-tc/totest/jobs.go +++ b/lib/go-tc/totest/jobs.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestJobs(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/origins.go b/lib/go-tc/totest/origins.go index eb130b6cc0..dd3a6de193 100644 --- a/lib/go-tc/totest/origins.go +++ b/lib/go-tc/totest/origins.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestOrigins(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/parameters.go b/lib/go-tc/totest/parameters.go index 5640070b1e..744039a072 100644 --- a/lib/go-tc/totest/parameters.go +++ b/lib/go-tc/totest/parameters.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestParameters(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/physlocations.go b/lib/go-tc/totest/physlocations.go index 3cfd526030..d41e161df3 100644 --- a/lib/go-tc/totest/physlocations.go +++ b/lib/go-tc/totest/physlocations.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestPhysLocations(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/profile_parameters.go b/lib/go-tc/totest/profile_parameters.go index 72049aa930..d719bd2119 100644 --- a/lib/go-tc/totest/profile_parameters.go +++ b/lib/go-tc/totest/profile_parameters.go @@ -22,9 +22,9 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestProfileParameters(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/profiles.go b/lib/go-tc/totest/profiles.go index a13020ed4a..e3928f8bd7 100644 --- a/lib/go-tc/totest/profiles.go +++ b/lib/go-tc/totest/profiles.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestProfiles(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/regions.go b/lib/go-tc/totest/regions.go index c2b5f1de86..ed66ebb59d 100644 --- a/lib/go-tc/totest/regions.go +++ b/lib/go-tc/totest/regions.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestRegions(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/roles.go b/lib/go-tc/totest/roles.go index 3301a01d33..aee91c9897 100644 --- a/lib/go-tc/totest/roles.go +++ b/lib/go-tc/totest/roles.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestRoles(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/server_capabilities.go b/lib/go-tc/totest/server_capabilities.go index 629cc33070..4c2cdc7f9a 100644 --- a/lib/go-tc/totest/server_capabilities.go +++ b/lib/go-tc/totest/server_capabilities.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestServerCapabilities(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/server_check_extensions.go b/lib/go-tc/totest/server_check_extensions.go index 8a440a7190..4630a1a61a 100644 --- a/lib/go-tc/totest/server_check_extensions.go +++ b/lib/go-tc/totest/server_check_extensions.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestServerCheckExtensions(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/server_checks.go b/lib/go-tc/totest/server_checks.go index 072426eef4..30740b9116 100644 --- a/lib/go-tc/totest/server_checks.go +++ b/lib/go-tc/totest/server_checks.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestServerChecks(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/server_server_capabilities.go b/lib/go-tc/totest/server_server_capabilities.go index 626592f5ee..424a3ad870 100644 --- a/lib/go-tc/totest/server_server_capabilities.go +++ b/lib/go-tc/totest/server_server_capabilities.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestServerServerCapabilities(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/servers.go b/lib/go-tc/totest/servers.go index 31582d062f..5118807368 100644 --- a/lib/go-tc/totest/servers.go +++ b/lib/go-tc/totest/servers.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestServers(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/service_categories.go b/lib/go-tc/totest/service_categories.go index 62606dbdd0..fe641066b0 100644 --- a/lib/go-tc/totest/service_categories.go +++ b/lib/go-tc/totest/service_categories.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestServiceCategories(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/static_dns_entries.go b/lib/go-tc/totest/static_dns_entries.go index 421ddde902..d080b39b9a 100644 --- a/lib/go-tc/totest/static_dns_entries.go +++ b/lib/go-tc/totest/static_dns_entries.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestStaticDNSEntries(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/statuses.go b/lib/go-tc/totest/statuses.go index 59bb74cfe5..d4e7e5eded 100644 --- a/lib/go-tc/totest/statuses.go +++ b/lib/go-tc/totest/statuses.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestStatuses(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/steering_targets.go b/lib/go-tc/totest/steering_targets.go index 5a6fff0576..7ab49ffa93 100644 --- a/lib/go-tc/totest/steering_targets.go +++ b/lib/go-tc/totest/steering_targets.go @@ -22,9 +22,9 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestSteeringTargets(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/tenants.go b/lib/go-tc/totest/tenants.go index f2ab6b4074..8baf026a9e 100644 --- a/lib/go-tc/totest/tenants.go +++ b/lib/go-tc/totest/tenants.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestTenants(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/topologies.go b/lib/go-tc/totest/topologies.go index 9c464b0200..ddaaf581a4 100644 --- a/lib/go-tc/totest/topologies.go +++ b/lib/go-tc/totest/topologies.go @@ -22,8 +22,8 @@ package totest import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestTopologies(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totest/traffic_control.go b/lib/go-tc/totest/traffic_control.go index bd384718ff..d5ce2abb8c 100644 --- a/lib/go-tc/totest/traffic_control.go +++ b/lib/go-tc/totest/traffic_control.go @@ -19,7 +19,7 @@ package totest * under the License. */ -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" // TrafficControl - maps to the tc-fixtures.json file type TrafficControl struct { diff --git a/lib/go-tc/totest/types.go b/lib/go-tc/totest/types.go index df38b22ac8..50ec919dfd 100644 --- a/lib/go-tc/totest/types.go +++ b/lib/go-tc/totest/types.go @@ -24,8 +24,8 @@ import ( "fmt" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestTypes(t *testing.T, cl *toclient.Session, td TrafficControl, db *sql.DB) { diff --git a/lib/go-tc/totest/users.go b/lib/go-tc/totest/users.go index 8b7786c420..57a93dc216 100644 --- a/lib/go-tc/totest/users.go +++ b/lib/go-tc/totest/users.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func CreateTestUsers(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/asns.go b/lib/go-tc/totestv4/asns.go index 88804bb3a8..edbe04d759 100644 --- a/lib/go-tc/totestv4/asns.go +++ b/lib/go-tc/totestv4/asns.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestASNs(t *testing.T, cl *toclient.Session, dat TrafficControl) { diff --git a/lib/go-tc/totestv4/cachegroup_deliveryservices.go b/lib/go-tc/totestv4/cachegroup_deliveryservices.go index 244dce9c4d..bb6773f1b8 100644 --- a/lib/go-tc/totestv4/cachegroup_deliveryservices.go +++ b/lib/go-tc/totestv4/cachegroup_deliveryservices.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestCachegroupsDeliveryServices(t *testing.T, cl *toclient.Session) { diff --git a/lib/go-tc/totestv4/cachegroups.go b/lib/go-tc/totestv4/cachegroups.go index 336d175426..aa92aaaee5 100644 --- a/lib/go-tc/totestv4/cachegroups.go +++ b/lib/go-tc/totestv4/cachegroups.go @@ -22,9 +22,9 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestCacheGroups(t *testing.T, cl *toclient.Session, dat TrafficControl) { diff --git a/lib/go-tc/totestv4/cdns.go b/lib/go-tc/totestv4/cdns.go index 198f80a427..071c41f735 100644 --- a/lib/go-tc/totestv4/cdns.go +++ b/lib/go-tc/totestv4/cdns.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func GetCDNID(t *testing.T, cl *toclient.Session, cdnName string) func() int { diff --git a/lib/go-tc/totestv4/coordinates.go b/lib/go-tc/totestv4/coordinates.go index 0a2f2a5af7..8a580de475 100644 --- a/lib/go-tc/totestv4/coordinates.go +++ b/lib/go-tc/totestv4/coordinates.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestCoordinates(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/deliveryservice_regexes.go b/lib/go-tc/totestv4/deliveryservice_regexes.go index 0b4ebd8f5c..d1ff96cf59 100644 --- a/lib/go-tc/totestv4/deliveryservice_regexes.go +++ b/lib/go-tc/totestv4/deliveryservice_regexes.go @@ -24,9 +24,9 @@ import ( "fmt" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestDeliveryServicesRegexes(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/deliveryservice_request_comments.go b/lib/go-tc/totestv4/deliveryservice_request_comments.go index a41cf941f5..5521956ee1 100644 --- a/lib/go-tc/totestv4/deliveryservice_request_comments.go +++ b/lib/go-tc/totestv4/deliveryservice_request_comments.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestDeliveryServiceRequestComments(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/deliveryservice_requests.go b/lib/go-tc/totestv4/deliveryservice_requests.go index 546cdb0682..fde4e73351 100644 --- a/lib/go-tc/totestv4/deliveryservice_requests.go +++ b/lib/go-tc/totestv4/deliveryservice_requests.go @@ -23,9 +23,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) // this resets the IDs of things attached to a DS, which needs to be done diff --git a/lib/go-tc/totestv4/deliveryservices.go b/lib/go-tc/totestv4/deliveryservices.go index 8aeaf1f16f..d249e423d9 100644 --- a/lib/go-tc/totestv4/deliveryservices.go +++ b/lib/go-tc/totestv4/deliveryservices.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestDeliveryServices(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/deliveryservices_required_capabilities.go b/lib/go-tc/totestv4/deliveryservices_required_capabilities.go index c6143d72cc..7ee0ec3963 100644 --- a/lib/go-tc/totestv4/deliveryservices_required_capabilities.go +++ b/lib/go-tc/totestv4/deliveryservices_required_capabilities.go @@ -22,9 +22,9 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestDeliveryServicesRequiredCapabilities(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/divisions.go b/lib/go-tc/totestv4/divisions.go index ad090b1d74..c747f7bc2d 100644 --- a/lib/go-tc/totestv4/divisions.go +++ b/lib/go-tc/totestv4/divisions.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestDivisions(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/federation_resolvers.go b/lib/go-tc/totestv4/federation_resolvers.go index 68b972692f..de2e0d7012 100644 --- a/lib/go-tc/totestv4/federation_resolvers.go +++ b/lib/go-tc/totestv4/federation_resolvers.go @@ -23,9 +23,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestFederationResolvers(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/federation_users.go b/lib/go-tc/totestv4/federation_users.go index 738e1b3531..75e079aa27 100644 --- a/lib/go-tc/totestv4/federation_users.go +++ b/lib/go-tc/totestv4/federation_users.go @@ -22,10 +22,10 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestFederationUsers(t *testing.T, cl *toclient.Session) { diff --git a/lib/go-tc/totestv4/federations.go b/lib/go-tc/totestv4/federations.go index 1b1d814dbb..75e1f9b817 100644 --- a/lib/go-tc/totestv4/federations.go +++ b/lib/go-tc/totestv4/federations.go @@ -23,9 +23,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) // TODO fix/remove globals diff --git a/lib/go-tc/totestv4/jobs.go b/lib/go-tc/totestv4/jobs.go index ada443d729..0940268bfc 100644 --- a/lib/go-tc/totestv4/jobs.go +++ b/lib/go-tc/totestv4/jobs.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestJobs(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/origins.go b/lib/go-tc/totestv4/origins.go index 005ae36515..8421678ed4 100644 --- a/lib/go-tc/totestv4/origins.go +++ b/lib/go-tc/totestv4/origins.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestOrigins(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/parameters.go b/lib/go-tc/totestv4/parameters.go index 6bc076424c..b3bb796146 100644 --- a/lib/go-tc/totestv4/parameters.go +++ b/lib/go-tc/totestv4/parameters.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestParameters(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/physlocations.go b/lib/go-tc/totestv4/physlocations.go index a8d6480567..a68d149b5a 100644 --- a/lib/go-tc/totestv4/physlocations.go +++ b/lib/go-tc/totestv4/physlocations.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestPhysLocations(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/profile_parameters.go b/lib/go-tc/totestv4/profile_parameters.go index 16b1aa9864..b6bcfac0ab 100644 --- a/lib/go-tc/totestv4/profile_parameters.go +++ b/lib/go-tc/totestv4/profile_parameters.go @@ -22,9 +22,9 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestProfileParameters(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/profiles.go b/lib/go-tc/totestv4/profiles.go index 43339a3bdf..e4a0a00082 100644 --- a/lib/go-tc/totestv4/profiles.go +++ b/lib/go-tc/totestv4/profiles.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestProfiles(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/regions.go b/lib/go-tc/totestv4/regions.go index 7399d96ced..1ee03661b8 100644 --- a/lib/go-tc/totestv4/regions.go +++ b/lib/go-tc/totestv4/regions.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestRegions(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/roles.go b/lib/go-tc/totestv4/roles.go index 3b40fb2390..6c849bfcb3 100644 --- a/lib/go-tc/totestv4/roles.go +++ b/lib/go-tc/totestv4/roles.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestRoles(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/server_capabilities.go b/lib/go-tc/totestv4/server_capabilities.go index 538aee69c0..3756e6c84a 100644 --- a/lib/go-tc/totestv4/server_capabilities.go +++ b/lib/go-tc/totestv4/server_capabilities.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestServerCapabilities(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/server_check_extensions.go b/lib/go-tc/totestv4/server_check_extensions.go index 1fcb5c209a..bcf5396830 100644 --- a/lib/go-tc/totestv4/server_check_extensions.go +++ b/lib/go-tc/totestv4/server_check_extensions.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestServerCheckExtensions(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/server_checks.go b/lib/go-tc/totestv4/server_checks.go index 99ddf03771..6ec32a74bc 100644 --- a/lib/go-tc/totestv4/server_checks.go +++ b/lib/go-tc/totestv4/server_checks.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestServerChecks(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/server_server_capabilities.go b/lib/go-tc/totestv4/server_server_capabilities.go index 56d1944b5c..2553e72409 100644 --- a/lib/go-tc/totestv4/server_server_capabilities.go +++ b/lib/go-tc/totestv4/server_server_capabilities.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestServerServerCapabilities(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/servers.go b/lib/go-tc/totestv4/servers.go index 34969bb67c..fa347aa461 100644 --- a/lib/go-tc/totestv4/servers.go +++ b/lib/go-tc/totestv4/servers.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestServers(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/service_categories.go b/lib/go-tc/totestv4/service_categories.go index 1ceea17499..d2aedc9b00 100644 --- a/lib/go-tc/totestv4/service_categories.go +++ b/lib/go-tc/totestv4/service_categories.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestServiceCategories(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/static_dns_entries.go b/lib/go-tc/totestv4/static_dns_entries.go index 3d494741fe..ef1ee9f693 100644 --- a/lib/go-tc/totestv4/static_dns_entries.go +++ b/lib/go-tc/totestv4/static_dns_entries.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestStaticDNSEntries(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/statuses.go b/lib/go-tc/totestv4/statuses.go index 1530a7f035..bca45f98fb 100644 --- a/lib/go-tc/totestv4/statuses.go +++ b/lib/go-tc/totestv4/statuses.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestStatuses(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/steering_targets.go b/lib/go-tc/totestv4/steering_targets.go index c963331cab..4b996ea44b 100644 --- a/lib/go-tc/totestv4/steering_targets.go +++ b/lib/go-tc/totestv4/steering_targets.go @@ -22,9 +22,9 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestSteeringTargets(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/tenants.go b/lib/go-tc/totestv4/tenants.go index bafa6942f7..c370ea6876 100644 --- a/lib/go-tc/totestv4/tenants.go +++ b/lib/go-tc/totestv4/tenants.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestTenants(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/topologies.go b/lib/go-tc/totestv4/topologies.go index e5f6245513..5082fd2e5d 100644 --- a/lib/go-tc/totestv4/topologies.go +++ b/lib/go-tc/totestv4/topologies.go @@ -22,8 +22,8 @@ package totestv4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestTopologies(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/totestv4/traffic_control.go b/lib/go-tc/totestv4/traffic_control.go index 0743e06782..6e3bebd503 100644 --- a/lib/go-tc/totestv4/traffic_control.go +++ b/lib/go-tc/totestv4/traffic_control.go @@ -19,7 +19,7 @@ package totestv4 * under the License. */ -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" // TrafficControl - maps to the tc-fixtures.json file type TrafficControl struct { diff --git a/lib/go-tc/totestv4/types.go b/lib/go-tc/totestv4/types.go index 6f6880421f..dc8806529d 100644 --- a/lib/go-tc/totestv4/types.go +++ b/lib/go-tc/totestv4/types.go @@ -24,8 +24,8 @@ import ( "fmt" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestTypes(t *testing.T, cl *toclient.Session, td TrafficControl, db *sql.DB) { diff --git a/lib/go-tc/totestv4/users.go b/lib/go-tc/totestv4/users.go index 50d6195816..3f93f4a68f 100644 --- a/lib/go-tc/totestv4/users.go +++ b/lib/go-tc/totestv4/users.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func CreateTestUsers(t *testing.T, cl *toclient.Session, td TrafficControl) { diff --git a/lib/go-tc/tovalidate/db.go b/lib/go-tc/tovalidate/db.go index b7042c0474..256b2c83c9 100644 --- a/lib/go-tc/tovalidate/db.go +++ b/lib/go-tc/tovalidate/db.go @@ -24,7 +24,7 @@ import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" validation "github.com/go-ozzo/ozzo-validation" "github.com/jmoiron/sqlx" diff --git a/lib/go-tc/traffic_monitor_test.go b/lib/go-tc/traffic_monitor_test.go index 1cd4fb8dfc..f49db51546 100644 --- a/lib/go-tc/traffic_monitor_test.go +++ b/lib/go-tc/traffic_monitor_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func makeFakeStats(text string) map[string][]ResultStatVal { diff --git a/lib/go-tc/traffic_stats.go b/lib/go-tc/traffic_stats.go index 5c92d8b84b..68ef7d3a44 100644 --- a/lib/go-tc/traffic_stats.go +++ b/lib/go-tc/traffic_stats.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" influx "github.com/influxdata/influxdb/client/v2" ) diff --git a/lib/go-tc/users.go b/lib/go-tc/users.go index 6965521002..de6245ef1f 100644 --- a/lib/go-tc/users.go +++ b/lib/go-tc/users.go @@ -26,8 +26,8 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" @@ -558,7 +558,7 @@ type UserRegistrationRequestV40 struct { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (urr *UserRegistrationRequestV4) Validate(tx *sql.Tx) error { var errs = []error{} @@ -580,7 +580,7 @@ func (urr *UserRegistrationRequestV4) Validate(tx *sql.Tx) error { } // Validate implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.ParseValidator +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.ParseValidator // interface. func (urr *UserRegistrationRequest) Validate(tx *sql.Tx) error { var errs = []error{} diff --git a/lib/go-util/net.go b/lib/go-util/net.go index d240eb0394..325d0fd2d6 100644 --- a/lib/go-util/net.go +++ b/lib/go-util/net.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) const BitsPerByte = 8 diff --git a/lib/varnishcfg/access_control.go b/lib/varnishcfg/access_control.go index 204a83fce4..de1d789196 100644 --- a/lib/varnishcfg/access_control.go +++ b/lib/varnishcfg/access_control.go @@ -24,8 +24,8 @@ import ( "net" "strings" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func (v VCLBuilder) configureAccessControl(vclFile *vclFile) ([]string, error) { diff --git a/lib/varnishcfg/access_control_test.go b/lib/varnishcfg/access_control_test.go index 7ae8d9617b..336c5b6fd8 100644 --- a/lib/varnishcfg/access_control_test.go +++ b/lib/varnishcfg/access_control_test.go @@ -24,10 +24,10 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestConfigureAccessControl(t *testing.T) { diff --git a/lib/varnishcfg/backends.go b/lib/varnishcfg/backends.go index 0d31457764..024a30b397 100644 --- a/lib/varnishcfg/backends.go +++ b/lib/varnishcfg/backends.go @@ -23,8 +23,8 @@ import ( "fmt" "strings" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func (v *VCLBuilder) configureDirectors(vclFile *vclFile, parents *atscfg.ParentAbstraction) ([]string, error) { diff --git a/lib/varnishcfg/backends_test.go b/lib/varnishcfg/backends_test.go index 276ef10f40..97406c68d6 100644 --- a/lib/varnishcfg/backends_test.go +++ b/lib/varnishcfg/backends_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" ) func TestAddBackends(t *testing.T) { diff --git a/lib/varnishcfg/cache_control.go b/lib/varnishcfg/cache_control.go index 851c0ff919..e2ceae0fe7 100644 --- a/lib/varnishcfg/cache_control.go +++ b/lib/varnishcfg/cache_control.go @@ -23,8 +23,8 @@ import ( "fmt" "strings" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func (v VCLBuilder) configureUncacheableDSes(vclFile *vclFile, profileDSes []atscfg.ProfileDS) []string { diff --git a/lib/varnishcfg/cache_control_test.go b/lib/varnishcfg/cache_control_test.go index beb57d6cb4..5acaad11b6 100644 --- a/lib/varnishcfg/cache_control_test.go +++ b/lib/varnishcfg/cache_control_test.go @@ -23,9 +23,9 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestConfigureUncacheableDSes(t *testing.T) { diff --git a/lib/varnishcfg/hitch.go b/lib/varnishcfg/hitch.go index 2727feb96e..804f57913f 100644 --- a/lib/varnishcfg/hitch.go +++ b/lib/varnishcfg/hitch.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "github.com/apache/trafficcontrol/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" ) // GetHitchConfig returns Hitch config using TO data diff --git a/lib/varnishcfg/hitch_test.go b/lib/varnishcfg/hitch_test.go index 8cb92bf762..fe8f48917f 100644 --- a/lib/varnishcfg/hitch_test.go +++ b/lib/varnishcfg/hitch_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestGetHitchConfig(t *testing.T) { diff --git a/lib/varnishcfg/vclbuilder.go b/lib/varnishcfg/vclbuilder.go index 480aaa686e..5ff02adee8 100644 --- a/lib/varnishcfg/vclbuilder.go +++ b/lib/varnishcfg/vclbuilder.go @@ -25,8 +25,8 @@ import ( "fmt" "strings" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" ) // VCLBuilder builds the default VCL file using TO data. diff --git a/tc-health-client/config/config.go b/tc-health-client/config/config.go index dc2f00c45e..e767ee9361 100644 --- a/tc-health-client/config/config.go +++ b/tc-health-client/config/config.go @@ -33,9 +33,9 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/cache-config/t3cutil" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/tc-health-client/util" + "github.com/apache/trafficcontrol/v7/cache-config/t3cutil" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/tc-health-client/util" "github.com/pborman/getopt/v2" ) diff --git a/tc-health-client/config/config_test.go b/tc-health-client/config/config_test.go index d5bc18fbee..905c6ae52d 100644 --- a/tc-health-client/config/config_test.go +++ b/tc-health-client/config/config_test.go @@ -24,7 +24,7 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/tc-health-client/util" + "github.com/apache/trafficcontrol/v7/tc-health-client/util" ) const ( diff --git a/tc-health-client/sar/multisar.go b/tc-health-client/sar/multisar.go index df0833440d..2aa83c0868 100644 --- a/tc-health-client/sar/multisar.go +++ b/tc-health-client/sar/multisar.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-llog" + "github.com/apache/trafficcontrol/v7/lib/go-llog" ) type HostPort struct { diff --git a/tc-health-client/sar/sar.go b/tc-health-client/sar/sar.go index b99a62cd7d..c593758d9e 100644 --- a/tc-health-client/sar/sar.go +++ b/tc-health-client/sar/sar.go @@ -30,7 +30,7 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-llog" + "github.com/apache/trafficcontrol/v7/lib/go-llog" ) // SAR calls SARAddr if host is an IP address, or SARHost if host is an FQDN. diff --git a/tc-health-client/tc-health-client.go b/tc-health-client/tc-health-client.go index 5a5a8ccc13..e5761a3868 100644 --- a/tc-health-client/tc-health-client.go +++ b/tc-health-client/tc-health-client.go @@ -30,10 +30,10 @@ import ( "golang.org/x/sys/unix" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/tc-health-client/config" - "github.com/apache/trafficcontrol/tc-health-client/tmagent" - "github.com/apache/trafficcontrol/tc-health-client/util" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/tc-health-client/config" + "github.com/apache/trafficcontrol/v7/tc-health-client/tmagent" + "github.com/apache/trafficcontrol/v7/tc-health-client/util" ) const ( diff --git a/tc-health-client/testing/tests/health-client-main_test.go b/tc-health-client/testing/tests/health-client-main_test.go index 67816372dc..510663ffa2 100644 --- a/tc-health-client/testing/tests/health-client-main_test.go +++ b/tc-health-client/testing/tests/health-client-main_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/config" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc/totest" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/config" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc/totest" ) const cfgFmt = `Using Config values: diff --git a/tc-health-client/testing/tests/health-client-startup_test.go b/tc-health-client/testing/tests/health-client-startup_test.go index 7c05322fe6..79d5137457 100644 --- a/tc-health-client/testing/tests/health-client-startup_test.go +++ b/tc-health-client/testing/tests/health-client-startup_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/cache-config/testing/ort-tests/tcdata" - "github.com/apache/trafficcontrol/tc-health-client/testing/tests/hcutil" - "github.com/apache/trafficcontrol/tc-health-client/tmagent" + "github.com/apache/trafficcontrol/v7/cache-config/testing/ort-tests/tcdata" + "github.com/apache/trafficcontrol/v7/tc-health-client/testing/tests/hcutil" + "github.com/apache/trafficcontrol/v7/tc-health-client/tmagent" ) func startHealthClient() { diff --git a/tc-health-client/tmagent/markdownservice.go b/tc-health-client/tmagent/markdownservice.go index 03cce7d6a8..eab5e022fe 100644 --- a/tc-health-client/tmagent/markdownservice.go +++ b/tc-health-client/tmagent/markdownservice.go @@ -27,10 +27,10 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/tc-health-client/config" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/tc-health-client/config" ) // ParentStatus contains the trafficserver 'HostStatus' fields that diff --git a/tc-health-client/tmagent/parenthealth.go b/tc-health-client/tmagent/parenthealth.go index 87eb462383..8661fd5503 100644 --- a/tc-health-client/tmagent/parenthealth.go +++ b/tc-health-client/tmagent/parenthealth.go @@ -27,9 +27,9 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/tc-health-client/sar" - "github.com/apache/trafficcontrol/tc-health-client/util" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/tc-health-client/sar" + "github.com/apache/trafficcontrol/v7/tc-health-client/util" ) const ParentHealthVersion = "1.0" diff --git a/tc-health-client/tmagent/parenthealthservice.go b/tc-health-client/tmagent/parenthealthservice.go index 0b44988ae9..78ee7fb0e5 100644 --- a/tc-health-client/tmagent/parenthealthservice.go +++ b/tc-health-client/tmagent/parenthealthservice.go @@ -25,8 +25,8 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) type ParentHealthServer struct { diff --git a/tc-health-client/tmagent/parentservicehealth.go b/tc-health-client/tmagent/parentservicehealth.go index 4842eac19a..de114fa744 100644 --- a/tc-health-client/tmagent/parentservicehealth.go +++ b/tc-health-client/tmagent/parentservicehealth.go @@ -28,9 +28,9 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/tc-health-client/config" - "github.com/apache/trafficcontrol/tc-health-client/util" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/tc-health-client/config" + "github.com/apache/trafficcontrol/v7/tc-health-client/util" ) // ParentServiceHealth is the recursive parent health polled from other diff --git a/tc-health-client/tmagent/tmagent.go b/tc-health-client/tmagent/tmagent.go index 277cb03d0b..1d3ea1a57e 100644 --- a/tc-health-client/tmagent/tmagent.go +++ b/tc-health-client/tmagent/tmagent.go @@ -34,11 +34,11 @@ import ( "path/filepath" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/tc-health-client/config" - "github.com/apache/trafficcontrol/tc-health-client/util" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/tc-health-client/config" + "github.com/apache/trafficcontrol/v7/tc-health-client/util" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" "gopkg.in/yaml.v3" ) diff --git a/tc-health-client/tmagent/tmagent_test.go b/tc-health-client/tmagent/tmagent_test.go index aaa93a3f09..106a27842d 100644 --- a/tc-health-client/tmagent/tmagent_test.go +++ b/tc-health-client/tmagent/tmagent_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/apache/trafficcontrol/tc-health-client/config" - "github.com/apache/trafficcontrol/tc-health-client/util" + "github.com/apache/trafficcontrol/v7/tc-health-client/config" + "github.com/apache/trafficcontrol/v7/tc-health-client/util" ) const ( diff --git a/tc-health-client/tmagent/tmhealthservice.go b/tc-health-client/tmagent/tmhealthservice.go index ffe3deb9f2..09c587f04b 100644 --- a/tc-health-client/tmagent/tmhealthservice.go +++ b/tc-health-client/tmagent/tmhealthservice.go @@ -24,10 +24,10 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/tc-health-client/config" - "github.com/apache/trafficcontrol/traffic_monitor/tmclient" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/tc-health-client/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tmclient" ) type TrafficMonitorHealth struct { diff --git a/test/fakeOrigin/fakeOrigin.go b/test/fakeOrigin/fakeOrigin.go index 69026c8f96..1fccf57847 100644 --- a/test/fakeOrigin/fakeOrigin.go +++ b/test/fakeOrigin/fakeOrigin.go @@ -24,9 +24,9 @@ import ( "fmt" "os" - "github.com/apache/trafficcontrol/test/fakeOrigin/endpoint" - "github.com/apache/trafficcontrol/test/fakeOrigin/httpService" - "github.com/apache/trafficcontrol/test/fakeOrigin/transcode" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/endpoint" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/httpService" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/transcode" ) func printUsage() { diff --git a/test/fakeOrigin/httpService/handler.go b/test/fakeOrigin/httpService/handler.go index 801753f802..b96284738d 100644 --- a/test/fakeOrigin/httpService/handler.go +++ b/test/fakeOrigin/httpService/handler.go @@ -32,8 +32,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/test/fakeOrigin/endpoint" - "github.com/apache/trafficcontrol/test/fakeOrigin/m3u8" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/endpoint" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/m3u8" ) type httpEndpoint struct { diff --git a/test/fakeOrigin/httpService/httpService.go b/test/fakeOrigin/httpService/httpService.go index 961f4b3d2a..1a069a5182 100644 --- a/test/fakeOrigin/httpService/httpService.go +++ b/test/fakeOrigin/httpService/httpService.go @@ -35,9 +35,9 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/test/fakeOrigin/dtp" - "github.com/apache/trafficcontrol/test/fakeOrigin/endpoint" - "github.com/apache/trafficcontrol/test/fakeOrigin/transcode" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/dtp" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/endpoint" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/transcode" ) // EndpointRoutes contains the paths of all HTTP routes for a given config "endpoint" diff --git a/test/fakeOrigin/httpService/ssl.keygen.go b/test/fakeOrigin/httpService/ssl.keygen.go index 652f3f76bd..8cf6bd8165 100644 --- a/test/fakeOrigin/httpService/ssl.keygen.go +++ b/test/fakeOrigin/httpService/ssl.keygen.go @@ -23,7 +23,7 @@ import ( "errors" "os" - "github.com/apache/trafficcontrol/test/fakeOrigin/transcode" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/transcode" ) func assertSSLCerts(crtPath, keyPath string) error { diff --git a/test/fakeOrigin/transcode/transcode.go b/test/fakeOrigin/transcode/transcode.go index 57ca4b4c30..86ed3d8eab 100644 --- a/test/fakeOrigin/transcode/transcode.go +++ b/test/fakeOrigin/transcode/transcode.go @@ -34,7 +34,7 @@ import ( "regexp" "time" - "github.com/apache/trafficcontrol/test/fakeOrigin/endpoint" + "github.com/apache/trafficcontrol/v7/test/fakeOrigin/endpoint" ) type TranscodeMeta struct { diff --git a/test/router/client/client.go b/test/router/client/client.go index 6b16367434..ec09ca50d7 100644 --- a/test/router/client/client.go +++ b/test/router/client/client.go @@ -30,7 +30,7 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/test/router/data" + "github.com/apache/trafficcontrol/v7/test/router/data" ) func MustLoadCertificates(cafile string) *x509.CertPool { diff --git a/test/router/dnssec/dnssec_suite_test.go b/test/router/dnssec/dnssec_suite_test.go index 20c3b2378b..79c2602008 100644 --- a/test/router/dnssec/dnssec_suite_test.go +++ b/test/router/dnssec/dnssec_suite_test.go @@ -26,7 +26,7 @@ import ( "flag" "testing" - "github.com/apache/trafficcontrol/test/router/dnssec" + "github.com/apache/trafficcontrol/v7/test/router/dnssec" "github.com/miekg/dns" ) diff --git a/test/router/dnssec/dnssec_test.go b/test/router/dnssec/dnssec_test.go index f5dd3da870..7c4a24f225 100644 --- a/test/router/dnssec/dnssec_test.go +++ b/test/router/dnssec/dnssec_test.go @@ -20,7 +20,7 @@ package dnssec_test */ import ( - "github.com/apache/trafficcontrol/test/router/dnssec" + "github.com/apache/trafficcontrol/v7/test/router/dnssec" "github.com/miekg/dns" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/router/load/load.go b/test/router/load/load.go index 4fd0db53cf..29866d83f0 100644 --- a/test/router/load/load.go +++ b/test/router/load/load.go @@ -24,8 +24,8 @@ import ( "sync" "fmt" - "github.com/apache/trafficcontrol/test/router/client" - "github.com/apache/trafficcontrol/test/router/data" + "github.com/apache/trafficcontrol/v7/test/router/client" + "github.com/apache/trafficcontrol/v7/test/router/data" ) type LoadTest struct { diff --git a/test/router/server/server.go b/test/router/server/server.go index 95c9800923..7a33d81dd9 100644 --- a/test/router/server/server.go +++ b/test/router/server/server.go @@ -28,8 +28,8 @@ import ( "net/http/cookiejar" "net/url" - "github.com/apache/trafficcontrol/test/router/data" - "github.com/apache/trafficcontrol/test/router/load" + "github.com/apache/trafficcontrol/v7/test/router/data" + "github.com/apache/trafficcontrol/v7/test/router/load" ) var done chan struct{} diff --git a/tools/fill_expiration_and_provider/fill_expiration_and_provider.go b/tools/fill_expiration_and_provider/fill_expiration_and_provider.go index f5f49bf333..af6cfc3466 100644 --- a/tools/fill_expiration_and_provider/fill_expiration_and_provider.go +++ b/tools/fill_expiration_and_provider/fill_expiration_and_provider.go @@ -26,8 +26,8 @@ import ( "errors" "flag" "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" "io/ioutil" "os" diff --git a/traffic_monitor/cache/astats-dsnames.go b/traffic_monitor/cache/astats-dsnames.go index f953dabfb4..8ec5fbf99b 100644 --- a/traffic_monitor/cache/astats-dsnames.go +++ b/traffic_monitor/cache/astats-dsnames.go @@ -28,10 +28,10 @@ import ( "fmt" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) func init() { diff --git a/traffic_monitor/cache/astats.go b/traffic_monitor/cache/astats.go index b684c16b24..d62cc8afc3 100644 --- a/traffic_monitor/cache/astats.go +++ b/traffic_monitor/cache/astats.go @@ -36,11 +36,11 @@ import ( "regexp" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" - "github.com/apache/trafficcontrol/traffic_monitor/poller" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/poller" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/cache/astats_csv.go b/traffic_monitor/cache/astats_csv.go index 10317a82dd..689876f994 100644 --- a/traffic_monitor/cache/astats_csv.go +++ b/traffic_monitor/cache/astats_csv.go @@ -27,8 +27,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) type astatsDataCsv struct { diff --git a/traffic_monitor/cache/astats_test.go b/traffic_monitor/cache/astats_test.go index ead6cc3d92..145a8a51c9 100644 --- a/traffic_monitor/cache/astats_test.go +++ b/traffic_monitor/cache/astats_test.go @@ -26,10 +26,10 @@ import ( "os" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/poller" - "github.com/apache/trafficcontrol/traffic_monitor/todata" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/poller" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" ) func TestAstatsJson(t *testing.T) { diff --git a/traffic_monitor/cache/cache.go b/traffic_monitor/cache/cache.go index 013474013b..63f1ac96b8 100644 --- a/traffic_monitor/cache/cache.go +++ b/traffic_monitor/cache/cache.go @@ -25,10 +25,10 @@ import ( "regexp" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) // Handler is a cache handler, which fulfills the common/handler `Handler` interface. diff --git a/traffic_monitor/cache/cache_test.go b/traffic_monitor/cache/cache_test.go index 43b2ad6393..ac5a32dd42 100644 --- a/traffic_monitor/cache/cache_test.go +++ b/traffic_monitor/cache/cache_test.go @@ -26,11 +26,11 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/poller" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/poller" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) func TestHandlerPrecompute(t *testing.T) { diff --git a/traffic_monitor/cache/data.go b/traffic_monitor/cache/data.go index 3afd06e153..69dcea49fc 100644 --- a/traffic_monitor/cache/data.go +++ b/traffic_monitor/cache/data.go @@ -22,7 +22,7 @@ package cache import ( "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // AvailableTuple contains a boolean value to indicate whether IPv4 is diff --git a/traffic_monitor/cache/data_test.go b/traffic_monitor/cache/data_test.go index 640f616232..3b83e7963b 100644 --- a/traffic_monitor/cache/data_test.go +++ b/traffic_monitor/cache/data_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" ) func randAvailableStatuses() AvailableStatuses { diff --git a/traffic_monitor/cache/noop.go b/traffic_monitor/cache/noop.go index e61d85c484..2255f38c2d 100644 --- a/traffic_monitor/cache/noop.go +++ b/traffic_monitor/cache/noop.go @@ -25,7 +25,7 @@ package cache import ( "io" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) func init() { diff --git a/traffic_monitor/cache/stats_over_http.go b/traffic_monitor/cache/stats_over_http.go index 3e1498d242..6221e7fcb7 100644 --- a/traffic_monitor/cache/stats_over_http.go +++ b/traffic_monitor/cache/stats_over_http.go @@ -29,10 +29,10 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_monitor/poller" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/poller" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/cache/stats_over_http_test.go b/traffic_monitor/cache/stats_over_http_test.go index 4230e5fc3f..08d4f4185c 100644 --- a/traffic_monitor/cache/stats_over_http_test.go +++ b/traffic_monitor/cache/stats_over_http_test.go @@ -26,7 +26,7 @@ import ( "os" "testing" - "github.com/apache/trafficcontrol/traffic_monitor/poller" + "github.com/apache/trafficcontrol/v7/traffic_monitor/poller" ) func TestStatsOverHTTPParse(t *testing.T) { diff --git a/traffic_monitor/cache/stats_types.go b/traffic_monitor/cache/stats_types.go index f69accefb8..d4d9611996 100644 --- a/traffic_monitor/cache/stats_types.go +++ b/traffic_monitor/cache/stats_types.go @@ -10,7 +10,7 @@ // format: // // 1. Create a file for your type in the traffic_monitor/cache directory and -// package, `github.com/apache/trafficcontrol/traffic_monitor/cache/` +// package, `github.com/apache/trafficcontrol/v7/traffic_monitor/cache/` // 2. Create Parse and (optionally) Precompute functions in your file, with the // signature of `StatisticsParser` and `StatisticsPrecomputer`, respectively // 3. In your file's special `init` func, call `registerDecoder` with your two @@ -86,7 +86,7 @@ import ( "fmt" "io" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) const DefaultStatsType = "astats" diff --git a/traffic_monitor/cache/vstats.go b/traffic_monitor/cache/vstats.go index c977dedc9c..733a848647 100644 --- a/traffic_monitor/cache/vstats.go +++ b/traffic_monitor/cache/vstats.go @@ -24,8 +24,8 @@ import ( "fmt" "io" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/config/config.go b/traffic_monitor/config/config.go index 7938acc44b..658f70702f 100644 --- a/traffic_monitor/config/config.go +++ b/traffic_monitor/config/config.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/bandwidth.go b/traffic_monitor/datareq/bandwidth.go index ad3bd2babf..04901849e3 100644 --- a/traffic_monitor/datareq/bandwidth.go +++ b/traffic_monitor/datareq/bandwidth.go @@ -22,9 +22,9 @@ package datareq import ( "fmt" - "github.com/apache/trafficcontrol/traffic_monitor/ds" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/ds" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) func srvAPIBandwidthKbps(toData todata.TODataThreadsafe, lastStats threadsafe.LastStats) []byte { diff --git a/traffic_monitor/datareq/bandwidthcapacity.go b/traffic_monitor/datareq/bandwidthcapacity.go index bd70da8021..d9fd0a3ee2 100644 --- a/traffic_monitor/datareq/bandwidthcapacity.go +++ b/traffic_monitor/datareq/bandwidthcapacity.go @@ -22,7 +22,7 @@ package datareq import ( "strconv" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" ) func srvAPIBandwidthCapacityKbps(statMaxKbpses threadsafe.CacheKbpses) []byte { diff --git a/traffic_monitor/datareq/cacheavailablecount.go b/traffic_monitor/datareq/cacheavailablecount.go index 10c7a728bd..fa25b59e39 100644 --- a/traffic_monitor/datareq/cacheavailablecount.go +++ b/traffic_monitor/datareq/cacheavailablecount.go @@ -22,8 +22,8 @@ package datareq import ( "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" ) func srvAPICacheAvailableCount(localStates peer.CRStatesThreadsafe) []byte { diff --git a/traffic_monitor/datareq/cachecount.go b/traffic_monitor/datareq/cachecount.go index 20aadc1555..0ff31a2815 100644 --- a/traffic_monitor/datareq/cachecount.go +++ b/traffic_monitor/datareq/cachecount.go @@ -22,7 +22,7 @@ package datareq import ( "strconv" - "github.com/apache/trafficcontrol/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" ) // TODO determine if this should use peerStates diff --git a/traffic_monitor/datareq/cachedowncount.go b/traffic_monitor/datareq/cachedowncount.go index a86a815394..c5e0d31455 100644 --- a/traffic_monitor/datareq/cachedowncount.go +++ b/traffic_monitor/datareq/cachedowncount.go @@ -22,9 +22,9 @@ package datareq import ( "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" ) func srvAPICacheDownCount(localStates peer.CRStatesThreadsafe, monitorConfig threadsafe.TrafficMonitorConfigMap) []byte { diff --git a/traffic_monitor/datareq/cachestat.go b/traffic_monitor/datareq/cachestat.go index 22c02a2f71..c78f7c18a1 100644 --- a/traffic_monitor/datareq/cachestat.go +++ b/traffic_monitor/datareq/cachestat.go @@ -23,9 +23,9 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) func srvCacheStats(params url.Values, errorCount threadsafe.Uint, path string, toData todata.TODataThreadsafe, diff --git a/traffic_monitor/datareq/cachestate.go b/traffic_monitor/datareq/cachestate.go index 335a698cca..43e956875e 100644 --- a/traffic_monitor/datareq/cachestate.go +++ b/traffic_monitor/datareq/cachestate.go @@ -23,11 +23,11 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/cachestate_test.go b/traffic_monitor/datareq/cachestate_test.go index d70b50e2fc..7ac8380526 100644 --- a/traffic_monitor/datareq/cachestate_test.go +++ b/traffic_monitor/datareq/cachestate_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" ) func TestCreateCacheStatusesForKbps(t *testing.T) { diff --git a/traffic_monitor/datareq/cachestatfilter.go b/traffic_monitor/datareq/cachestatfilter.go index c9eb70241f..0eadd38140 100644 --- a/traffic_monitor/datareq/cachestatfilter.go +++ b/traffic_monitor/datareq/cachestatfilter.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" ) // CacheStatFilter fulfills the cache.Filter interface, for filtering stats. See the `NewCacheStatFilter` documentation for details on which query parameters are used to filter. diff --git a/traffic_monitor/datareq/configdoc.go b/traffic_monitor/datareq/configdoc.go index 3fa930ad56..2482586a0a 100644 --- a/traffic_monitor/datareq/configdoc.go +++ b/traffic_monitor/datareq/configdoc.go @@ -20,7 +20,7 @@ package datareq import ( - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/crconfig.go b/traffic_monitor/datareq/crconfig.go index c5fe485ab1..00dc81de13 100644 --- a/traffic_monitor/datareq/crconfig.go +++ b/traffic_monitor/datareq/crconfig.go @@ -23,8 +23,8 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/towrap" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" ) func srvTRConfig(opsConfig threadsafe.OpsConfig, toSession towrap.TrafficOpsSessionThreadsafe) ([]byte, time.Time, error) { diff --git a/traffic_monitor/datareq/crconfighist.go b/traffic_monitor/datareq/crconfighist.go index 290ca5b813..d6bdd523be 100644 --- a/traffic_monitor/datareq/crconfighist.go +++ b/traffic_monitor/datareq/crconfighist.go @@ -20,7 +20,7 @@ package datareq import ( - "github.com/apache/trafficcontrol/traffic_monitor/towrap" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/crstate.go b/traffic_monitor/datareq/crstate.go index 3c119af696..544f7fe524 100644 --- a/traffic_monitor/datareq/crstate.go +++ b/traffic_monitor/datareq/crstate.go @@ -25,12 +25,12 @@ import ( "net/url" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) func srvTRState( diff --git a/traffic_monitor/datareq/crstate_test.go b/traffic_monitor/datareq/crstate_test.go index 1373774ff5..90f35de608 100644 --- a/traffic_monitor/datareq/crstate_test.go +++ b/traffic_monitor/datareq/crstate_test.go @@ -20,10 +20,10 @@ package datareq import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/todata" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "testing" ) diff --git a/traffic_monitor/datareq/datareq.go b/traffic_monitor/datareq/datareq.go index b7ba5f1cd7..5e058cd89a 100644 --- a/traffic_monitor/datareq/datareq.go +++ b/traffic_monitor/datareq/datareq.go @@ -29,15 +29,15 @@ import ( "time" "unicode" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" - "github.com/apache/trafficcontrol/traffic_monitor/towrap" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" ) // MakeDispatchMap returns the map of paths to http.HandlerFuncs for dispatching. diff --git a/traffic_monitor/datareq/datareq_test.go b/traffic_monitor/datareq/datareq_test.go index a7317a793d..31a633b95d 100644 --- a/traffic_monitor/datareq/datareq_test.go +++ b/traffic_monitor/datareq/datareq_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/dsstat.go b/traffic_monitor/datareq/dsstat.go index 3b5afccdfb..a2677a8c5a 100644 --- a/traffic_monitor/datareq/dsstat.go +++ b/traffic_monitor/datareq/dsstat.go @@ -23,8 +23,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/dsstatfilter.go b/traffic_monitor/datareq/dsstatfilter.go index 60cbc988df..0515d1f319 100644 --- a/traffic_monitor/datareq/dsstatfilter.go +++ b/traffic_monitor/datareq/dsstatfilter.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" ) // DSStatFilter fulfills the cache.Filter interface, for filtering stats. See the `NewDSStatFilter` documentation for details on which query parameters are used to filter. diff --git a/traffic_monitor/datareq/eventlog.go b/traffic_monitor/datareq/eventlog.go index 08860c9b57..79df8bed2f 100644 --- a/traffic_monitor/datareq/eventlog.go +++ b/traffic_monitor/datareq/eventlog.go @@ -20,7 +20,7 @@ package datareq import ( - "github.com/apache/trafficcontrol/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/monitorconfig.go b/traffic_monitor/datareq/monitorconfig.go index 56cc5d3ce1..4dd9b01265 100644 --- a/traffic_monitor/datareq/monitorconfig.go +++ b/traffic_monitor/datareq/monitorconfig.go @@ -20,7 +20,7 @@ package datareq import ( - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/peerstate.go b/traffic_monitor/datareq/peerstate.go index be68120390..06cabe05ca 100644 --- a/traffic_monitor/datareq/peerstate.go +++ b/traffic_monitor/datareq/peerstate.go @@ -24,11 +24,11 @@ import ( "net/url" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/srvhttp" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/srvhttp" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/peerstatefilter.go b/traffic_monitor/datareq/peerstatefilter.go index 68a1a449b7..2635433aad 100644 --- a/traffic_monitor/datareq/peerstatefilter.go +++ b/traffic_monitor/datareq/peerstatefilter.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // PeerStateFilter fulfills the cache.Filter interface, for filtering stats. See the `NewPeerStateFilter` documentation for details on which query parameters are used to filter. diff --git a/traffic_monitor/datareq/stat.go b/traffic_monitor/datareq/stat.go index 31b0b17225..d366a8fc02 100644 --- a/traffic_monitor/datareq/stat.go +++ b/traffic_monitor/datareq/stat.go @@ -25,11 +25,11 @@ import ( "sort" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/statsummary.go b/traffic_monitor/datareq/statsummary.go index 184f93506c..1e42718088 100644 --- a/traffic_monitor/datareq/statsummary.go +++ b/traffic_monitor/datareq/statsummary.go @@ -24,13 +24,13 @@ import ( "net/url" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/srvhttp" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/srvhttp" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/datareq/trafficopsuri.go b/traffic_monitor/datareq/trafficopsuri.go index face7f0907..dd700acca4 100644 --- a/traffic_monitor/datareq/trafficopsuri.go +++ b/traffic_monitor/datareq/trafficopsuri.go @@ -20,7 +20,7 @@ package datareq import ( - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" ) func srvAPITrafficOpsURI(opsConfig threadsafe.OpsConfig) []byte { diff --git a/traffic_monitor/datareq/version.go b/traffic_monitor/datareq/version.go index c285d9da2d..1e98ac2c73 100644 --- a/traffic_monitor/datareq/version.go +++ b/traffic_monitor/datareq/version.go @@ -20,7 +20,7 @@ package datareq import ( - "github.com/apache/trafficcontrol/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" ) func srvAPIVersion(staticAppData config.StaticAppData) []byte { diff --git a/traffic_monitor/ds/stat.go b/traffic_monitor/ds/stat.go index 17bc61351d..00dde05d23 100644 --- a/traffic_monitor/ds/stat.go +++ b/traffic_monitor/ds/stat.go @@ -24,14 +24,14 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) // TODO remove 'ds' and 'stat' from names diff --git a/traffic_monitor/ds/stat_test.go b/traffic_monitor/ds/stat_test.go index 31024cd820..7cdbd9b819 100644 --- a/traffic_monitor/ds/stat_test.go +++ b/traffic_monitor/ds/stat_test.go @@ -28,15 +28,15 @@ import ( "regexp" "testing" - tc_log "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + tc_log "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" ) func checkLogOutput(t *testing.T, buffer *bytes.Buffer, toData todata.TOData, caches []tc.CacheName) { diff --git a/traffic_monitor/dsdata/stat.go b/traffic_monitor/dsdata/stat.go index e38c4566a5..e08185938c 100644 --- a/traffic_monitor/dsdata/stat.go +++ b/traffic_monitor/dsdata/stat.go @@ -26,8 +26,8 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/srvhttp" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/srvhttp" ) // Filter encapsulates functions to filter a given set of Stats, e.g. from HTTP query parameters. diff --git a/traffic_monitor/health/cache.go b/traffic_monitor/health/cache.go index 94489884db..5136d7029b 100644 --- a/traffic_monitor/health/cache.go +++ b/traffic_monitor/health/cache.go @@ -24,14 +24,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) // Used as a dummy value for evaluating threshold stats (which don't use real diff --git a/traffic_monitor/health/cache_test.go b/traffic_monitor/health/cache_test.go index 847d82931a..45e19e246f 100644 --- a/traffic_monitor/health/cache_test.go +++ b/traffic_monitor/health/cache_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TestNoMonitoredInterfacesGetVitals assures that GetVitals diff --git a/traffic_monitor/health/event.go b/traffic_monitor/health/event.go index e6b943a1c2..71ef8d51d3 100644 --- a/traffic_monitor/health/event.go +++ b/traffic_monitor/health/event.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) const ( diff --git a/traffic_monitor/manager/distributedpeer.go b/traffic_monitor/manager/distributedpeer.go index 225732c40e..4c725eb89c 100644 --- a/traffic_monitor/manager/distributedpeer.go +++ b/traffic_monitor/manager/distributedpeer.go @@ -20,10 +20,10 @@ package manager */ import ( - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" ) // StartDistributedPeerManager listens for distributed peer results and updates the localStates diff --git a/traffic_monitor/manager/health.go b/traffic_monitor/manager/health.go index c71fb7cbe6..38f31065c7 100644 --- a/traffic_monitor/manager/health.go +++ b/traffic_monitor/manager/health.go @@ -22,14 +22,14 @@ package manager import ( "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) // StartHealthResultManager starts the goroutine which listens for health results. diff --git a/traffic_monitor/manager/manager.go b/traffic_monitor/manager/manager.go index 2ff954ad84..9a92de1c5c 100644 --- a/traffic_monitor/manager/manager.go +++ b/traffic_monitor/manager/manager.go @@ -28,16 +28,16 @@ import ( "golang.org/x/sys/unix" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/handler" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/poller" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" - "github.com/apache/trafficcontrol/traffic_monitor/towrap" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/handler" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/poller" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" ) // Start starts the poller and handler goroutines diff --git a/traffic_monitor/manager/monitorconfig.go b/traffic_monitor/manager/monitorconfig.go index 93d66091da..e574312298 100644 --- a/traffic_monitor/manager/monitorconfig.go +++ b/traffic_monitor/manager/monitorconfig.go @@ -29,15 +29,15 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/poller" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" - "github.com/apache/trafficcontrol/traffic_monitor/towrap" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/poller" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" ) type PollIntervals struct { diff --git a/traffic_monitor/manager/monitorconfig_test.go b/traffic_monitor/manager/monitorconfig_test.go index 50e95fd4e9..80bfcf897e 100644 --- a/traffic_monitor/manager/monitorconfig_test.go +++ b/traffic_monitor/manager/monitorconfig_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestCreateServerHealthPollURL(t *testing.T) { diff --git a/traffic_monitor/manager/opsconfig.go b/traffic_monitor/manager/opsconfig.go index 227e2dd89e..80f477c15e 100644 --- a/traffic_monitor/manager/opsconfig.go +++ b/traffic_monitor/manager/opsconfig.go @@ -27,17 +27,17 @@ import ( "golang.org/x/sys/unix" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/datareq" - "github.com/apache/trafficcontrol/traffic_monitor/handler" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/srvhttp" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" - "github.com/apache/trafficcontrol/traffic_monitor/towrap" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/datareq" + "github.com/apache/trafficcontrol/v7/traffic_monitor/handler" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/srvhttp" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/manager/peer.go b/traffic_monitor/manager/peer.go index 9c384cc9b4..cb50df3d25 100644 --- a/traffic_monitor/manager/peer.go +++ b/traffic_monitor/manager/peer.go @@ -20,9 +20,9 @@ package manager */ import ( - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" ) // StartPeerManager listens for peer results, and when it gets one, it adds it to the peerStates list, and optimistically combines the good results into combinedStates diff --git a/traffic_monitor/manager/stat.go b/traffic_monitor/manager/stat.go index 509a0b0d7c..72a74ace8e 100644 --- a/traffic_monitor/manager/stat.go +++ b/traffic_monitor/manager/stat.go @@ -24,15 +24,15 @@ import ( "runtime" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/ds" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/threadsafe" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/ds" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/threadsafe" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) func pruneHistory(history []cache.Result, limit uint64) []cache.Result { diff --git a/traffic_monitor/manager/statecombiner.go b/traffic_monitor/manager/statecombiner.go index 4a4fe465bd..1f035c6676 100644 --- a/traffic_monitor/manager/statecombiner.go +++ b/traffic_monitor/manager/statecombiner.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) // StartStateCombiner starts the State Combiner goroutine, and returns the threadsafe CombinedStates, and a func to signal to combine states. diff --git a/traffic_monitor/manager/statecombiner_test.go b/traffic_monitor/manager/statecombiner_test.go index 217069a1c7..0f2ebb2689 100644 --- a/traffic_monitor/manager/statecombiner_test.go +++ b/traffic_monitor/manager/statecombiner_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/health" - "github.com/apache/trafficcontrol/traffic_monitor/peer" - "github.com/apache/trafficcontrol/traffic_monitor/todata" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/health" + "github.com/apache/trafficcontrol/v7/traffic_monitor/peer" + "github.com/apache/trafficcontrol/v7/traffic_monitor/todata" ) func TestCombineCacheState(t *testing.T) { diff --git a/traffic_monitor/peer/crstates.go b/traffic_monitor/peer/crstates.go index c1813896e5..ef9bcab36f 100644 --- a/traffic_monitor/peer/crstates.go +++ b/traffic_monitor/peer/crstates.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const defaultMapCapacity = 8 diff --git a/traffic_monitor/peer/peer.go b/traffic_monitor/peer/peer.go index a07fe818bd..e202b646d4 100644 --- a/traffic_monitor/peer/peer.go +++ b/traffic_monitor/peer/peer.go @@ -23,8 +23,8 @@ import ( "io" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/peer/peer_test.go b/traffic_monitor/peer/peer_test.go index 995493a513..bfd0a11cc0 100644 --- a/traffic_monitor/peer/peer_test.go +++ b/traffic_monitor/peer/peer_test.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestCrStates(t *testing.T) { diff --git a/traffic_monitor/poller/cache.go b/traffic_monitor/poller/cache.go index 01a4cfac77..02cf363c46 100644 --- a/traffic_monitor/poller/cache.go +++ b/traffic_monitor/poller/cache.go @@ -27,9 +27,9 @@ import ( "sync/atomic" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/handler" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/handler" ) type CachePoller struct { diff --git a/traffic_monitor/poller/monitorconfig.go b/traffic_monitor/poller/monitorconfig.go index 5f4f04eafc..36b5e8ad70 100644 --- a/traffic_monitor/poller/monitorconfig.go +++ b/traffic_monitor/poller/monitorconfig.go @@ -23,10 +23,10 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/handler" - "github.com/apache/trafficcontrol/traffic_monitor/towrap" // TODO move to common + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/handler" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" // TODO move to common ) type MonitorCfg struct { diff --git a/traffic_monitor/poller/peer.go b/traffic_monitor/poller/peer.go index 5492fabdcd..ef5fb1798d 100644 --- a/traffic_monitor/poller/peer.go +++ b/traffic_monitor/poller/peer.go @@ -27,9 +27,9 @@ import ( "sync/atomic" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/handler" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/handler" ) type PeerPoller struct { diff --git a/traffic_monitor/poller/poller_type_http.go b/traffic_monitor/poller/poller_type_http.go index 747b9ace72..25a6d817a2 100644 --- a/traffic_monitor/poller/poller_type_http.go +++ b/traffic_monitor/poller/poller_type_http.go @@ -26,8 +26,8 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" ) const PollerTypeHTTP = "http" diff --git a/traffic_monitor/poller/poller_types.go b/traffic_monitor/poller/poller_types.go index 8ecfd8f592..5e1e19b0e1 100644 --- a/traffic_monitor/poller/poller_types.go +++ b/traffic_monitor/poller/poller_types.go @@ -22,7 +22,7 @@ package poller import ( "time" - "github.com/apache/trafficcontrol/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" ) const DefaultPollerType = PollerTypeHTTP diff --git a/traffic_monitor/srvhttp/srvhttp.go b/traffic_monitor/srvhttp/srvhttp.go index ba344a9a3d..1368c37aa1 100644 --- a/traffic_monitor/srvhttp/srvhttp.go +++ b/traffic_monitor/srvhttp/srvhttp.go @@ -30,9 +30,9 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/hydrogen18/stoppableListener" ) diff --git a/traffic_monitor/tests/_integration/config/config.go b/traffic_monitor/tests/_integration/config/config.go index 3a1022012a..a98dcb7f49 100644 --- a/traffic_monitor/tests/_integration/config/config.go +++ b/traffic_monitor/tests/_integration/config/config.go @@ -26,7 +26,7 @@ import ( "os" "reflect" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/kelseyhightower/envconfig" ) diff --git a/traffic_monitor/tests/_integration/kbps_test.go b/traffic_monitor/tests/_integration/kbps_test.go index 410219f679..92e4d8fcf3 100644 --- a/traffic_monitor/tests/_integration/kbps_test.go +++ b/traffic_monitor/tests/_integration/kbps_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestKBPS(t *testing.T) { diff --git a/traffic_monitor/tests/_integration/traffic_monitor_test.go b/traffic_monitor/tests/_integration/traffic_monitor_test.go index 0e11f2133d..707c72f21a 100644 --- a/traffic_monitor/tests/_integration/traffic_monitor_test.go +++ b/traffic_monitor/tests/_integration/traffic_monitor_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_monitor/tests/_integration/config" - "github.com/apache/trafficcontrol/traffic_monitor/tmclient" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tests/_integration/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tmclient" ) var Config config.Config diff --git a/traffic_monitor/threadsafe/cacheavailablestatus.go b/traffic_monitor/threadsafe/cacheavailablestatus.go index 6122628b9b..f1d4e16049 100644 --- a/traffic_monitor/threadsafe/cacheavailablestatus.go +++ b/traffic_monitor/threadsafe/cacheavailablestatus.go @@ -22,7 +22,7 @@ package threadsafe import ( "sync" - "github.com/apache/trafficcontrol/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" ) // CacheAvailableStatus wraps a map of cache available statuses to be safe for diff --git a/traffic_monitor/threadsafe/cachemaxkbpses.go b/traffic_monitor/threadsafe/cachemaxkbpses.go index a750d0ce30..4f38218068 100644 --- a/traffic_monitor/threadsafe/cachemaxkbpses.go +++ b/traffic_monitor/threadsafe/cachemaxkbpses.go @@ -22,7 +22,7 @@ package threadsafe import ( "sync" - "github.com/apache/trafficcontrol/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" ) // CacheKbpses wraps a map of cache kbps measurements to be safe for multiple diff --git a/traffic_monitor/threadsafe/dsstats.go b/traffic_monitor/threadsafe/dsstats.go index f7612e8596..57b7363670 100644 --- a/traffic_monitor/threadsafe/dsstats.go +++ b/traffic_monitor/threadsafe/dsstats.go @@ -22,7 +22,7 @@ package threadsafe import ( "sync" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" ) // DSStats wraps a deliveryservice.Stats object to be safe for multiple reader goroutines and a single writer. diff --git a/traffic_monitor/threadsafe/durationmap.go b/traffic_monitor/threadsafe/durationmap.go index 5709aad512..590a553d85 100644 --- a/traffic_monitor/threadsafe/durationmap.go +++ b/traffic_monitor/threadsafe/durationmap.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // DurationMap wraps a map[tc.CacheName]time.Duration in an object safe for a single writer and multiple readers. diff --git a/traffic_monitor/threadsafe/lastkbpsstats.go b/traffic_monitor/threadsafe/lastkbpsstats.go index 32781b9bd8..ea86cb2435 100644 --- a/traffic_monitor/threadsafe/lastkbpsstats.go +++ b/traffic_monitor/threadsafe/lastkbpsstats.go @@ -22,7 +22,7 @@ package threadsafe import ( "sync" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" ) // LastStats wraps a deliveryservice.LastStats object to be safe for multiple readers and one writer. diff --git a/traffic_monitor/threadsafe/monitorconfig.go b/traffic_monitor/threadsafe/monitorconfig.go index 70ffcaaac9..8c7de98fd6 100644 --- a/traffic_monitor/threadsafe/monitorconfig.go +++ b/traffic_monitor/threadsafe/monitorconfig.go @@ -22,7 +22,7 @@ package threadsafe import ( "sync" - tc "github.com/apache/trafficcontrol/lib/go-tc" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TrafficMonitorConfigMapThreadsafe encapsulates a LegacyTrafficMonitorConfigMap safe for multiple readers and a single writer. diff --git a/traffic_monitor/threadsafe/opsconfig.go b/traffic_monitor/threadsafe/opsconfig.go index e3e60b285b..1889a7e688 100644 --- a/traffic_monitor/threadsafe/opsconfig.go +++ b/traffic_monitor/threadsafe/opsconfig.go @@ -22,7 +22,7 @@ package threadsafe import ( "sync" - "github.com/apache/trafficcontrol/traffic_monitor/handler" + "github.com/apache/trafficcontrol/v7/traffic_monitor/handler" ) // OpsConfig provides safe access for multiple reader goroutines and a single writer to a stored OpsConfig object. diff --git a/traffic_monitor/threadsafe/polledcaches.go b/traffic_monitor/threadsafe/polledcaches.go index c00375bd5a..1975786e36 100644 --- a/traffic_monitor/threadsafe/polledcaches.go +++ b/traffic_monitor/threadsafe/polledcaches.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" ) // UnpolledCaches is a structure containing a map of caches names (which have yet to be polled) to diff --git a/traffic_monitor/threadsafe/resulthistory.go b/traffic_monitor/threadsafe/resulthistory.go index 40ddfb1d2e..fbef687dd1 100644 --- a/traffic_monitor/threadsafe/resulthistory.go +++ b/traffic_monitor/threadsafe/resulthistory.go @@ -22,7 +22,7 @@ package threadsafe import ( "sync" - "github.com/apache/trafficcontrol/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" ) // ResultHistory provides safe access for multiple goroutines readers and a single writer to a stored ResultHistory object. diff --git a/traffic_monitor/threadsafe/resultstathistory.go b/traffic_monitor/threadsafe/resultstathistory.go index 5af8cda88d..e91c68f4b7 100644 --- a/traffic_monitor/threadsafe/resultstathistory.go +++ b/traffic_monitor/threadsafe/resultstathistory.go @@ -28,10 +28,10 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/srvhttp" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/srvhttp" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/threadsafe/resultstathistory_test.go b/traffic_monitor/threadsafe/resultstathistory_test.go index 881fef133b..4a3efa90a3 100644 --- a/traffic_monitor/threadsafe/resultstathistory_test.go +++ b/traffic_monitor/threadsafe/resultstathistory_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/cache" - "github.com/apache/trafficcontrol/traffic_monitor/srvhttp" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/cache" + "github.com/apache/trafficcontrol/v7/traffic_monitor/srvhttp" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/tmcheck/dsstats.go b/traffic_monitor/tmcheck/dsstats.go index 9f5528edc3..8354ae997e 100644 --- a/traffic_monitor/tmcheck/dsstats.go +++ b/traffic_monitor/tmcheck/dsstats.go @@ -23,9 +23,9 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) // ValidateDSStates validates that all Delivery Services in the CRConfig exist in given Traffic Monitor's DSStats. diff --git a/traffic_monitor/tmcheck/offlinestates.go b/traffic_monitor/tmcheck/offlinestates.go index 73f98adfcf..fd4e8e650e 100644 --- a/traffic_monitor/tmcheck/offlinestates.go +++ b/traffic_monitor/tmcheck/offlinestates.go @@ -23,8 +23,8 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) // ValidateOfflineStates validates that no OFFLINE or ADMIN_DOWN caches in the given Traffic Ops' CRConfig are marked Available in the given Traffic Monitor's CRStates. diff --git a/traffic_monitor/tmcheck/peerpoller.go b/traffic_monitor/tmcheck/peerpoller.go index 98a2183785..7d7bce94cf 100644 --- a/traffic_monitor/tmcheck/peerpoller.go +++ b/traffic_monitor/tmcheck/peerpoller.go @@ -21,8 +21,8 @@ package tmcheck import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" "time" ) diff --git a/traffic_monitor/tmcheck/queryinterval.go b/traffic_monitor/tmcheck/queryinterval.go index 30bb5ab5b4..7015618de5 100644 --- a/traffic_monitor/tmcheck/queryinterval.go +++ b/traffic_monitor/tmcheck/queryinterval.go @@ -23,8 +23,8 @@ import ( "fmt" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) const QueryIntervalMax = time.Duration(10) * time.Second diff --git a/traffic_monitor/tmcheck/tmcheck.go b/traffic_monitor/tmcheck/tmcheck.go index 33870e4955..4a6ef8e99e 100644 --- a/traffic_monitor/tmcheck/tmcheck.go +++ b/traffic_monitor/tmcheck/tmcheck.go @@ -27,10 +27,10 @@ import ( "net/url" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/datareq" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/datareq" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/tmclient/tmclient.go b/traffic_monitor/tmclient/tmclient.go index e3ebc6f038..d5ac0ba4ca 100644 --- a/traffic_monitor/tmclient/tmclient.go +++ b/traffic_monitor/tmclient/tmclient.go @@ -29,12 +29,12 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/datareq" - "github.com/apache/trafficcontrol/traffic_monitor/dsdata" - "github.com/apache/trafficcontrol/traffic_monitor/handler" - "github.com/apache/trafficcontrol/traffic_monitor/towrap" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/datareq" + "github.com/apache/trafficcontrol/v7/traffic_monitor/dsdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/handler" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" ) type TMClient struct { diff --git a/traffic_monitor/todata/todata.go b/traffic_monitor/todata/todata.go index f0b6cfd678..178e086c5c 100644 --- a/traffic_monitor/todata/todata.go +++ b/traffic_monitor/todata/todata.go @@ -25,9 +25,9 @@ import ( "strings" "sync" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/towrap" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/towrap" jsoniter "github.com/json-iterator/go" ) diff --git a/traffic_monitor/todata/todata_test.go b/traffic_monitor/todata/todata_test.go index c222d7dac8..471663dfc8 100644 --- a/traffic_monitor/todata/todata_test.go +++ b/traffic_monitor/todata/todata_test.go @@ -20,7 +20,7 @@ package todata */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "reflect" "testing" diff --git a/traffic_monitor/tools/nagios-validate-deliveryservices/nagios-validate-deliveryservices.go b/traffic_monitor/tools/nagios-validate-deliveryservices/nagios-validate-deliveryservices.go index 1c362b0045..47a7668c6d 100644 --- a/traffic_monitor/tools/nagios-validate-deliveryservices/nagios-validate-deliveryservices.go +++ b/traffic_monitor/tools/nagios-validate-deliveryservices/nagios-validate-deliveryservices.go @@ -23,9 +23,9 @@ import ( "flag" "fmt" - "github.com/apache/trafficcontrol/lib/go-nagios" - "github.com/apache/trafficcontrol/traffic_monitor/tmcheck" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-nagios" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tmcheck" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) const UserAgent = "tm-offline-validator/0.1" diff --git a/traffic_monitor/tools/nagios-validate-offline/nagios-validate-offline.go b/traffic_monitor/tools/nagios-validate-offline/nagios-validate-offline.go index d1a4b088cd..305c017970 100644 --- a/traffic_monitor/tools/nagios-validate-offline/nagios-validate-offline.go +++ b/traffic_monitor/tools/nagios-validate-offline/nagios-validate-offline.go @@ -23,9 +23,9 @@ import ( "flag" "fmt" - "github.com/apache/trafficcontrol/lib/go-nagios" - "github.com/apache/trafficcontrol/traffic_monitor/tmcheck" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-nagios" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tmcheck" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) const UserAgent = "tm-offline-validator/0.1" diff --git a/traffic_monitor/tools/nagios-validate-peerpoller/nagios-validate-peerpoller.go b/traffic_monitor/tools/nagios-validate-peerpoller/nagios-validate-peerpoller.go index fb8a4daa54..50a21ede68 100644 --- a/traffic_monitor/tools/nagios-validate-peerpoller/nagios-validate-peerpoller.go +++ b/traffic_monitor/tools/nagios-validate-peerpoller/nagios-validate-peerpoller.go @@ -22,9 +22,9 @@ package main import ( "flag" "fmt" - "github.com/apache/trafficcontrol/lib/go-nagios" - "github.com/apache/trafficcontrol/traffic_monitor/tmcheck" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-nagios" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tmcheck" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) const UserAgent = "tm-peerpoller-validator/0.1" diff --git a/traffic_monitor/tools/nagios-validate-queryinterval/nagios-validate-queryinterval.go b/traffic_monitor/tools/nagios-validate-queryinterval/nagios-validate-queryinterval.go index 5bf1efd063..5d02855a6f 100644 --- a/traffic_monitor/tools/nagios-validate-queryinterval/nagios-validate-queryinterval.go +++ b/traffic_monitor/tools/nagios-validate-queryinterval/nagios-validate-queryinterval.go @@ -22,9 +22,9 @@ package main import ( "flag" "fmt" - "github.com/apache/trafficcontrol/lib/go-nagios" - "github.com/apache/trafficcontrol/traffic_monitor/tmcheck" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-nagios" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tmcheck" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) const UserAgent = "tm-queryinterval-validator/0.1" diff --git a/traffic_monitor/tools/testcaches/fakesrvr/cmd.go b/traffic_monitor/tools/testcaches/fakesrvr/cmd.go index 8e931ff59d..01d9d31814 100644 --- a/traffic_monitor/tools/testcaches/fakesrvr/cmd.go +++ b/traffic_monitor/tools/testcaches/fakesrvr/cmd.go @@ -27,7 +27,7 @@ import ( "sync/atomic" "unsafe" - "github.com/apache/trafficcontrol/traffic_monitor/tools/testcaches/fakesrvrdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tools/testcaches/fakesrvrdata" ) type CmdFunc = func(http.ResponseWriter, *http.Request, fakesrvrdata.Ths) diff --git a/traffic_monitor/tools/testcaches/fakesrvr/fakesrvr.go b/traffic_monitor/tools/testcaches/fakesrvr/fakesrvr.go index a370fe373d..d68e55354e 100644 --- a/traffic_monitor/tools/testcaches/fakesrvr/fakesrvr.go +++ b/traffic_monitor/tools/testcaches/fakesrvr/fakesrvr.go @@ -25,7 +25,7 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/traffic_monitor/tools/testcaches/fakesrvrdata" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tools/testcaches/fakesrvrdata" ) func News(portStart int, numPorts int, remaps []string) ([]*http.Server, error) { diff --git a/traffic_monitor/tools/testcaches/fakesrvr/server.go b/traffic_monitor/tools/testcaches/fakesrvr/server.go index 7ba81d2419..c7d0f590a7 100644 --- a/traffic_monitor/tools/testcaches/fakesrvr/server.go +++ b/traffic_monitor/tools/testcaches/fakesrvr/server.go @@ -30,8 +30,8 @@ import ( "sync/atomic" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_monitor/tools/testcaches/fakesrvrdata" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tools/testcaches/fakesrvrdata" ) // TODO config? diff --git a/traffic_monitor/tools/testcaches/testcaches.go b/traffic_monitor/tools/testcaches/testcaches.go index c989c2f2df..aafbc9db00 100644 --- a/traffic_monitor/tools/testcaches/testcaches.go +++ b/traffic_monitor/tools/testcaches/testcaches.go @@ -25,7 +25,7 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/traffic_monitor/tools/testcaches/fakesrvr" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tools/testcaches/fakesrvr" ) func makeFakeRemaps(n int) []string { diff --git a/traffic_monitor/tools/testto/testto.go b/traffic_monitor/tools/testto/testto.go index 066b4ed472..8a8e88f0a0 100644 --- a/traffic_monitor/tools/testto/testto.go +++ b/traffic_monitor/tools/testto/testto.go @@ -30,8 +30,8 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func main() { diff --git a/traffic_monitor/tools/validator-service/validator-service.go b/traffic_monitor/tools/validator-service/validator-service.go index 9a5cb5b148..da44363adf 100644 --- a/traffic_monitor/tools/validator-service/validator-service.go +++ b/traffic_monitor/tools/validator-service/validator-service.go @@ -24,9 +24,9 @@ package main import ( "flag" "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/tmcheck" - to "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/tmcheck" + to "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" "io" "net/http" "sort" diff --git a/traffic_monitor/towrap/towrap.go b/traffic_monitor/towrap/towrap.go index 9173f5b0bf..429e1b7f85 100644 --- a/traffic_monitor/towrap/towrap.go +++ b/traffic_monitor/towrap/towrap.go @@ -34,11 +34,11 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_monitor/config" - legacyClient "github.com/apache/trafficcontrol/traffic_ops/v4-client" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + legacyClient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" jsoniter "github.com/json-iterator/go" "golang.org/x/net/publicsuffix" diff --git a/traffic_monitor/towrap/towrap_test.go b/traffic_monitor/towrap/towrap_test.go index e8482f37f2..17ffa477fb 100644 --- a/traffic_monitor/towrap/towrap_test.go +++ b/traffic_monitor/towrap/towrap_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" ) func TestTrafficOpsSessionThreadsafeUpdateSetsNonNilSessions(t *testing.T) { diff --git a/traffic_monitor/traffic_monitor.go b/traffic_monitor/traffic_monitor.go index 5d31bc5a88..6c7caf9bae 100644 --- a/traffic_monitor/traffic_monitor.go +++ b/traffic_monitor/traffic_monitor.go @@ -27,9 +27,9 @@ import ( "runtime" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_monitor/config" - "github.com/apache/trafficcontrol/traffic_monitor/manager" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_monitor/config" + "github.com/apache/trafficcontrol/v7/traffic_monitor/manager" ) // GitRevision is the git revision of the app. The app SHOULD always be built with this set via the `-X` flag. diff --git a/traffic_ops/app/bin/checks/DnssecRefresh/ToDnssecRefresh.go b/traffic_ops/app/bin/checks/DnssecRefresh/ToDnssecRefresh.go index 65a65f3744..c32019ce0c 100644 --- a/traffic_ops/app/bin/checks/DnssecRefresh/ToDnssecRefresh.go +++ b/traffic_ops/app/bin/checks/DnssecRefresh/ToDnssecRefresh.go @@ -28,8 +28,8 @@ import ( "os" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/app/bin/checks/DnssecRefresh/config" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/app/bin/checks/DnssecRefresh/config" ) func main() { diff --git a/traffic_ops/app/bin/checks/DnssecRefresh/config/config.go b/traffic_ops/app/bin/checks/DnssecRefresh/config/config.go index 6c5039b1a3..c0ed31efbe 100644 --- a/traffic_ops/app/bin/checks/DnssecRefresh/config/config.go +++ b/traffic_ops/app/bin/checks/DnssecRefresh/config/config.go @@ -28,7 +28,7 @@ import ( "os" "strings" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/pborman/getopt/v2" ) diff --git a/traffic_ops/app/db/admin.go b/traffic_ops/app/db/admin.go index 01529c8eae..c69aebe5b0 100644 --- a/traffic_ops/app/db/admin.go +++ b/traffic_ops/app/db/admin.go @@ -31,7 +31,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database" diff --git a/traffic_ops/app/db/reencrypt/reencrypt.go b/traffic_ops/app/db/reencrypt/reencrypt.go index 2453befdee..35e19b1b4f 100644 --- a/traffic_ops/app/db/reencrypt/reencrypt.go +++ b/traffic_ops/app/db/reencrypt/reencrypt.go @@ -54,7 +54,7 @@ import ( "io/ioutil" "os" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" _ "github.com/lib/pq" diff --git a/traffic_ops/app/db/traffic_vault_migrate/postgres.go b/traffic_ops/app/db/traffic_vault_migrate/postgres.go index 02271d9ad4..414fe6ff9c 100644 --- a/traffic_ops/app/db/traffic_vault_migrate/postgres.go +++ b/traffic_ops/app/db/traffic_vault_migrate/postgres.go @@ -28,9 +28,9 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - util "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + util "github.com/apache/trafficcontrol/v7/lib/go-util" _ "github.com/lib/pq" ) diff --git a/traffic_ops/app/db/traffic_vault_migrate/riak.go b/traffic_ops/app/db/traffic_vault_migrate/riak.go index db20764177..cac55f6a4c 100644 --- a/traffic_ops/app/db/traffic_vault_migrate/riak.go +++ b/traffic_ops/app/db/traffic_vault_migrate/riak.go @@ -29,9 +29,9 @@ import ( "github.com/basho/riak-go-client" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ( diff --git a/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate.go b/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate.go index 561a7bb84c..b190d2c1b8 100644 --- a/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate.go +++ b/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate.go @@ -32,8 +32,8 @@ import ( "github.com/pborman/getopt/v2" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) var ( diff --git a/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate_test.go b/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate_test.go index 7776696f4e..4fe6783896 100644 --- a/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate_test.go +++ b/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/lestrrat-go/jwx/jwk" ) diff --git a/traffic_ops/testing/api/config/config.go b/traffic_ops/testing/api/config/config.go index a439a502ec..2cded9c375 100644 --- a/traffic_ops/testing/api/config/config.go +++ b/traffic_ops/testing/api/config/config.go @@ -28,7 +28,7 @@ import ( "reflect" "strings" - log "github.com/apache/trafficcontrol/lib/go-log" + log "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/kelseyhightower/envconfig" ) diff --git a/traffic_ops/testing/api/utils/utils.go b/traffic_ops/testing/api/utils/utils.go index e022a87264..fa03eb579c 100644 --- a/traffic_ops/testing/api/utils/utils.go +++ b/traffic_ops/testing/api/utils/utils.go @@ -28,12 +28,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - v3client "github.com/apache/trafficcontrol/traffic_ops/v3-client" - v4client "github.com/apache/trafficcontrol/traffic_ops/v4-client" - v5client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + v3client "github.com/apache/trafficcontrol/v7/traffic_ops/v3-client" + v4client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" + v5client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) // FindNeedle searches a "haystack" slice of values for the the "needle" value, diff --git a/traffic_ops/testing/api/v3/about_test.go b/traffic_ops/testing/api/v3/about_test.go index 10b013916e..906f65518c 100644 --- a/traffic_ops/testing/api/v3/about_test.go +++ b/traffic_ops/testing/api/v3/about_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestAbout(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/asns_test.go b/traffic_ops/testing/api/v3/asns_test.go index b18f976322..03742a1701 100644 --- a/traffic_ops/testing/api/v3/asns_test.go +++ b/traffic_ops/testing/api/v3/asns_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestASN(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/cachegroups_parameters_test.go b/traffic_ops/testing/api/v3/cachegroups_parameters_test.go index 4fdba573dc..3f19744ee3 100644 --- a/traffic_ops/testing/api/v3/cachegroups_parameters_test.go +++ b/traffic_ops/testing/api/v3/cachegroups_parameters_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestCacheGroupParameters(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/cachegroups_test.go b/traffic_ops/testing/api/v3/cachegroups_test.go index f20b4c6c0a..76134c48be 100644 --- a/traffic_ops/testing/api/v3/cachegroups_test.go +++ b/traffic_ops/testing/api/v3/cachegroups_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestCacheGroups(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go b/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go index cf248206f4..27e694fa3b 100644 --- a/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go +++ b/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go @@ -21,10 +21,10 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestCacheGroupsDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/capabilities_test.go b/traffic_ops/testing/api/v3/capabilities_test.go index 90f5d8a11a..866fd4a573 100644 --- a/traffic_ops/testing/api/v3/capabilities_test.go +++ b/traffic_ops/testing/api/v3/capabilities_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // These capabilities are defined during the setup process in todb.go. diff --git a/traffic_ops/testing/api/v3/cdn_domains_test.go b/traffic_ops/testing/api/v3/cdn_domains_test.go index d87f01d0af..ed2a2d9975 100644 --- a/traffic_ops/testing/api/v3/cdn_domains_test.go +++ b/traffic_ops/testing/api/v3/cdn_domains_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestCDNDomains(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/cdn_federations_test.go b/traffic_ops/testing/api/v3/cdn_federations_test.go index 64368e6b32..dd143bf5af 100644 --- a/traffic_ops/testing/api/v3/cdn_federations_test.go +++ b/traffic_ops/testing/api/v3/cdn_federations_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) var fedIDs = make(map[string]int) diff --git a/traffic_ops/testing/api/v3/cdns_name_configs_monitoring_test.go b/traffic_ops/testing/api/v3/cdns_name_configs_monitoring_test.go index 8afd5daa12..9ada03ab53 100644 --- a/traffic_ops/testing/api/v3/cdns_name_configs_monitoring_test.go +++ b/traffic_ops/testing/api/v3/cdns_name_configs_monitoring_test.go @@ -21,10 +21,10 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestCDNNameConfigsMonitoring(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/cdns_name_snapshot_new_test.go b/traffic_ops/testing/api/v3/cdns_name_snapshot_new_test.go index 806d22f819..6274b3c401 100644 --- a/traffic_ops/testing/api/v3/cdns_name_snapshot_new_test.go +++ b/traffic_ops/testing/api/v3/cdns_name_snapshot_new_test.go @@ -21,10 +21,10 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) var baselineCRConfig tc.CRConfig diff --git a/traffic_ops/testing/api/v3/cdns_name_snapshot_test.go b/traffic_ops/testing/api/v3/cdns_name_snapshot_test.go index eb1fde46a6..06415bdcb4 100644 --- a/traffic_ops/testing/api/v3/cdns_name_snapshot_test.go +++ b/traffic_ops/testing/api/v3/cdns_name_snapshot_test.go @@ -20,8 +20,8 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestCDNNameSnapshot(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/cdns_test.go b/traffic_ops/testing/api/v3/cdns_test.go index f7ef15eacb..9d102f95f3 100644 --- a/traffic_ops/testing/api/v3/cdns_test.go +++ b/traffic_ops/testing/api/v3/cdns_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestCDNs(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/cookie_test.go b/traffic_ops/testing/api/v3/cookie_test.go index 7bc8f4bc93..7ca826a05c 100644 --- a/traffic_ops/testing/api/v3/cookie_test.go +++ b/traffic_ops/testing/api/v3/cookie_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - toclient "github.com/apache/trafficcontrol/traffic_ops/v3-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v3-client" ) func TestCookies(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/coordinates_test.go b/traffic_ops/testing/api/v3/coordinates_test.go index 12409e7018..fe72c5b0e3 100644 --- a/traffic_ops/testing/api/v3/coordinates_test.go +++ b/traffic_ops/testing/api/v3/coordinates_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestCoordinates(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go b/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go index 8438ba48ab..21d278b9a1 100644 --- a/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go +++ b/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestDeliveryServiceRequestComments(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/deliveryservice_requests_test.go b/traffic_ops/testing/api/v3/deliveryservice_requests_test.go index bf2e0495ec..c74c518fef 100644 --- a/traffic_ops/testing/api/v3/deliveryservice_requests_test.go +++ b/traffic_ops/testing/api/v3/deliveryservice_requests_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestDeliveryServiceRequests(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/deliveryservices_keys_test.go b/traffic_ops/testing/api/v3/deliveryservices_keys_test.go index 72659b3af2..0f923c2102 100644 --- a/traffic_ops/testing/api/v3/deliveryservices_keys_test.go +++ b/traffic_ops/testing/api/v3/deliveryservices_keys_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" ) func TestDeliveryServicesKeys(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go b/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go index 9fabb758e3..25ce05e700 100644 --- a/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go +++ b/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestDeliveryServicesRequiredCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/deliveryservices_test.go b/traffic_ops/testing/api/v3/deliveryservices_test.go index 0eb36876d0..eb9ffef594 100644 --- a/traffic_ops/testing/api/v3/deliveryservices_test.go +++ b/traffic_ops/testing/api/v3/deliveryservices_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/deliveryserviceservers_test.go b/traffic_ops/testing/api/v3/deliveryserviceservers_test.go index afe93e81da..0e59245eda 100644 --- a/traffic_ops/testing/api/v3/deliveryserviceservers_test.go +++ b/traffic_ops/testing/api/v3/deliveryserviceservers_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestDeliveryServiceServers(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go b/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go index 9172cb870d..42f026e1d6 100644 --- a/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go +++ b/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestDeliveryServicesEligible(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go b/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go index 42e6c9bf5c..88ac377d6f 100644 --- a/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go +++ b/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go @@ -22,9 +22,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestDeliveryServicesRegexes(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/divisions_test.go b/traffic_ops/testing/api/v3/divisions_test.go index e4da897c2b..4def18d677 100644 --- a/traffic_ops/testing/api/v3/divisions_test.go +++ b/traffic_ops/testing/api/v3/divisions_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestDivisions(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/federation_deliveryservices_test.go b/traffic_ops/testing/api/v3/federation_deliveryservices_test.go index 383f32857b..0dd7367116 100644 --- a/traffic_ops/testing/api/v3/federation_deliveryservices_test.go +++ b/traffic_ops/testing/api/v3/federation_deliveryservices_test.go @@ -21,10 +21,10 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestFederationsDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/federation_federation_resolvers_test.go b/traffic_ops/testing/api/v3/federation_federation_resolvers_test.go index 005235883f..efc6aab914 100644 --- a/traffic_ops/testing/api/v3/federation_federation_resolvers_test.go +++ b/traffic_ops/testing/api/v3/federation_federation_resolvers_test.go @@ -19,9 +19,9 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestFederationFederationResolvers(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/federation_resolvers_test.go b/traffic_ops/testing/api/v3/federation_resolvers_test.go index f250edbca0..59838ae1c8 100644 --- a/traffic_ops/testing/api/v3/federation_resolvers_test.go +++ b/traffic_ops/testing/api/v3/federation_resolvers_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestFederationResolvers(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/federation_users_test.go b/traffic_ops/testing/api/v3/federation_users_test.go index c3282ec650..40056205f4 100644 --- a/traffic_ops/testing/api/v3/federation_users_test.go +++ b/traffic_ops/testing/api/v3/federation_users_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestFederationUsers(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/federations_test.go b/traffic_ops/testing/api/v3/federations_test.go index 0836ea813d..9960db2198 100644 --- a/traffic_ops/testing/api/v3/federations_test.go +++ b/traffic_ops/testing/api/v3/federations_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestFederations(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/fixtures_test.go b/traffic_ops/testing/api/v3/fixtures_test.go index 42dfec6b0c..6afa9c987f 100644 --- a/traffic_ops/testing/api/v3/fixtures_test.go +++ b/traffic_ops/testing/api/v3/fixtures_test.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "os" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // LoadFixtures ... diff --git a/traffic_ops/testing/api/v3/iso_test.go b/traffic_ops/testing/api/v3/iso_test.go index 50004f6fd9..7049198875 100644 --- a/traffic_ops/testing/api/v3/iso_test.go +++ b/traffic_ops/testing/api/v3/iso_test.go @@ -22,8 +22,8 @@ package v3 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" ) func TestGetOSVersions(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/jobs_test.go b/traffic_ops/testing/api/v3/jobs_test.go index ee368cc64e..03e7edb36e 100644 --- a/traffic_ops/testing/api/v3/jobs_test.go +++ b/traffic_ops/testing/api/v3/jobs_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestJobs(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/loginfail_test.go b/traffic_ops/testing/api/v3/loginfail_test.go index c2bd65cde0..610c507cbc 100644 --- a/traffic_ops/testing/api/v3/loginfail_test.go +++ b/traffic_ops/testing/api/v3/loginfail_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util/assert" - toclient "github.com/apache/trafficcontrol/traffic_ops/v3-client" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v3-client" "golang.org/x/net/publicsuffix" ) diff --git a/traffic_ops/testing/api/v3/logs_test.go b/traffic_ops/testing/api/v3/logs_test.go index e841347f90..72fef7e83d 100644 --- a/traffic_ops/testing/api/v3/logs_test.go +++ b/traffic_ops/testing/api/v3/logs_test.go @@ -21,8 +21,8 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestLogs(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/monitoring_test.go b/traffic_ops/testing/api/v3/monitoring_test.go index a0a73bbfde..685dc61f1a 100644 --- a/traffic_ops/testing/api/v3/monitoring_test.go +++ b/traffic_ops/testing/api/v3/monitoring_test.go @@ -18,7 +18,7 @@ package v3 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestMonitoring(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/origins_test.go b/traffic_ops/testing/api/v3/origins_test.go index a13aea30c1..3577858f19 100644 --- a/traffic_ops/testing/api/v3/origins_test.go +++ b/traffic_ops/testing/api/v3/origins_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestOrigins(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/parameters_test.go b/traffic_ops/testing/api/v3/parameters_test.go index 2066c65211..0d834949f6 100644 --- a/traffic_ops/testing/api/v3/parameters_test.go +++ b/traffic_ops/testing/api/v3/parameters_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestParameters(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/phys_locations_test.go b/traffic_ops/testing/api/v3/phys_locations_test.go index 75479b98e0..0351decff3 100644 --- a/traffic_ops/testing/api/v3/phys_locations_test.go +++ b/traffic_ops/testing/api/v3/phys_locations_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestPhysLocations(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/ping_test.go b/traffic_ops/testing/api/v3/ping_test.go index c7d45370ee..ec1eaa404a 100644 --- a/traffic_ops/testing/api/v3/ping_test.go +++ b/traffic_ops/testing/api/v3/ping_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestPing(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/profile_parameters_test.go b/traffic_ops/testing/api/v3/profile_parameters_test.go index ed44727c0e..8724462c87 100644 --- a/traffic_ops/testing/api/v3/profile_parameters_test.go +++ b/traffic_ops/testing/api/v3/profile_parameters_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) const queryParamFormat = "?profileId=%s¶meterId=%s" diff --git a/traffic_ops/testing/api/v3/profiles_export_test.go b/traffic_ops/testing/api/v3/profiles_export_test.go index c97569a91f..f087903ce0 100644 --- a/traffic_ops/testing/api/v3/profiles_export_test.go +++ b/traffic_ops/testing/api/v3/profiles_export_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestProfilesExport(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/profiles_import_test.go b/traffic_ops/testing/api/v3/profiles_import_test.go index d616f4c473..9b4ef07fda 100644 --- a/traffic_ops/testing/api/v3/profiles_import_test.go +++ b/traffic_ops/testing/api/v3/profiles_import_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestProfilesImport(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/profiles_name_copy_test.go b/traffic_ops/testing/api/v3/profiles_name_copy_test.go index 43e82f6922..fca8a610b0 100644 --- a/traffic_ops/testing/api/v3/profiles_name_copy_test.go +++ b/traffic_ops/testing/api/v3/profiles_name_copy_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestProfilesNameCopy(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/profiles_test.go b/traffic_ops/testing/api/v3/profiles_test.go index 77d69a013f..ebed948cb2 100644 --- a/traffic_ops/testing/api/v3/profiles_test.go +++ b/traffic_ops/testing/api/v3/profiles_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestProfiles(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/regions_test.go b/traffic_ops/testing/api/v3/regions_test.go index 4b99fa8a48..ea7b1b7051 100644 --- a/traffic_ops/testing/api/v3/regions_test.go +++ b/traffic_ops/testing/api/v3/regions_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestRegions(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/roles_test.go b/traffic_ops/testing/api/v3/roles_test.go index fe41c3cc88..3b5fb87af3 100644 --- a/traffic_ops/testing/api/v3/roles_test.go +++ b/traffic_ops/testing/api/v3/roles_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestRoles(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/server_capabilities_test.go b/traffic_ops/testing/api/v3/server_capabilities_test.go index bd28f24d98..9f49765cbc 100644 --- a/traffic_ops/testing/api/v3/server_capabilities_test.go +++ b/traffic_ops/testing/api/v3/server_capabilities_test.go @@ -21,10 +21,10 @@ import ( "sort" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestServerCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/server_server_capabilities_test.go b/traffic_ops/testing/api/v3/server_server_capabilities_test.go index 8c0660372a..49eb871672 100644 --- a/traffic_ops/testing/api/v3/server_server_capabilities_test.go +++ b/traffic_ops/testing/api/v3/server_server_capabilities_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestServerServerCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/servercheckextension_test.go b/traffic_ops/testing/api/v3/servercheckextension_test.go index ef6dffd931..aab949fc6d 100644 --- a/traffic_ops/testing/api/v3/servercheckextension_test.go +++ b/traffic_ops/testing/api/v3/servercheckextension_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) var ( diff --git a/traffic_ops/testing/api/v3/serverchecks_test.go b/traffic_ops/testing/api/v3/serverchecks_test.go index f60731d37b..c7ae1c7e75 100644 --- a/traffic_ops/testing/api/v3/serverchecks_test.go +++ b/traffic_ops/testing/api/v3/serverchecks_test.go @@ -19,11 +19,11 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestServerChecks(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/servers_hostname_update_status_test.go b/traffic_ops/testing/api/v3/servers_hostname_update_status_test.go index ee298f087a..08b29a2bbf 100644 --- a/traffic_ops/testing/api/v3/servers_hostname_update_status_test.go +++ b/traffic_ops/testing/api/v3/servers_hostname_update_status_test.go @@ -20,8 +20,8 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" ) func TestServersHostnameUpdateStatus(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/servers_id_deliveryservices_test.go b/traffic_ops/testing/api/v3/servers_id_deliveryservices_test.go index 267cf989c9..7f9a97d38b 100644 --- a/traffic_ops/testing/api/v3/servers_id_deliveryservices_test.go +++ b/traffic_ops/testing/api/v3/servers_id_deliveryservices_test.go @@ -19,11 +19,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestServersIDDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/servers_id_queue_update_test.go b/traffic_ops/testing/api/v3/servers_id_queue_update_test.go index bafc1ade00..763bdec1e6 100644 --- a/traffic_ops/testing/api/v3/servers_id_queue_update_test.go +++ b/traffic_ops/testing/api/v3/servers_id_queue_update_test.go @@ -19,11 +19,11 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestServersIDQueueUpdate(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/servers_id_status_test.go b/traffic_ops/testing/api/v3/servers_id_status_test.go index b6e2b6c543..da90914d9f 100644 --- a/traffic_ops/testing/api/v3/servers_id_status_test.go +++ b/traffic_ops/testing/api/v3/servers_id_status_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestServersIDStatus(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/servers_test.go b/traffic_ops/testing/api/v3/servers_test.go index a35b280392..37b49bbc2a 100644 --- a/traffic_ops/testing/api/v3/servers_test.go +++ b/traffic_ops/testing/api/v3/servers_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestServers(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/servicecategories_test.go b/traffic_ops/testing/api/v3/servicecategories_test.go index 417e48b9c0..f049018958 100644 --- a/traffic_ops/testing/api/v3/servicecategories_test.go +++ b/traffic_ops/testing/api/v3/servicecategories_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestServiceCategories(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/session_test.go b/traffic_ops/testing/api/v3/session_test.go index f10c9cb819..39a4f2e6bf 100644 --- a/traffic_ops/testing/api/v3/session_test.go +++ b/traffic_ops/testing/api/v3/session_test.go @@ -18,7 +18,7 @@ package v3 import ( "time" - "github.com/apache/trafficcontrol/traffic_ops/v3-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/v3-client" _ "github.com/lib/pq" ) diff --git a/traffic_ops/testing/api/v3/snapshot_test.go b/traffic_ops/testing/api/v3/snapshot_test.go index 31a222c0cf..2eee8cfb61 100644 --- a/traffic_ops/testing/api/v3/snapshot_test.go +++ b/traffic_ops/testing/api/v3/snapshot_test.go @@ -22,10 +22,10 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestSnapshot(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/staticdnsentries_test.go b/traffic_ops/testing/api/v3/staticdnsentries_test.go index 8aa7df25d6..46eb1de045 100644 --- a/traffic_ops/testing/api/v3/staticdnsentries_test.go +++ b/traffic_ops/testing/api/v3/staticdnsentries_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestStaticDNSEntries(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/stats_summary_test.go b/traffic_ops/testing/api/v3/stats_summary_test.go index 17634b47cd..06adf00e4d 100644 --- a/traffic_ops/testing/api/v3/stats_summary_test.go +++ b/traffic_ops/testing/api/v3/stats_summary_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) var latestTime time.Time diff --git a/traffic_ops/testing/api/v3/statuses_test.go b/traffic_ops/testing/api/v3/statuses_test.go index 938890388c..0f2caeec66 100644 --- a/traffic_ops/testing/api/v3/statuses_test.go +++ b/traffic_ops/testing/api/v3/statuses_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestStatuses(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/steering_test.go b/traffic_ops/testing/api/v3/steering_test.go index a15ad1a20c..e26b23a6e5 100644 --- a/traffic_ops/testing/api/v3/steering_test.go +++ b/traffic_ops/testing/api/v3/steering_test.go @@ -19,10 +19,10 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestSteering(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/steeringtargets_test.go b/traffic_ops/testing/api/v3/steeringtargets_test.go index 03bb41067c..132b1c6885 100644 --- a/traffic_ops/testing/api/v3/steeringtargets_test.go +++ b/traffic_ops/testing/api/v3/steeringtargets_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestSteeringTargets(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/tenants_test.go b/traffic_ops/testing/api/v3/tenants_test.go index 134f2aca1f..5e19b7166a 100644 --- a/traffic_ops/testing/api/v3/tenants_test.go +++ b/traffic_ops/testing/api/v3/tenants_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestTenants(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/todb_test.go b/traffic_ops/testing/api/v3/todb_test.go index 123e94fa25..258be9b375 100644 --- a/traffic_ops/testing/api/v3/todb_test.go +++ b/traffic_ops/testing/api/v3/todb_test.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" ) var ( diff --git a/traffic_ops/testing/api/v3/topologies_queue_update_test.go b/traffic_ops/testing/api/v3/topologies_queue_update_test.go index fec1e183af..bc6ade1918 100644 --- a/traffic_ops/testing/api/v3/topologies_queue_update_test.go +++ b/traffic_ops/testing/api/v3/topologies_queue_update_test.go @@ -25,10 +25,10 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestTopologiesQueueUpdate(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/topologies_test.go b/traffic_ops/testing/api/v3/topologies_test.go index be6dc85c30..e37d21929b 100644 --- a/traffic_ops/testing/api/v3/topologies_test.go +++ b/traffic_ops/testing/api/v3/topologies_test.go @@ -24,10 +24,10 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestTopologies(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/traffic_control_test.go b/traffic_ops/testing/api/v3/traffic_control_test.go index 5249466685..068ad81d60 100644 --- a/traffic_ops/testing/api/v3/traffic_control_test.go +++ b/traffic_ops/testing/api/v3/traffic_control_test.go @@ -16,7 +16,7 @@ package v3 import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TrafficControl - maps to the tc-fixtures.json file diff --git a/traffic_ops/testing/api/v3/traffic_ops_test.go b/traffic_ops/testing/api/v3/traffic_ops_test.go index 5412de39e0..3089a55dae 100644 --- a/traffic_ops/testing/api/v3/traffic_ops_test.go +++ b/traffic_ops/testing/api/v3/traffic_ops_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/config" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/config" _ "github.com/lib/pq" ) diff --git a/traffic_ops/testing/api/v3/types_test.go b/traffic_ops/testing/api/v3/types_test.go index 3d0752097a..d6f2ef57a5 100644 --- a/traffic_ops/testing/api/v3/types_test.go +++ b/traffic_ops/testing/api/v3/types_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestTypes(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/user_current_test.go b/traffic_ops/testing/api/v3/user_current_test.go index 3496b510ff..cbada9422b 100644 --- a/traffic_ops/testing/api/v3/user_current_test.go +++ b/traffic_ops/testing/api/v3/user_current_test.go @@ -19,10 +19,10 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestUserCurrent(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/users_register_test.go b/traffic_ops/testing/api/v3/users_register_test.go index 8c4cff29c5..d281b3c469 100644 --- a/traffic_ops/testing/api/v3/users_register_test.go +++ b/traffic_ops/testing/api/v3/users_register_test.go @@ -19,11 +19,11 @@ import ( "net/mail" "testing" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestUsersRegister(t *testing.T) { diff --git a/traffic_ops/testing/api/v3/users_test.go b/traffic_ops/testing/api/v3/users_test.go index fd0acfe591..bad8f53f5c 100644 --- a/traffic_ops/testing/api/v3/users_test.go +++ b/traffic_ops/testing/api/v3/users_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func TestUsers(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/about_test.go b/traffic_ops/testing/api/v4/about_test.go index c30f0bf7fc..17df55776f 100644 --- a/traffic_ops/testing/api/v4/about_test.go +++ b/traffic_ops/testing/api/v4/about_test.go @@ -19,9 +19,9 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestAbout(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/acme_test.go b/traffic_ops/testing/api/v4/acme_test.go index 339b246341..e6ad14dc6f 100644 --- a/traffic_ops/testing/api/v4/acme_test.go +++ b/traffic_ops/testing/api/v4/acme_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestAcmeAutoRenew(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/asns_test.go b/traffic_ops/testing/api/v4/asns_test.go index 889f0853e6..84ae847680 100644 --- a/traffic_ops/testing/api/v4/asns_test.go +++ b/traffic_ops/testing/api/v4/asns_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestASN(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cachegroups_test.go b/traffic_ops/testing/api/v4/cachegroups_test.go index 7fe486baed..fe3efd5df5 100644 --- a/traffic_ops/testing/api/v4/cachegroups_test.go +++ b/traffic_ops/testing/api/v4/cachegroups_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCacheGroups(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cachegroupsdeliveryservices_test.go b/traffic_ops/testing/api/v4/cachegroupsdeliveryservices_test.go index db8626e458..22eff0098f 100644 --- a/traffic_ops/testing/api/v4/cachegroupsdeliveryservices_test.go +++ b/traffic_ops/testing/api/v4/cachegroupsdeliveryservices_test.go @@ -19,12 +19,12 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCacheGroupsDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdn_dnsseckeys_test.go b/traffic_ops/testing/api/v4/cdn_dnsseckeys_test.go index 5c0872658a..1bf0d08e93 100644 --- a/traffic_ops/testing/api/v4/cdn_dnsseckeys_test.go +++ b/traffic_ops/testing/api/v4/cdn_dnsseckeys_test.go @@ -22,10 +22,10 @@ import ( "strings" "testing" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNsDNSSEC(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdn_domains_test.go b/traffic_ops/testing/api/v4/cdn_domains_test.go index 24e3cf2ff2..30c38dac15 100644 --- a/traffic_ops/testing/api/v4/cdn_domains_test.go +++ b/traffic_ops/testing/api/v4/cdn_domains_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNDomains(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdn_federations_test.go b/traffic_ops/testing/api/v4/cdn_federations_test.go index 312f8d210e..2726d8a319 100644 --- a/traffic_ops/testing/api/v4/cdn_federations_test.go +++ b/traffic_ops/testing/api/v4/cdn_federations_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNFederations(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdn_locks_test.go b/traffic_ops/testing/api/v4/cdn_locks_test.go index 36e1da8485..208a6a6524 100644 --- a/traffic_ops/testing/api/v4/cdn_locks_test.go +++ b/traffic_ops/testing/api/v4/cdn_locks_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNLocks(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdn_queue_updates_test.go b/traffic_ops/testing/api/v4/cdn_queue_updates_test.go index 17abdcd6de..b4a5024feb 100644 --- a/traffic_ops/testing/api/v4/cdn_queue_updates_test.go +++ b/traffic_ops/testing/api/v4/cdn_queue_updates_test.go @@ -21,12 +21,12 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNQueueUpdates(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdnnotifications_test.go b/traffic_ops/testing/api/v4/cdnnotifications_test.go index a5ff944a3b..721c082155 100644 --- a/traffic_ops/testing/api/v4/cdnnotifications_test.go +++ b/traffic_ops/testing/api/v4/cdnnotifications_test.go @@ -21,11 +21,11 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNNotifications(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdns_name_configs_monitoring_test.go b/traffic_ops/testing/api/v4/cdns_name_configs_monitoring_test.go index 29854de2d1..9d36f2d3a4 100644 --- a/traffic_ops/testing/api/v4/cdns_name_configs_monitoring_test.go +++ b/traffic_ops/testing/api/v4/cdns_name_configs_monitoring_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNNameConfigsMonitoring(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdns_name_snapshot_new_test.go b/traffic_ops/testing/api/v4/cdns_name_snapshot_new_test.go index 3a993388ee..e79634fe3a 100644 --- a/traffic_ops/testing/api/v4/cdns_name_snapshot_new_test.go +++ b/traffic_ops/testing/api/v4/cdns_name_snapshot_new_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) var baselineCRConfig tc.CRConfig diff --git a/traffic_ops/testing/api/v4/cdns_name_snapshot_test.go b/traffic_ops/testing/api/v4/cdns_name_snapshot_test.go index 71e218aeb4..3a38c3f355 100644 --- a/traffic_ops/testing/api/v4/cdns_name_snapshot_test.go +++ b/traffic_ops/testing/api/v4/cdns_name_snapshot_test.go @@ -20,8 +20,8 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNNameSnapshot(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cdns_test.go b/traffic_ops/testing/api/v4/cdns_test.go index 9b48cdec96..d534748519 100644 --- a/traffic_ops/testing/api/v4/cdns_test.go +++ b/traffic_ops/testing/api/v4/cdns_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCDNs(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/cookie_test.go b/traffic_ops/testing/api/v4/cookie_test.go index 19a11c48d0..47a2c8a40b 100644 --- a/traffic_ops/testing/api/v4/cookie_test.go +++ b/traffic_ops/testing/api/v4/cookie_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCookies(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/coordinates_test.go b/traffic_ops/testing/api/v4/coordinates_test.go index c66cf2455a..45015a12da 100644 --- a/traffic_ops/testing/api/v4/coordinates_test.go +++ b/traffic_ops/testing/api/v4/coordinates_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestCoordinates(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/deliveryservice_request_comments_test.go b/traffic_ops/testing/api/v4/deliveryservice_request_comments_test.go index e6003628cc..03e7c92cb8 100644 --- a/traffic_ops/testing/api/v4/deliveryservice_request_comments_test.go +++ b/traffic_ops/testing/api/v4/deliveryservice_request_comments_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDeliveryServiceRequestComments(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/deliveryservice_requests_test.go b/traffic_ops/testing/api/v4/deliveryservice_requests_test.go index 55a01974f3..907652520c 100644 --- a/traffic_ops/testing/api/v4/deliveryservice_requests_test.go +++ b/traffic_ops/testing/api/v4/deliveryservice_requests_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDeliveryServiceRequests(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/deliveryservices_keys_test.go b/traffic_ops/testing/api/v4/deliveryservices_keys_test.go index a668a0bac0..3003e09cec 100644 --- a/traffic_ops/testing/api/v4/deliveryservices_keys_test.go +++ b/traffic_ops/testing/api/v4/deliveryservices_keys_test.go @@ -18,11 +18,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDeliveryServicesKeys(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/deliveryservices_required_capabilities_test.go b/traffic_ops/testing/api/v4/deliveryservices_required_capabilities_test.go index ddf131f565..4a9282b064 100644 --- a/traffic_ops/testing/api/v4/deliveryservices_required_capabilities_test.go +++ b/traffic_ops/testing/api/v4/deliveryservices_required_capabilities_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDeliveryServicesRequiredCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/deliveryservices_test.go b/traffic_ops/testing/api/v4/deliveryservices_test.go index cd79d2b4d7..c97c420641 100644 --- a/traffic_ops/testing/api/v4/deliveryservices_test.go +++ b/traffic_ops/testing/api/v4/deliveryservices_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/deliveryserviceservers_test.go b/traffic_ops/testing/api/v4/deliveryserviceservers_test.go index 553b024142..1c5331606b 100644 --- a/traffic_ops/testing/api/v4/deliveryserviceservers_test.go +++ b/traffic_ops/testing/api/v4/deliveryserviceservers_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDeliveryServiceServers(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/deliveryservicesideligible_test.go b/traffic_ops/testing/api/v4/deliveryservicesideligible_test.go index 07ce984a19..87154a8668 100644 --- a/traffic_ops/testing/api/v4/deliveryservicesideligible_test.go +++ b/traffic_ops/testing/api/v4/deliveryservicesideligible_test.go @@ -19,9 +19,9 @@ import ( "net/http" "testing" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDeliveryServicesEligible(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/deliveryservicesregexes_test.go b/traffic_ops/testing/api/v4/deliveryservicesregexes_test.go index d3632a7fab..3754d786c3 100644 --- a/traffic_ops/testing/api/v4/deliveryservicesregexes_test.go +++ b/traffic_ops/testing/api/v4/deliveryservicesregexes_test.go @@ -21,11 +21,11 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDeliveryServicesRegexes(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/divisions_test.go b/traffic_ops/testing/api/v4/divisions_test.go index eb02aa4cff..920a317a7c 100644 --- a/traffic_ops/testing/api/v4/divisions_test.go +++ b/traffic_ops/testing/api/v4/divisions_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestDivisions(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/federation_deliveryservices_test.go b/traffic_ops/testing/api/v4/federation_deliveryservices_test.go index 7b8f7df8c0..fffbb9b90d 100644 --- a/traffic_ops/testing/api/v4/federation_deliveryservices_test.go +++ b/traffic_ops/testing/api/v4/federation_deliveryservices_test.go @@ -22,13 +22,13 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestFederationsDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/federation_federation_resolvers_test.go b/traffic_ops/testing/api/v4/federation_federation_resolvers_test.go index 24cc7ce513..efdd0642f7 100644 --- a/traffic_ops/testing/api/v4/federation_federation_resolvers_test.go +++ b/traffic_ops/testing/api/v4/federation_federation_resolvers_test.go @@ -19,11 +19,11 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestFederationFederationResolvers(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/federation_resolvers_test.go b/traffic_ops/testing/api/v4/federation_resolvers_test.go index a9023beef3..d17951f0b9 100644 --- a/traffic_ops/testing/api/v4/federation_resolvers_test.go +++ b/traffic_ops/testing/api/v4/federation_resolvers_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestFederationResolvers(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/federation_users_test.go b/traffic_ops/testing/api/v4/federation_users_test.go index 5630f14c57..6a9e2795e0 100644 --- a/traffic_ops/testing/api/v4/federation_users_test.go +++ b/traffic_ops/testing/api/v4/federation_users_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestFederationUsers(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/federations_test.go b/traffic_ops/testing/api/v4/federations_test.go index 1d77f17ba0..3e5e11a868 100644 --- a/traffic_ops/testing/api/v4/federations_test.go +++ b/traffic_ops/testing/api/v4/federations_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestFederations(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/fixtures_test.go b/traffic_ops/testing/api/v4/fixtures_test.go index c1e7cd3710..cdcbcfacda 100644 --- a/traffic_ops/testing/api/v4/fixtures_test.go +++ b/traffic_ops/testing/api/v4/fixtures_test.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "os" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // LoadFixtures ... diff --git a/traffic_ops/testing/api/v4/iso_test.go b/traffic_ops/testing/api/v4/iso_test.go index 38be16c1dc..e84840cf1e 100644 --- a/traffic_ops/testing/api/v4/iso_test.go +++ b/traffic_ops/testing/api/v4/iso_test.go @@ -22,9 +22,9 @@ package v4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestGetOSVersions(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/jobs_test.go b/traffic_ops/testing/api/v4/jobs_test.go index 6692db17e7..4a1f9455c2 100644 --- a/traffic_ops/testing/api/v4/jobs_test.go +++ b/traffic_ops/testing/api/v4/jobs_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestJobs(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/loginfail_test.go b/traffic_ops/testing/api/v4/loginfail_test.go index 081e17ce11..c487b3450f 100644 --- a/traffic_ops/testing/api/v4/loginfail_test.go +++ b/traffic_ops/testing/api/v4/loginfail_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" "golang.org/x/net/publicsuffix" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestLoginFail(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/logs_test.go b/traffic_ops/testing/api/v4/logs_test.go index c2bc0efb77..82eed24c55 100644 --- a/traffic_ops/testing/api/v4/logs_test.go +++ b/traffic_ops/testing/api/v4/logs_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestLogs(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/monitoring_test.go b/traffic_ops/testing/api/v4/monitoring_test.go index 7581c6f40e..545a1ec61c 100644 --- a/traffic_ops/testing/api/v4/monitoring_test.go +++ b/traffic_ops/testing/api/v4/monitoring_test.go @@ -18,8 +18,8 @@ package v4 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestMonitoring(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/multiple_server_capabilities_test.go b/traffic_ops/testing/api/v4/multiple_server_capabilities_test.go index 4a4c1c2ae4..66c67a0b23 100644 --- a/traffic_ops/testing/api/v4/multiple_server_capabilities_test.go +++ b/traffic_ops/testing/api/v4/multiple_server_capabilities_test.go @@ -21,12 +21,12 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestMultipleServerCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/origins_test.go b/traffic_ops/testing/api/v4/origins_test.go index 52f4b7a70a..588d958201 100644 --- a/traffic_ops/testing/api/v4/origins_test.go +++ b/traffic_ops/testing/api/v4/origins_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestOrigins(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/parameters_test.go b/traffic_ops/testing/api/v4/parameters_test.go index 6c45af6f56..f5aa9babc7 100644 --- a/traffic_ops/testing/api/v4/parameters_test.go +++ b/traffic_ops/testing/api/v4/parameters_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestParameters(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/phys_locations_test.go b/traffic_ops/testing/api/v4/phys_locations_test.go index b9d50e4e35..7dadcd497b 100644 --- a/traffic_ops/testing/api/v4/phys_locations_test.go +++ b/traffic_ops/testing/api/v4/phys_locations_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestPhysLocations(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/ping_test.go b/traffic_ops/testing/api/v4/ping_test.go index 10e6b0a4bc..5519dc9a1c 100644 --- a/traffic_ops/testing/api/v4/ping_test.go +++ b/traffic_ops/testing/api/v4/ping_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestPing(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/profile_parameters_test.go b/traffic_ops/testing/api/v4/profile_parameters_test.go index 8020d0ecd8..445b0994c7 100644 --- a/traffic_ops/testing/api/v4/profile_parameters_test.go +++ b/traffic_ops/testing/api/v4/profile_parameters_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestProfileParameters(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/profiles_export_test.go b/traffic_ops/testing/api/v4/profiles_export_test.go index 9a2609e83c..94ffcc0bf2 100644 --- a/traffic_ops/testing/api/v4/profiles_export_test.go +++ b/traffic_ops/testing/api/v4/profiles_export_test.go @@ -20,12 +20,12 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestProfilesExport(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/profiles_import_test.go b/traffic_ops/testing/api/v4/profiles_import_test.go index 627b94269c..87b4da5533 100644 --- a/traffic_ops/testing/api/v4/profiles_import_test.go +++ b/traffic_ops/testing/api/v4/profiles_import_test.go @@ -20,12 +20,12 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestProfilesImport(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/profiles_name_copy_test.go b/traffic_ops/testing/api/v4/profiles_name_copy_test.go index b4afff6b46..29a30223bd 100644 --- a/traffic_ops/testing/api/v4/profiles_name_copy_test.go +++ b/traffic_ops/testing/api/v4/profiles_name_copy_test.go @@ -19,9 +19,9 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestProfilesNameCopy(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/profiles_test.go b/traffic_ops/testing/api/v4/profiles_test.go index f8a9f03080..55f5d98460 100644 --- a/traffic_ops/testing/api/v4/profiles_test.go +++ b/traffic_ops/testing/api/v4/profiles_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestProfiles(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/regions_test.go b/traffic_ops/testing/api/v4/regions_test.go index 7ad5a1b1bd..0ea30a3a94 100644 --- a/traffic_ops/testing/api/v4/regions_test.go +++ b/traffic_ops/testing/api/v4/regions_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestRegions(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/roles_test.go b/traffic_ops/testing/api/v4/roles_test.go index b9ec22a769..cf5f768f30 100644 --- a/traffic_ops/testing/api/v4/roles_test.go +++ b/traffic_ops/testing/api/v4/roles_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestRoles(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/server_capabilities_test.go b/traffic_ops/testing/api/v4/server_capabilities_test.go index ba9dcd187d..bea809d2f1 100644 --- a/traffic_ops/testing/api/v4/server_capabilities_test.go +++ b/traffic_ops/testing/api/v4/server_capabilities_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServerCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/server_server_capabilities_test.go b/traffic_ops/testing/api/v4/server_server_capabilities_test.go index 2264f64f82..f6c6dddb11 100644 --- a/traffic_ops/testing/api/v4/server_server_capabilities_test.go +++ b/traffic_ops/testing/api/v4/server_server_capabilities_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServerServerCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/servercheckextension_test.go b/traffic_ops/testing/api/v4/servercheckextension_test.go index 4c8fb013c6..438bb0f585 100644 --- a/traffic_ops/testing/api/v4/servercheckextension_test.go +++ b/traffic_ops/testing/api/v4/servercheckextension_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) var ( diff --git a/traffic_ops/testing/api/v4/serverchecks_test.go b/traffic_ops/testing/api/v4/serverchecks_test.go index 4859ddfd63..214b14d69d 100644 --- a/traffic_ops/testing/api/v4/serverchecks_test.go +++ b/traffic_ops/testing/api/v4/serverchecks_test.go @@ -21,13 +21,13 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServerChecks(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/servers_hostname_update_status_test.go b/traffic_ops/testing/api/v4/servers_hostname_update_status_test.go index a75bf39495..cfd57d1ba5 100644 --- a/traffic_ops/testing/api/v4/servers_hostname_update_status_test.go +++ b/traffic_ops/testing/api/v4/servers_hostname_update_status_test.go @@ -19,8 +19,8 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServersHostnameUpdateStatus(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/servers_hostname_update_test.go b/traffic_ops/testing/api/v4/servers_hostname_update_test.go index dc4a54a54a..896842d82d 100644 --- a/traffic_ops/testing/api/v4/servers_hostname_update_test.go +++ b/traffic_ops/testing/api/v4/servers_hostname_update_test.go @@ -20,12 +20,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServersHostnameUpdate(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/servers_id_deliveryservices_test.go b/traffic_ops/testing/api/v4/servers_id_deliveryservices_test.go index 731495c717..aec6254c86 100644 --- a/traffic_ops/testing/api/v4/servers_id_deliveryservices_test.go +++ b/traffic_ops/testing/api/v4/servers_id_deliveryservices_test.go @@ -19,13 +19,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServersIDDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/servers_id_queue_update_test.go b/traffic_ops/testing/api/v4/servers_id_queue_update_test.go index 19309598c7..98b4ea8685 100644 --- a/traffic_ops/testing/api/v4/servers_id_queue_update_test.go +++ b/traffic_ops/testing/api/v4/servers_id_queue_update_test.go @@ -18,13 +18,13 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServersIDQueueUpdate(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/servers_id_status_test.go b/traffic_ops/testing/api/v4/servers_id_status_test.go index 680168e10b..8abc2fd1c5 100644 --- a/traffic_ops/testing/api/v4/servers_id_status_test.go +++ b/traffic_ops/testing/api/v4/servers_id_status_test.go @@ -19,13 +19,13 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServersIDStatus(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/servers_test.go b/traffic_ops/testing/api/v4/servers_test.go index f779c3fc92..9d7e066d84 100644 --- a/traffic_ops/testing/api/v4/servers_test.go +++ b/traffic_ops/testing/api/v4/servers_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServers(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/servicecategories_test.go b/traffic_ops/testing/api/v4/servicecategories_test.go index bc1c16f4ca..284bef8d0f 100644 --- a/traffic_ops/testing/api/v4/servicecategories_test.go +++ b/traffic_ops/testing/api/v4/servicecategories_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestServiceCategories(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/session_test.go b/traffic_ops/testing/api/v4/session_test.go index e0efa4d78a..8920ca5a82 100644 --- a/traffic_ops/testing/api/v4/session_test.go +++ b/traffic_ops/testing/api/v4/session_test.go @@ -18,7 +18,7 @@ package v4 import ( "time" - "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" _ "github.com/lib/pq" ) diff --git a/traffic_ops/testing/api/v4/snapshot_test.go b/traffic_ops/testing/api/v4/snapshot_test.go index 4cfbecbf8e..d23eee349f 100644 --- a/traffic_ops/testing/api/v4/snapshot_test.go +++ b/traffic_ops/testing/api/v4/snapshot_test.go @@ -21,12 +21,12 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestSnapshot(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/sslkey_expirations_test.go b/traffic_ops/testing/api/v4/sslkey_expirations_test.go index 0e454410b9..9a48392dc9 100644 --- a/traffic_ops/testing/api/v4/sslkey_expirations_test.go +++ b/traffic_ops/testing/api/v4/sslkey_expirations_test.go @@ -19,9 +19,9 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestSSLExpirations(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/staticdnsentries_test.go b/traffic_ops/testing/api/v4/staticdnsentries_test.go index 71e9c96024..c78979447c 100644 --- a/traffic_ops/testing/api/v4/staticdnsentries_test.go +++ b/traffic_ops/testing/api/v4/staticdnsentries_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestStaticDNSEntries(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/stats_summary_test.go b/traffic_ops/testing/api/v4/stats_summary_test.go index 3a68783b4a..a7abcdb7a5 100644 --- a/traffic_ops/testing/api/v4/stats_summary_test.go +++ b/traffic_ops/testing/api/v4/stats_summary_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) var latestTime time.Time diff --git a/traffic_ops/testing/api/v4/statuses_test.go b/traffic_ops/testing/api/v4/statuses_test.go index 1b977075db..35c3fcb69e 100644 --- a/traffic_ops/testing/api/v4/statuses_test.go +++ b/traffic_ops/testing/api/v4/statuses_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestStatuses(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/steering_test.go b/traffic_ops/testing/api/v4/steering_test.go index e39936c2dc..19179056a7 100644 --- a/traffic_ops/testing/api/v4/steering_test.go +++ b/traffic_ops/testing/api/v4/steering_test.go @@ -19,11 +19,11 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestSteering(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/steeringtargets_test.go b/traffic_ops/testing/api/v4/steeringtargets_test.go index d948b17495..734f6ff99c 100644 --- a/traffic_ops/testing/api/v4/steeringtargets_test.go +++ b/traffic_ops/testing/api/v4/steeringtargets_test.go @@ -21,14 +21,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestSteeringTargets(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/tenants_test.go b/traffic_ops/testing/api/v4/tenants_test.go index 154bb71c7c..38842bd7ca 100644 --- a/traffic_ops/testing/api/v4/tenants_test.go +++ b/traffic_ops/testing/api/v4/tenants_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestTenants(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/todb_test.go b/traffic_ops/testing/api/v4/todb_test.go index a80a3e997a..ef7a542f83 100644 --- a/traffic_ops/testing/api/v4/todb_test.go +++ b/traffic_ops/testing/api/v4/todb_test.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" ) var ( diff --git a/traffic_ops/testing/api/v4/topologies_queue_update_test.go b/traffic_ops/testing/api/v4/topologies_queue_update_test.go index e6da9973e6..7f365d47a8 100644 --- a/traffic_ops/testing/api/v4/topologies_queue_update_test.go +++ b/traffic_ops/testing/api/v4/topologies_queue_update_test.go @@ -25,12 +25,12 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestTopologiesQueueUpdate(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/topologies_test.go b/traffic_ops/testing/api/v4/topologies_test.go index a7863ae51e..f49b1c70bd 100644 --- a/traffic_ops/testing/api/v4/topologies_test.go +++ b/traffic_ops/testing/api/v4/topologies_test.go @@ -25,12 +25,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestTopologies(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/traffic_ops_test.go b/traffic_ops/testing/api/v4/traffic_ops_test.go index c669342ba7..a9b67f85cd 100644 --- a/traffic_ops/testing/api/v4/traffic_ops_test.go +++ b/traffic_ops/testing/api/v4/traffic_ops_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-log" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/config" + "github.com/apache/trafficcontrol/v7/lib/go-log" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/config" _ "github.com/lib/pq" ) diff --git a/traffic_ops/testing/api/v4/traffic_vault_ping_test.go b/traffic_ops/testing/api/v4/traffic_vault_ping_test.go index 309f232f45..0464dea898 100644 --- a/traffic_ops/testing/api/v4/traffic_vault_ping_test.go +++ b/traffic_ops/testing/api/v4/traffic_vault_ping_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestTrafficVaultPing(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/types_test.go b/traffic_ops/testing/api/v4/types_test.go index e718f5c611..b98957039f 100644 --- a/traffic_ops/testing/api/v4/types_test.go +++ b/traffic_ops/testing/api/v4/types_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestTypes(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/user_current_test.go b/traffic_ops/testing/api/v4/user_current_test.go index f1bf898e09..bb8558e2fa 100644 --- a/traffic_ops/testing/api/v4/user_current_test.go +++ b/traffic_ops/testing/api/v4/user_current_test.go @@ -18,10 +18,10 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestUserCurrent(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/users_register_test.go b/traffic_ops/testing/api/v4/users_register_test.go index 5790dbc924..d18ac186fa 100644 --- a/traffic_ops/testing/api/v4/users_register_test.go +++ b/traffic_ops/testing/api/v4/users_register_test.go @@ -19,12 +19,12 @@ import ( "net/mail" "testing" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestUsersRegister(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/users_test.go b/traffic_ops/testing/api/v4/users_test.go index af2a009a86..ad1e02b06b 100644 --- a/traffic_ops/testing/api/v4/users_test.go +++ b/traffic_ops/testing/api/v4/users_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) func TestUsers(t *testing.T) { diff --git a/traffic_ops/testing/api/v4/withobjs_test.go b/traffic_ops/testing/api/v4/withobjs_test.go index e3c6631490..defabdc2b2 100644 --- a/traffic_ops/testing/api/v4/withobjs_test.go +++ b/traffic_ops/testing/api/v4/withobjs_test.go @@ -19,11 +19,11 @@ import ( "database/sql" "testing" - totest "github.com/apache/trafficcontrol/lib/go-tc/totestv4" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - toclient "github.com/apache/trafficcontrol/traffic_ops/v4-client" + totest "github.com/apache/trafficcontrol/v7/lib/go-tc/totestv4" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) // WithObjs creates the objs in order, runs f, and defers deleting the objs in the same order. diff --git a/traffic_ops/testing/api/v5/about_test.go b/traffic_ops/testing/api/v5/about_test.go index 7ef9a63713..184c4f6eb1 100644 --- a/traffic_ops/testing/api/v5/about_test.go +++ b/traffic_ops/testing/api/v5/about_test.go @@ -19,9 +19,9 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestAbout(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/acme_test.go b/traffic_ops/testing/api/v5/acme_test.go index a22deb69df..20f0de1f32 100644 --- a/traffic_ops/testing/api/v5/acme_test.go +++ b/traffic_ops/testing/api/v5/acme_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestAcmeAutoRenew(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/asns_test.go b/traffic_ops/testing/api/v5/asns_test.go index 917d2939dc..2ff0b87212 100644 --- a/traffic_ops/testing/api/v5/asns_test.go +++ b/traffic_ops/testing/api/v5/asns_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestASN(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cachegroups_test.go b/traffic_ops/testing/api/v5/cachegroups_test.go index a4a8b18676..a599287826 100644 --- a/traffic_ops/testing/api/v5/cachegroups_test.go +++ b/traffic_ops/testing/api/v5/cachegroups_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCacheGroups(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cachegroupsdeliveryservices_test.go b/traffic_ops/testing/api/v5/cachegroupsdeliveryservices_test.go index a55804bb78..f07da45998 100644 --- a/traffic_ops/testing/api/v5/cachegroupsdeliveryservices_test.go +++ b/traffic_ops/testing/api/v5/cachegroupsdeliveryservices_test.go @@ -20,11 +20,11 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCacheGroupsDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cdn_dnsseckeys_test.go b/traffic_ops/testing/api/v5/cdn_dnsseckeys_test.go index 1537858205..ae7a32e971 100644 --- a/traffic_ops/testing/api/v5/cdn_dnsseckeys_test.go +++ b/traffic_ops/testing/api/v5/cdn_dnsseckeys_test.go @@ -22,10 +22,10 @@ import ( "strings" "testing" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCDNsDNSSEC(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cdn_domains_test.go b/traffic_ops/testing/api/v5/cdn_domains_test.go index 8a0c86725f..393f270673 100644 --- a/traffic_ops/testing/api/v5/cdn_domains_test.go +++ b/traffic_ops/testing/api/v5/cdn_domains_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCDNDomains(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cdn_federations_test.go b/traffic_ops/testing/api/v5/cdn_federations_test.go index d0a554774e..953b049258 100644 --- a/traffic_ops/testing/api/v5/cdn_federations_test.go +++ b/traffic_ops/testing/api/v5/cdn_federations_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) var fedIDs = make(map[string]int) diff --git a/traffic_ops/testing/api/v5/cdn_locks_test.go b/traffic_ops/testing/api/v5/cdn_locks_test.go index 768a56e6c5..66b808b024 100644 --- a/traffic_ops/testing/api/v5/cdn_locks_test.go +++ b/traffic_ops/testing/api/v5/cdn_locks_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCDNLocks(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cdn_queue_updates_test.go b/traffic_ops/testing/api/v5/cdn_queue_updates_test.go index 32d82e3ca3..2f696cba3d 100644 --- a/traffic_ops/testing/api/v5/cdn_queue_updates_test.go +++ b/traffic_ops/testing/api/v5/cdn_queue_updates_test.go @@ -21,11 +21,11 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCDNQueueUpdates(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cdnnotifications_test.go b/traffic_ops/testing/api/v5/cdnnotifications_test.go index 65759ea63b..5cda3c0888 100644 --- a/traffic_ops/testing/api/v5/cdnnotifications_test.go +++ b/traffic_ops/testing/api/v5/cdnnotifications_test.go @@ -21,11 +21,11 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCDNNotifications(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cdns_name_configs_monitoring_test.go b/traffic_ops/testing/api/v5/cdns_name_configs_monitoring_test.go index 4960379bb6..f3dd8dfeb1 100644 --- a/traffic_ops/testing/api/v5/cdns_name_configs_monitoring_test.go +++ b/traffic_ops/testing/api/v5/cdns_name_configs_monitoring_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCDNNameConfigsMonitoring(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cdns_name_snapshot_new_test.go b/traffic_ops/testing/api/v5/cdns_name_snapshot_new_test.go index 4dc65c71c3..4ef7e23e38 100644 --- a/traffic_ops/testing/api/v5/cdns_name_snapshot_new_test.go +++ b/traffic_ops/testing/api/v5/cdns_name_snapshot_new_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) var baselineCRConfig tc.CRConfig diff --git a/traffic_ops/testing/api/v5/cdns_name_snapshot_test.go b/traffic_ops/testing/api/v5/cdns_name_snapshot_test.go index a242c9ac51..ac8c33a21e 100644 --- a/traffic_ops/testing/api/v5/cdns_name_snapshot_test.go +++ b/traffic_ops/testing/api/v5/cdns_name_snapshot_test.go @@ -20,8 +20,8 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCDNNameSnapshot(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cdns_test.go b/traffic_ops/testing/api/v5/cdns_test.go index 6c3e09e1e6..77842281fd 100644 --- a/traffic_ops/testing/api/v5/cdns_test.go +++ b/traffic_ops/testing/api/v5/cdns_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCDNs(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/cookie_test.go b/traffic_ops/testing/api/v5/cookie_test.go index 00a1d1762c..9407a57c4e 100644 --- a/traffic_ops/testing/api/v5/cookie_test.go +++ b/traffic_ops/testing/api/v5/cookie_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCookies(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/coordinates_test.go b/traffic_ops/testing/api/v5/coordinates_test.go index a73696d5b9..88ec76740c 100644 --- a/traffic_ops/testing/api/v5/coordinates_test.go +++ b/traffic_ops/testing/api/v5/coordinates_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestCoordinates(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/deliveryservice_request_comments_test.go b/traffic_ops/testing/api/v5/deliveryservice_request_comments_test.go index 94d49c8b71..8b9fc21015 100644 --- a/traffic_ops/testing/api/v5/deliveryservice_request_comments_test.go +++ b/traffic_ops/testing/api/v5/deliveryservice_request_comments_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestDeliveryServiceRequestComments(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/deliveryservice_requests_test.go b/traffic_ops/testing/api/v5/deliveryservice_requests_test.go index 51f0ddbab5..35c561ada3 100644 --- a/traffic_ops/testing/api/v5/deliveryservice_requests_test.go +++ b/traffic_ops/testing/api/v5/deliveryservice_requests_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) // this resets the IDs of things attached to a DS, which needs to be done diff --git a/traffic_ops/testing/api/v5/deliveryservices_keys_test.go b/traffic_ops/testing/api/v5/deliveryservices_keys_test.go index c7d7dddbe1..b7160ae136 100644 --- a/traffic_ops/testing/api/v5/deliveryservices_keys_test.go +++ b/traffic_ops/testing/api/v5/deliveryservices_keys_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestDeliveryServicesKeys(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/deliveryservices_required_capabilities_test.go b/traffic_ops/testing/api/v5/deliveryservices_required_capabilities_test.go index 6fd31c5cbf..b25e249916 100644 --- a/traffic_ops/testing/api/v5/deliveryservices_required_capabilities_test.go +++ b/traffic_ops/testing/api/v5/deliveryservices_required_capabilities_test.go @@ -17,11 +17,11 @@ package v5 import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" "testing" ) diff --git a/traffic_ops/testing/api/v5/deliveryservices_test.go b/traffic_ops/testing/api/v5/deliveryservices_test.go index 56b849c722..8c85bae6a0 100644 --- a/traffic_ops/testing/api/v5/deliveryservices_test.go +++ b/traffic_ops/testing/api/v5/deliveryservices_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/deliveryserviceservers_test.go b/traffic_ops/testing/api/v5/deliveryserviceservers_test.go index 8b68fab3c7..ff62ae354a 100644 --- a/traffic_ops/testing/api/v5/deliveryserviceservers_test.go +++ b/traffic_ops/testing/api/v5/deliveryserviceservers_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestDeliveryServiceServers(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/deliveryservicesideligible_test.go b/traffic_ops/testing/api/v5/deliveryservicesideligible_test.go index 25c79b8c88..5c07a72186 100644 --- a/traffic_ops/testing/api/v5/deliveryservicesideligible_test.go +++ b/traffic_ops/testing/api/v5/deliveryservicesideligible_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestDeliveryServicesEligible(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/deliveryservicesregexes_test.go b/traffic_ops/testing/api/v5/deliveryservicesregexes_test.go index d7c1862fa8..5f0d0e75eb 100644 --- a/traffic_ops/testing/api/v5/deliveryservicesregexes_test.go +++ b/traffic_ops/testing/api/v5/deliveryservicesregexes_test.go @@ -22,10 +22,10 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestDeliveryServicesRegexes(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/divisions_test.go b/traffic_ops/testing/api/v5/divisions_test.go index 86f8f6f3ea..01cce2f14b 100644 --- a/traffic_ops/testing/api/v5/divisions_test.go +++ b/traffic_ops/testing/api/v5/divisions_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestDivisions(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/federation_deliveryservices_test.go b/traffic_ops/testing/api/v5/federation_deliveryservices_test.go index f2f51e5f2f..1ee7588ce4 100644 --- a/traffic_ops/testing/api/v5/federation_deliveryservices_test.go +++ b/traffic_ops/testing/api/v5/federation_deliveryservices_test.go @@ -22,12 +22,12 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestFederationsDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/federation_federation_resolvers_test.go b/traffic_ops/testing/api/v5/federation_federation_resolvers_test.go index dd41da155c..23ed6f95e7 100644 --- a/traffic_ops/testing/api/v5/federation_federation_resolvers_test.go +++ b/traffic_ops/testing/api/v5/federation_federation_resolvers_test.go @@ -19,10 +19,10 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestFederationFederationResolvers(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/federation_resolvers_test.go b/traffic_ops/testing/api/v5/federation_resolvers_test.go index 898a56d9f3..c82cb10546 100644 --- a/traffic_ops/testing/api/v5/federation_resolvers_test.go +++ b/traffic_ops/testing/api/v5/federation_resolvers_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestFederationResolvers(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/federation_users_test.go b/traffic_ops/testing/api/v5/federation_users_test.go index 9686783286..e95e57b0ea 100644 --- a/traffic_ops/testing/api/v5/federation_users_test.go +++ b/traffic_ops/testing/api/v5/federation_users_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestFederationUsers(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/federations_test.go b/traffic_ops/testing/api/v5/federations_test.go index 51dcb6d5fe..1194859a8c 100644 --- a/traffic_ops/testing/api/v5/federations_test.go +++ b/traffic_ops/testing/api/v5/federations_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestFederations(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/fixtures_test.go b/traffic_ops/testing/api/v5/fixtures_test.go index cdb38317e6..179a82c601 100644 --- a/traffic_ops/testing/api/v5/fixtures_test.go +++ b/traffic_ops/testing/api/v5/fixtures_test.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "os" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // LoadFixtures ... diff --git a/traffic_ops/testing/api/v5/iso_test.go b/traffic_ops/testing/api/v5/iso_test.go index 3bdaad2509..fb5b5dccb2 100644 --- a/traffic_ops/testing/api/v5/iso_test.go +++ b/traffic_ops/testing/api/v5/iso_test.go @@ -22,9 +22,9 @@ package v5 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestGetOSVersions(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/jobs_test.go b/traffic_ops/testing/api/v5/jobs_test.go index 06172bc448..51a501f02f 100644 --- a/traffic_ops/testing/api/v5/jobs_test.go +++ b/traffic_ops/testing/api/v5/jobs_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestJobs(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/loginfail_test.go b/traffic_ops/testing/api/v5/loginfail_test.go index 7f66908d55..bd0e994fba 100644 --- a/traffic_ops/testing/api/v5/loginfail_test.go +++ b/traffic_ops/testing/api/v5/loginfail_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" "golang.org/x/net/publicsuffix" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" - toclient "github.com/apache/trafficcontrol/traffic_ops/v5-client" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" + toclient "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestLoginFail(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/logs_test.go b/traffic_ops/testing/api/v5/logs_test.go index 1c7360c0d1..05f1a27071 100644 --- a/traffic_ops/testing/api/v5/logs_test.go +++ b/traffic_ops/testing/api/v5/logs_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestLogs(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/monitoring_test.go b/traffic_ops/testing/api/v5/monitoring_test.go index 03bcd8d68f..4fa1c9829f 100644 --- a/traffic_ops/testing/api/v5/monitoring_test.go +++ b/traffic_ops/testing/api/v5/monitoring_test.go @@ -18,8 +18,8 @@ package v5 import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestMonitoring(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/multiple_server_capabilities_test.go b/traffic_ops/testing/api/v5/multiple_server_capabilities_test.go index cf719ba997..e3f40f1ce5 100644 --- a/traffic_ops/testing/api/v5/multiple_server_capabilities_test.go +++ b/traffic_ops/testing/api/v5/multiple_server_capabilities_test.go @@ -21,11 +21,11 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestMultipleServerCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/origins_test.go b/traffic_ops/testing/api/v5/origins_test.go index cbbc950614..5273bea047 100644 --- a/traffic_ops/testing/api/v5/origins_test.go +++ b/traffic_ops/testing/api/v5/origins_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestOrigins(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/parameters_test.go b/traffic_ops/testing/api/v5/parameters_test.go index 32ef97ce6a..6c8e00ef97 100644 --- a/traffic_ops/testing/api/v5/parameters_test.go +++ b/traffic_ops/testing/api/v5/parameters_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestParameters(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/phys_locations_test.go b/traffic_ops/testing/api/v5/phys_locations_test.go index a684d8be5f..b43ac810d9 100644 --- a/traffic_ops/testing/api/v5/phys_locations_test.go +++ b/traffic_ops/testing/api/v5/phys_locations_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestPhysLocations(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/ping_test.go b/traffic_ops/testing/api/v5/ping_test.go index 6d1fcc656f..098fefc420 100644 --- a/traffic_ops/testing/api/v5/ping_test.go +++ b/traffic_ops/testing/api/v5/ping_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestPing(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/profile_parameters_test.go b/traffic_ops/testing/api/v5/profile_parameters_test.go index 61b29b966a..acc7d81a19 100644 --- a/traffic_ops/testing/api/v5/profile_parameters_test.go +++ b/traffic_ops/testing/api/v5/profile_parameters_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestProfileParameters(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/profiles_export_test.go b/traffic_ops/testing/api/v5/profiles_export_test.go index 94fc640cc8..9017928017 100644 --- a/traffic_ops/testing/api/v5/profiles_export_test.go +++ b/traffic_ops/testing/api/v5/profiles_export_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestProfilesExport(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/profiles_import_test.go b/traffic_ops/testing/api/v5/profiles_import_test.go index 60b6ba91d9..daca7fe4b2 100644 --- a/traffic_ops/testing/api/v5/profiles_import_test.go +++ b/traffic_ops/testing/api/v5/profiles_import_test.go @@ -20,12 +20,12 @@ import ( "reflect" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestProfilesImport(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/profiles_name_copy_test.go b/traffic_ops/testing/api/v5/profiles_name_copy_test.go index efb0a4c83b..5c442c5d8d 100644 --- a/traffic_ops/testing/api/v5/profiles_name_copy_test.go +++ b/traffic_ops/testing/api/v5/profiles_name_copy_test.go @@ -19,9 +19,9 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestProfilesNameCopy(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/profiles_test.go b/traffic_ops/testing/api/v5/profiles_test.go index b5845e5bd8..590ecfdb1b 100644 --- a/traffic_ops/testing/api/v5/profiles_test.go +++ b/traffic_ops/testing/api/v5/profiles_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestProfiles(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/regions_test.go b/traffic_ops/testing/api/v5/regions_test.go index f031e542fd..7187a9cb15 100644 --- a/traffic_ops/testing/api/v5/regions_test.go +++ b/traffic_ops/testing/api/v5/regions_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestRegions(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/roles_test.go b/traffic_ops/testing/api/v5/roles_test.go index 79388da15c..23e206fcfe 100644 --- a/traffic_ops/testing/api/v5/roles_test.go +++ b/traffic_ops/testing/api/v5/roles_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestRoles(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/server_capabilities_test.go b/traffic_ops/testing/api/v5/server_capabilities_test.go index 1d4fd1d396..2d8497a4e1 100644 --- a/traffic_ops/testing/api/v5/server_capabilities_test.go +++ b/traffic_ops/testing/api/v5/server_capabilities_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServerCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/server_server_capabilities_test.go b/traffic_ops/testing/api/v5/server_server_capabilities_test.go index 4f88a0a16d..8e8f073b87 100644 --- a/traffic_ops/testing/api/v5/server_server_capabilities_test.go +++ b/traffic_ops/testing/api/v5/server_server_capabilities_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServerServerCapabilities(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/servercheckextension_test.go b/traffic_ops/testing/api/v5/servercheckextension_test.go index 6d4b713973..2cb76a9a44 100644 --- a/traffic_ops/testing/api/v5/servercheckextension_test.go +++ b/traffic_ops/testing/api/v5/servercheckextension_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) var ( diff --git a/traffic_ops/testing/api/v5/serverchecks_test.go b/traffic_ops/testing/api/v5/serverchecks_test.go index 0648c31890..51da93549f 100644 --- a/traffic_ops/testing/api/v5/serverchecks_test.go +++ b/traffic_ops/testing/api/v5/serverchecks_test.go @@ -21,12 +21,12 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServerChecks(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/servers_hostname_update_status_test.go b/traffic_ops/testing/api/v5/servers_hostname_update_status_test.go index cc7123ead9..b7f5d41a65 100644 --- a/traffic_ops/testing/api/v5/servers_hostname_update_status_test.go +++ b/traffic_ops/testing/api/v5/servers_hostname_update_status_test.go @@ -20,8 +20,8 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServersHostnameUpdateStatus(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/servers_hostname_update_test.go b/traffic_ops/testing/api/v5/servers_hostname_update_test.go index e52ccb7052..0700e17f8a 100644 --- a/traffic_ops/testing/api/v5/servers_hostname_update_test.go +++ b/traffic_ops/testing/api/v5/servers_hostname_update_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServersHostnameUpdate(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/servers_id_deliveryservices_test.go b/traffic_ops/testing/api/v5/servers_id_deliveryservices_test.go index ee67655c6f..ae59e2cff5 100644 --- a/traffic_ops/testing/api/v5/servers_id_deliveryservices_test.go +++ b/traffic_ops/testing/api/v5/servers_id_deliveryservices_test.go @@ -19,12 +19,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServersIDDeliveryServices(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/servers_id_queue_update_test.go b/traffic_ops/testing/api/v5/servers_id_queue_update_test.go index ed1bdd048c..b109559517 100644 --- a/traffic_ops/testing/api/v5/servers_id_queue_update_test.go +++ b/traffic_ops/testing/api/v5/servers_id_queue_update_test.go @@ -19,12 +19,12 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServersIDQueueUpdate(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/servers_id_status_test.go b/traffic_ops/testing/api/v5/servers_id_status_test.go index ba7bdbca4e..004356e6b3 100644 --- a/traffic_ops/testing/api/v5/servers_id_status_test.go +++ b/traffic_ops/testing/api/v5/servers_id_status_test.go @@ -19,12 +19,12 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServersIDStatus(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/servers_test.go b/traffic_ops/testing/api/v5/servers_test.go index 38ad3fc189..3e82d417f4 100644 --- a/traffic_ops/testing/api/v5/servers_test.go +++ b/traffic_ops/testing/api/v5/servers_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServers(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/servicecategories_test.go b/traffic_ops/testing/api/v5/servicecategories_test.go index 10921f8c93..6febf7e33e 100644 --- a/traffic_ops/testing/api/v5/servicecategories_test.go +++ b/traffic_ops/testing/api/v5/servicecategories_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestServiceCategories(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/session_test.go b/traffic_ops/testing/api/v5/session_test.go index d85897646f..a02be99d75 100644 --- a/traffic_ops/testing/api/v5/session_test.go +++ b/traffic_ops/testing/api/v5/session_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" _ "github.com/lib/pq" ) diff --git a/traffic_ops/testing/api/v5/snapshot_test.go b/traffic_ops/testing/api/v5/snapshot_test.go index 4128fce3d6..744baf88a3 100644 --- a/traffic_ops/testing/api/v5/snapshot_test.go +++ b/traffic_ops/testing/api/v5/snapshot_test.go @@ -21,11 +21,11 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestSnapshot(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/sslkey_expirations_test.go b/traffic_ops/testing/api/v5/sslkey_expirations_test.go index 14559695c5..d8f57d0d2d 100644 --- a/traffic_ops/testing/api/v5/sslkey_expirations_test.go +++ b/traffic_ops/testing/api/v5/sslkey_expirations_test.go @@ -19,9 +19,9 @@ import ( "net/url" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestSSLExpirations(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/staticdnsentries_test.go b/traffic_ops/testing/api/v5/staticdnsentries_test.go index f4873786b7..40525474cc 100644 --- a/traffic_ops/testing/api/v5/staticdnsentries_test.go +++ b/traffic_ops/testing/api/v5/staticdnsentries_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestStaticDNSEntries(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/stats_summary_test.go b/traffic_ops/testing/api/v5/stats_summary_test.go index cd4a94d657..943f66ef2f 100644 --- a/traffic_ops/testing/api/v5/stats_summary_test.go +++ b/traffic_ops/testing/api/v5/stats_summary_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) var latestTime time.Time diff --git a/traffic_ops/testing/api/v5/statuses_test.go b/traffic_ops/testing/api/v5/statuses_test.go index 0ac1000a49..2bd883d183 100644 --- a/traffic_ops/testing/api/v5/statuses_test.go +++ b/traffic_ops/testing/api/v5/statuses_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestStatuses(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/steering_test.go b/traffic_ops/testing/api/v5/steering_test.go index 54714ab880..c1f7fe6ad2 100644 --- a/traffic_ops/testing/api/v5/steering_test.go +++ b/traffic_ops/testing/api/v5/steering_test.go @@ -19,11 +19,11 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestSteering(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/steeringtargets_test.go b/traffic_ops/testing/api/v5/steeringtargets_test.go index 561dc5af36..2e32efb758 100644 --- a/traffic_ops/testing/api/v5/steeringtargets_test.go +++ b/traffic_ops/testing/api/v5/steeringtargets_test.go @@ -21,13 +21,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestSteeringTargets(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/tenants_test.go b/traffic_ops/testing/api/v5/tenants_test.go index 3c46776441..1474239610 100644 --- a/traffic_ops/testing/api/v5/tenants_test.go +++ b/traffic_ops/testing/api/v5/tenants_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestTenants(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/todb_test.go b/traffic_ops/testing/api/v5/todb_test.go index aed6c19387..7ca07253e9 100644 --- a/traffic_ops/testing/api/v5/todb_test.go +++ b/traffic_ops/testing/api/v5/todb_test.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" ) var ( diff --git a/traffic_ops/testing/api/v5/topologies_queue_update_test.go b/traffic_ops/testing/api/v5/topologies_queue_update_test.go index 22c0fea2db..99ca14e262 100644 --- a/traffic_ops/testing/api/v5/topologies_queue_update_test.go +++ b/traffic_ops/testing/api/v5/topologies_queue_update_test.go @@ -25,11 +25,11 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestTopologiesQueueUpdate(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/topologies_test.go b/traffic_ops/testing/api/v5/topologies_test.go index 5c492ee498..c803c4891b 100644 --- a/traffic_ops/testing/api/v5/topologies_test.go +++ b/traffic_ops/testing/api/v5/topologies_test.go @@ -25,12 +25,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestTopologies(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/traffic_control_test.go b/traffic_ops/testing/api/v5/traffic_control_test.go index 3fca22db40..51b9e9ab15 100644 --- a/traffic_ops/testing/api/v5/traffic_control_test.go +++ b/traffic_ops/testing/api/v5/traffic_control_test.go @@ -16,7 +16,7 @@ package v5 import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TrafficControl - maps to the tc-fixtures.json file diff --git a/traffic_ops/testing/api/v5/traffic_ops_test.go b/traffic_ops/testing/api/v5/traffic_ops_test.go index fba7e4058c..bc2ce65d18 100644 --- a/traffic_ops/testing/api/v5/traffic_ops_test.go +++ b/traffic_ops/testing/api/v5/traffic_ops_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/config" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/config" _ "github.com/lib/pq" ) diff --git a/traffic_ops/testing/api/v5/traffic_vault_ping_test.go b/traffic_ops/testing/api/v5/traffic_vault_ping_test.go index 3ede36e898..c8e3a4d0e0 100644 --- a/traffic_ops/testing/api/v5/traffic_vault_ping_test.go +++ b/traffic_ops/testing/api/v5/traffic_vault_ping_test.go @@ -19,8 +19,8 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestTrafficVaultPing(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/types_test.go b/traffic_ops/testing/api/v5/types_test.go index 307744eee0..bfa9b4976f 100644 --- a/traffic_ops/testing/api/v5/types_test.go +++ b/traffic_ops/testing/api/v5/types_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestTypes(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/user_current_test.go b/traffic_ops/testing/api/v5/user_current_test.go index 42e3e5cdac..cc036a0f1e 100644 --- a/traffic_ops/testing/api/v5/user_current_test.go +++ b/traffic_ops/testing/api/v5/user_current_test.go @@ -18,10 +18,10 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestUserCurrent(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/users_register_test.go b/traffic_ops/testing/api/v5/users_register_test.go index 7085f95f61..f2654230f2 100644 --- a/traffic_ops/testing/api/v5/users_register_test.go +++ b/traffic_ops/testing/api/v5/users_register_test.go @@ -19,12 +19,12 @@ import ( "net/mail" "testing" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestUsersRegister(t *testing.T) { diff --git a/traffic_ops/testing/api/v5/users_test.go b/traffic_ops/testing/api/v5/users_test.go index 4b69ef6d96..6bce4dedb4 100644 --- a/traffic_ops/testing/api/v5/users_test.go +++ b/traffic_ops/testing/api/v5/users_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-util/assert" - "github.com/apache/trafficcontrol/traffic_ops/testing/api/utils" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/traffic_ops/testing/api/utils" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" ) func TestUsers(t *testing.T) { diff --git a/traffic_ops/toclientlib/toclientlib.go b/traffic_ops/toclientlib/toclientlib.go index 6208daa60e..feb2428554 100644 --- a/traffic_ops/toclientlib/toclientlib.go +++ b/traffic_ops/toclientlib/toclientlib.go @@ -31,8 +31,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "golang.org/x/net/publicsuffix" ) diff --git a/traffic_ops/traffic_ops_golang/acme/acme_account.go b/traffic_ops/traffic_ops_golang/acme/acme_account.go index 9be98dfb8d..fe7527ca28 100644 --- a/traffic_ops/traffic_ops_golang/acme/acme_account.go +++ b/traffic_ops/traffic_ops_golang/acme/acme_account.go @@ -25,8 +25,8 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) const readQuery = `SELECT email, private_key, uri, provider FROM acme_account` diff --git a/traffic_ops/traffic_ops_golang/api/api.go b/traffic_ops/traffic_ops_golang/api/api.go index 7c9c014442..5b9f5eed59 100644 --- a/traffic_ops/traffic_ops_golang/api/api.go +++ b/traffic_ops/traffic_ops_golang/api/api.go @@ -38,15 +38,15 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tocookie" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tocookie" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" influx "github.com/influxdata/influxdb/client/v2" "github.com/jmoiron/sqlx" @@ -776,7 +776,7 @@ func (inf *APIInfo) SendMail(to rfc.EmailAddress, msg []byte) (int, error, error } // IsResourceAuthorizedToCurrentUser is a convenience method used to call -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant.IsResourceAuthorizedToUserTx +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant.IsResourceAuthorizedToUserTx // using an APIInfo structure to provide the current user and database transaction. func (inf *APIInfo) IsResourceAuthorizedToCurrentUser(resourceTenantID int) (bool, error) { return tenant.IsResourceAuthorizedToUserTx(resourceTenantID, inf.User, inf.Tx.Tx) diff --git a/traffic_ops/traffic_ops_golang/api/api_test.go b/traffic_ops/traffic_ops_golang/api/api_test.go index 56d8a5ce7c..40740f078c 100644 --- a/traffic_ops/traffic_ops_golang/api/api_test.go +++ b/traffic_ops/traffic_ops_golang/api/api_test.go @@ -34,8 +34,8 @@ import ( "github.com/lib/pq" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func ExampleVersion_String() { diff --git a/traffic_ops/traffic_ops_golang/api/async_status.go b/traffic_ops/traffic_ops_golang/api/async_status.go index e8b65a29b1..b3bec52826 100644 --- a/traffic_ops/traffic_ops_golang/api/async_status.go +++ b/traffic_ops/traffic_ops_golang/api/async_status.go @@ -24,7 +24,7 @@ import ( "errors" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/api/change_log.go b/traffic_ops/traffic_ops_golang/api/change_log.go index adb008cac2..d9f68eeb21 100644 --- a/traffic_ops/traffic_ops_golang/api/change_log.go +++ b/traffic_ops/traffic_ops_golang/api/change_log.go @@ -25,9 +25,9 @@ import ( "fmt" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" ) type ChangeLog struct { diff --git a/traffic_ops/traffic_ops_golang/api/change_log_test.go b/traffic_ops/traffic_ops_golang/api/change_log_test.go index 5776f52ff3..ca77349f9f 100644 --- a/traffic_ops/traffic_ops_golang/api/change_log_test.go +++ b/traffic_ops/traffic_ops_golang/api/change_log_test.go @@ -27,7 +27,7 @@ import ( "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" ) type testIdentifier struct { diff --git a/traffic_ops/traffic_ops_golang/api/generic_crud.go b/traffic_ops/traffic_ops_golang/api/generic_crud.go index f1cf640e78..4c30a776a5 100644 --- a/traffic_ops/traffic_ops_golang/api/generic_crud.go +++ b/traffic_ops/traffic_ops_golang/api/generic_crud.go @@ -26,13 +26,13 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - ims "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + ims "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) type GenericCreator interface { diff --git a/traffic_ops/traffic_ops_golang/api/shared_handlers.go b/traffic_ops/traffic_ops_golang/api/shared_handlers.go index 211338b43e..696197d418 100644 --- a/traffic_ops/traffic_ops_golang/api/shared_handlers.go +++ b/traffic_ops/traffic_ops_golang/api/shared_handlers.go @@ -32,9 +32,9 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const nilVersionErrorMsg = "a wrapped handler was called without an API version" diff --git a/traffic_ops/traffic_ops_golang/api/shared_handlers_test.go b/traffic_ops/traffic_ops_golang/api/shared_handlers_test.go index 8e2c4ae0ea..5c991217d6 100644 --- a/traffic_ops/traffic_ops_golang/api/shared_handlers_test.go +++ b/traffic_ops/traffic_ops_golang/api/shared_handlers_test.go @@ -29,11 +29,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/api/shared_interfaces.go b/traffic_ops/traffic_ops_golang/api/shared_interfaces.go index 1d92773935..9039be71c5 100644 --- a/traffic_ops/traffic_ops_golang/api/shared_interfaces.go +++ b/traffic_ops/traffic_ops_golang/api/shared_interfaces.go @@ -23,9 +23,9 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) type CRUDer interface { diff --git a/traffic_ops/traffic_ops_golang/apicapability/api_capabilities.go b/traffic_ops/traffic_ops_golang/apicapability/api_capabilities.go index 6b769599bc..360236954f 100644 --- a/traffic_ops/traffic_ops_golang/apicapability/api_capabilities.go +++ b/traffic_ops/traffic_ops_golang/apicapability/api_capabilities.go @@ -29,11 +29,11 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/apicapability/api_capabilities_test.go b/traffic_ops/traffic_ops_golang/apicapability/api_capabilities_test.go index 7deae74b93..a56db93485 100644 --- a/traffic_ops/traffic_ops_golang/apicapability/api_capabilities_test.go +++ b/traffic_ops/traffic_ops_golang/apicapability/api_capabilities_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/apitenant/tenant.go b/traffic_ops/traffic_ops_golang/apitenant/tenant.go index 4047baa076..8440b26114 100644 --- a/traffic_ops/traffic_ops_golang/apitenant/tenant.go +++ b/traffic_ops/traffic_ops_golang/apitenant/tenant.go @@ -30,15 +30,15 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/apitenant/tenant_test.go b/traffic_ops/traffic_ops_golang/apitenant/tenant_test.go index d66fce55ad..f827013714 100644 --- a/traffic_ops/traffic_ops_golang/apitenant/tenant_test.go +++ b/traffic_ops/traffic_ops_golang/apitenant/tenant_test.go @@ -24,9 +24,9 @@ import ( "strconv" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/asn/asns.go b/traffic_ops/traffic_ops_golang/asn/asns.go index d0aa231c8b..047d7fc604 100644 --- a/traffic_ops/traffic_ops_golang/asn/asns.go +++ b/traffic_ops/traffic_ops_golang/asn/asns.go @@ -28,14 +28,14 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/asn/asns_test.go b/traffic_ops/traffic_ops_golang/asn/asns_test.go index 62a46af7f8..62759d1bc5 100644 --- a/traffic_ops/traffic_ops_golang/asn/asns_test.go +++ b/traffic_ops/traffic_ops_golang/asn/asns_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func getTestASNs() []tc.ASNNullable { diff --git a/traffic_ops/traffic_ops_golang/auth/authorize.go b/traffic_ops/traffic_ops_golang/auth/authorize.go index 7a26f131eb..7c69a0fbec 100644 --- a/traffic_ops/traffic_ops_golang/auth/authorize.go +++ b/traffic_ops/traffic_ops_golang/auth/authorize.go @@ -29,8 +29,8 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/auth/certificate.go b/traffic_ops/traffic_ops_golang/auth/certificate.go index 50fd78f0aa..7639e37675 100644 --- a/traffic_ops/traffic_ops_golang/auth/certificate.go +++ b/traffic_ops/traffic_ops_golang/auth/certificate.go @@ -28,8 +28,8 @@ import ( "net/http" "path/filepath" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc/ldap" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc/ldap" ) // VerifyClientCertificate takes a http.Request, pulls the (optionally) provided client TLS diff --git a/traffic_ops/traffic_ops_golang/auth/ldap.go b/traffic_ops/traffic_ops_golang/auth/ldap.go index e0c9021318..96a4e5bc8f 100644 --- a/traffic_ops/traffic_ops_golang/auth/ldap.go +++ b/traffic_ops/traffic_ops_golang/auth/ldap.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" "github.com/go-ldap/ldap/v3" ) diff --git a/traffic_ops/traffic_ops_golang/auth/password_check.go b/traffic_ops/traffic_ops_golang/auth/password_check.go index 71efb5ee3c..13ed0faa43 100644 --- a/traffic_ops/traffic_ops_golang/auth/password_check.go +++ b/traffic_ops/traffic_ops_golang/auth/password_check.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) // A lookup table, bool will always be true diff --git a/traffic_ops/traffic_ops_golang/auth/usercache.go b/traffic_ops/traffic_ops_golang/auth/usercache.go index 1cfebef9ab..68b06a5687 100644 --- a/traffic_ops/traffic_ops_golang/auth/usercache.go +++ b/traffic_ops/traffic_ops_golang/auth/usercache.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/auth/usercache_test.go b/traffic_ops/traffic_ops_golang/auth/usercache_test.go index ce10ebdfb3..5a744d2678 100644 --- a/traffic_ops/traffic_ops_golang/auth/usercache_test.go +++ b/traffic_ops/traffic_ops_golang/auth/usercache_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go index c507e97318..fd3f36fbce 100644 --- a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go +++ b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go @@ -29,14 +29,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups_test.go b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups_test.go index 601f05af1a..5326fb25ea 100644 --- a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups_test.go +++ b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/cachegroup/dspost.go b/traffic_ops/traffic_ops_golang/cachegroup/dspost.go index e0eeb2b739..1f4a0be100 100644 --- a/traffic_ops/traffic_ops_golang/cachegroup/dspost.go +++ b/traffic_ops/traffic_ops_golang/cachegroup/dspost.go @@ -27,12 +27,12 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go b/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go index f889a67c2d..ed8c0287fc 100644 --- a/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go +++ b/traffic_ops/traffic_ops_golang/cachegroup/queueupdate.go @@ -27,9 +27,9 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) const queue = "queue" diff --git a/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters.go b/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters.go index 24ee3e10e1..75ea861220 100644 --- a/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters.go +++ b/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters.go @@ -31,14 +31,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/parameter" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/parameter" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters_test.go b/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters_test.go index 29776eb16e..b5bf0cc4f6 100644 --- a/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters_test.go +++ b/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters_test.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/cachesstats/cachesstats.go b/traffic_ops/traffic_ops_golang/cachesstats/cachesstats.go index 8431167cb1..d804755f4c 100644 --- a/traffic_ops/traffic_ops_golang/cachesstats/cachesstats.go +++ b/traffic_ops/traffic_ops_golang/cachesstats/cachesstats.go @@ -25,11 +25,11 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/monitorhlp" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/monitorhlp" ) const ATSCurrentConnectionsStat = "ats.proxy.process.http.current_client_connections" diff --git a/traffic_ops/traffic_ops_golang/cachesstats/cachesstats_test.go b/traffic_ops/traffic_ops_golang/cachesstats/cachesstats_test.go index 4233949e34..9621c3eaa9 100644 --- a/traffic_ops/traffic_ops_golang/cachesstats/cachesstats_test.go +++ b/traffic_ops/traffic_ops_golang/cachesstats/cachesstats_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestAddStatsInvalidString(t *testing.T) { diff --git a/traffic_ops/traffic_ops_golang/capabilities/capabilities.go b/traffic_ops/traffic_ops_golang/capabilities/capabilities.go index 49f8bead43..55b65c611c 100644 --- a/traffic_ops/traffic_ops_golang/capabilities/capabilities.go +++ b/traffic_ops/traffic_ops_golang/capabilities/capabilities.go @@ -31,11 +31,11 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) const readQuery = ` diff --git a/traffic_ops/traffic_ops_golang/cdn/capacity.go b/traffic_ops/traffic_ops_golang/cdn/capacity.go index 95d41209f4..ffb47b7643 100644 --- a/traffic_ops/traffic_ops_golang/cdn/capacity.go +++ b/traffic_ops/traffic_ops_golang/cdn/capacity.go @@ -26,12 +26,12 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/monitorhlp" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/monitorhlp" ) func GetCapacity(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/cdn/capacity_test.go b/traffic_ops/traffic_ops_golang/cdn/capacity_test.go index f1bcc85431..6b49157294 100644 --- a/traffic_ops/traffic_ops_golang/cdn/capacity_test.go +++ b/traffic_ops/traffic_ops_golang/cdn/capacity_test.go @@ -22,7 +22,7 @@ package cdn import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestGetStatsFromServiceInterface(t *testing.T) { diff --git a/traffic_ops/traffic_ops_golang/cdn/cdns.go b/traffic_ops/traffic_ops_golang/cdn/cdns.go index 8211767b11..2800e44951 100644 --- a/traffic_ops/traffic_ops_golang/cdn/cdns.go +++ b/traffic_ops/traffic_ops_golang/cdn/cdns.go @@ -29,14 +29,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" "github.com/asaskevich/govalidator" validation "github.com/go-ozzo/ozzo-validation" diff --git a/traffic_ops/traffic_ops_golang/cdn/cdns_test.go b/traffic_ops/traffic_ops_golang/cdn/cdns_test.go index a19fc2ee99..a3bc4b8248 100644 --- a/traffic_ops/traffic_ops_golang/cdn/cdns_test.go +++ b/traffic_ops/traffic_ops_golang/cdn/cdns_test.go @@ -27,11 +27,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/cdn/dnssec.go b/traffic_ops/traffic_ops_golang/cdn/dnssec.go index d74c028897..9578de29ba 100644 --- a/traffic_ops/traffic_ops_golang/cdn/dnssec.go +++ b/traffic_ops/traffic_ops_golang/cdn/dnssec.go @@ -32,12 +32,12 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" ) const ( diff --git a/traffic_ops/traffic_ops_golang/cdn/dnssecrefresh.go b/traffic_ops/traffic_ops_golang/cdn/dnssecrefresh.go index 99e65b102d..cb85636d50 100644 --- a/traffic_ops/traffic_ops_golang/cdn/dnssecrefresh.go +++ b/traffic_ops/traffic_ops_golang/cdn/dnssecrefresh.go @@ -29,14 +29,14 @@ import ( "sync/atomic" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/cdn/domains.go b/traffic_ops/traffic_ops_golang/cdn/domains.go index 21df9d6820..e8a08f45a9 100644 --- a/traffic_ops/traffic_ops_golang/cdn/domains.go +++ b/traffic_ops/traffic_ops_golang/cdn/domains.go @@ -24,10 +24,10 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/cdn/genksk.go b/traffic_ops/traffic_ops_golang/cdn/genksk.go index 72c157a08b..5e650c017f 100644 --- a/traffic_ops/traffic_ops_golang/cdn/genksk.go +++ b/traffic_ops/traffic_ops_golang/cdn/genksk.go @@ -26,11 +26,11 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" ) const DefaultKSKTTLSeconds = 60 diff --git a/traffic_ops/traffic_ops_golang/cdn/health.go b/traffic_ops/traffic_ops_golang/cdn/health.go index cc9f9250b5..74a3e835f2 100644 --- a/traffic_ops/traffic_ops_golang/cdn/health.go +++ b/traffic_ops/traffic_ops_golang/cdn/health.go @@ -25,10 +25,10 @@ import ( "net/http" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/monitorhlp" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/monitorhlp" ) func GetHealth(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/cdn/namedelete.go b/traffic_ops/traffic_ops_golang/cdn/namedelete.go index 133b8fbdc1..ac9cec8f0e 100644 --- a/traffic_ops/traffic_ops_golang/cdn/namedelete.go +++ b/traffic_ops/traffic_ops_golang/cdn/namedelete.go @@ -25,9 +25,9 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) func DeleteName(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/cdn/queue.go b/traffic_ops/traffic_ops_golang/cdn/queue.go index 2d602a8b74..5e852d9b4e 100644 --- a/traffic_ops/traffic_ops_golang/cdn/queue.go +++ b/traffic_ops/traffic_ops_golang/cdn/queue.go @@ -26,10 +26,10 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/cdn/sslkeys.go b/traffic_ops/traffic_ops_golang/cdn/sslkeys.go index 7715c6dab4..fb8cdc2681 100644 --- a/traffic_ops/traffic_ops_golang/cdn/sslkeys.go +++ b/traffic_ops/traffic_ops_golang/cdn/sslkeys.go @@ -23,7 +23,7 @@ import ( "errors" "net/http" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func GetSSLKeys(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/cdn_lock/cdn_lock.go b/traffic_ops/traffic_ops_golang/cdn_lock/cdn_lock.go index 61694c691d..c0f57bd426 100644 --- a/traffic_ops/traffic_ops_golang/cdn_lock/cdn_lock.go +++ b/traffic_ops/traffic_ops_golang/cdn_lock/cdn_lock.go @@ -28,11 +28,11 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations.go b/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations.go index 514ae7c5a3..83645a441e 100644 --- a/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations.go +++ b/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations.go @@ -30,14 +30,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" "github.com/asaskevich/govalidator" validation "github.com/go-ozzo/ozzo-validation" diff --git a/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations_test.go b/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations_test.go index e671122a00..0b94c98ea5 100644 --- a/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations_test.go +++ b/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/cdni/capacity.go b/traffic_ops/traffic_ops_golang/cdni/capacity.go index 3afa6f62f6..7ca6c43dad 100644 --- a/traffic_ops/traffic_ops_golang/cdni/capacity.go +++ b/traffic_ops/traffic_ops_golang/cdni/capacity.go @@ -22,8 +22,8 @@ package cdni import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func getCapacities(inf *api.APIInfo, ucdn string) (Capabilities, error) { diff --git a/traffic_ops/traffic_ops_golang/cdni/shared.go b/traffic_ops/traffic_ops_golang/cdni/shared.go index 117d624c40..1916f35396 100644 --- a/traffic_ops/traffic_ops_golang/cdni/shared.go +++ b/traffic_ops/traffic_ops_golang/cdni/shared.go @@ -29,10 +29,10 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwt" diff --git a/traffic_ops/traffic_ops_golang/cdni/telemetry.go b/traffic_ops/traffic_ops_golang/cdni/telemetry.go index 6fd718c603..473cef647f 100644 --- a/traffic_ops/traffic_ops_golang/cdni/telemetry.go +++ b/traffic_ops/traffic_ops_golang/cdni/telemetry.go @@ -22,8 +22,8 @@ package cdni import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func getTelemetries(inf *api.APIInfo, ucdn string) (Capabilities, error) { diff --git a/traffic_ops/traffic_ops_golang/cdnnotification/cdnnotifications.go b/traffic_ops/traffic_ops_golang/cdnnotification/cdnnotifications.go index b0c8ed9228..0f577d20d3 100644 --- a/traffic_ops/traffic_ops_golang/cdnnotification/cdnnotifications.go +++ b/traffic_ops/traffic_ops_golang/cdnnotification/cdnnotifications.go @@ -25,10 +25,10 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) const readQuery = ` diff --git a/traffic_ops/traffic_ops_golang/config/config.go b/traffic_ops/traffic_ops_golang/config/config.go index 8a8fee6d07..f2cef87a12 100644 --- a/traffic_ops/traffic_ops_golang/config/config.go +++ b/traffic_ops/traffic_ops_golang/config/config.go @@ -31,9 +31,9 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) // Options is a structure used to hold the route configuration options that can be supplied for the backend routes. diff --git a/traffic_ops/traffic_ops_golang/coordinate/coordinates.go b/traffic_ops/traffic_ops_golang/coordinate/coordinates.go index 06078b5596..28ee684c80 100644 --- a/traffic_ops/traffic_ops_golang/coordinate/coordinates.go +++ b/traffic_ops/traffic_ops_golang/coordinate/coordinates.go @@ -31,14 +31,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/coordinate/coordinates_test.go b/traffic_ops/traffic_ops_golang/coordinate/coordinates_test.go index 1a468a13af..9bd589923d 100644 --- a/traffic_ops/traffic_ops_golang/coordinate/coordinates_test.go +++ b/traffic_ops/traffic_ops_golang/coordinate/coordinates_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/config.go b/traffic_ops/traffic_ops_golang/crconfig/config.go index 885bb4d45c..c02f2aa63f 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/config.go +++ b/traffic_ops/traffic_ops_golang/crconfig/config.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func makeCRConfigConfig(cdn string, tx *sql.Tx, dnssecEnabled bool, domain string) (map[string]interface{}, error) { diff --git a/traffic_ops/traffic_ops_golang/crconfig/config_test.go b/traffic_ops/traffic_ops_golang/crconfig/config_test.go index 0880676793..e211a56636 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/config_test.go +++ b/traffic_ops/traffic_ops_golang/crconfig/config_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/crconfig.go b/traffic_ops/traffic_ops_golang/crconfig/crconfig.go index fc1ac53004..504b80bbf3 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/crconfig.go +++ b/traffic_ops/traffic_ops_golang/crconfig/crconfig.go @@ -25,9 +25,9 @@ import ( "net/url" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/topology" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/topology" ) // Make creates and returns the CRConfig from the database. diff --git a/traffic_ops/traffic_ops_golang/crconfig/deliveryservice.go b/traffic_ops/traffic_ops_golang/crconfig/deliveryservice.go index 17805994a7..265be45fa7 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/deliveryservice.go +++ b/traffic_ops/traffic_ops_golang/crconfig/deliveryservice.go @@ -27,8 +27,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go b/traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go index 3c02242608..4dd28c6bc9 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go +++ b/traffic_ops/traffic_ops_golang/crconfig/deliveryservice_test.go @@ -29,9 +29,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/edgelocations.go b/traffic_ops/traffic_ops_golang/crconfig/edgelocations.go index 7ffb96d441..fa30eb3a63 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/edgelocations.go +++ b/traffic_ops/traffic_ops_golang/crconfig/edgelocations.go @@ -23,7 +23,7 @@ import ( "database/sql" "errors" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/edgelocations_test.go b/traffic_ops/traffic_ops_golang/crconfig/edgelocations_test.go index 6e3523f5e6..73f9a3a8d9 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/edgelocations_test.go +++ b/traffic_ops/traffic_ops_golang/crconfig/edgelocations_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/handler.go b/traffic_ops/traffic_ops_golang/crconfig/handler.go index 87fce08e62..c0367bc4b3 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/handler.go +++ b/traffic_ops/traffic_ops_golang/crconfig/handler.go @@ -27,13 +27,13 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/monitoring" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/monitoring" ) // Handler creates and serves the CRConfig from the raw SQL data. diff --git a/traffic_ops/traffic_ops_golang/crconfig/servers.go b/traffic_ops/traffic_ops_golang/crconfig/servers.go index ad12f2d64c..3b6b752341 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/servers.go +++ b/traffic_ops/traffic_ops_golang/crconfig/servers.go @@ -26,9 +26,9 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/servers_test.go b/traffic_ops/traffic_ops_golang/crconfig/servers_test.go index 983594f498..2f712bce9f 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/servers_test.go +++ b/traffic_ops/traffic_ops_golang/crconfig/servers_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/snapshot.go b/traffic_ops/traffic_ops_golang/crconfig/snapshot.go index 7aa6918b53..31c615f1d6 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/snapshot.go +++ b/traffic_ops/traffic_ops_golang/crconfig/snapshot.go @@ -25,9 +25,9 @@ import ( "errors" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/monitoring" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/monitoring" ) // Snapshot takes the CRConfig JSON-serializable object (which may be generated via crconfig.Make), and writes it to the snapshot table. diff --git a/traffic_ops/traffic_ops_golang/crconfig/snapshot_test.go b/traffic_ops/traffic_ops_golang/crconfig/snapshot_test.go index 9c67806e4b..01c2d5bf5b 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/snapshot_test.go +++ b/traffic_ops/traffic_ops_golang/crconfig/snapshot_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/monitoring" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/monitoring" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/crconfig/stats.go b/traffic_ops/traffic_ops_golang/crconfig/stats.go index 480cf27166..ec2de0595b 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/stats.go +++ b/traffic_ops/traffic_ops_golang/crconfig/stats.go @@ -22,7 +22,7 @@ package crconfig import ( "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func makeStats(cdn string, user string, host string, version string) tc.CRConfigStats { diff --git a/traffic_ops/traffic_ops_golang/crconfig/stats_test.go b/traffic_ops/traffic_ops_golang/crconfig/stats_test.go index 920e14e16e..b849da9642 100644 --- a/traffic_ops/traffic_ops_golang/crconfig/stats_test.go +++ b/traffic_ops/traffic_ops_golang/crconfig/stats_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" ) func ExpectedMakeStats() tc.CRConfigStats { diff --git a/traffic_ops/traffic_ops_golang/crstats/cdnrouting.go b/traffic_ops/traffic_ops_golang/crstats/cdnrouting.go index 738d24b40b..acf2036c04 100644 --- a/traffic_ops/traffic_ops_golang/crstats/cdnrouting.go +++ b/traffic_ops/traffic_ops_golang/crstats/cdnrouting.go @@ -24,8 +24,8 @@ import ( "errors" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) // GetCDNRouting is the handler for getting aggregated routing percentages across CDNs. diff --git a/traffic_ops/traffic_ops_golang/crstats/dsrouting.go b/traffic_ops/traffic_ops_golang/crstats/dsrouting.go index 55c94542d6..2d19bca884 100644 --- a/traffic_ops/traffic_ops_golang/crstats/dsrouting.go +++ b/traffic_ops/traffic_ops_golang/crstats/dsrouting.go @@ -25,13 +25,13 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/lib/pq" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" ) // GetDSRouting is the handler for getting aggregated routing percentages for a DS. diff --git a/traffic_ops/traffic_ops_golang/crstats/routing.go b/traffic_ops/traffic_ops_golang/crstats/routing.go index 5f10b57cb7..b72f750595 100644 --- a/traffic_ops/traffic_ops_golang/crstats/routing.go +++ b/traffic_ops/traffic_ops_golang/crstats/routing.go @@ -33,8 +33,8 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) type ( diff --git a/traffic_ops/traffic_ops_golang/crstats/routing_test.go b/traffic_ops/traffic_ops_golang/crstats/routing_test.go index d27889c3f9..1764aeaafd 100644 --- a/traffic_ops/traffic_ops_golang/crstats/routing_test.go +++ b/traffic_ops/traffic_ops_golang/crstats/routing_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/dbdump/dbdump.go b/traffic_ops/traffic_ops_golang/dbdump/dbdump.go index 8dc578ab99..be0c02a928 100644 --- a/traffic_ops/traffic_ops_golang/dbdump/dbdump.go +++ b/traffic_ops/traffic_ops_golang/dbdump/dbdump.go @@ -27,9 +27,9 @@ import ( "os/exec" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func filename() string { diff --git a/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers.go b/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers.go index a9d388ff89..48cd14bbe9 100644 --- a/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers.go +++ b/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers.go @@ -28,9 +28,9 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/topology/topology_validation" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/topology/topology_validation" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers_test.go b/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers_test.go index cd3d3a3a94..82ad9441b5 100644 --- a/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers_test.go +++ b/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers_test.go @@ -30,9 +30,9 @@ import ( "time" "unicode" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/acme.go b/traffic_ops/traffic_ops_golang/deliveryservice/acme.go index 4483248bbc..902bd95829 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/acme.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/acme.go @@ -35,16 +35,16 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" "github.com/go-acme/lego/certcrypto" "github.com/go-acme/lego/certificate" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/acme_renew.go b/traffic_ops/traffic_ops_golang/deliveryservice/acme_renew.go index eb7c78af09..b20bc7357f 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/acme_renew.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/acme_renew.go @@ -25,14 +25,14 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" "github.com/go-acme/lego/certificate" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/acme_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/acme_test.go index 24089cd643..afd495bc75 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/acme_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/acme_test.go @@ -29,9 +29,9 @@ import ( "encoding/pem" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" "github.com/go-acme/lego/challenge/dns01" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/autorenewcerts.go b/traffic_ops/traffic_ops_golang/deliveryservice/autorenewcerts.go index 4f7f855f39..c18b8a8e5f 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/autorenewcerts.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/autorenewcerts.go @@ -27,15 +27,15 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" ) type DsKey struct { diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/capacity.go b/traffic_ops/traffic_ops_golang/deliveryservice/capacity.go index 7e54a0fdb3..0f65e8d977 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/capacity.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/capacity.go @@ -27,13 +27,13 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/monitorhlp" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/monitorhlp" ) func GetCapacity(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/consistenthash/consistenthash.go b/traffic_ops/traffic_ops_golang/deliveryservice/consistenthash/consistenthash.go index a79162061a..eb0f077094 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/consistenthash/consistenthash.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/consistenthash/consistenthash.go @@ -23,7 +23,7 @@ import ( "database/sql" "encoding/json" "errors" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" "io/ioutil" "net/http" "net/url" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deleteoldcerts.go b/traffic_ops/traffic_ops_golang/deliveryservice/deleteoldcerts.go index bfd30d3dc0..a27611ffa6 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/deleteoldcerts.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/deleteoldcerts.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" ) // DeleteOldCerts asynchronously deletes HTTPS certificates in Riak which have no corresponding delivery service in the database. diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices.go index 19e0dc7d56..3c94a76fef 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices.go @@ -32,16 +32,16 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" "github.com/asaskevich/govalidator" validation "github.com/go-ozzo/ozzo-validation" @@ -84,11 +84,11 @@ func (ds *TODeliveryService) UnmarshalJSON(data []byte) error { } // APIInfo implements -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.APIInfoer. +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.APIInfoer. func (ds *TODeliveryService) APIInfo() *api.APIInfo { return ds.ReqInfo } // SetKeys implements part of the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Identifier +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Identifier // interface. func (ds *TODeliveryService) SetKeys(keys map[string]interface{}) { i, _ := keys["id"].(int) @@ -96,7 +96,7 @@ func (ds *TODeliveryService) SetKeys(keys map[string]interface{}) { } // GetKeys implements part of the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Identifier +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Identifier // interface. func (ds TODeliveryService) GetKeys() (map[string]interface{}, bool) { if ds.ID == nil { @@ -106,28 +106,28 @@ func (ds TODeliveryService) GetKeys() (map[string]interface{}, bool) { } // GetKeyFieldsInfo implements part of the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Identifier +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Identifier // interface. func (ds TODeliveryService) GetKeyFieldsInfo() []api.KeyFieldInfo { return []api.KeyFieldInfo{{Field: "id", Func: api.GetIntKey}} } // GetAuditName implements part of the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Identifier +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Identifier // interface. func (ds *TODeliveryService) GetAuditName() string { return ds.XMLID } // GetType implements part of the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Identifier +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Identifier // interface. func (ds *TODeliveryService) GetType() string { return "ds" } // IsTenantAuthorized implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Tenantable +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Tenantable // interface. func (ds *TODeliveryService) IsTenantAuthorized(user *auth.CurrentUser) (bool, error) { return isTenantAuthorized(ds.ReqInfo, &ds.DeliveryServiceV5) @@ -664,9 +664,9 @@ func createConsistentHashQueryParams(tx *sql.Tx, dsID int, consistentHashQueryPa } // Read implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Reader +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Reader // interface (given that -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.APIInfoer +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.APIInfoer // is already implemented). func (ds *TODeliveryService) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) { version := ds.APIInfo().Version @@ -1310,11 +1310,11 @@ func updateV50(w http.ResponseWriter, r *http.Request, inf *api.APIInfo, ds *tc. } // Delete implements the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Deleter +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Deleter // interface (given that the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.APIInfoer +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.APIInfoer // and -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.Identifier +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.Identifier // interfaces are already implemented). func (ds *TODeliveryService) Delete() (error, error, int) { if ds.ID == nil { @@ -1376,7 +1376,7 @@ func (ds *TODeliveryService) Delete() (error, error, int) { } // DeleteQuery implements part of the -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api.GenericDeleter +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api.GenericDeleter // interface. func (*TODeliveryService) DeleteQuery() string { return `DELETE FROM deliveryservice WHERE id = :id` diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_required_capabilities.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_required_capabilities.go index aac113ea1a..91b0aff3c9 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_required_capabilities.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_required_capabilities.go @@ -28,14 +28,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_required_capabilities_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_required_capabilities_test.go index 5c480ea690..017612af62 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_required_capabilities_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_required_capabilities_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_test.go index c5b93e0133..786ab042c8 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/dnssec.go b/traffic_ops/traffic_ops_golang/deliveryservice/dnssec.go index a1cfa8352d..edf71b3f50 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/dnssec.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/dnssec.go @@ -30,8 +30,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" "github.com/miekg/dns" ) diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/dnssec_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/dnssec_test.go index 2434f50b3e..f816f0c4a5 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/dnssec_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/dnssec_test.go @@ -25,7 +25,7 @@ import ( "math" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) func TestMakeDSRecordText(t *testing.T) { diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/eligible.go b/traffic_ops/traffic_ops_golang/deliveryservice/eligible.go index 9a2c184ad7..d54942d0dd 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/eligible.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/eligible.go @@ -26,11 +26,11 @@ import ( "net/http" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/eligible_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/eligible_test.go index cda71eae68..44d24f851d 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/eligible_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/eligible_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/gencert.go b/traffic_ops/traffic_ops_golang/deliveryservice/gencert.go index 21c31160a6..28ec17edf0 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/gencert.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/gencert.go @@ -31,7 +31,7 @@ import ( "math/big" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) const NewCertValidDuration = time.Hour * 24 * 365 diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/health.go b/traffic_ops/traffic_ops_golang/deliveryservice/health.go index 24cecee080..200f5d2fa1 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/health.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/health.go @@ -26,12 +26,12 @@ import ( "net/http" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/monitorhlp" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/monitorhlp" ) func GetHealth(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/health_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/health_test.go index 64516e7561..580506f5f9 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/health_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/health_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) func TestAddHealth(t *testing.T) { diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/keys.go b/traffic_ops/traffic_ops_golang/deliveryservice/keys.go index a0ac2741e7..f6ded5263c 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/keys.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/keys.go @@ -35,11 +35,11 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" ) const ( diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/letsencrypt_dns_challenge.go b/traffic_ops/traffic_ops_golang/deliveryservice/letsencrypt_dns_challenge.go index a9af8cd09d..649e6738e8 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/letsencrypt_dns_challenge.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/letsencrypt_dns_challenge.go @@ -23,9 +23,9 @@ import ( "errors" "net/http" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/assign.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/assign.go index 69a56dbcc5..4678b60f22 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/request/assign.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/assign.go @@ -25,10 +25,10 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/routing/middleware" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/routing/middleware" ) // GetAssignment is the handler for GET requests to diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/comment/comments.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/comment/comments.go index b4e119d14d..a5168bba0b 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/request/comment/comments.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/comment/comments.go @@ -27,13 +27,13 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/comment/comments_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/comment/comments_test.go index de7f41b531..a02fdca2b9 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/request/comment/comments_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/comment/comments_test.go @@ -25,10 +25,10 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" ) func TestFuncs(t *testing.T) { diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/requests.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/requests.go index 4addef68e4..ec7e6c7239 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/request/requests.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/requests.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/routing/middleware" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/routing/middleware" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/requests_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/requests_test.go index 388288d008..39c62852e9 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/request/requests_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/requests_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/status.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/status.go index 695f744742..dfefaa5a68 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/request/status.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/status.go @@ -25,10 +25,10 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/routing/middleware" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/routing/middleware" ) // GetStatus is the handler for GET requests to diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/validate.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/validate.go index 7b5883a3d8..ea65e9a5e9 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/request/validate.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/validate.go @@ -24,11 +24,11 @@ import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/request/validate_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/request/validate_test.go index 60012cb70b..7f4910520e 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/request/validate_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/request/validate_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/safe.go b/traffic_ops/traffic_ops_golang/deliveryservice/safe.go index c26e612419..e262f43b3d 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/safe.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/safe.go @@ -25,11 +25,11 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" ) const safeUpdateQuery = ` diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/safe_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/safe_test.go index 9cdea41527..213b7cc664 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/safe_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/safe_test.go @@ -22,8 +22,8 @@ package deliveryservice import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/servers/delete.go b/traffic_ops/traffic_ops_golang/deliveryservice/servers/delete.go index aaa3878e07..bcec002d8f 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/servers/delete.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/servers/delete.go @@ -26,11 +26,11 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" ) // Delete handler for deleting the association between a Delivery Service and a Server diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go index d0b0587755..f6947c3a00 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go @@ -29,17 +29,17 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers_test.go b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers_test.go index d3e077cd59..5c1fa87a0f 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/sslkeys.go b/traffic_ops/traffic_ops_golang/deliveryservice/sslkeys.go index 38402e9cf0..832908faa9 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/sslkeys.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/sslkeys.go @@ -28,13 +28,13 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" ) // GenerateSSLKeys generates a new private key, certificate signing request and diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/urlkey.go b/traffic_ops/traffic_ops_golang/deliveryservice/urlkey.go index ce57ea8726..3b9ae2c72a 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservice/urlkey.go +++ b/traffic_ops/traffic_ops_golang/deliveryservice/urlkey.go @@ -27,10 +27,10 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" ) // GetURLKeysByID returns the URL sig keys for a delivery service identified by the id in the path parameter. diff --git a/traffic_ops/traffic_ops_golang/deliveryservicerequests/deliveryservicerequests.go b/traffic_ops/traffic_ops_golang/deliveryservicerequests/deliveryservicerequests.go index 206c2ad531..725ab081b5 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservicerequests/deliveryservicerequests.go +++ b/traffic_ops/traffic_ops_golang/deliveryservicerequests/deliveryservicerequests.go @@ -1,7 +1,7 @@ // Package deliveryservicerequests contains the handler for the endpoint // responsible for issuing a request for Delivery Service creation via email - // not to be confused with package -// github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice/request. +// github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice/request. // // Deprecated: This package contains logic relating to a deprecated API // endpoint and is subject to removal in the future. @@ -32,9 +32,9 @@ import ( "net/http" "net/mail" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) const msg = "From: %s\r\nTo:%s\r\nContent-Type: text/html\r\nSubject: Delivery Service Request for %s\r\n\r\n%s" diff --git a/traffic_ops/traffic_ops_golang/deliveryservicesregexes/deliveryservicesregexes.go b/traffic_ops/traffic_ops_golang/deliveryservicesregexes/deliveryservicesregexes.go index b93e399e6c..8e78810c12 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservicesregexes/deliveryservicesregexes.go +++ b/traffic_ops/traffic_ops_golang/deliveryservicesregexes/deliveryservicesregexes.go @@ -27,12 +27,12 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" validation "github.com/go-ozzo/ozzo-validation" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/deliveryservicesregexes/deliveryservicesregexes_test.go b/traffic_ops/traffic_ops_golang/deliveryservicesregexes/deliveryservicesregexes_test.go index e9eacb338d..6f9418aaa7 100644 --- a/traffic_ops/traffic_ops_golang/deliveryservicesregexes/deliveryservicesregexes_test.go +++ b/traffic_ops/traffic_ops_golang/deliveryservicesregexes/deliveryservicesregexes_test.go @@ -20,7 +20,7 @@ package deliveryservicesregexes */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" "testing" diff --git a/traffic_ops/traffic_ops_golang/division/divisions.go b/traffic_ops/traffic_ops_golang/division/divisions.go index 2749e5f54c..5b091558f3 100644 --- a/traffic_ops/traffic_ops_golang/division/divisions.go +++ b/traffic_ops/traffic_ops_golang/division/divisions.go @@ -29,14 +29,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/division/divisions_test.go b/traffic_ops/traffic_ops_golang/division/divisions_test.go index 1e683510cc..689cace6de 100644 --- a/traffic_ops/traffic_ops_golang/division/divisions_test.go +++ b/traffic_ops/traffic_ops_golang/division/divisions_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/federation_resolvers/federation_resolvers.go b/traffic_ops/traffic_ops_golang/federation_resolvers/federation_resolvers.go index ef1c30f51f..f74be5298b 100644 --- a/traffic_ops/traffic_ops_golang/federation_resolvers/federation_resolvers.go +++ b/traffic_ops/traffic_ops_golang/federation_resolvers/federation_resolvers.go @@ -27,13 +27,13 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" ) const insertFederationResolverQuery = ` diff --git a/traffic_ops/traffic_ops_golang/federations/allfederations.go b/traffic_ops/traffic_ops_golang/federations/allfederations.go index 035fa7364e..f16d4d1b45 100644 --- a/traffic_ops/traffic_ops_golang/federations/allfederations.go +++ b/traffic_ops/traffic_ops_golang/federations/allfederations.go @@ -25,10 +25,10 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func GetAll(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/federations/ds.go b/traffic_ops/traffic_ops_golang/federations/ds.go index daf0b44f1f..433b709af1 100644 --- a/traffic_ops/traffic_ops_golang/federations/ds.go +++ b/traffic_ops/traffic_ops_golang/federations/ds.go @@ -27,9 +27,9 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/federations/federation_resolvers.go b/traffic_ops/traffic_ops_golang/federations/federation_resolvers.go index 2923044b6e..30462bc183 100644 --- a/traffic_ops/traffic_ops_golang/federations/federation_resolvers.go +++ b/traffic_ops/traffic_ops_golang/federations/federation_resolvers.go @@ -24,9 +24,9 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) const deleteFederationFederationResolversQuery = ` diff --git a/traffic_ops/traffic_ops_golang/federations/federations.go b/traffic_ops/traffic_ops_golang/federations/federations.go index 02acc736ce..1f43192973 100644 --- a/traffic_ops/traffic_ops_golang/federations/federations.go +++ b/traffic_ops/traffic_ops_golang/federations/federations.go @@ -30,14 +30,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/federations/federations_test.go b/traffic_ops/traffic_ops_golang/federations/federations_test.go index c568996351..650d512869 100644 --- a/traffic_ops/traffic_ops_golang/federations/federations_test.go +++ b/traffic_ops/traffic_ops_golang/federations/federations_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/federations/user.go b/traffic_ops/traffic_ops_golang/federations/user.go index a14ff7bd13..f4b50e4046 100644 --- a/traffic_ops/traffic_ops_golang/federations/user.go +++ b/traffic_ops/traffic_ops_golang/federations/user.go @@ -27,9 +27,9 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go b/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go index 41cc0b4265..8ea35499d1 100644 --- a/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go +++ b/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go @@ -30,14 +30,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" diff --git a/traffic_ops/traffic_ops_golang/iso/iso.go b/traffic_ops/traffic_ops_golang/iso/iso.go index cb6b703c5f..16fc647785 100644 --- a/traffic_ops/traffic_ops_golang/iso/iso.go +++ b/traffic_ops/traffic_ops_golang/iso/iso.go @@ -30,11 +30,11 @@ import ( "path/filepath" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/iso/iso_test.go b/traffic_ops/traffic_ops_golang/iso/iso_test.go index 928e3811da..f3f8bfaefa 100644 --- a/traffic_ops/traffic_ops_golang/iso/iso_test.go +++ b/traffic_ops/traffic_ops_golang/iso/iso_test.go @@ -33,9 +33,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - libtc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + libtc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/iso/osversions.go b/traffic_ops/traffic_ops_golang/iso/osversions.go index 1436984d07..13653670e7 100644 --- a/traffic_ops/traffic_ops_golang/iso/osversions.go +++ b/traffic_ops/traffic_ops_golang/iso/osversions.go @@ -27,9 +27,9 @@ import ( "os" "path/filepath" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/iso/osversions_test.go b/traffic_ops/traffic_ops_golang/iso/osversions_test.go index d4bbf48ccf..4845d45993 100644 --- a/traffic_ops/traffic_ops_golang/iso/osversions_test.go +++ b/traffic_ops/traffic_ops_golang/iso/osversions_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/login/login.go b/traffic_ops/traffic_ops_golang/login/login.go index 2689109426..3864a8373f 100644 --- a/traffic_ops/traffic_ops_golang/login/login.go +++ b/traffic_ops/traffic_ops_golang/login/login.go @@ -34,13 +34,13 @@ import ( "path/filepath" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tocookie" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tocookie" "github.com/jmoiron/sqlx" "github.com/lestrrat-go/jwx/jwa" diff --git a/traffic_ops/traffic_ops_golang/login/login_test.go b/traffic_ops/traffic_ops_golang/login/login_test.go index 17346c7122..14b71af9c9 100644 --- a/traffic_ops/traffic_ops_golang/login/login_test.go +++ b/traffic_ops/traffic_ops_golang/login/login_test.go @@ -27,9 +27,9 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" ) func TestLoginWithEmptyCredentials(t *testing.T) { diff --git a/traffic_ops/traffic_ops_golang/login/logout.go b/traffic_ops/traffic_ops_golang/login/logout.go index 348c811b3c..86e8893d46 100644 --- a/traffic_ops/traffic_ops_golang/login/logout.go +++ b/traffic_ops/traffic_ops_golang/login/logout.go @@ -25,10 +25,10 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tocookie" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tocookie" ) func LogoutHandler(secret string) http.HandlerFunc { diff --git a/traffic_ops/traffic_ops_golang/login/logout_test.go b/traffic_ops/traffic_ops_golang/login/logout_test.go index 966e250f90..51ea9cf0b7 100644 --- a/traffic_ops/traffic_ops_golang/login/logout_test.go +++ b/traffic_ops/traffic_ops_golang/login/logout_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tocookie" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tocookie" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/login/register.go b/traffic_ops/traffic_ops_golang/login/register.go index 6a0fc0164b..18b8903e8e 100644 --- a/traffic_ops/traffic_ops_golang/login/register.go +++ b/traffic_ops/traffic_ops_golang/login/register.go @@ -29,13 +29,13 @@ import "fmt" import "html/template" import "net/http" -import "github.com/apache/trafficcontrol/lib/go-log" -import "github.com/apache/trafficcontrol/lib/go-rfc" -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-log" +import "github.com/apache/trafficcontrol/v7/lib/go-rfc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" -import "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" -import "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" -import "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" +import "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" +import "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" +import "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" type registrationEmailFormatter struct { From rfc.EmailAddress diff --git a/traffic_ops/traffic_ops_golang/login/register_test.go b/traffic_ops/traffic_ops_golang/login/register_test.go index 83037118e5..37a508d929 100644 --- a/traffic_ops/traffic_ops_golang/login/register_test.go +++ b/traffic_ops/traffic_ops_golang/login/register_test.go @@ -23,7 +23,7 @@ import "bytes" import "net/mail" import "testing" -import "github.com/apache/trafficcontrol/lib/go-rfc" +import "github.com/apache/trafficcontrol/v7/lib/go-rfc" func TestRegistrationTemplateRender(t *testing.T) { to := rfc.EmailAddress{ diff --git a/traffic_ops/traffic_ops_golang/logs/log.go b/traffic_ops/traffic_ops_golang/logs/log.go index 2128b2a507..3958c7bf4a 100644 --- a/traffic_ops/traffic_ops_golang/logs/log.go +++ b/traffic_ops/traffic_ops_golang/logs/log.go @@ -29,10 +29,10 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) // These are the default values for query string parameters if not provided. diff --git a/traffic_ops/traffic_ops_golang/monitoring/monitoring.go b/traffic_ops/traffic_ops_golang/monitoring/monitoring.go index 9088f89f31..dac462b3b8 100644 --- a/traffic_ops/traffic_ops_golang/monitoring/monitoring.go +++ b/traffic_ops/traffic_ops_golang/monitoring/monitoring.go @@ -28,10 +28,10 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/topology" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/topology" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/monitoring/monitoring_test.go b/traffic_ops/traffic_ops_golang/monitoring/monitoring_test.go index 580ba61c09..ac87101548 100644 --- a/traffic_ops/traffic_ops_golang/monitoring/monitoring_test.go +++ b/traffic_ops/traffic_ops_golang/monitoring/monitoring_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/parameter" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/parameter" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/origin/origins.go b/traffic_ops/traffic_ops_golang/origin/origins.go index f5a807ea91..ae270c8072 100644 --- a/traffic_ops/traffic_ops_golang/origin/origins.go +++ b/traffic_ops/traffic_ops_golang/origin/origins.go @@ -28,16 +28,16 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" diff --git a/traffic_ops/traffic_ops_golang/origin/origins_test.go b/traffic_ops/traffic_ops_golang/origin/origins_test.go index a4e1220ab8..3be7df2039 100644 --- a/traffic_ops/traffic_ops_golang/origin/origins_test.go +++ b/traffic_ops/traffic_ops_golang/origin/origins_test.go @@ -27,11 +27,11 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/parameter/parameters.go b/traffic_ops/traffic_ops_golang/parameter/parameters.go index 0bbda81250..f2132080c9 100644 --- a/traffic_ops/traffic_ops_golang/parameter/parameters.go +++ b/traffic_ops/traffic_ops_golang/parameter/parameters.go @@ -29,15 +29,15 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-atscfg" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/parameter/parameters_test.go b/traffic_ops/traffic_ops_golang/parameter/parameters_test.go index 3d66caedd6..43666df999 100644 --- a/traffic_ops/traffic_ops_golang/parameter/parameters_test.go +++ b/traffic_ops/traffic_ops_golang/parameter/parameters_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/physlocation/phys_locations.go b/traffic_ops/traffic_ops_golang/physlocation/phys_locations.go index 7de94d9a94..0fdb44eada 100644 --- a/traffic_ops/traffic_ops_golang/physlocation/phys_locations.go +++ b/traffic_ops/traffic_ops_golang/physlocation/phys_locations.go @@ -28,14 +28,14 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/physlocation/phys_locations_test.go b/traffic_ops/traffic_ops_golang/physlocation/phys_locations_test.go index 727183f453..2628b10068 100644 --- a/traffic_ops/traffic_ops_golang/physlocation/phys_locations_test.go +++ b/traffic_ops/traffic_ops_golang/physlocation/phys_locations_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/ping/ping.go b/traffic_ops/traffic_ops_golang/ping/ping.go index 8e876e619f..643fdcf261 100644 --- a/traffic_ops/traffic_ops_golang/ping/ping.go +++ b/traffic_ops/traffic_ops_golang/ping/ping.go @@ -22,8 +22,8 @@ package ping import ( "net/http" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) const pingResponse = `{"ping":"pong"}` diff --git a/traffic_ops/traffic_ops_golang/ping/vault.go b/traffic_ops/traffic_ops_golang/ping/vault.go index 381260d0f7..1dcba222d5 100644 --- a/traffic_ops/traffic_ops_golang/ping/vault.go +++ b/traffic_ops/traffic_ops_golang/ping/vault.go @@ -23,7 +23,7 @@ import ( "errors" "net/http" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func Vault(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/plugin/hello_config.go b/traffic_ops/traffic_ops_golang/plugin/hello_config.go index a3caa7c8d7..2b213140b4 100644 --- a/traffic_ops/traffic_ops_golang/plugin/hello_config.go +++ b/traffic_ops/traffic_ops_golang/plugin/hello_config.go @@ -17,7 +17,7 @@ package plugin import ( "encoding/json" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/traffic_ops/traffic_ops_golang/plugin/hello_context.go b/traffic_ops/traffic_ops_golang/plugin/hello_context.go index 4314915f3c..ee68915517 100644 --- a/traffic_ops/traffic_ops_golang/plugin/hello_context.go +++ b/traffic_ops/traffic_ops_golang/plugin/hello_context.go @@ -15,7 +15,7 @@ package plugin */ import ( - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/traffic_ops/traffic_ops_golang/plugin/hello_middleware.go b/traffic_ops/traffic_ops_golang/plugin/hello_middleware.go index c32654a226..43e4911ad4 100644 --- a/traffic_ops/traffic_ops_golang/plugin/hello_middleware.go +++ b/traffic_ops/traffic_ops_golang/plugin/hello_middleware.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/routing/middleware" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/routing/middleware" ) func init() { diff --git a/traffic_ops/traffic_ops_golang/plugin/hello_shared_config.go b/traffic_ops/traffic_ops_golang/plugin/hello_shared_config.go index ba7b9f3409..a2501bbe98 100644 --- a/traffic_ops/traffic_ops_golang/plugin/hello_shared_config.go +++ b/traffic_ops/traffic_ops_golang/plugin/hello_shared_config.go @@ -17,7 +17,7 @@ package plugin import ( "encoding/json" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/traffic_ops/traffic_ops_golang/plugin/hello_startup.go b/traffic_ops/traffic_ops_golang/plugin/hello_startup.go index 209f9349bc..9b1bb880c3 100644 --- a/traffic_ops/traffic_ops_golang/plugin/hello_startup.go +++ b/traffic_ops/traffic_ops_golang/plugin/hello_startup.go @@ -15,7 +15,7 @@ package plugin */ import ( - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" ) func init() { diff --git a/traffic_ops/traffic_ops_golang/plugin/plugin.go b/traffic_ops/traffic_ops_golang/plugin/plugin.go index b1c1eee24f..05324d7953 100644 --- a/traffic_ops/traffic_ops_golang/plugin/plugin.go +++ b/traffic_ops/traffic_ops_golang/plugin/plugin.go @@ -25,8 +25,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" ) // List returns the list of plugin names compiled into the calling executable. diff --git a/traffic_ops/traffic_ops_golang/plugin/proxy.go b/traffic_ops/traffic_ops_golang/plugin/proxy.go index cb65b050b7..b0a815abb4 100644 --- a/traffic_ops/traffic_ops_golang/plugin/proxy.go +++ b/traffic_ops/traffic_ops_golang/plugin/proxy.go @@ -21,8 +21,8 @@ import ( "net/url" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) // The proxy plugin reverse-proxies to other HTTP services, as configured. diff --git a/traffic_ops/traffic_ops_golang/plugins/plugins.go b/traffic_ops/traffic_ops_golang/plugins/plugins.go index 0d5afcf921..b35fe58de4 100644 --- a/traffic_ops/traffic_ops_golang/plugins/plugins.go +++ b/traffic_ops/traffic_ops_golang/plugins/plugins.go @@ -22,11 +22,11 @@ package plugins import ( "net/http" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/plugin" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/plugin" ) // Get handler for getting enabled TO Plugins. diff --git a/traffic_ops/traffic_ops_golang/profile/copy.go b/traffic_ops/traffic_ops_golang/profile/copy.go index f7d6d58548..b928819e2b 100644 --- a/traffic_ops/traffic_ops_golang/profile/copy.go +++ b/traffic_ops/traffic_ops_golang/profile/copy.go @@ -26,11 +26,11 @@ import ( "net/http" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/profileparameter" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/profileparameter" ) type errorDetails struct { diff --git a/traffic_ops/traffic_ops_golang/profile/copy_test.go b/traffic_ops/traffic_ops_golang/profile/copy_test.go index d0977c3bd8..2f3d665973 100644 --- a/traffic_ops/traffic_ops_golang/profile/copy_test.go +++ b/traffic_ops/traffic_ops_golang/profile/copy_test.go @@ -28,13 +28,13 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/profile/profile_export.go b/traffic_ops/traffic_ops_golang/profile/profile_export.go index e839922438..f3834d7ad3 100644 --- a/traffic_ops/traffic_ops_golang/profile/profile_export.go +++ b/traffic_ops/traffic_ops_golang/profile/profile_export.go @@ -24,12 +24,12 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) // ExportProfileHandler exports a profile per ID diff --git a/traffic_ops/traffic_ops_golang/profile/profile_export_test.go b/traffic_ops/traffic_ops_golang/profile/profile_export_test.go index a99165fdbc..cc22e5d06d 100644 --- a/traffic_ops/traffic_ops_golang/profile/profile_export_test.go +++ b/traffic_ops/traffic_ops_golang/profile/profile_export_test.go @@ -23,7 +23,7 @@ import ( "errors" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/profile/profile_import.go b/traffic_ops/traffic_ops_golang/profile/profile_import.go index 003f3c774d..eee4a921e7 100644 --- a/traffic_ops/traffic_ops_golang/profile/profile_import.go +++ b/traffic_ops/traffic_ops_golang/profile/profile_import.go @@ -25,9 +25,9 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/profile/profile_import_test.go b/traffic_ops/traffic_ops_golang/profile/profile_import_test.go index 1087309197..9ac2588224 100644 --- a/traffic_ops/traffic_ops_golang/profile/profile_import_test.go +++ b/traffic_ops/traffic_ops_golang/profile/profile_import_test.go @@ -23,7 +23,7 @@ import ( "errors" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/profile/profiles.go b/traffic_ops/traffic_ops_golang/profile/profiles.go index 80e83d35a6..bfc616cc5a 100644 --- a/traffic_ops/traffic_ops_golang/profile/profiles.go +++ b/traffic_ops/traffic_ops_golang/profile/profiles.go @@ -34,16 +34,16 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/parameter" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/parameter" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/profile/profiles_test.go b/traffic_ops/traffic_ops_golang/profile/profiles_test.go index 443ec66397..ca80c4de34 100644 --- a/traffic_ops/traffic_ops_golang/profile/profiles_test.go +++ b/traffic_ops/traffic_ops_golang/profile/profiles_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/profileparameter/parameterprofilebyid.go b/traffic_ops/traffic_ops_golang/profileparameter/parameterprofilebyid.go index 00455d7370..4f31057520 100644 --- a/traffic_ops/traffic_ops_golang/profileparameter/parameterprofilebyid.go +++ b/traffic_ops/traffic_ops_golang/profileparameter/parameterprofilebyid.go @@ -24,8 +24,8 @@ import ( "errors" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func GetProfileID(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/profileparameter/parameterprofilebyname.go b/traffic_ops/traffic_ops_golang/profileparameter/parameterprofilebyname.go index 08aa2dfff9..09ab44acd2 100644 --- a/traffic_ops/traffic_ops_golang/profileparameter/parameterprofilebyname.go +++ b/traffic_ops/traffic_ops_golang/profileparameter/parameterprofilebyname.go @@ -24,8 +24,8 @@ import ( "errors" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func GetProfileName(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/profileparameter/postparameterprofile.go b/traffic_ops/traffic_ops_golang/profileparameter/postparameterprofile.go index 387ce4e0f4..0b98e03651 100644 --- a/traffic_ops/traffic_ops_golang/profileparameter/postparameterprofile.go +++ b/traffic_ops/traffic_ops_golang/profileparameter/postparameterprofile.go @@ -26,9 +26,9 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/profileparameter/postprofileparameter.go b/traffic_ops/traffic_ops_golang/profileparameter/postprofileparameter.go index 9b25d30e54..c194e874e4 100644 --- a/traffic_ops/traffic_ops_golang/profileparameter/postprofileparameter.go +++ b/traffic_ops/traffic_ops_golang/profileparameter/postprofileparameter.go @@ -26,9 +26,9 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/profileparameter/postprofileparametersbyid.go b/traffic_ops/traffic_ops_golang/profileparameter/postprofileparametersbyid.go index 3abce517ae..e63ad0ac5c 100644 --- a/traffic_ops/traffic_ops_golang/profileparameter/postprofileparametersbyid.go +++ b/traffic_ops/traffic_ops_golang/profileparameter/postprofileparametersbyid.go @@ -25,9 +25,9 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) func PostProfileParamsByID(w http.ResponseWriter, r *http.Request) { diff --git a/traffic_ops/traffic_ops_golang/profileparameter/postprofileparametersbyname.go b/traffic_ops/traffic_ops_golang/profileparameter/postprofileparametersbyname.go index ec0c4df2a5..1cdbad6022 100644 --- a/traffic_ops/traffic_ops_golang/profileparameter/postprofileparametersbyname.go +++ b/traffic_ops/traffic_ops_golang/profileparameter/postprofileparametersbyname.go @@ -25,9 +25,9 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/profileparameter/profile_parameters.go b/traffic_ops/traffic_ops_golang/profileparameter/profile_parameters.go index 601acbaf71..b1800a21c9 100644 --- a/traffic_ops/traffic_ops_golang/profileparameter/profile_parameters.go +++ b/traffic_ops/traffic_ops_golang/profileparameter/profile_parameters.go @@ -29,13 +29,13 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/profileparameter/profile_parameters_test.go b/traffic_ops/traffic_ops_golang/profileparameter/profile_parameters_test.go index 38a86b0d70..5d474e943e 100644 --- a/traffic_ops/traffic_ops_golang/profileparameter/profile_parameters_test.go +++ b/traffic_ops/traffic_ops_golang/profileparameter/profile_parameters_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/region/regions.go b/traffic_ops/traffic_ops_golang/region/regions.go index 5ce193057d..259ecf6c97 100644 --- a/traffic_ops/traffic_ops_golang/region/regions.go +++ b/traffic_ops/traffic_ops_golang/region/regions.go @@ -27,13 +27,13 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/region/regions_test.go b/traffic_ops/traffic_ops_golang/region/regions_test.go index d34d337e2d..9a59d7be64 100644 --- a/traffic_ops/traffic_ops_golang/region/regions_test.go +++ b/traffic_ops/traffic_ops_golang/region/regions_test.go @@ -26,9 +26,9 @@ import ( "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" ) func getTestRegions() []tc.Region { diff --git a/traffic_ops/traffic_ops_golang/role/roles.go b/traffic_ops/traffic_ops_golang/role/roles.go index e38706dbe0..5d9880e975 100644 --- a/traffic_ops/traffic_ops_golang/role/roles.go +++ b/traffic_ops/traffic_ops_golang/role/roles.go @@ -30,13 +30,13 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/role/roles_test.go b/traffic_ops/traffic_ops_golang/role/roles_test.go index f3638b7a3f..402c623a3e 100644 --- a/traffic_ops/traffic_ops_golang/role/roles_test.go +++ b/traffic_ops/traffic_ops_golang/role/roles_test.go @@ -30,14 +30,14 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go b/traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go index 459f2a034f..3ac4efc8cb 100644 --- a/traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go +++ b/traffic_ops/traffic_ops_golang/routing/middleware/wrappers.go @@ -31,14 +31,14 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/about" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tocookie" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/about" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tocookie" "github.com/lestrrat-go/jwx/jwt" ) diff --git a/traffic_ops/traffic_ops_golang/routing/middleware/wrappers_test.go b/traffic_ops/traffic_ops_golang/routing/middleware/wrappers_test.go index 600f31a8b2..9f79df07ab 100644 --- a/traffic_ops/traffic_ops_golang/routing/middleware/wrappers_test.go +++ b/traffic_ops/traffic_ops_golang/routing/middleware/wrappers_test.go @@ -34,12 +34,12 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tocookie" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tocookie" "github.com/jmoiron/sqlx" "github.com/lestrrat-go/jwx/jwa" diff --git a/traffic_ops/traffic_ops_golang/routing/routes.go b/traffic_ops/traffic_ops_golang/routing/routes.go index 23d70f83c6..e7f50e7eec 100644 --- a/traffic_ops/traffic_ops_golang/routing/routes.go +++ b/traffic_ops/traffic_ops_golang/routing/routes.go @@ -28,68 +28,68 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/about" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/acme" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/apicapability" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/apitenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/asn" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cachegroup" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cachegroupparameter" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cachesstats" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/capabilities" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cdn" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cdn_lock" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cdnfederation" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cdni" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cdnnotification" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/coordinate" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/crconfig" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/crstats" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbdump" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice/consistenthash" - dsrequest "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice/request" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice/request/comment" - dsserver "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice/servers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservicerequests" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservicesregexes" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/division" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/federation_resolvers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/federations" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/invalidationjobs" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/iso" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/login" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/logs" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/origin" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/parameter" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/physlocation" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/ping" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/plugins" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/profile" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/profileparameter" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/region" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/role" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/server" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/servercapability" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/servercheck" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/servercheck/extensions" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/servicecategory" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/staticdnsentry" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/status" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/steering" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/steeringtargets" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/systeminfo" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/topology" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficstats" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/types" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/urisigning" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/user" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/vault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/about" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/acme" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/apicapability" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/apitenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/asn" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cachegroup" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cachegroupparameter" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cachesstats" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/capabilities" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cdn" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cdn_lock" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cdnfederation" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cdni" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cdnnotification" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/coordinate" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/crconfig" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/crstats" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbdump" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice/consistenthash" + dsrequest "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice/request" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice/request/comment" + dsserver "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice/servers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservicerequests" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservicesregexes" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/division" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/federation_resolvers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/federations" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/invalidationjobs" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/iso" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/login" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/logs" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/origin" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/parameter" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/physlocation" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/ping" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/plugins" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/profile" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/profileparameter" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/region" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/role" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/server" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/servercapability" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/servercheck" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/servercheck/extensions" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/servicecategory" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/staticdnsentry" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/status" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/steering" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/steeringtargets" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/systeminfo" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/topology" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficstats" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/types" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/urisigning" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/user" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/vault" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/routing/routing.go b/traffic_ops/traffic_ops_golang/routing/routing.go index b09760868c..f00afc443f 100644 --- a/traffic_ops/traffic_ops_golang/routing/routing.go +++ b/traffic_ops/traffic_ops_golang/routing/routing.go @@ -37,13 +37,13 @@ import ( "sync/atomic" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/plugin" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/routing/middleware" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/plugin" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/routing/middleware" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/routing/routing_test.go b/traffic_ops/traffic_ops_golang/routing/routing_test.go index 7b8cee8884..0d6f3e0a70 100644 --- a/traffic_ops/traffic_ops_golang/routing/routing_test.go +++ b/traffic_ops/traffic_ops_golang/routing/routing_test.go @@ -30,10 +30,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/routing/middleware" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/routing/middleware" ) type key int diff --git a/traffic_ops/traffic_ops_golang/server/detail.go b/traffic_ops/traffic_ops_golang/server/detail.go index f06fbd74f3..c6cb4c33c1 100644 --- a/traffic_ops/traffic_ops_golang/server/detail.go +++ b/traffic_ops/traffic_ops_golang/server/detail.go @@ -26,13 +26,13 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/server/detail_test.go b/traffic_ops/traffic_ops_golang/server/detail_test.go index bbcfa53788..c92ca279bf 100644 --- a/traffic_ops/traffic_ops_golang/server/detail_test.go +++ b/traffic_ops/traffic_ops_golang/server/detail_test.go @@ -18,10 +18,10 @@ import ( "strings" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/server/put_status.go b/traffic_ops/traffic_ops_golang/server/put_status.go index d66060a49f..e2fa5e52b3 100644 --- a/traffic_ops/traffic_ops_golang/server/put_status.go +++ b/traffic_ops/traffic_ops_golang/server/put_status.go @@ -29,10 +29,10 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) // InvalidStatusForDeliveryServicesAlertText returns a string describing that diff --git a/traffic_ops/traffic_ops_golang/server/put_status_test.go b/traffic_ops/traffic_ops_golang/server/put_status_test.go index def35a57bf..b2ed948975 100644 --- a/traffic_ops/traffic_ops_golang/server/put_status_test.go +++ b/traffic_ops/traffic_ops_golang/server/put_status_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/server/queue_update.go b/traffic_ops/traffic_ops_golang/server/queue_update.go index 68b5af0c58..3889449ec3 100644 --- a/traffic_ops/traffic_ops_golang/server/queue_update.go +++ b/traffic_ops/traffic_ops_golang/server/queue_update.go @@ -25,10 +25,10 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) // QueueUpdateHandler implements an http handler that sets a server's diff --git a/traffic_ops/traffic_ops_golang/server/servers.go b/traffic_ops/traffic_ops_golang/server/servers.go index 5601df03fb..c2f8a9aff9 100644 --- a/traffic_ops/traffic_ops_golang/server/servers.go +++ b/traffic_ops/traffic_ops_golang/server/servers.go @@ -31,17 +31,17 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/topology/topology_validation" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/topology/topology_validation" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/google/uuid" diff --git a/traffic_ops/traffic_ops_golang/server/servers_assignment.go b/traffic_ops/traffic_ops_golang/server/servers_assignment.go index 27fa04cafa..bdcd2041ac 100644 --- a/traffic_ops/traffic_ops_golang/server/servers_assignment.go +++ b/traffic_ops/traffic_ops_golang/server/servers_assignment.go @@ -28,13 +28,13 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/server/servers_assignment_test.go b/traffic_ops/traffic_ops_golang/server/servers_assignment_test.go index 5c387479da..2d487c0f24 100644 --- a/traffic_ops/traffic_ops_golang/server/servers_assignment_test.go +++ b/traffic_ops/traffic_ops_golang/server/servers_assignment_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/server/servers_server_capability.go b/traffic_ops/traffic_ops_golang/server/servers_server_capability.go index 5c8d0c507a..dacb0861e4 100644 --- a/traffic_ops/traffic_ops_golang/server/servers_server_capability.go +++ b/traffic_ops/traffic_ops_golang/server/servers_server_capability.go @@ -29,13 +29,13 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" validation "github.com/go-ozzo/ozzo-validation" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/server/servers_server_capability_test.go b/traffic_ops/traffic_ops_golang/server/servers_server_capability_test.go index 89c7dc34ae..99e578726b 100644 --- a/traffic_ops/traffic_ops_golang/server/servers_server_capability_test.go +++ b/traffic_ops/traffic_ops_golang/server/servers_server_capability_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/server/servers_test.go b/traffic_ops/traffic_ops_golang/server/servers_test.go index 34f9b28747..17c3f12292 100644 --- a/traffic_ops/traffic_ops_golang/server/servers_test.go +++ b/traffic_ops/traffic_ops_golang/server/servers_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/server/servers_update_status.go b/traffic_ops/traffic_ops_golang/server/servers_update_status.go index 738ba19bdb..d60fab28da 100644 --- a/traffic_ops/traffic_ops_golang/server/servers_update_status.go +++ b/traffic_ops/traffic_ops_golang/server/servers_update_status.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/server/servers_update_status_test.go b/traffic_ops/traffic_ops_golang/server/servers_update_status_test.go index 9300699ce2..75584dd07e 100644 --- a/traffic_ops/traffic_ops_golang/server/servers_update_status_test.go +++ b/traffic_ops/traffic_ops_golang/server/servers_update_status_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/server/update.go b/traffic_ops/traffic_ops_golang/server/update.go index dfeb82a0b1..3571590bbd 100644 --- a/traffic_ops/traffic_ops_golang/server/update.go +++ b/traffic_ops/traffic_ops_golang/server/update.go @@ -28,9 +28,9 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) // UpdateHandler implements an http handler that updates a server's upd_pending and reval_pending values. diff --git a/traffic_ops/traffic_ops_golang/servercapability/servercapability.go b/traffic_ops/traffic_ops_golang/servercapability/servercapability.go index bf0d7918cf..a039f7da0d 100644 --- a/traffic_ops/traffic_ops_golang/servercapability/servercapability.go +++ b/traffic_ops/traffic_ops_golang/servercapability/servercapability.go @@ -27,13 +27,13 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/servercapability/servercapability_test.go b/traffic_ops/traffic_ops_golang/servercapability/servercapability_test.go index 263bbf9e06..86423f86c0 100644 --- a/traffic_ops/traffic_ops_golang/servercapability/servercapability_test.go +++ b/traffic_ops/traffic_ops_golang/servercapability/servercapability_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/servercheck/extensions/extension.go b/traffic_ops/traffic_ops_golang/servercheck/extensions/extension.go index 37d61bf594..a65e28b95e 100644 --- a/traffic_ops/traffic_ops_golang/servercheck/extensions/extension.go +++ b/traffic_ops/traffic_ops_golang/servercheck/extensions/extension.go @@ -25,11 +25,11 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/servercheck/servercheck.go b/traffic_ops/traffic_ops_golang/servercheck/servercheck.go index ea49e8ddb8..99aa0ab876 100644 --- a/traffic_ops/traffic_ops_golang/servercheck/servercheck.go +++ b/traffic_ops/traffic_ops_golang/servercheck/servercheck.go @@ -25,12 +25,12 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) const ServerCheck_Get_Endpoint = "GET /servercheck" diff --git a/traffic_ops/traffic_ops_golang/servicecategory/servicecategories.go b/traffic_ops/traffic_ops_golang/servicecategory/servicecategories.go index 59f383a975..fc6606d0de 100644 --- a/traffic_ops/traffic_ops_golang/servicecategory/servicecategories.go +++ b/traffic_ops/traffic_ops_golang/servicecategory/servicecategories.go @@ -27,14 +27,14 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/jmoiron/sqlx" diff --git a/traffic_ops/traffic_ops_golang/servicecategory/servicecategories_test.go b/traffic_ops/traffic_ops_golang/servicecategory/servicecategories_test.go index aa842142c0..87a442c7bb 100644 --- a/traffic_ops/traffic_ops_golang/servicecategory/servicecategories_test.go +++ b/traffic_ops/traffic_ops_golang/servicecategory/servicecategories_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/staticdnsentry/staticdnsentry.go b/traffic_ops/traffic_ops_golang/staticdnsentry/staticdnsentry.go index 3db3282393..0484bd5c50 100644 --- a/traffic_ops/traffic_ops_golang/staticdnsentry/staticdnsentry.go +++ b/traffic_ops/traffic_ops_golang/staticdnsentry/staticdnsentry.go @@ -28,13 +28,13 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" diff --git a/traffic_ops/traffic_ops_golang/staticdnsentry/staticdnsentry_test.go b/traffic_ops/traffic_ops_golang/staticdnsentry/staticdnsentry_test.go index 40a08c45da..96875e2b53 100644 --- a/traffic_ops/traffic_ops_golang/staticdnsentry/staticdnsentry_test.go +++ b/traffic_ops/traffic_ops_golang/staticdnsentry/staticdnsentry_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - util "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + util "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/status/statuses.go b/traffic_ops/traffic_ops_golang/status/statuses.go index a48884af0f..1bd19bf513 100644 --- a/traffic_ops/traffic_ops_golang/status/statuses.go +++ b/traffic_ops/traffic_ops_golang/status/statuses.go @@ -25,11 +25,11 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/status/statuses_test.go b/traffic_ops/traffic_ops_golang/status/statuses_test.go index 16e1068258..f02473b5e1 100644 --- a/traffic_ops/traffic_ops_golang/status/statuses_test.go +++ b/traffic_ops/traffic_ops_golang/status/statuses_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/steering/steering.go b/traffic_ops/traffic_ops_golang/steering/steering.go index fc22ff4207..89d7ab1f05 100644 --- a/traffic_ops/traffic_ops_golang/steering/steering.go +++ b/traffic_ops/traffic_ops_golang/steering/steering.go @@ -25,9 +25,9 @@ import ( "net/http" "sort" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/steeringtargets/steeringtargets.go b/traffic_ops/traffic_ops_golang/steeringtargets/steeringtargets.go index 46023832c1..c398615625 100644 --- a/traffic_ops/traffic_ops_golang/steeringtargets/steeringtargets.go +++ b/traffic_ops/traffic_ops_golang/steeringtargets/steeringtargets.go @@ -26,15 +26,15 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" - - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" + + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/steeringtargets/steeringtargets_test.go b/traffic_ops/traffic_ops_golang/steeringtargets/steeringtargets_test.go index fe8fe0074a..8d3583ffe0 100644 --- a/traffic_ops/traffic_ops_golang/steeringtargets/steeringtargets_test.go +++ b/traffic_ops/traffic_ops_golang/steeringtargets/steeringtargets_test.go @@ -22,9 +22,9 @@ package steeringtargets import ( "testing" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/alerts.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/alerts.go index d744c86811..62eb87f4e9 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/alerts.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/alerts.go @@ -1,6 +1,6 @@ package v13 -import tc "github.com/apache/trafficcontrol/lib/go-tc" +import tc "github.com/apache/trafficcontrol/v7/lib/go-tc" /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/asns.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/asns.go index 3cd438911e..612e022e77 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/asns.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/asns.go @@ -1,6 +1,6 @@ package v13 -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/cdns.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/cdns.go index eed5be5551..9ebe47030a 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/cdns.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/cdns.go @@ -19,7 +19,7 @@ package v13 * under the License. */ -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" // CDNs - CDNsResponse to get the "response" top level key // swagger:response CDNs diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/divisions.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/divisions.go index 65b1604a8d..825739027f 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/divisions.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/divisions.go @@ -1,6 +1,6 @@ package v13 -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/physlocations.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/physlocations.go index 64f254ab75..f74c96d232 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/physlocations.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/physlocations.go @@ -19,7 +19,7 @@ package v13 * under the License. */ -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" // PhysLocations - PhysLocationsResponse to get the "response" top level key // swagger:response PhysLocations diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/profileparameters.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/profileparameters.go index 7651b4828e..2641218028 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/profileparameters.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/profileparameters.go @@ -1,6 +1,6 @@ package v13 -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/profiles.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/profiles.go index 585bbd51a6..3416477fd5 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/profiles.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/profiles.go @@ -19,7 +19,7 @@ package v13 * under the License. */ -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" // Profiles - ProfilesResponse to get the "response" top level key // swagger:response Profiles diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/regions.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/regions.go index 20c6795ebf..17d33c75e3 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/regions.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/regions.go @@ -1,6 +1,6 @@ package v13 -import "github.com/apache/trafficcontrol/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/statuses.go b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/statuses.go index 4871924d7c..bd7550ff0e 100644 --- a/traffic_ops/traffic_ops_golang/swaggerdocs/v13/statuses.go +++ b/traffic_ops/traffic_ops_golang/swaggerdocs/v13/statuses.go @@ -20,7 +20,7 @@ package v13 */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // Statuses - StatusesResponse to get the "response" top level key diff --git a/traffic_ops/traffic_ops_golang/systeminfo/system_info.go b/traffic_ops/traffic_ops_golang/systeminfo/system_info.go index 9831fa781e..a2eb5c3e06 100644 --- a/traffic_ops/traffic_ops_golang/systeminfo/system_info.go +++ b/traffic_ops/traffic_ops_golang/systeminfo/system_info.go @@ -24,9 +24,9 @@ import ( "net/http" "time" - tc "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + tc "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/systeminfo/system_info_test.go b/traffic_ops/traffic_ops_golang/systeminfo/system_info_test.go index 9cc34b6290..3b87416599 100644 --- a/traffic_ops/traffic_ops_golang/systeminfo/system_info_test.go +++ b/traffic_ops/traffic_ops_golang/systeminfo/system_info_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/tenant/tenancy.go b/traffic_ops/traffic_ops_golang/tenant/tenancy.go index a6dd3fbbe1..8713165cca 100644 --- a/traffic_ops/traffic_ops_golang/tenant/tenancy.go +++ b/traffic_ops/traffic_ops_golang/tenant/tenancy.go @@ -28,10 +28,10 @@ import ( "net/http" "strconv" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" ) // DeliveryServiceTenantInfo provides only deliveryservice info needed here diff --git a/traffic_ops/traffic_ops_golang/tocookie/cookie_test.go b/traffic_ops/traffic_ops_golang/tocookie/cookie_test.go index e226e862a8..7b3e165cbf 100644 --- a/traffic_ops/traffic_ops_golang/tocookie/cookie_test.go +++ b/traffic_ops/traffic_ops_golang/tocookie/cookie_test.go @@ -24,7 +24,7 @@ import ( "net/http" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" ) func TestParse(t *testing.T) { diff --git a/traffic_ops/traffic_ops_golang/topology/cycle_detection.go b/traffic_ops/traffic_ops_golang/topology/cycle_detection.go index 2344bf0ae6..b0254981b8 100644 --- a/traffic_ops/traffic_ops_golang/topology/cycle_detection.go +++ b/traffic_ops/traffic_ops_golang/topology/cycle_detection.go @@ -20,7 +20,7 @@ package topology */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "math" ) diff --git a/traffic_ops/traffic_ops_golang/topology/queue_update.go b/traffic_ops/traffic_ops_golang/topology/queue_update.go index 2ea61e6641..4457b4f3f3 100644 --- a/traffic_ops/traffic_ops_golang/topology/queue_update.go +++ b/traffic_ops/traffic_ops_golang/topology/queue_update.go @@ -29,12 +29,12 @@ import ( validation "github.com/go-ozzo/ozzo-validation" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) func Validate(reqObj tc.TopologiesQueueUpdateRequest, topologyName tc.TopologyName, tx *sql.Tx) error { diff --git a/traffic_ops/traffic_ops_golang/topology/snapshot.go b/traffic_ops/traffic_ops_golang/topology/snapshot.go index 5a86a4b279..d15535bc4b 100644 --- a/traffic_ops/traffic_ops_golang/topology/snapshot.go +++ b/traffic_ops/traffic_ops_golang/topology/snapshot.go @@ -23,8 +23,8 @@ import ( "database/sql" "errors" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/lib/pq" ) diff --git a/traffic_ops/traffic_ops_golang/topology/snapshot_test.go b/traffic_ops/traffic_ops_golang/topology/snapshot_test.go index bbf62993a9..2d81a06b73 100644 --- a/traffic_ops/traffic_ops_golang/topology/snapshot_test.go +++ b/traffic_ops/traffic_ops_golang/topology/snapshot_test.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/topology/topologies.go b/traffic_ops/traffic_ops_golang/topology/topologies.go index e7382a7641..ecfa5fbb36 100644 --- a/traffic_ops/traffic_ops_golang/topology/topologies.go +++ b/traffic_ops/traffic_ops_golang/topology/topologies.go @@ -28,17 +28,17 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/cachegroup" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/topology/topology_validation" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/cachegroup" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/topology/topology_validation" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/topology/topology_validation/topology_validation.go b/traffic_ops/traffic_ops_golang/topology/topology_validation/topology_validation.go index de19198692..e89fe8933f 100644 --- a/traffic_ops/traffic_ops_golang/topology/topology_validation/topology_validation.go +++ b/traffic_ops/traffic_ops_golang/topology/topology_validation/topology_validation.go @@ -27,7 +27,7 @@ import ( "fmt" "strings" - "github.com/apache/trafficcontrol/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-log" "github.com/jmoiron/sqlx" "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/topology/validation.go b/traffic_ops/traffic_ops_golang/topology/validation.go index e36245ff1a..8a00ab89a5 100644 --- a/traffic_ops/traffic_ops_golang/topology/validation.go +++ b/traffic_ops/traffic_ops_golang/topology/validation.go @@ -23,9 +23,9 @@ import ( "fmt" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func checkUniqueCacheGroupNames(nodes []tc.TopologyNode) error { diff --git a/traffic_ops/traffic_ops_golang/traffic_ops_golang.go b/traffic_ops/traffic_ops_golang/traffic_ops_golang.go index 2bbbf40391..c5a07c77d7 100644 --- a/traffic_ops/traffic_ops_golang/traffic_ops_golang.go +++ b/traffic_ops/traffic_ops_golang/traffic_ops_golang.go @@ -35,17 +35,17 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/about" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/plugin" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/routing" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/server" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" - _ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends" // init traffic vault backends - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/about" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/config" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/plugin" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/routing" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/server" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" + _ "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends" // init traffic vault backends + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc" "github.com/jmoiron/sqlx" _ "github.com/lib/pq" diff --git a/traffic_ops/traffic_ops_golang/trafficstats/cache.go b/traffic_ops/traffic_ops_golang/trafficstats/cache.go index c03b8042fd..9bab68af19 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/cache.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/cache.go @@ -25,11 +25,11 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" influx "github.com/influxdata/influxdb/client/v2" ) diff --git a/traffic_ops/traffic_ops_golang/trafficstats/cdn.go b/traffic_ops/traffic_ops_golang/trafficstats/cdn.go index b523d3e9c6..cbf0013acb 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/cdn.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/cdn.go @@ -27,9 +27,9 @@ import ( influx "github.com/influxdata/influxdb/client/v2" "github.com/lib/pq" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) const ( diff --git a/traffic_ops/traffic_ops_golang/trafficstats/deliveryservice.go b/traffic_ops/traffic_ops_golang/trafficstats/deliveryservice.go index 0b0981ce10..a1290c63fd 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/deliveryservice.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/deliveryservice.go @@ -28,12 +28,12 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" influx "github.com/influxdata/influxdb/client/v2" ) diff --git a/traffic_ops/traffic_ops_golang/trafficstats/series.go b/traffic_ops/traffic_ops_golang/trafficstats/series.go index 708f4d201f..232f0762d2 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/series.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/series.go @@ -23,8 +23,8 @@ import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" influx "github.com/influxdata/influxdb/client/v2" ) diff --git a/traffic_ops/traffic_ops_golang/trafficstats/stats_summary.go b/traffic_ops/traffic_ops_golang/trafficstats/stats_summary.go index deb4c7d346..1eeb8abebe 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/stats_summary.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/stats_summary.go @@ -23,10 +23,10 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/trafficstats/stats_summary_test.go b/traffic_ops/traffic_ops_golang/trafficstats/stats_summary_test.go index 45dbfa7b79..5d396916e3 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/stats_summary_test.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/stats_summary_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/trafficstats/summary.go b/traffic_ops/traffic_ops_golang/trafficstats/summary.go index c338057482..1b1e33cfe1 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/summary.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/summary.go @@ -23,8 +23,8 @@ import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" influx "github.com/influxdata/influxdb/client/v2" ) diff --git a/traffic_ops/traffic_ops_golang/trafficstats/util.go b/traffic_ops/traffic_ops_golang/trafficstats/util.go index 7725c1c9b3..f4ac793e21 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/util.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/util.go @@ -28,10 +28,10 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) var ( diff --git a/traffic_ops/traffic_ops_golang/trafficstats/util_test.go b/traffic_ops/traffic_ops_golang/trafficstats/util_test.go index 31404f26ec..7364f204a7 100644 --- a/traffic_ops/traffic_ops_golang/trafficstats/util_test.go +++ b/traffic_ops/traffic_ops_golang/trafficstats/util_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) func TestTSConfigFromRequest(t *testing.T) { diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/backends.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/backends.go index b9ff26c200..0017052d08 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/backends.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/backends.go @@ -21,5 +21,5 @@ package backends */ import ( - _ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres" + _ "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres" ) diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled/disabled.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled/disabled.go index c79f566e89..9621b35e9a 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled/disabled.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/disabled/disabled.go @@ -27,7 +27,7 @@ import ( "context" "database/sql" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) type Error string diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/encrypt.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/encrypt.go index 6e874c10b4..e890f914f8 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/encrypt.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/encrypt.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "time" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/hashicorpvault" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/hashicorpvault" ) // readKey reads the AES key (encoded in base64) used for encryption/decryption from either an on-disk file diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/hashicorpvault/client.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/hashicorpvault/client.go index 0254887b5c..e9fc01e572 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/hashicorpvault/client.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/hashicorpvault/client.go @@ -25,8 +25,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" ) const ( diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/postgres.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/postgres.go index 1499882d30..0cc06d183b 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/postgres.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/postgres.go @@ -29,12 +29,12 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/deliveryservice" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/deliveryservice" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/uri_signing_keys.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/uri_signing_keys.go index 77da0770ec..fa7a3b3d5f 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/uri_signing_keys.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/uri_signing_keys.go @@ -24,7 +24,7 @@ import ( "database/sql" "errors" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/url_sig_keys.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/url_sig_keys.go index 44a4c73ec4..6c47c82b3b 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/url_sig_keys.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/postgres/url_sig_keys.go @@ -25,8 +25,8 @@ import ( "encoding/json" "errors" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/dsutil.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/dsutil.go index 5abe9e0027..731df8f8f9 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/dsutil.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/dsutil.go @@ -25,9 +25,9 @@ import ( "errors" "strings" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/basho/riak-go-client" ) diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak.go index 0daa48ba88..f7af3158a6 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak.go @@ -26,10 +26,10 @@ import ( "encoding/json" "errors" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/trafficvault" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/trafficvault" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak_services.go b/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak_services.go index 6967b12353..af8431a54c 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak_services.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak_services.go @@ -32,8 +32,8 @@ import ( "sync" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-util" "github.com/basho/riak-go-client" ) diff --git a/traffic_ops/traffic_ops_golang/trafficvault/trafficvault.go b/traffic_ops/traffic_ops_golang/trafficvault/trafficvault.go index 9b58a903f9..030f2e5332 100644 --- a/traffic_ops/traffic_ops_golang/trafficvault/trafficvault.go +++ b/traffic_ops/traffic_ops_golang/trafficvault/trafficvault.go @@ -27,7 +27,7 @@ import ( "encoding/json" "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // TrafficVault defines the methods necessary for a struct to implement in order to diff --git a/traffic_ops/traffic_ops_golang/types/types.go b/traffic_ops/traffic_ops_golang/types/types.go index 4d81073579..bdb837cb81 100644 --- a/traffic_ops/traffic_ops_golang/types/types.go +++ b/traffic_ops/traffic_ops_golang/types/types.go @@ -28,14 +28,14 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" ) diff --git a/traffic_ops/traffic_ops_golang/types/types_test.go b/traffic_ops/traffic_ops_golang/types/types_test.go index 3ad395401c..4b4e44b366 100644 --- a/traffic_ops/traffic_ops_golang/types/types_test.go +++ b/traffic_ops/traffic_ops_golang/types/types_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) diff --git a/traffic_ops/traffic_ops_golang/urisigning/urisigning.go b/traffic_ops/traffic_ops_golang/urisigning/urisigning.go index 518630a7b3..b533a8a509 100644 --- a/traffic_ops/traffic_ops_golang/urisigning/urisigning.go +++ b/traffic_ops/traffic_ops_golang/urisigning/urisigning.go @@ -29,11 +29,11 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" "github.com/lestrrat-go/jwx/jwk" ) diff --git a/traffic_ops/traffic_ops_golang/urisigning/urisigning_test.go b/traffic_ops/traffic_ops_golang/urisigning/urisigning_test.go index 244f54d127..96107ddddf 100644 --- a/traffic_ops/traffic_ops_golang/urisigning/urisigning_test.go +++ b/traffic_ops/traffic_ops_golang/urisigning/urisigning_test.go @@ -24,7 +24,7 @@ import ( "encoding/json" "testing" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) const ( diff --git a/traffic_ops/traffic_ops_golang/user/current.go b/traffic_ops/traffic_ops_golang/user/current.go index 7943e66acc..0d7587dd3b 100644 --- a/traffic_ops/traffic_ops_golang/user/current.go +++ b/traffic_ops/traffic_ops_golang/user/current.go @@ -27,16 +27,16 @@ import ( "net/http" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" ) const replacePasswordQuery = ` diff --git a/traffic_ops/traffic_ops_golang/user/current_test.go b/traffic_ops/traffic_ops_golang/user/current_test.go index 0a92391643..122feb24df 100644 --- a/traffic_ops/traffic_ops_golang/user/current_test.go +++ b/traffic_ops/traffic_ops_golang/user/current_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/test" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/test" "github.com/jmoiron/sqlx" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/traffic_ops/traffic_ops_golang/user/user.go b/traffic_ops/traffic_ops_golang/user/user.go index 38e9f7b19b..90c8ee9e11 100644 --- a/traffic_ops/traffic_ops_golang/user/user.go +++ b/traffic_ops/traffic_ops_golang/user/user.go @@ -29,16 +29,16 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-tc/tovalidate" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc/tovalidate" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/auth" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/tenant" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/util/ims" validation "github.com/go-ozzo/ozzo-validation" "github.com/go-ozzo/ozzo-validation/is" diff --git a/traffic_ops/traffic_ops_golang/user/user_test.go b/traffic_ops/traffic_ops_golang/user/user_test.go index af7368719c..15061a1802 100644 --- a/traffic_ops/traffic_ops_golang/user/user_test.go +++ b/traffic_ops/traffic_ops_golang/user/user_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" ) var ( diff --git a/traffic_ops/traffic_ops_golang/util/ims/ims.go b/traffic_ops/traffic_ops_golang/util/ims/ims.go index f53e76ec7c..d5e7ec122b 100644 --- a/traffic_ops/traffic_ops_golang/util/ims/ims.go +++ b/traffic_ops/traffic_ops_golang/util/ims/ims.go @@ -6,9 +6,9 @@ import ( "net/http" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" "github.com/jmoiron/sqlx" ) diff --git a/traffic_ops/traffic_ops_golang/util/monitorhlp/monitorhlp.go b/traffic_ops/traffic_ops_golang/util/monitorhlp/monitorhlp.go index 419b3ef4ed..d26a536468 100644 --- a/traffic_ops/traffic_ops_golang/util/monitorhlp/monitorhlp.go +++ b/traffic_ops/traffic_ops_golang/util/monitorhlp/monitorhlp.go @@ -30,8 +30,8 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/dbhelpers" ) const ( diff --git a/traffic_ops/traffic_ops_golang/vault/bucket.go b/traffic_ops/traffic_ops_golang/vault/bucket.go index f842a732b1..441927b40d 100644 --- a/traffic_ops/traffic_ops_golang/vault/bucket.go +++ b/traffic_ops/traffic_ops_golang/vault/bucket.go @@ -24,8 +24,8 @@ import ( "errors" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/traffic_ops_golang/api" ) // GetBucketKeyDeprecated fetches a specific key from a specific "bucket" from diff --git a/traffic_ops/v3-client/about.go b/traffic_ops/v3-client/about.go index 13811e6ad0..04f3b53be3 100644 --- a/traffic_ops/v3-client/about.go +++ b/traffic_ops/v3-client/about.go @@ -21,7 +21,7 @@ package client */ import ( - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/api_capability.go b/traffic_ops/v3-client/api_capability.go index af5043502f..7a4a7013d4 100644 --- a/traffic_ops/v3-client/api_capability.go +++ b/traffic_ops/v3-client/api_capability.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) /* diff --git a/traffic_ops/v3-client/asn.go b/traffic_ops/v3-client/asn.go index c0459372c8..01dd4683e5 100644 --- a/traffic_ops/v3-client/asn.go +++ b/traffic_ops/v3-client/asn.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/cachegroup.go b/traffic_ops/v3-client/cachegroup.go index 6cfb0fd6ce..264bfb8d8e 100644 --- a/traffic_ops/v3-client/cachegroup.go +++ b/traffic_ops/v3-client/cachegroup.go @@ -22,8 +22,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/cachegroup_parameters.go b/traffic_ops/v3-client/cachegroup_parameters.go index 75826538e6..c609e418b8 100644 --- a/traffic_ops/v3-client/cachegroup_parameters.go +++ b/traffic_ops/v3-client/cachegroup_parameters.go @@ -19,8 +19,8 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/capability.go b/traffic_ops/v3-client/capability.go index 2eaea5c5ab..8401b6b520 100644 --- a/traffic_ops/v3-client/capability.go +++ b/traffic_ops/v3-client/capability.go @@ -18,8 +18,8 @@ import "errors" import "net/http" import "net/url" -import "github.com/apache/trafficcontrol/lib/go-tc" -import "github.com/apache/trafficcontrol/traffic_ops/toclientlib" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" // API_CAPABILITIES is Deprecated: will be removed in the next major version. Be aware this may not be the URI being requested, for clients created with Login and ClientOps.ForceLatestAPI false. const API_CAPABILITIES = apiBase + "/capabilities" diff --git a/traffic_ops/v3-client/cdn.go b/traffic_ops/v3-client/cdn.go index f1505bfea0..4562ca1652 100644 --- a/traffic_ops/v3-client/cdn.go +++ b/traffic_ops/v3-client/cdn.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/cdn_domains.go b/traffic_ops/v3-client/cdn_domains.go index efb391037a..79d7fc06fd 100644 --- a/traffic_ops/v3-client/cdn_domains.go +++ b/traffic_ops/v3-client/cdn_domains.go @@ -3,8 +3,8 @@ package client import ( "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) /* diff --git a/traffic_ops/v3-client/cdnfederations.go b/traffic_ops/v3-client/cdnfederations.go index f343203451..6d680086b8 100644 --- a/traffic_ops/v3-client/cdnfederations.go +++ b/traffic_ops/v3-client/cdnfederations.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) /* Internally, the CDNName is only used in the GET method. The CDNName diff --git a/traffic_ops/v3-client/coordinate.go b/traffic_ops/v3-client/coordinate.go index 7c0c7814ff..2dd8ce4801 100644 --- a/traffic_ops/v3-client/coordinate.go +++ b/traffic_ops/v3-client/coordinate.go @@ -19,8 +19,8 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/crconfig.go b/traffic_ops/v3-client/crconfig.go index e387cc7fe3..d72caf300f 100644 --- a/traffic_ops/v3-client/crconfig.go +++ b/traffic_ops/v3-client/crconfig.go @@ -21,8 +21,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/deliveryservice.go b/traffic_ops/v3-client/deliveryservice.go index f2c18edf42..b57e215ac5 100644 --- a/traffic_ops/v3-client/deliveryservice.go +++ b/traffic_ops/v3-client/deliveryservice.go @@ -23,9 +23,9 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // These are the API endpoints used by the various Delivery Service-related client methods. diff --git a/traffic_ops/v3-client/deliveryservice_regexes.go b/traffic_ops/v3-client/deliveryservice_regexes.go index 4174b46f33..1c6ab2732d 100644 --- a/traffic_ops/v3-client/deliveryservice_regexes.go +++ b/traffic_ops/v3-client/deliveryservice_regexes.go @@ -19,8 +19,8 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/deliveryservice_request_comments.go b/traffic_ops/v3-client/deliveryservice_request_comments.go index bff7f2c52b..a6cfde6b1f 100644 --- a/traffic_ops/v3-client/deliveryservice_request_comments.go +++ b/traffic_ops/v3-client/deliveryservice_request_comments.go @@ -19,8 +19,8 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/deliveryservice_requests.go b/traffic_ops/v3-client/deliveryservice_requests.go index 9b36468412..46a43be296 100644 --- a/traffic_ops/v3-client/deliveryservice_requests.go +++ b/traffic_ops/v3-client/deliveryservice_requests.go @@ -21,8 +21,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/deliveryservices_required_capabilities.go b/traffic_ops/v3-client/deliveryservices_required_capabilities.go index 1b8e7d57ff..4b1b022e9c 100644 --- a/traffic_ops/v3-client/deliveryservices_required_capabilities.go +++ b/traffic_ops/v3-client/deliveryservices_required_capabilities.go @@ -21,8 +21,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/deliveryserviceserver.go b/traffic_ops/v3-client/deliveryserviceserver.go index 529d9c2bbe..3b6a1b7aaf 100644 --- a/traffic_ops/v3-client/deliveryserviceserver.go +++ b/traffic_ops/v3-client/deliveryserviceserver.go @@ -22,9 +22,9 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // CreateDeliveryServiceServers associates the given servers with the given delivery services. If replace is true, it deletes any existing associations for the given delivery service. diff --git a/traffic_ops/v3-client/division.go b/traffic_ops/v3-client/division.go index 5bed644f24..b25913f809 100644 --- a/traffic_ops/v3-client/division.go +++ b/traffic_ops/v3-client/division.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/dsuser.go b/traffic_ops/v3-client/dsuser.go index 7601d3900c..ae09f7aad7 100644 --- a/traffic_ops/v3-client/dsuser.go +++ b/traffic_ops/v3-client/dsuser.go @@ -18,7 +18,7 @@ package client import ( "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" ) // SetUserDeliveryService associates the given delivery services with the given user. diff --git a/traffic_ops/v3-client/federation.go b/traffic_ops/v3-client/federation.go index 55f6bc35ab..c7b23b90fc 100644 --- a/traffic_ops/v3-client/federation.go +++ b/traffic_ops/v3-client/federation.go @@ -23,8 +23,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // APIFederations is Deprecated: will be removed in the next major version. Be aware this may not be the URI being requested, for clients created with Login and ClientOps.ForceLatestAPI false. diff --git a/traffic_ops/v3-client/federation_federation_resolver.go b/traffic_ops/v3-client/federation_federation_resolver.go index 1ce9be1085..53554bce77 100644 --- a/traffic_ops/v3-client/federation_federation_resolver.go +++ b/traffic_ops/v3-client/federation_federation_resolver.go @@ -16,8 +16,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetFederationFederationResolversByID retrieves all Federation Resolvers belonging to Federation of ID. diff --git a/traffic_ops/v3-client/federation_resolver.go b/traffic_ops/v3-client/federation_resolver.go index 2cb50de761..9f7a2e3f27 100644 --- a/traffic_ops/v3-client/federation_resolver.go +++ b/traffic_ops/v3-client/federation_resolver.go @@ -19,8 +19,8 @@ import "net/http" import "net/url" import "strconv" -import "github.com/apache/trafficcontrol/lib/go-tc" -import "github.com/apache/trafficcontrol/traffic_ops/toclientlib" +import "github.com/apache/trafficcontrol/v7/lib/go-tc" +import "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" func (to *Session) getFederationResolvers(id *uint, ip *string, t *string, header http.Header) ([]tc.FederationResolver, toclientlib.ReqInf, error) { var vals = url.Values{} diff --git a/traffic_ops/v3-client/iso.go b/traffic_ops/v3-client/iso.go index 8f3f22fbd4..974fc1da85 100644 --- a/traffic_ops/v3-client/iso.go +++ b/traffic_ops/v3-client/iso.go @@ -20,8 +20,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/job.go b/traffic_ops/v3-client/job.go index 80c61198a0..be30b31877 100644 --- a/traffic_ops/v3-client/job.go +++ b/traffic_ops/v3-client/job.go @@ -22,8 +22,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // Creates a new Content Invalidation Job diff --git a/traffic_ops/v3-client/log.go b/traffic_ops/v3-client/log.go index 9e19544af3..b7d7d2bbaf 100644 --- a/traffic_ops/v3-client/log.go +++ b/traffic_ops/v3-client/log.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/origin.go b/traffic_ops/v3-client/origin.go index 208c37885f..26128c24ad 100644 --- a/traffic_ops/v3-client/origin.go +++ b/traffic_ops/v3-client/origin.go @@ -22,8 +22,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/parameter.go b/traffic_ops/v3-client/parameter.go index 19b6548f88..f8922e3e5e 100644 --- a/traffic_ops/v3-client/parameter.go +++ b/traffic_ops/v3-client/parameter.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/phys_location.go b/traffic_ops/v3-client/phys_location.go index 3f1628825c..5438780f97 100644 --- a/traffic_ops/v3-client/phys_location.go +++ b/traffic_ops/v3-client/phys_location.go @@ -21,8 +21,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/ping.go b/traffic_ops/v3-client/ping.go index a278fd8c4a..043a5db745 100644 --- a/traffic_ops/v3-client/ping.go +++ b/traffic_ops/v3-client/ping.go @@ -16,7 +16,7 @@ package client import ( - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/profile.go b/traffic_ops/v3-client/profile.go index 88fdb2ccb1..a64a59e88a 100644 --- a/traffic_ops/v3-client/profile.go +++ b/traffic_ops/v3-client/profile.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/profile_parameter.go b/traffic_ops/v3-client/profile_parameter.go index 0270c41001..156071dae9 100644 --- a/traffic_ops/v3-client/profile_parameter.go +++ b/traffic_ops/v3-client/profile_parameter.go @@ -19,8 +19,8 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/region.go b/traffic_ops/v3-client/region.go index e75ca321a9..6a178a9c9a 100644 --- a/traffic_ops/v3-client/region.go +++ b/traffic_ops/v3-client/region.go @@ -22,8 +22,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/role.go b/traffic_ops/v3-client/role.go index eb3a35c190..a7a10571de 100644 --- a/traffic_ops/v3-client/role.go +++ b/traffic_ops/v3-client/role.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/server.go b/traffic_ops/v3-client/server.go index c7d026c3e6..6c0ad1f6db 100644 --- a/traffic_ops/v3-client/server.go +++ b/traffic_ops/v3-client/server.go @@ -23,8 +23,8 @@ import ( "net/url" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/server_server_capabilities.go b/traffic_ops/v3-client/server_server_capabilities.go index bc62cc0c53..4fc6efbdf7 100644 --- a/traffic_ops/v3-client/server_server_capabilities.go +++ b/traffic_ops/v3-client/server_server_capabilities.go @@ -21,8 +21,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/server_update_status.go b/traffic_ops/v3-client/server_update_status.go index 18c8e4708c..47cfc267f1 100644 --- a/traffic_ops/v3-client/server_update_status.go +++ b/traffic_ops/v3-client/server_update_status.go @@ -21,8 +21,8 @@ import ( "strconv" "strings" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // UpdateServerStatus updates a server's status and returns the response. diff --git a/traffic_ops/v3-client/servercapability.go b/traffic_ops/v3-client/servercapability.go index d24d9bad74..9a7ef4c9ee 100644 --- a/traffic_ops/v3-client/servercapability.go +++ b/traffic_ops/v3-client/servercapability.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/servercheck.go b/traffic_ops/v3-client/servercheck.go index adb8d5a174..4b58f6b6cd 100644 --- a/traffic_ops/v3-client/servercheck.go +++ b/traffic_ops/v3-client/servercheck.go @@ -16,8 +16,8 @@ package client import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // API_SERVERCHECK is Deprecated: will be removed in the next major version. Be aware this may not be the URI being requested, for clients created with Login and ClientOps.ForceLatestAPI false. diff --git a/traffic_ops/v3-client/servercheckextensions.go b/traffic_ops/v3-client/servercheckextensions.go index a11a95422d..744477d0df 100644 --- a/traffic_ops/v3-client/servercheckextensions.go +++ b/traffic_ops/v3-client/servercheckextensions.go @@ -15,8 +15,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // API_TO_EXTENSION is Deprecated: will be removed in the next major version. Be aware this may not be the URI being requested, for clients created with Login and ClientOps.ForceLatestAPI false. diff --git a/traffic_ops/v3-client/serviceCategory.go b/traffic_ops/v3-client/serviceCategory.go index fd0b6ada74..6ca3f1844b 100644 --- a/traffic_ops/v3-client/serviceCategory.go +++ b/traffic_ops/v3-client/serviceCategory.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/session.go b/traffic_ops/v3-client/session.go index d4470b2d69..df9fcadf1b 100644 --- a/traffic_ops/v3-client/session.go +++ b/traffic_ops/v3-client/session.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // Login authenticates with Traffic Ops and returns the client object. diff --git a/traffic_ops/v3-client/staticdnsentry.go b/traffic_ops/v3-client/staticdnsentry.go index a8a8788783..dc6af36eeb 100644 --- a/traffic_ops/v3-client/staticdnsentry.go +++ b/traffic_ops/v3-client/staticdnsentry.go @@ -21,8 +21,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/stats_summary.go b/traffic_ops/v3-client/stats_summary.go index a14260d814..78d2d46e8b 100644 --- a/traffic_ops/v3-client/stats_summary.go +++ b/traffic_ops/v3-client/stats_summary.go @@ -16,8 +16,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/status.go b/traffic_ops/v3-client/status.go index 462f3d382f..131c750cee 100644 --- a/traffic_ops/v3-client/status.go +++ b/traffic_ops/v3-client/status.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/steering.go b/traffic_ops/v3-client/steering.go index af55d4b845..5c1633f6e7 100644 --- a/traffic_ops/v3-client/steering.go +++ b/traffic_ops/v3-client/steering.go @@ -18,8 +18,8 @@ package client import ( "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func (to *Session) SteeringWithHdr(header http.Header) ([]tc.Steering, toclientlib.ReqInf, error) { diff --git a/traffic_ops/v3-client/steeringtarget.go b/traffic_ops/v3-client/steeringtarget.go index 33c1abb7fb..a50460ba08 100644 --- a/traffic_ops/v3-client/steeringtarget.go +++ b/traffic_ops/v3-client/steeringtarget.go @@ -20,8 +20,8 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func (to *Session) CreateSteeringTarget(st tc.SteeringTargetNullable) (tc.Alerts, toclientlib.ReqInf, error) { diff --git a/traffic_ops/v3-client/tenant.go b/traffic_ops/v3-client/tenant.go index 7b51dca652..17f14ad28d 100644 --- a/traffic_ops/v3-client/tenant.go +++ b/traffic_ops/v3-client/tenant.go @@ -21,8 +21,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // API_TENANTS is Deprecated: will be removed in the next major version. Be aware this may not be the URI being requested, for clients created with Login and ClientOps.ForceLatestAPI false. diff --git a/traffic_ops/v3-client/topology.go b/traffic_ops/v3-client/topology.go index d20a1f9802..57535bf74d 100644 --- a/traffic_ops/v3-client/topology.go +++ b/traffic_ops/v3-client/topology.go @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // ApiTopologies is Deprecated: will be removed in the next major version. Be aware this may not be the URI being requested, for clients created with Login and ClientOps.ForceLatestAPI false. diff --git a/traffic_ops/v3-client/topology_queue_updates.go b/traffic_ops/v3-client/topology_queue_updates.go index 0543979727..92ce64a97c 100644 --- a/traffic_ops/v3-client/topology_queue_updates.go +++ b/traffic_ops/v3-client/topology_queue_updates.go @@ -22,8 +22,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func (to *Session) TopologiesQueueUpdate(topologyName tc.TopologyName, req tc.TopologiesQueueUpdateRequest) (tc.TopologiesQueueUpdateResponse, toclientlib.ReqInf, error) { diff --git a/traffic_ops/v3-client/traffic_monitor.go b/traffic_ops/v3-client/traffic_monitor.go index ec8f93033c..c3b698f483 100644 --- a/traffic_ops/v3-client/traffic_monitor.go +++ b/traffic_ops/v3-client/traffic_monitor.go @@ -3,8 +3,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) /* diff --git a/traffic_ops/v3-client/traffic_stats.go b/traffic_ops/v3-client/traffic_stats.go index b8d600cee9..24d3872612 100644 --- a/traffic_ops/v3-client/traffic_stats.go +++ b/traffic_ops/v3-client/traffic_stats.go @@ -15,8 +15,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetCurrentStats gets current stats for each CDNs and a total across them diff --git a/traffic_ops/v3-client/type.go b/traffic_ops/v3-client/type.go index 1fe7a8d37d..5e17bffea6 100644 --- a/traffic_ops/v3-client/type.go +++ b/traffic_ops/v3-client/type.go @@ -20,8 +20,8 @@ import ( "fmt" "net/http" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v3-client/user.go b/traffic_ops/v3-client/user.go index b9b3ffeeee..42172e82b2 100644 --- a/traffic_ops/v3-client/user.go +++ b/traffic_ops/v3-client/user.go @@ -22,9 +22,9 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) func (to *Session) GetUsersWithHdr(header http.Header) ([]tc.User, toclientlib.ReqInf, error) { diff --git a/traffic_ops/v4-client/about.go b/traffic_ops/v4-client/about.go index e7614e927e..15a8c50d93 100644 --- a/traffic_ops/v4-client/about.go +++ b/traffic_ops/v4-client/about.go @@ -17,7 +17,7 @@ package client */ import ( - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiAbout is the API version-relative path for the /about API endpoint. diff --git a/traffic_ops/v4-client/acme.go b/traffic_ops/v4-client/acme.go index d2498a40d4..c765a157b5 100644 --- a/traffic_ops/v4-client/acme.go +++ b/traffic_ops/v4-client/acme.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiAcmeAutorenew is the API version-relative path for the /acme_autorenew API endpoint. diff --git a/traffic_ops/v4-client/asn.go b/traffic_ops/v4-client/asn.go index ba7d221625..00a6b7592d 100644 --- a/traffic_ops/v4-client/asn.go +++ b/traffic_ops/v4-client/asn.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiASNs is the API version-relative path for the /asns API endpoint. diff --git a/traffic_ops/v4-client/async_status.go b/traffic_ops/v4-client/async_status.go index 0fb4f624e7..c57825403b 100644 --- a/traffic_ops/v4-client/async_status.go +++ b/traffic_ops/v4-client/async_status.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiAsyncStatus is the API version-relative path for the /async_status/{id} API endpoint. diff --git a/traffic_ops/v4-client/cachegroup.go b/traffic_ops/v4-client/cachegroup.go index 0d290fa66b..b313dfe23a 100644 --- a/traffic_ops/v4-client/cachegroup.go +++ b/traffic_ops/v4-client/cachegroup.go @@ -19,8 +19,8 @@ import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCachegroups is the API version-relative path for the /cachegroups API endpoint. diff --git a/traffic_ops/v4-client/cdn.go b/traffic_ops/v4-client/cdn.go index 99979c16fa..63d086a8b0 100644 --- a/traffic_ops/v4-client/cdn.go +++ b/traffic_ops/v4-client/cdn.go @@ -19,8 +19,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCDNs is the API version-relative path for the /cdns API endpoint. diff --git a/traffic_ops/v4-client/cdn_dnssec.go b/traffic_ops/v4-client/cdn_dnssec.go index 6950b5fdd3..fe88ff65ad 100644 --- a/traffic_ops/v4-client/cdn_dnssec.go +++ b/traffic_ops/v4-client/cdn_dnssec.go @@ -18,8 +18,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v4-client/cdn_domains.go b/traffic_ops/v4-client/cdn_domains.go index 9ff1b3d72c..22a4c8fc3c 100644 --- a/traffic_ops/v4-client/cdn_domains.go +++ b/traffic_ops/v4-client/cdn_domains.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetDomains gets all CDN Domains. diff --git a/traffic_ops/v4-client/cdn_lock.go b/traffic_ops/v4-client/cdn_lock.go index 022a550bd5..7b668c8ab6 100644 --- a/traffic_ops/v4-client/cdn_lock.go +++ b/traffic_ops/v4-client/cdn_lock.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCDNLocks is the API version-relative path for the /cdn_locks API endpoint. diff --git a/traffic_ops/v4-client/cdn_notifications.go b/traffic_ops/v4-client/cdn_notifications.go index abf0f678c3..51ed2cadc5 100644 --- a/traffic_ops/v4-client/cdn_notifications.go +++ b/traffic_ops/v4-client/cdn_notifications.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCDNNotifications is the API version-relative path to the diff --git a/traffic_ops/v4-client/cdnfederations.go b/traffic_ops/v4-client/cdnfederations.go index dcd6bfcb66..83e000cdd2 100644 --- a/traffic_ops/v4-client/cdnfederations.go +++ b/traffic_ops/v4-client/cdnfederations.go @@ -19,8 +19,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) /* Internally, the CDNName is only used in the GET method. The CDNName diff --git a/traffic_ops/v4-client/coordinate.go b/traffic_ops/v4-client/coordinate.go index 9397938b69..1eb5429a6e 100644 --- a/traffic_ops/v4-client/coordinate.go +++ b/traffic_ops/v4-client/coordinate.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCoordinates is the API version-relative path for the /coordinates API endpoint. diff --git a/traffic_ops/v4-client/crconfig.go b/traffic_ops/v4-client/crconfig.go index 5a055073dc..e22b817b61 100644 --- a/traffic_ops/v4-client/crconfig.go +++ b/traffic_ops/v4-client/crconfig.go @@ -19,8 +19,8 @@ import ( "encoding/json" "errors" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiSnapshot is the API version-relative path for the /snapshot API endpoint. diff --git a/traffic_ops/v4-client/deliveryservice.go b/traffic_ops/v4-client/deliveryservice.go index e464784ebf..9bc1b75b72 100644 --- a/traffic_ops/v4-client/deliveryservice.go +++ b/traffic_ops/v4-client/deliveryservice.go @@ -25,9 +25,9 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // These are the API endpoints used by the various Delivery Service-related client methods. diff --git a/traffic_ops/v4-client/deliveryservice_regexes.go b/traffic_ops/v4-client/deliveryservice_regexes.go index df9488f979..d451bf9005 100644 --- a/traffic_ops/v4-client/deliveryservice_regexes.go +++ b/traffic_ops/v4-client/deliveryservice_regexes.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDSRegexes is the full API route to the diff --git a/traffic_ops/v4-client/deliveryservice_request_comments.go b/traffic_ops/v4-client/deliveryservice_request_comments.go index e7d8f945ae..4ab67839a2 100644 --- a/traffic_ops/v4-client/deliveryservice_request_comments.go +++ b/traffic_ops/v4-client/deliveryservice_request_comments.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDeliveryServiceRequestComments is the API version-relative route to diff --git a/traffic_ops/v4-client/deliveryservice_requests.go b/traffic_ops/v4-client/deliveryservice_requests.go index 89e59575d0..7bf054d30f 100644 --- a/traffic_ops/v4-client/deliveryservice_requests.go +++ b/traffic_ops/v4-client/deliveryservice_requests.go @@ -21,8 +21,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDSRequests is the API version-relative path to the diff --git a/traffic_ops/v4-client/deliveryservices_required_capabilities.go b/traffic_ops/v4-client/deliveryservices_required_capabilities.go index d0f63f7059..c7edb2cd03 100644 --- a/traffic_ops/v4-client/deliveryservices_required_capabilities.go +++ b/traffic_ops/v4-client/deliveryservices_required_capabilities.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDeliveryServicesRequiredCapabilities is the API version-relative diff --git a/traffic_ops/v4-client/deliveryserviceserver.go b/traffic_ops/v4-client/deliveryserviceserver.go index 225870b42a..9c1a71d63f 100644 --- a/traffic_ops/v4-client/deliveryserviceserver.go +++ b/traffic_ops/v4-client/deliveryserviceserver.go @@ -20,9 +20,9 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // CreateDeliveryServiceServers associates the given servers with the given diff --git a/traffic_ops/v4-client/division.go b/traffic_ops/v4-client/division.go index 880fe3baa1..bce3190c0a 100644 --- a/traffic_ops/v4-client/division.go +++ b/traffic_ops/v4-client/division.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDivisions is the API version-relative path to the /divisions API route. diff --git a/traffic_ops/v4-client/federation.go b/traffic_ops/v4-client/federation.go index 1b0bfb04b8..1f27c2a457 100644 --- a/traffic_ops/v4-client/federation.go +++ b/traffic_ops/v4-client/federation.go @@ -19,8 +19,8 @@ import ( "fmt" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiFederations is the API version-relative path to the /federations API route. diff --git a/traffic_ops/v4-client/federation_federation_resolver.go b/traffic_ops/v4-client/federation_federation_resolver.go index 1a308952a6..cce4425d63 100644 --- a/traffic_ops/v4-client/federation_federation_resolver.go +++ b/traffic_ops/v4-client/federation_federation_resolver.go @@ -16,8 +16,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetFederationFederationResolvers retrieves all Federation Resolvers belonging to Federation of ID. diff --git a/traffic_ops/v4-client/federation_resolver.go b/traffic_ops/v4-client/federation_resolver.go index 2818a79f21..d995b433bb 100644 --- a/traffic_ops/v4-client/federation_resolver.go +++ b/traffic_ops/v4-client/federation_resolver.go @@ -18,8 +18,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiFederationResolvers is the API-version-relative path to the diff --git a/traffic_ops/v4-client/iso.go b/traffic_ops/v4-client/iso.go index eb1e6ff6c9..40ba39e225 100644 --- a/traffic_ops/v4-client/iso.go +++ b/traffic_ops/v4-client/iso.go @@ -20,8 +20,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiOSVersions is the full path to the /osversions API endpoint. diff --git a/traffic_ops/v4-client/job.go b/traffic_ops/v4-client/job.go index 5898f8a115..53d105b5a8 100644 --- a/traffic_ops/v4-client/job.go +++ b/traffic_ops/v4-client/job.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiJobs is the API version-relative path to the /jobs API route. diff --git a/traffic_ops/v4-client/log.go b/traffic_ops/v4-client/log.go index f828f4e3a5..d0980dfc85 100644 --- a/traffic_ops/v4-client/log.go +++ b/traffic_ops/v4-client/log.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiLogs is the API version-relative path to the /logs API endpoint. diff --git a/traffic_ops/v4-client/origin.go b/traffic_ops/v4-client/origin.go index b735527780..41930bb0f0 100644 --- a/traffic_ops/v4-client/origin.go +++ b/traffic_ops/v4-client/origin.go @@ -22,8 +22,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiOrigins is the full path to the /origins API route. diff --git a/traffic_ops/v4-client/parameter.go b/traffic_ops/v4-client/parameter.go index 288648a29f..65dddaa78e 100644 --- a/traffic_ops/v4-client/parameter.go +++ b/traffic_ops/v4-client/parameter.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiParameters is the full path to the /parameters API endpoint. diff --git a/traffic_ops/v4-client/phys_location.go b/traffic_ops/v4-client/phys_location.go index c9c94f3f76..5f961079a8 100644 --- a/traffic_ops/v4-client/phys_location.go +++ b/traffic_ops/v4-client/phys_location.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiPhysLocations is the full path to the /phys_locations API route. diff --git a/traffic_ops/v4-client/ping.go b/traffic_ops/v4-client/ping.go index 40bc9843cf..41cc926335 100644 --- a/traffic_ops/v4-client/ping.go +++ b/traffic_ops/v4-client/ping.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiPing is the full path to the /ping API endpoint. diff --git a/traffic_ops/v4-client/profile.go b/traffic_ops/v4-client/profile.go index efc80277f0..485f8846e9 100644 --- a/traffic_ops/v4-client/profile.go +++ b/traffic_ops/v4-client/profile.go @@ -19,8 +19,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v4-client/profile_parameter.go b/traffic_ops/v4-client/profile_parameter.go index e0adfcbb6e..8ad87cdb89 100644 --- a/traffic_ops/v4-client/profile_parameter.go +++ b/traffic_ops/v4-client/profile_parameter.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiProfileParameters is the full path to the /profileparameters API endpoint. diff --git a/traffic_ops/v4-client/region.go b/traffic_ops/v4-client/region.go index 7ef85216bf..a79a6ac246 100644 --- a/traffic_ops/v4-client/region.go +++ b/traffic_ops/v4-client/region.go @@ -20,8 +20,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiRegions is the API version-relative path to the /regions API endpoint. diff --git a/traffic_ops/v4-client/role.go b/traffic_ops/v4-client/role.go index cf831f7f1b..9dca2248f9 100644 --- a/traffic_ops/v4-client/role.go +++ b/traffic_ops/v4-client/role.go @@ -18,8 +18,8 @@ package client import ( "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiRoles is the full path to the /roles API endpoint. diff --git a/traffic_ops/v4-client/server.go b/traffic_ops/v4-client/server.go index ab56c42c47..00b3beb7f4 100644 --- a/traffic_ops/v4-client/server.go +++ b/traffic_ops/v4-client/server.go @@ -21,8 +21,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v4-client/server_server_capabilities.go b/traffic_ops/v4-client/server_server_capabilities.go index 15bd1efbc2..2d77593c16 100644 --- a/traffic_ops/v4-client/server_server_capabilities.go +++ b/traffic_ops/v4-client/server_server_capabilities.go @@ -20,8 +20,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiServerServerCapabilities is the API version-relative path to the diff --git a/traffic_ops/v4-client/server_update_status.go b/traffic_ops/v4-client/server_update_status.go index b61223dd74..ceb9e4ed03 100644 --- a/traffic_ops/v4-client/server_update_status.go +++ b/traffic_ops/v4-client/server_update_status.go @@ -21,8 +21,8 @@ import ( "net/url" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // UpdateServerStatus updates the Status of the server identified by diff --git a/traffic_ops/v4-client/servercapability.go b/traffic_ops/v4-client/servercapability.go index 1b41e18827..672508025e 100644 --- a/traffic_ops/v4-client/servercapability.go +++ b/traffic_ops/v4-client/servercapability.go @@ -18,8 +18,8 @@ package client import ( "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiServerCapabilities is the full path to the /server_capabilities API diff --git a/traffic_ops/v4-client/servercheck.go b/traffic_ops/v4-client/servercheck.go index 9a429aff73..051112e68e 100644 --- a/traffic_ops/v4-client/servercheck.go +++ b/traffic_ops/v4-client/servercheck.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiServercheck is the API version-relative path to the /servercheck API endpoint. diff --git a/traffic_ops/v4-client/servercheckextensions.go b/traffic_ops/v4-client/servercheckextensions.go index 205f11e218..e9028120d8 100644 --- a/traffic_ops/v4-client/servercheckextensions.go +++ b/traffic_ops/v4-client/servercheckextensions.go @@ -15,8 +15,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiTOExtension is the API version-relative path to the /servercheck/extensions API diff --git a/traffic_ops/v4-client/serviceCategory.go b/traffic_ops/v4-client/serviceCategory.go index 31cb964040..17d64ea7c7 100644 --- a/traffic_ops/v4-client/serviceCategory.go +++ b/traffic_ops/v4-client/serviceCategory.go @@ -19,8 +19,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiServiceCategories is the API version-relative path to the /service_categories API diff --git a/traffic_ops/v4-client/session.go b/traffic_ops/v4-client/session.go index 1072281660..e3564c649b 100644 --- a/traffic_ops/v4-client/session.go +++ b/traffic_ops/v4-client/session.go @@ -22,7 +22,7 @@ import ( "net/url" "time" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // RequestOptions is the set of options commonly available to pass to methods diff --git a/traffic_ops/v4-client/sslkey_expirations.go b/traffic_ops/v4-client/sslkey_expirations.go index db29b65a4a..750441c1b0 100644 --- a/traffic_ops/v4-client/sslkey_expirations.go +++ b/traffic_ops/v4-client/sslkey_expirations.go @@ -17,8 +17,8 @@ package client import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetExpiringCerts gets the exiring certs within the days if 'days' param is passed diff --git a/traffic_ops/v4-client/staticdnsentry.go b/traffic_ops/v4-client/staticdnsentry.go index dee4fe520d..78a9c5571f 100644 --- a/traffic_ops/v4-client/staticdnsentry.go +++ b/traffic_ops/v4-client/staticdnsentry.go @@ -20,8 +20,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiStaticDNSEntries is the full path to the /staticdnsentries API diff --git a/traffic_ops/v4-client/stats_summary.go b/traffic_ops/v4-client/stats_summary.go index 9b8e9a683d..223633f5d5 100644 --- a/traffic_ops/v4-client/stats_summary.go +++ b/traffic_ops/v4-client/stats_summary.go @@ -15,8 +15,8 @@ package client import ( "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiStatsSummary is the full path to the /stats_summary API endpoint. diff --git a/traffic_ops/v4-client/status.go b/traffic_ops/v4-client/status.go index 4da8b778f5..cf103faa6f 100644 --- a/traffic_ops/v4-client/status.go +++ b/traffic_ops/v4-client/status.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiStatuses is the API version-relative path to the /statuses API endpoint. diff --git a/traffic_ops/v4-client/steering.go b/traffic_ops/v4-client/steering.go index d7c846d58c..d9ae7f0bab 100644 --- a/traffic_ops/v4-client/steering.go +++ b/traffic_ops/v4-client/steering.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // Steering retrieves information about all (Tenant-accessible) Steering diff --git a/traffic_ops/v4-client/steeringtarget.go b/traffic_ops/v4-client/steeringtarget.go index 3fbe31736c..464b122ddf 100644 --- a/traffic_ops/v4-client/steeringtarget.go +++ b/traffic_ops/v4-client/steeringtarget.go @@ -19,8 +19,8 @@ import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // CreateSteeringTarget adds the given Steering Target to a Steering Delivery diff --git a/traffic_ops/v4-client/tenant.go b/traffic_ops/v4-client/tenant.go index a7fddab8d8..a3c0a1dcbd 100644 --- a/traffic_ops/v4-client/tenant.go +++ b/traffic_ops/v4-client/tenant.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiTenants is the API version-relative path to the /tenants API endpoint. diff --git a/traffic_ops/v4-client/topology.go b/traffic_ops/v4-client/topology.go index c543cce3f9..319f1ba03f 100644 --- a/traffic_ops/v4-client/topology.go +++ b/traffic_ops/v4-client/topology.go @@ -18,8 +18,8 @@ package client import ( "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiTopologies is the API version-relative path to the /topologies API endpoint. diff --git a/traffic_ops/v4-client/topology_queue_updates.go b/traffic_ops/v4-client/topology_queue_updates.go index e2235a5a9a..dc80754d0e 100644 --- a/traffic_ops/v4-client/topology_queue_updates.go +++ b/traffic_ops/v4-client/topology_queue_updates.go @@ -23,8 +23,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // TopologiesQueueUpdate queues updates for the Topology with the given Name. diff --git a/traffic_ops/v4-client/traffic_monitor.go b/traffic_ops/v4-client/traffic_monitor.go index b6acc2e152..82439bedd8 100644 --- a/traffic_ops/v4-client/traffic_monitor.go +++ b/traffic_ops/v4-client/traffic_monitor.go @@ -23,8 +23,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCDNMonitoringConfig is the API path on which Traffic Ops serves the CDN monitoring diff --git a/traffic_ops/v4-client/traffic_stats.go b/traffic_ops/v4-client/traffic_stats.go index 68bf2f7194..86d5a57eb3 100644 --- a/traffic_ops/v4-client/traffic_stats.go +++ b/traffic_ops/v4-client/traffic_stats.go @@ -15,8 +15,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetCurrentStats gets current stats for each CDNs and a total across them. diff --git a/traffic_ops/v4-client/type.go b/traffic_ops/v4-client/type.go index 521f1d8a94..e1ee740057 100644 --- a/traffic_ops/v4-client/type.go +++ b/traffic_ops/v4-client/type.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiTypes is the API version-relative path to the /types API endpoint. diff --git a/traffic_ops/v4-client/user.go b/traffic_ops/v4-client/user.go index 38b46be17c..19190edc6c 100644 --- a/traffic_ops/v4-client/user.go +++ b/traffic_ops/v4-client/user.go @@ -19,9 +19,9 @@ import ( "fmt" "strconv" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // UserCurrentResponseV4 is an alias to avoid client breaking changes. In-case of a minor or major version change, we replace the below alias with a new structure. diff --git a/traffic_ops/v4-client/vault.go b/traffic_ops/v4-client/vault.go index 26d85bbe3b..710248b61e 100644 --- a/traffic_ops/v4-client/vault.go +++ b/traffic_ops/v4-client/vault.go @@ -15,8 +15,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v5-client/about.go b/traffic_ops/v5-client/about.go index e7614e927e..15a8c50d93 100644 --- a/traffic_ops/v5-client/about.go +++ b/traffic_ops/v5-client/about.go @@ -17,7 +17,7 @@ package client */ import ( - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiAbout is the API version-relative path for the /about API endpoint. diff --git a/traffic_ops/v5-client/acme.go b/traffic_ops/v5-client/acme.go index d2498a40d4..c765a157b5 100644 --- a/traffic_ops/v5-client/acme.go +++ b/traffic_ops/v5-client/acme.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiAcmeAutorenew is the API version-relative path for the /acme_autorenew API endpoint. diff --git a/traffic_ops/v5-client/asn.go b/traffic_ops/v5-client/asn.go index f6b2a27c8d..c4ce027679 100644 --- a/traffic_ops/v5-client/asn.go +++ b/traffic_ops/v5-client/asn.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiASNs is the API version-relative path for the /asns API endpoint. diff --git a/traffic_ops/v5-client/async_status.go b/traffic_ops/v5-client/async_status.go index 0fb4f624e7..c57825403b 100644 --- a/traffic_ops/v5-client/async_status.go +++ b/traffic_ops/v5-client/async_status.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiAsyncStatus is the API version-relative path for the /async_status/{id} API endpoint. diff --git a/traffic_ops/v5-client/cachegroup.go b/traffic_ops/v5-client/cachegroup.go index d660349e71..54770d2936 100644 --- a/traffic_ops/v5-client/cachegroup.go +++ b/traffic_ops/v5-client/cachegroup.go @@ -19,8 +19,8 @@ import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCachegroups is the API version-relative path for the /cachegroups API endpoint. diff --git a/traffic_ops/v5-client/cdn.go b/traffic_ops/v5-client/cdn.go index 41f2d2af4d..ba22fa5547 100644 --- a/traffic_ops/v5-client/cdn.go +++ b/traffic_ops/v5-client/cdn.go @@ -19,8 +19,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCDNs is the API version-relative path for the /cdns API endpoint. diff --git a/traffic_ops/v5-client/cdn_dnssec.go b/traffic_ops/v5-client/cdn_dnssec.go index 6950b5fdd3..fe88ff65ad 100644 --- a/traffic_ops/v5-client/cdn_dnssec.go +++ b/traffic_ops/v5-client/cdn_dnssec.go @@ -18,8 +18,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v5-client/cdn_domains.go b/traffic_ops/v5-client/cdn_domains.go index 9ff1b3d72c..22a4c8fc3c 100644 --- a/traffic_ops/v5-client/cdn_domains.go +++ b/traffic_ops/v5-client/cdn_domains.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetDomains gets all CDN Domains. diff --git a/traffic_ops/v5-client/cdn_lock.go b/traffic_ops/v5-client/cdn_lock.go index 022a550bd5..7b668c8ab6 100644 --- a/traffic_ops/v5-client/cdn_lock.go +++ b/traffic_ops/v5-client/cdn_lock.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCDNLocks is the API version-relative path for the /cdn_locks API endpoint. diff --git a/traffic_ops/v5-client/cdn_notifications.go b/traffic_ops/v5-client/cdn_notifications.go index abf0f678c3..51ed2cadc5 100644 --- a/traffic_ops/v5-client/cdn_notifications.go +++ b/traffic_ops/v5-client/cdn_notifications.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCDNNotifications is the API version-relative path to the diff --git a/traffic_ops/v5-client/cdnfederations.go b/traffic_ops/v5-client/cdnfederations.go index c574af79eb..8f8c34e40c 100644 --- a/traffic_ops/v5-client/cdnfederations.go +++ b/traffic_ops/v5-client/cdnfederations.go @@ -19,8 +19,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) /* Internally, the CDNName is only used in the GET method. The CDNName diff --git a/traffic_ops/v5-client/coordinate.go b/traffic_ops/v5-client/coordinate.go index f5c9346ea7..adfd207012 100644 --- a/traffic_ops/v5-client/coordinate.go +++ b/traffic_ops/v5-client/coordinate.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCoordinates is the API version-relative path for the /coordinates API endpoint. diff --git a/traffic_ops/v5-client/crconfig.go b/traffic_ops/v5-client/crconfig.go index 5a055073dc..e22b817b61 100644 --- a/traffic_ops/v5-client/crconfig.go +++ b/traffic_ops/v5-client/crconfig.go @@ -19,8 +19,8 @@ import ( "encoding/json" "errors" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiSnapshot is the API version-relative path for the /snapshot API endpoint. diff --git a/traffic_ops/v5-client/deliveryservice.go b/traffic_ops/v5-client/deliveryservice.go index b0e2ec2702..4894f1d3a9 100644 --- a/traffic_ops/v5-client/deliveryservice.go +++ b/traffic_ops/v5-client/deliveryservice.go @@ -25,9 +25,9 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // These are the API endpoints used by the various Delivery Service-related client methods. diff --git a/traffic_ops/v5-client/deliveryservice_regexes.go b/traffic_ops/v5-client/deliveryservice_regexes.go index df9488f979..d451bf9005 100644 --- a/traffic_ops/v5-client/deliveryservice_regexes.go +++ b/traffic_ops/v5-client/deliveryservice_regexes.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDSRegexes is the full API route to the diff --git a/traffic_ops/v5-client/deliveryservice_request_comments.go b/traffic_ops/v5-client/deliveryservice_request_comments.go index d089d32bbe..f8dab425d9 100644 --- a/traffic_ops/v5-client/deliveryservice_request_comments.go +++ b/traffic_ops/v5-client/deliveryservice_request_comments.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDeliveryServiceRequestComments is the API version-relative route to diff --git a/traffic_ops/v5-client/deliveryservice_requests.go b/traffic_ops/v5-client/deliveryservice_requests.go index 7336fde031..f6fdf073c8 100644 --- a/traffic_ops/v5-client/deliveryservice_requests.go +++ b/traffic_ops/v5-client/deliveryservice_requests.go @@ -21,8 +21,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDSRequests is the API version-relative path to the diff --git a/traffic_ops/v5-client/deliveryservices_required_capabilities.go b/traffic_ops/v5-client/deliveryservices_required_capabilities.go index d0f63f7059..c7edb2cd03 100644 --- a/traffic_ops/v5-client/deliveryservices_required_capabilities.go +++ b/traffic_ops/v5-client/deliveryservices_required_capabilities.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDeliveryServicesRequiredCapabilities is the API version-relative diff --git a/traffic_ops/v5-client/deliveryserviceserver.go b/traffic_ops/v5-client/deliveryserviceserver.go index 6a0d290d28..d07186d73d 100644 --- a/traffic_ops/v5-client/deliveryserviceserver.go +++ b/traffic_ops/v5-client/deliveryserviceserver.go @@ -20,9 +20,9 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // CreateDeliveryServiceServers associates the given servers with the given diff --git a/traffic_ops/v5-client/division.go b/traffic_ops/v5-client/division.go index d0f4f9666b..7c80233a8d 100644 --- a/traffic_ops/v5-client/division.go +++ b/traffic_ops/v5-client/division.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiDivisions is the API version-relative path to the /divisions API route. diff --git a/traffic_ops/v5-client/federation.go b/traffic_ops/v5-client/federation.go index 1b0bfb04b8..1f27c2a457 100644 --- a/traffic_ops/v5-client/federation.go +++ b/traffic_ops/v5-client/federation.go @@ -19,8 +19,8 @@ import ( "fmt" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiFederations is the API version-relative path to the /federations API route. diff --git a/traffic_ops/v5-client/federation_federation_resolver.go b/traffic_ops/v5-client/federation_federation_resolver.go index 1a308952a6..cce4425d63 100644 --- a/traffic_ops/v5-client/federation_federation_resolver.go +++ b/traffic_ops/v5-client/federation_federation_resolver.go @@ -16,8 +16,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetFederationFederationResolvers retrieves all Federation Resolvers belonging to Federation of ID. diff --git a/traffic_ops/v5-client/federation_resolver.go b/traffic_ops/v5-client/federation_resolver.go index f660425c4f..3f37234173 100644 --- a/traffic_ops/v5-client/federation_resolver.go +++ b/traffic_ops/v5-client/federation_resolver.go @@ -18,8 +18,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiFederationResolvers is the API-version-relative path to the diff --git a/traffic_ops/v5-client/iso.go b/traffic_ops/v5-client/iso.go index eb1e6ff6c9..40ba39e225 100644 --- a/traffic_ops/v5-client/iso.go +++ b/traffic_ops/v5-client/iso.go @@ -20,8 +20,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiOSVersions is the full path to the /osversions API endpoint. diff --git a/traffic_ops/v5-client/job.go b/traffic_ops/v5-client/job.go index 5898f8a115..53d105b5a8 100644 --- a/traffic_ops/v5-client/job.go +++ b/traffic_ops/v5-client/job.go @@ -19,8 +19,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiJobs is the API version-relative path to the /jobs API route. diff --git a/traffic_ops/v5-client/log.go b/traffic_ops/v5-client/log.go index 65ddacef9c..dd53a76399 100644 --- a/traffic_ops/v5-client/log.go +++ b/traffic_ops/v5-client/log.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiLogs is the API version-relative path to the /logs API endpoint. diff --git a/traffic_ops/v5-client/origin.go b/traffic_ops/v5-client/origin.go index 48d2be2d50..a380e1f792 100644 --- a/traffic_ops/v5-client/origin.go +++ b/traffic_ops/v5-client/origin.go @@ -22,8 +22,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiOrigins is the full path to the /origins API route. diff --git a/traffic_ops/v5-client/parameter.go b/traffic_ops/v5-client/parameter.go index 59bc105a45..bcfe2c8934 100644 --- a/traffic_ops/v5-client/parameter.go +++ b/traffic_ops/v5-client/parameter.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiParameters is the full path to the /parameters API endpoint. diff --git a/traffic_ops/v5-client/phys_location.go b/traffic_ops/v5-client/phys_location.go index ce50b45a63..198d99ba76 100644 --- a/traffic_ops/v5-client/phys_location.go +++ b/traffic_ops/v5-client/phys_location.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiPhysLocations is the full path to the /phys_locations API route. diff --git a/traffic_ops/v5-client/ping.go b/traffic_ops/v5-client/ping.go index 40bc9843cf..41cc926335 100644 --- a/traffic_ops/v5-client/ping.go +++ b/traffic_ops/v5-client/ping.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiPing is the full path to the /ping API endpoint. diff --git a/traffic_ops/v5-client/profile.go b/traffic_ops/v5-client/profile.go index 4b6f6e4317..ff0ee53ca7 100644 --- a/traffic_ops/v5-client/profile.go +++ b/traffic_ops/v5-client/profile.go @@ -19,8 +19,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v5-client/profile_parameter.go b/traffic_ops/v5-client/profile_parameter.go index d0720520b8..866ff28661 100644 --- a/traffic_ops/v5-client/profile_parameter.go +++ b/traffic_ops/v5-client/profile_parameter.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiProfileParameters is the full path to the /profileparameters API endpoint. diff --git a/traffic_ops/v5-client/region.go b/traffic_ops/v5-client/region.go index e7c2edaa12..7c3b610e8b 100644 --- a/traffic_ops/v5-client/region.go +++ b/traffic_ops/v5-client/region.go @@ -20,8 +20,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiRegions is the API version-relative path to the /regions API endpoint. diff --git a/traffic_ops/v5-client/role.go b/traffic_ops/v5-client/role.go index cf831f7f1b..9dca2248f9 100644 --- a/traffic_ops/v5-client/role.go +++ b/traffic_ops/v5-client/role.go @@ -18,8 +18,8 @@ package client import ( "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiRoles is the full path to the /roles API endpoint. diff --git a/traffic_ops/v5-client/server.go b/traffic_ops/v5-client/server.go index da2cb96047..b163bb0ca0 100644 --- a/traffic_ops/v5-client/server.go +++ b/traffic_ops/v5-client/server.go @@ -21,8 +21,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_ops/v5-client/server_server_capabilities.go b/traffic_ops/v5-client/server_server_capabilities.go index d0d125e44d..725401539a 100644 --- a/traffic_ops/v5-client/server_server_capabilities.go +++ b/traffic_ops/v5-client/server_server_capabilities.go @@ -20,8 +20,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiServerServerCapabilities is the API version-relative path to the diff --git a/traffic_ops/v5-client/server_update_status.go b/traffic_ops/v5-client/server_update_status.go index d5bb3e97d8..d3359cfb06 100644 --- a/traffic_ops/v5-client/server_update_status.go +++ b/traffic_ops/v5-client/server_update_status.go @@ -22,8 +22,8 @@ import ( "strconv" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // UpdateServerStatus updates the Status of the server identified by diff --git a/traffic_ops/v5-client/servercapability.go b/traffic_ops/v5-client/servercapability.go index b955b5cfa1..69208fb014 100644 --- a/traffic_ops/v5-client/servercapability.go +++ b/traffic_ops/v5-client/servercapability.go @@ -18,8 +18,8 @@ package client import ( "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiServerCapabilities is the full path to the /server_capabilities API diff --git a/traffic_ops/v5-client/servercheck.go b/traffic_ops/v5-client/servercheck.go index 9a429aff73..051112e68e 100644 --- a/traffic_ops/v5-client/servercheck.go +++ b/traffic_ops/v5-client/servercheck.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiServercheck is the API version-relative path to the /servercheck API endpoint. diff --git a/traffic_ops/v5-client/servercheckextensions.go b/traffic_ops/v5-client/servercheckextensions.go index 205f11e218..e9028120d8 100644 --- a/traffic_ops/v5-client/servercheckextensions.go +++ b/traffic_ops/v5-client/servercheckextensions.go @@ -15,8 +15,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiTOExtension is the API version-relative path to the /servercheck/extensions API diff --git a/traffic_ops/v5-client/serviceCategory.go b/traffic_ops/v5-client/serviceCategory.go index 1bd32f295e..715119e1e0 100644 --- a/traffic_ops/v5-client/serviceCategory.go +++ b/traffic_ops/v5-client/serviceCategory.go @@ -19,8 +19,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiServiceCategories is the API version-relative path to the /service_categories API diff --git a/traffic_ops/v5-client/session.go b/traffic_ops/v5-client/session.go index 3408cb8580..85563a5e47 100644 --- a/traffic_ops/v5-client/session.go +++ b/traffic_ops/v5-client/session.go @@ -22,7 +22,7 @@ import ( "net/url" "time" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // RequestOptions is the set of options commonly available to pass to methods diff --git a/traffic_ops/v5-client/sslkey_expirations.go b/traffic_ops/v5-client/sslkey_expirations.go index db29b65a4a..750441c1b0 100644 --- a/traffic_ops/v5-client/sslkey_expirations.go +++ b/traffic_ops/v5-client/sslkey_expirations.go @@ -17,8 +17,8 @@ package client import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetExpiringCerts gets the exiring certs within the days if 'days' param is passed diff --git a/traffic_ops/v5-client/staticdnsentry.go b/traffic_ops/v5-client/staticdnsentry.go index 63397884a4..aa2f44d988 100644 --- a/traffic_ops/v5-client/staticdnsentry.go +++ b/traffic_ops/v5-client/staticdnsentry.go @@ -20,8 +20,8 @@ import ( "net/url" "strconv" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiStaticDNSEntries is the full path to the /staticdnsentries API diff --git a/traffic_ops/v5-client/stats_summary.go b/traffic_ops/v5-client/stats_summary.go index 03b7597cff..554a68685b 100644 --- a/traffic_ops/v5-client/stats_summary.go +++ b/traffic_ops/v5-client/stats_summary.go @@ -15,8 +15,8 @@ package client import ( "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiStatsSummary is the full path to the /stats_summary API endpoint. diff --git a/traffic_ops/v5-client/status.go b/traffic_ops/v5-client/status.go index 0448f5280d..ebb3c9e02a 100644 --- a/traffic_ops/v5-client/status.go +++ b/traffic_ops/v5-client/status.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiStatuses is the API version-relative path to the /statuses API endpoint. diff --git a/traffic_ops/v5-client/steering.go b/traffic_ops/v5-client/steering.go index d7c846d58c..d9ae7f0bab 100644 --- a/traffic_ops/v5-client/steering.go +++ b/traffic_ops/v5-client/steering.go @@ -16,8 +16,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // Steering retrieves information about all (Tenant-accessible) Steering diff --git a/traffic_ops/v5-client/steeringtarget.go b/traffic_ops/v5-client/steeringtarget.go index 3fbe31736c..464b122ddf 100644 --- a/traffic_ops/v5-client/steeringtarget.go +++ b/traffic_ops/v5-client/steeringtarget.go @@ -19,8 +19,8 @@ import ( "errors" "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // CreateSteeringTarget adds the given Steering Target to a Steering Delivery diff --git a/traffic_ops/v5-client/tenant.go b/traffic_ops/v5-client/tenant.go index 049b256408..74e345e56b 100644 --- a/traffic_ops/v5-client/tenant.go +++ b/traffic_ops/v5-client/tenant.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiTenants is the API version-relative path to the /tenants API endpoint. diff --git a/traffic_ops/v5-client/topology.go b/traffic_ops/v5-client/topology.go index f1ac4ef028..6e4d91af3f 100644 --- a/traffic_ops/v5-client/topology.go +++ b/traffic_ops/v5-client/topology.go @@ -18,8 +18,8 @@ package client import ( "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiTopologies is the API version-relative path to the /topologies API endpoint. diff --git a/traffic_ops/v5-client/topology_queue_updates.go b/traffic_ops/v5-client/topology_queue_updates.go index e2235a5a9a..dc80754d0e 100644 --- a/traffic_ops/v5-client/topology_queue_updates.go +++ b/traffic_ops/v5-client/topology_queue_updates.go @@ -23,8 +23,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // TopologiesQueueUpdate queues updates for the Topology with the given Name. diff --git a/traffic_ops/v5-client/traffic_monitor.go b/traffic_ops/v5-client/traffic_monitor.go index b6acc2e152..82439bedd8 100644 --- a/traffic_ops/v5-client/traffic_monitor.go +++ b/traffic_ops/v5-client/traffic_monitor.go @@ -23,8 +23,8 @@ import ( "fmt" "net/url" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiCDNMonitoringConfig is the API path on which Traffic Ops serves the CDN monitoring diff --git a/traffic_ops/v5-client/traffic_stats.go b/traffic_ops/v5-client/traffic_stats.go index 68bf2f7194..86d5a57eb3 100644 --- a/traffic_ops/v5-client/traffic_stats.go +++ b/traffic_ops/v5-client/traffic_stats.go @@ -15,8 +15,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // GetCurrentStats gets current stats for each CDNs and a total across them. diff --git a/traffic_ops/v5-client/type.go b/traffic_ops/v5-client/type.go index 6572c51a5a..c59ab5140a 100644 --- a/traffic_ops/v5-client/type.go +++ b/traffic_ops/v5-client/type.go @@ -18,8 +18,8 @@ package client import ( "fmt" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // apiTypes is the API version-relative path to the /types API endpoint. diff --git a/traffic_ops/v5-client/user.go b/traffic_ops/v5-client/user.go index 2cfb8a6d13..e5f28739ab 100644 --- a/traffic_ops/v5-client/user.go +++ b/traffic_ops/v5-client/user.go @@ -19,9 +19,9 @@ import ( "fmt" "strconv" - "github.com/apache/trafficcontrol/lib/go-rfc" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-rfc" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) // UserCurrentResponseV4 is an alias to avoid client breaking changes. In-case of a minor or major version change, we replace the below alias with a new structure. diff --git a/traffic_ops/v5-client/vault.go b/traffic_ops/v5-client/vault.go index 26d85bbe3b..710248b61e 100644 --- a/traffic_ops/v5-client/vault.go +++ b/traffic_ops/v5-client/vault.go @@ -15,8 +15,8 @@ package client */ import ( - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/toclientlib" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/traffic_ops/toclientlib" ) const ( diff --git a/traffic_router/ultimate-test-harness/http_test.go b/traffic_router/ultimate-test-harness/http_test.go index f878768086..9bc24a90f0 100644 --- a/traffic_router/ultimate-test-harness/http_test.go +++ b/traffic_router/ultimate-test-harness/http_test.go @@ -36,10 +36,10 @@ import ( "text/tabwriter" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) const ( diff --git a/traffic_router/ultimate-test-harness/main_test.go b/traffic_router/ultimate-test-harness/main_test.go index 2e778dd881..0f740b7dd9 100644 --- a/traffic_router/ultimate-test-harness/main_test.go +++ b/traffic_router/ultimate-test-harness/main_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" ) type Benchmark struct { diff --git a/traffic_router/ultimate-test-harness/traffic_ops_test.go b/traffic_router/ultimate-test-harness/traffic_ops_test.go index 370635d17b..6764f80506 100644 --- a/traffic_router/ultimate-test-harness/traffic_ops_test.go +++ b/traffic_router/ultimate-test-harness/traffic_ops_test.go @@ -23,7 +23,7 @@ import ( "fmt" "os" - client "github.com/apache/trafficcontrol/traffic_ops/v4-client" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v4-client" "github.com/kelseyhightower/envconfig" ) diff --git a/traffic_stats/influxdb_tools/create/create_ts_databases.go b/traffic_stats/influxdb_tools/create/create_ts_databases.go index f0361892a2..629c5275ff 100644 --- a/traffic_stats/influxdb_tools/create/create_ts_databases.go +++ b/traffic_stats/influxdb_tools/create/create_ts_databases.go @@ -23,7 +23,7 @@ import ( "flag" "fmt" - "github.com/apache/trafficcontrol/traffic_stats/influxdb" + "github.com/apache/trafficcontrol/v7/traffic_stats/influxdb" influx "github.com/influxdata/influxdb/client/v2" ) diff --git a/traffic_stats/influxdb_tools/sync/sync_test.go b/traffic_stats/influxdb_tools/sync/sync_test.go index 77a71afd49..942638171f 100644 --- a/traffic_stats/influxdb_tools/sync/sync_test.go +++ b/traffic_stats/influxdb_tools/sync/sync_test.go @@ -24,7 +24,7 @@ import ( "fmt" "testing" - "github.com/apache/trafficcontrol/lib/go-util/assert" + "github.com/apache/trafficcontrol/v7/lib/go-util/assert" influx "github.com/influxdata/influxdb/client/v2" "github.com/influxdata/influxdb/models" ) diff --git a/traffic_stats/influxdb_tools/sync/sync_ts_databases.go b/traffic_stats/influxdb_tools/sync/sync_ts_databases.go index 16d2bd978e..315f074932 100644 --- a/traffic_stats/influxdb_tools/sync/sync_ts_databases.go +++ b/traffic_stats/influxdb_tools/sync/sync_ts_databases.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/apache/trafficcontrol/traffic_stats/influxdb" + "github.com/apache/trafficcontrol/v7/traffic_stats/influxdb" influx "github.com/influxdata/influxdb/client/v2" ) diff --git a/traffic_stats/traffic_stats.go b/traffic_stats/traffic_stats.go index b13c2097ab..787e688e20 100644 --- a/traffic_stats/traffic_stats.go +++ b/traffic_stats/traffic_stats.go @@ -37,10 +37,10 @@ import ( "syscall" "time" - "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" - client "github.com/apache/trafficcontrol/traffic_ops/v5-client" + "github.com/apache/trafficcontrol/v7/lib/go-log" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" + client "github.com/apache/trafficcontrol/v7/traffic_ops/v5-client" "github.com/Shopify/sarama" "github.com/cihub/seelog" diff --git a/traffic_stats/traffic_stats_test.go b/traffic_stats/traffic_stats_test.go index 76008656f9..77713c75d5 100644 --- a/traffic_stats/traffic_stats_test.go +++ b/traffic_stats/traffic_stats_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/lib/go-util" + "github.com/apache/trafficcontrol/v7/lib/go-tc" + "github.com/apache/trafficcontrol/v7/lib/go-util" influx "github.com/influxdata/influxdb/client/v2" ) From b521813e63b956918f93154e8586447b5e102fe5 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 1 Mar 2023 12:02:34 -0700 Subject: [PATCH 4/5] Revert "Retract versions v1.1.0 through v1.1.5 from Go modules (#7150)" This reverts commit 83255a7728f0a01126fa81133eb19dd04c40db24. --- go.mod | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/go.mod b/go.mod index 754417a0a1..d2ea3153c2 100644 --- a/go.mod +++ b/go.mod @@ -101,18 +101,3 @@ require ( gopkg.in/jcmturner/gokrb5.v7 v7.5.0 // indirect gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect ) - -// Although the Apache Traffic Control considers v7.0.1 stable, Go modules consider it unstable because its major version -// is greater than 1, and without these retractions, a commit like 817a702a9de6 will have a computed vesion of -// v1.1.4-0.20201118150121-817a702a9de6 -// With these retractions, the same commit will have a computed version of -// v0.0.0-20201118150121-817a702a9de6 -// See https://pkg.go.dev/cmd/go@go1.15.15#hdr-Module_compatibility_and_semantic_versioning for details. -retract ( - v1.1.5-retractions - v1.1.4 - v1.1.3 - v1.1.2 - v1.1.1 - v1.1.0 -) From f5061d823b9675bec0660fe78d0c7a1ffb3e8095 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 1 Mar 2023 12:03:19 -0700 Subject: [PATCH 5/5] Update module version to v7 --- CHANGELOG.md | 1 + go.mod | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0435f751f..856523053b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,6 +86,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#7966](https://github.com/apache/trafficcontrol/pull/7696) *Traffic Control Cache Config (t3c)*: will no longer clear update flag when config failure occurs and will also give a cache config error msg on exit. - [#7716](https://github.com/apache/trafficcontrol/pull/7716) *Apache Traffic Server*: Use GCC 11 for building. - [#7742](https://github.com/apache/trafficcontrol/pull/7742) *Traffic Ops*: Changed api tests to supply the absolute path of certs. +- Updated the module path to [`github.com/apache/trafficcontrol/v7`](https://pkg.go.dev/github.com/apache/trafficcontrol/v7). Module https://pkg.go.dev/github.com/apache/trafficcontrol will not receive further updates. ### Fixed - [#7802](https://github.com/apache/trafficcontrol/pull/7802) *Traffic Control Health Client*: Fixed ReadMe.md typos and duplicates. diff --git a/go.mod b/go.mod index d2ea3153c2..eddc984e15 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/apache/trafficcontrol +module github.com/apache/trafficcontrol/v7 // Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE file