You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2020/11/18 19:08:28 UTC
[trafficcontrol] branch 5.0.x updated: DNSSEC Refresh check compile
fix (#5293)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch 5.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/5.0.x by this push:
new 12c717c DNSSEC Refresh check compile fix (#5293)
12c717c is described below
commit 12c717c780703d711842aeb5bb8db231711deaca
Author: ocket8888 <oc...@apache.org>
AuthorDate: Wed Nov 18 12:04:14 2020 -0700
DNSSEC Refresh check compile fix (#5293)
* move getopt to main vendor directory
* Add checks to Go unit test CI
* Fix license issues
* Fetching explicit external dependencies
(cherry picked from commit 6635c686c5694b633291a4a2f00c923031fd6aa1)
---
.github/actions/go-test/entrypoint.sh | 9 ++++++++-
.github/actions/to-integration-tests/entrypoint.sh | 9 ++++++++-
.github/workflows/go.unit.tests.yaml | 2 +-
LICENSE | 4 ++--
.../vendor => vendor}/github.com/pborman/getopt/.travis.yml | 0
.../vendor => vendor}/github.com/pborman/getopt/AUTHORS | 0
.../vendor => vendor}/github.com/pborman/getopt/CONTRIBUTING.md | 0
.../vendor => vendor}/github.com/pborman/getopt/LICENSE | 0
.../vendor => vendor}/github.com/pborman/getopt/README.md | 0
.../vendor => vendor}/github.com/pborman/getopt/bool.go | 0
.../vendor => vendor}/github.com/pborman/getopt/bool_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/breakup_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/counter.go | 0
.../vendor => vendor}/github.com/pborman/getopt/counter_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/duration.go | 0
.../vendor => vendor}/github.com/pborman/getopt/duration_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/enum.go | 0
.../vendor => vendor}/github.com/pborman/getopt/enum_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/error.go | 0
.../vendor => vendor}/github.com/pborman/getopt/getopt.go | 0
.../vendor => vendor}/github.com/pborman/getopt/int.go | 0
.../vendor => vendor}/github.com/pborman/getopt/int16.go | 0
.../vendor => vendor}/github.com/pborman/getopt/int16_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/int32.go | 0
.../vendor => vendor}/github.com/pborman/getopt/int32_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/int64.go | 0
.../vendor => vendor}/github.com/pborman/getopt/int64_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/int_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/list.go | 0
.../vendor => vendor}/github.com/pborman/getopt/list_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/option.go | 0
.../vendor => vendor}/github.com/pborman/getopt/set.go | 0
.../vendor => vendor}/github.com/pborman/getopt/signed.go | 0
.../vendor => vendor}/github.com/pborman/getopt/signed_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/string.go | 0
.../vendor => vendor}/github.com/pborman/getopt/string_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/uint.go | 0
.../vendor => vendor}/github.com/pborman/getopt/uint16.go | 0
.../vendor => vendor}/github.com/pborman/getopt/uint16_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/uint32.go | 0
.../vendor => vendor}/github.com/pborman/getopt/uint32_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/uint64.go | 0
.../vendor => vendor}/github.com/pborman/getopt/uint64_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/uint_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/unsigned.go | 0
.../vendor => vendor}/github.com/pborman/getopt/unsigned_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/util_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/bool.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/bool_test.go | 0
.../github.com/pborman/getopt/v2/breakup_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/counter.go | 0
.../github.com/pborman/getopt/v2/counter_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/duration.go | 0
.../github.com/pborman/getopt/v2/duration_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/enum.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/enum_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/error.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/generic.go | 0
.../github.com/pborman/getopt/v2/generic_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/getopt.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/help_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/int.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/int_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/list.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/list_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/option.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/set.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/signed.go | 0
.../github.com/pborman/getopt/v2/signed_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/string.go | 0
.../github.com/pborman/getopt/v2/string_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/unsigned.go | 0
.../github.com/pborman/getopt/v2/unsigned_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/util_test.go | 0
.../vendor => vendor}/github.com/pborman/getopt/v2/var.go | 0
.../vendor => vendor}/github.com/pborman/getopt/var.go | 0
76 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/.github/actions/go-test/entrypoint.sh b/.github/actions/go-test/entrypoint.sh
index d332785..82d5140 100755
--- a/.github/actions/go-test/entrypoint.sh
+++ b/.github/actions/go-test/entrypoint.sh
@@ -40,6 +40,13 @@ ln -s "$PWD" "$srcdir/trafficcontrol"
cd "$srcdir/trafficcontrol"
# Need to fetch golang.org/x/* dependencies
-/usr/local/go/bin/go get -v $INPUT_DIR
+/usr/local/go/bin/go get -v golang.org/x/net/publicsuffix\
+ golang.org/x/crypto/ed25519 \
+ golang.org/x/crypto/scrypt \
+ golang.org/x/net/idna \
+ golang.org/x/net/ipv4 \
+ golang.org/x/net/ipv6 \
+ golang.org/x/sys/unix \
+ golang.org/x/text/secure/bidirule
/usr/local/go/bin/go test -v $INPUT_DIR
exit $?
diff --git a/.github/actions/to-integration-tests/entrypoint.sh b/.github/actions/to-integration-tests/entrypoint.sh
index 443e7f4..79e04c2 100755
--- a/.github/actions/to-integration-tests/entrypoint.sh
+++ b/.github/actions/to-integration-tests/entrypoint.sh
@@ -109,7 +109,14 @@ ln -s "$PWD" "$srcdir/trafficcontrol"
cd "$srcdir/trafficcontrol/traffic_ops/traffic_ops_golang"
-go get ./...
+/usr/local/go/bin/go get -v golang.org/x/net/publicsuffix\
+ golang.org/x/crypto/ed25519 \
+ golang.org/x/crypto/scrypt \
+ golang.org/x/net/idna \
+ golang.org/x/net/ipv4 \
+ golang.org/x/net/ipv6 \
+ golang.org/x/sys/unix \
+ golang.org/x/text/secure/bidirule
go build .
echo "
diff --git a/.github/workflows/go.unit.tests.yaml b/.github/workflows/go.unit.tests.yaml
index d42cf92..740eb87 100644
--- a/.github/workflows/go.unit.tests.yaml
+++ b/.github/workflows/go.unit.tests.yaml
@@ -50,4 +50,4 @@ jobs:
- name: Run unit tests
uses: ./.github/actions/go-test
with:
- dir: ./grove/... ./lib/... ./traffic_monitor/... ./traffic_ops/traffic_ops_golang/... ./traffic_ops_ort/atstccfg/... ./traffic_stats/...
+ dir: ./grove/... ./lib/... ./traffic_monitor/... ./traffic_ops/traffic_ops_golang/... ./traffic_ops_ort/atstccfg/... ./traffic_stats/... ./traffic_ops/app/bin/...
diff --git a/LICENSE b/LICENSE
index d9b62a3..63d8da3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -466,8 +466,8 @@ For the gofrs/flock component:
./traffic_ops_ort/vendor/github.com/gofrs/flock/LICENSE
For the pborman/getopt component:
-@traffic_ops_ort/vendor/github.com/pborman/getopt/*
-./traffic_ops_ort/vendor/github.com/pborman/getopt/LICENSE
+@vendor/github.com/pborman/getopt/*
+vendor/github.com/pborman/getopt/LICENSE
For the contrib.go.opencensus.io/exporter/ocagent component:
@traffic_ops/traffic_ops_golang/vendor/contrib.go.opencensus.io/exporter/ocagent/*
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/.travis.yml b/vendor/github.com/pborman/getopt/.travis.yml
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/.travis.yml
rename to vendor/github.com/pborman/getopt/.travis.yml
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/AUTHORS b/vendor/github.com/pborman/getopt/AUTHORS
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/AUTHORS
rename to vendor/github.com/pborman/getopt/AUTHORS
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/CONTRIBUTING.md b/vendor/github.com/pborman/getopt/CONTRIBUTING.md
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/CONTRIBUTING.md
rename to vendor/github.com/pborman/getopt/CONTRIBUTING.md
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/LICENSE b/vendor/github.com/pborman/getopt/LICENSE
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/LICENSE
rename to vendor/github.com/pborman/getopt/LICENSE
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/README.md b/vendor/github.com/pborman/getopt/README.md
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/README.md
rename to vendor/github.com/pborman/getopt/README.md
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/bool.go b/vendor/github.com/pborman/getopt/bool.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/bool.go
rename to vendor/github.com/pborman/getopt/bool.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/bool_test.go b/vendor/github.com/pborman/getopt/bool_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/bool_test.go
rename to vendor/github.com/pborman/getopt/bool_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/breakup_test.go b/vendor/github.com/pborman/getopt/breakup_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/breakup_test.go
rename to vendor/github.com/pborman/getopt/breakup_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/counter.go b/vendor/github.com/pborman/getopt/counter.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/counter.go
rename to vendor/github.com/pborman/getopt/counter.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/counter_test.go b/vendor/github.com/pborman/getopt/counter_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/counter_test.go
rename to vendor/github.com/pborman/getopt/counter_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/duration.go b/vendor/github.com/pborman/getopt/duration.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/duration.go
rename to vendor/github.com/pborman/getopt/duration.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/duration_test.go b/vendor/github.com/pborman/getopt/duration_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/duration_test.go
rename to vendor/github.com/pborman/getopt/duration_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/enum.go b/vendor/github.com/pborman/getopt/enum.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/enum.go
rename to vendor/github.com/pborman/getopt/enum.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/enum_test.go b/vendor/github.com/pborman/getopt/enum_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/enum_test.go
rename to vendor/github.com/pborman/getopt/enum_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/error.go b/vendor/github.com/pborman/getopt/error.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/error.go
rename to vendor/github.com/pborman/getopt/error.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/getopt.go b/vendor/github.com/pborman/getopt/getopt.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/getopt.go
rename to vendor/github.com/pborman/getopt/getopt.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/int.go b/vendor/github.com/pborman/getopt/int.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/int.go
rename to vendor/github.com/pborman/getopt/int.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/int16.go b/vendor/github.com/pborman/getopt/int16.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/int16.go
rename to vendor/github.com/pborman/getopt/int16.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/int16_test.go b/vendor/github.com/pborman/getopt/int16_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/int16_test.go
rename to vendor/github.com/pborman/getopt/int16_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/int32.go b/vendor/github.com/pborman/getopt/int32.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/int32.go
rename to vendor/github.com/pborman/getopt/int32.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/int32_test.go b/vendor/github.com/pborman/getopt/int32_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/int32_test.go
rename to vendor/github.com/pborman/getopt/int32_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/int64.go b/vendor/github.com/pborman/getopt/int64.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/int64.go
rename to vendor/github.com/pborman/getopt/int64.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/int64_test.go b/vendor/github.com/pborman/getopt/int64_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/int64_test.go
rename to vendor/github.com/pborman/getopt/int64_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/int_test.go b/vendor/github.com/pborman/getopt/int_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/int_test.go
rename to vendor/github.com/pborman/getopt/int_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/list.go b/vendor/github.com/pborman/getopt/list.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/list.go
rename to vendor/github.com/pborman/getopt/list.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/list_test.go b/vendor/github.com/pborman/getopt/list_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/list_test.go
rename to vendor/github.com/pborman/getopt/list_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/option.go b/vendor/github.com/pborman/getopt/option.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/option.go
rename to vendor/github.com/pborman/getopt/option.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/set.go b/vendor/github.com/pborman/getopt/set.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/set.go
rename to vendor/github.com/pborman/getopt/set.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/signed.go b/vendor/github.com/pborman/getopt/signed.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/signed.go
rename to vendor/github.com/pborman/getopt/signed.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/signed_test.go b/vendor/github.com/pborman/getopt/signed_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/signed_test.go
rename to vendor/github.com/pborman/getopt/signed_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/string.go b/vendor/github.com/pborman/getopt/string.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/string.go
rename to vendor/github.com/pborman/getopt/string.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/string_test.go b/vendor/github.com/pborman/getopt/string_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/string_test.go
rename to vendor/github.com/pborman/getopt/string_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/uint.go b/vendor/github.com/pborman/getopt/uint.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/uint.go
rename to vendor/github.com/pborman/getopt/uint.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/uint16.go b/vendor/github.com/pborman/getopt/uint16.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/uint16.go
rename to vendor/github.com/pborman/getopt/uint16.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/uint16_test.go b/vendor/github.com/pborman/getopt/uint16_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/uint16_test.go
rename to vendor/github.com/pborman/getopt/uint16_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/uint32.go b/vendor/github.com/pborman/getopt/uint32.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/uint32.go
rename to vendor/github.com/pborman/getopt/uint32.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/uint32_test.go b/vendor/github.com/pborman/getopt/uint32_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/uint32_test.go
rename to vendor/github.com/pborman/getopt/uint32_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/uint64.go b/vendor/github.com/pborman/getopt/uint64.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/uint64.go
rename to vendor/github.com/pborman/getopt/uint64.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/uint64_test.go b/vendor/github.com/pborman/getopt/uint64_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/uint64_test.go
rename to vendor/github.com/pborman/getopt/uint64_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/uint_test.go b/vendor/github.com/pborman/getopt/uint_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/uint_test.go
rename to vendor/github.com/pborman/getopt/uint_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/unsigned.go b/vendor/github.com/pborman/getopt/unsigned.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/unsigned.go
rename to vendor/github.com/pborman/getopt/unsigned.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/unsigned_test.go b/vendor/github.com/pborman/getopt/unsigned_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/unsigned_test.go
rename to vendor/github.com/pborman/getopt/unsigned_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/util_test.go b/vendor/github.com/pborman/getopt/util_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/util_test.go
rename to vendor/github.com/pborman/getopt/util_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/bool.go b/vendor/github.com/pborman/getopt/v2/bool.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/bool.go
rename to vendor/github.com/pborman/getopt/v2/bool.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/bool_test.go b/vendor/github.com/pborman/getopt/v2/bool_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/bool_test.go
rename to vendor/github.com/pborman/getopt/v2/bool_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/breakup_test.go b/vendor/github.com/pborman/getopt/v2/breakup_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/breakup_test.go
rename to vendor/github.com/pborman/getopt/v2/breakup_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/counter.go b/vendor/github.com/pborman/getopt/v2/counter.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/counter.go
rename to vendor/github.com/pborman/getopt/v2/counter.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/counter_test.go b/vendor/github.com/pborman/getopt/v2/counter_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/counter_test.go
rename to vendor/github.com/pborman/getopt/v2/counter_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/duration.go b/vendor/github.com/pborman/getopt/v2/duration.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/duration.go
rename to vendor/github.com/pborman/getopt/v2/duration.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/duration_test.go b/vendor/github.com/pborman/getopt/v2/duration_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/duration_test.go
rename to vendor/github.com/pborman/getopt/v2/duration_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/enum.go b/vendor/github.com/pborman/getopt/v2/enum.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/enum.go
rename to vendor/github.com/pborman/getopt/v2/enum.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/enum_test.go b/vendor/github.com/pborman/getopt/v2/enum_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/enum_test.go
rename to vendor/github.com/pborman/getopt/v2/enum_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/error.go b/vendor/github.com/pborman/getopt/v2/error.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/error.go
rename to vendor/github.com/pborman/getopt/v2/error.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/generic.go b/vendor/github.com/pborman/getopt/v2/generic.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/generic.go
rename to vendor/github.com/pborman/getopt/v2/generic.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/generic_test.go b/vendor/github.com/pborman/getopt/v2/generic_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/generic_test.go
rename to vendor/github.com/pborman/getopt/v2/generic_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/getopt.go b/vendor/github.com/pborman/getopt/v2/getopt.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/getopt.go
rename to vendor/github.com/pborman/getopt/v2/getopt.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/help_test.go b/vendor/github.com/pborman/getopt/v2/help_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/help_test.go
rename to vendor/github.com/pborman/getopt/v2/help_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/int.go b/vendor/github.com/pborman/getopt/v2/int.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/int.go
rename to vendor/github.com/pborman/getopt/v2/int.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/int_test.go b/vendor/github.com/pborman/getopt/v2/int_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/int_test.go
rename to vendor/github.com/pborman/getopt/v2/int_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/list.go b/vendor/github.com/pborman/getopt/v2/list.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/list.go
rename to vendor/github.com/pborman/getopt/v2/list.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/list_test.go b/vendor/github.com/pborman/getopt/v2/list_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/list_test.go
rename to vendor/github.com/pborman/getopt/v2/list_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/option.go b/vendor/github.com/pborman/getopt/v2/option.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/option.go
rename to vendor/github.com/pborman/getopt/v2/option.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/set.go b/vendor/github.com/pborman/getopt/v2/set.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/set.go
rename to vendor/github.com/pborman/getopt/v2/set.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/signed.go b/vendor/github.com/pborman/getopt/v2/signed.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/signed.go
rename to vendor/github.com/pborman/getopt/v2/signed.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/signed_test.go b/vendor/github.com/pborman/getopt/v2/signed_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/signed_test.go
rename to vendor/github.com/pborman/getopt/v2/signed_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/string.go b/vendor/github.com/pborman/getopt/v2/string.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/string.go
rename to vendor/github.com/pborman/getopt/v2/string.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/string_test.go b/vendor/github.com/pborman/getopt/v2/string_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/string_test.go
rename to vendor/github.com/pborman/getopt/v2/string_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/unsigned.go b/vendor/github.com/pborman/getopt/v2/unsigned.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/unsigned.go
rename to vendor/github.com/pborman/getopt/v2/unsigned.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/unsigned_test.go b/vendor/github.com/pborman/getopt/v2/unsigned_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/unsigned_test.go
rename to vendor/github.com/pborman/getopt/v2/unsigned_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/util_test.go b/vendor/github.com/pborman/getopt/v2/util_test.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/util_test.go
rename to vendor/github.com/pborman/getopt/v2/util_test.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/v2/var.go b/vendor/github.com/pborman/getopt/v2/var.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/v2/var.go
rename to vendor/github.com/pborman/getopt/v2/var.go
diff --git a/traffic_ops_ort/vendor/github.com/pborman/getopt/var.go b/vendor/github.com/pborman/getopt/var.go
similarity index 100%
rename from traffic_ops_ort/vendor/github.com/pborman/getopt/var.go
rename to vendor/github.com/pborman/getopt/var.go