From 62e174118b8c1a25bcbaa55ec1598bc166d8aab3 Mon Sep 17 00:00:00 2001
From: Mark Severson <mark@kasten.io>
Date: Wed, 17 Jun 2020 16:17:58 -0600
Subject: [PATCH 1/2] Fix Go module ambiguous import errors

This is an extension of the mitigations introduced in #455.
Unfortunately, the original mitigations didn't address the primary cause
of ambiguous import errors: the github.com/Azure/go-autorest module.

The issue stems from the fact that old versions of the root module
(github.com/Azure/go-autorest) provide the same packages as the newer
submodules.

To correct this situation, the _root module_ needs to be upgraded to a
version that no longer provides those packages (a version where the
submodules are present). Fortunately, the submodules can be leveraged to
provide the necessary version bump.

See: https://github.com/Azure/go-autorest/issues/414#issuecomment-521751306

----

Caveat: in order for this to work, an importable version of the root
package needs to be referenceable.

PR #527 makes the root package importable.

The go.mod files assume that this importable version will be
referenceable as v14.2.0. If the version where the importable package is
available ends up being different, these files will need to be updated.

See also: #395, #413, #414, #455, #481, #524
---
 autorest/adal/go.mod                    |  2 +-
 autorest/adal/go_mod_tidy_hack.go       |  4 ++--
 autorest/azure/auth/go.mod              |  1 +
 autorest/azure/auth/go_mod_tidy_hack.go |  4 ++--
 autorest/azure/cli/go.mod               |  2 +-
 autorest/azure/cli/go_mod_tidy_hack.go  |  4 ++--
 autorest/date/go.mod                    |  2 +-
 autorest/date/go.sum                    | 16 ----------------
 autorest/date/go_mod_tidy_hack.go       |  4 ++--
 autorest/go.mod                         |  1 +
 autorest/go_mod_tidy_hack.go            | 24 ++++++++++++++++++++++++
 autorest/mocks/go.mod                   |  2 +-
 autorest/mocks/go.sum                   | 16 ----------------
 autorest/mocks/go_mod_tidy_hack.go      |  4 ++--
 autorest/to/go.mod                      |  2 +-
 autorest/to/go.sum                      | 17 -----------------
 autorest/to/go_mod_tidy_hack.go         |  4 ++--
 autorest/validation/go.mod              |  2 +-
 autorest/validation/go.sum              | 17 -----------------
 autorest/validation/go_mod_tidy_hack.go |  4 ++--
 logger/go.mod                           |  2 ++
 logger/go_mod_tidy_hack.go              | 24 ++++++++++++++++++++++++
 tracing/go.mod                          |  2 ++
 tracing/go_mod_tidy_hack.go             | 24 ++++++++++++++++++++++++
 24 files changed, 98 insertions(+), 86 deletions(-)
 create mode 100644 autorest/go_mod_tidy_hack.go
 create mode 100644 logger/go_mod_tidy_hack.go
 create mode 100644 tracing/go_mod_tidy_hack.go

diff --git a/autorest/adal/go.mod b/autorest/adal/go.mod
index a030eb42d..e7125344c 100644
--- a/autorest/adal/go.mod
+++ b/autorest/adal/go.mod
@@ -3,7 +3,7 @@ module github.com/Azure/go-autorest/autorest/adal
 go 1.12
 
 require (
-	github.com/Azure/go-autorest/autorest v0.9.0
+	github.com/Azure/go-autorest v14.2.0+incompatible
 	github.com/Azure/go-autorest/autorest/date v0.2.0
 	github.com/Azure/go-autorest/autorest/mocks v0.3.0
 	github.com/Azure/go-autorest/tracing v0.5.0
diff --git a/autorest/adal/go_mod_tidy_hack.go b/autorest/adal/go_mod_tidy_hack.go
index 28a4bfc4c..7551b7923 100644
--- a/autorest/adal/go_mod_tidy_hack.go
+++ b/autorest/adal/go_mod_tidy_hack.go
@@ -16,9 +16,9 @@ package adal
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
 // the resultant binary.
 
 // Necessary for safely adding multi-module repo.
 // See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/go-autorest/autorest"
+import _ "github.com/Azure/go-autorest"
diff --git a/autorest/azure/auth/go.mod b/autorest/azure/auth/go.mod
index 4bebbdc24..d38dcbbe0 100644
--- a/autorest/azure/auth/go.mod
+++ b/autorest/azure/auth/go.mod
@@ -3,6 +3,7 @@ module github.com/Azure/go-autorest/autorest/azure/auth
 go 1.12
 
 require (
+	github.com/Azure/go-autorest v14.2.0+incompatible
 	github.com/Azure/go-autorest/autorest v0.9.3
 	github.com/Azure/go-autorest/autorest/adal v0.8.1
 	github.com/Azure/go-autorest/autorest/azure/cli v0.3.1
diff --git a/autorest/azure/auth/go_mod_tidy_hack.go b/autorest/azure/auth/go_mod_tidy_hack.go
index 2f09cd177..38e4900ad 100644
--- a/autorest/azure/auth/go_mod_tidy_hack.go
+++ b/autorest/azure/auth/go_mod_tidy_hack.go
@@ -16,9 +16,9 @@ package auth
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
 // the resultant binary.
 
 // Necessary for safely adding multi-module repo.
 // See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/go-autorest/autorest"
+import _ "github.com/Azure/go-autorest"
diff --git a/autorest/azure/cli/go.mod b/autorest/azure/cli/go.mod
index a58302914..14397e9a6 100644
--- a/autorest/azure/cli/go.mod
+++ b/autorest/azure/cli/go.mod
@@ -3,7 +3,7 @@ module github.com/Azure/go-autorest/autorest/azure/cli
 go 1.12
 
 require (
-	github.com/Azure/go-autorest/autorest v0.9.0
+	github.com/Azure/go-autorest v14.2.0+incompatible
 	github.com/Azure/go-autorest/autorest/adal v0.8.0
 	github.com/Azure/go-autorest/autorest/date v0.2.0
 	github.com/dimchansky/utfbom v1.1.0
diff --git a/autorest/azure/cli/go_mod_tidy_hack.go b/autorest/azure/cli/go_mod_tidy_hack.go
index 618bed392..861ce2984 100644
--- a/autorest/azure/cli/go_mod_tidy_hack.go
+++ b/autorest/azure/cli/go_mod_tidy_hack.go
@@ -16,9 +16,9 @@ package cli
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
 // the resultant binary.
 
 // Necessary for safely adding multi-module repo.
 // See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/go-autorest/autorest"
+import _ "github.com/Azure/go-autorest"
diff --git a/autorest/date/go.mod b/autorest/date/go.mod
index 3adc4804c..f88ecc402 100644
--- a/autorest/date/go.mod
+++ b/autorest/date/go.mod
@@ -2,4 +2,4 @@ module github.com/Azure/go-autorest/autorest/date
 
 go 1.12
 
-require github.com/Azure/go-autorest/autorest v0.9.0
+require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/autorest/date/go.sum b/autorest/date/go.sum
index 9e2ee7a94..e69de29bb 100644
--- a/autorest/date/go.sum
+++ b/autorest/date/go.sum
@@ -1,16 +0,0 @@
-github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/autorest/date/go_mod_tidy_hack.go b/autorest/date/go_mod_tidy_hack.go
index 55adf930f..4e0543207 100644
--- a/autorest/date/go_mod_tidy_hack.go
+++ b/autorest/date/go_mod_tidy_hack.go
@@ -16,9 +16,9 @@ package date
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
 // the resultant binary.
 
 // Necessary for safely adding multi-module repo.
 // See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/go-autorest/autorest"
+import _ "github.com/Azure/go-autorest"
diff --git a/autorest/go.mod b/autorest/go.mod
index 499c56de4..035843d2c 100644
--- a/autorest/go.mod
+++ b/autorest/go.mod
@@ -3,6 +3,7 @@ module github.com/Azure/go-autorest/autorest
 go 1.12
 
 require (
+	github.com/Azure/go-autorest v14.2.0+incompatible
 	github.com/Azure/go-autorest/autorest/adal v0.8.2
 	github.com/Azure/go-autorest/autorest/mocks v0.3.0
 	github.com/Azure/go-autorest/logger v0.1.0
diff --git a/autorest/go_mod_tidy_hack.go b/autorest/go_mod_tidy_hack.go
new file mode 100644
index 000000000..da65e1041
--- /dev/null
+++ b/autorest/go_mod_tidy_hack.go
@@ -0,0 +1,24 @@
+// +build modhack
+
+package autorest
+
+// Copyright 2017 Microsoft Corporation
+//
+//  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.
+
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
+// the resultant binary.
+
+// Necessary for safely adding multi-module repo.
+// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
+import _ "github.com/Azure/go-autorest"
diff --git a/autorest/mocks/go.mod b/autorest/mocks/go.mod
index f1dfdbeb5..c3f6b7e86 100644
--- a/autorest/mocks/go.mod
+++ b/autorest/mocks/go.mod
@@ -2,4 +2,4 @@ module github.com/Azure/go-autorest/autorest/mocks
 
 go 1.12
 
-require github.com/Azure/go-autorest/autorest v0.9.0
+require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/autorest/mocks/go.sum b/autorest/mocks/go.sum
index 7d96b7ed8..e69de29bb 100644
--- a/autorest/mocks/go.sum
+++ b/autorest/mocks/go.sum
@@ -1,16 +0,0 @@
-github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/autorest/mocks/go_mod_tidy_hack.go b/autorest/mocks/go_mod_tidy_hack.go
index b828eed70..85a4baf10 100644
--- a/autorest/mocks/go_mod_tidy_hack.go
+++ b/autorest/mocks/go_mod_tidy_hack.go
@@ -16,9 +16,9 @@ package mocks
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
 // the resultant binary.
 
 // Necessary for safely adding multi-module repo.
 // See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/go-autorest/autorest"
+import _ "github.com/Azure/go-autorest"
diff --git a/autorest/to/go.mod b/autorest/to/go.mod
index 48fd8c6e5..8fd041e2b 100644
--- a/autorest/to/go.mod
+++ b/autorest/to/go.mod
@@ -2,4 +2,4 @@ module github.com/Azure/go-autorest/autorest/to
 
 go 1.12
 
-require github.com/Azure/go-autorest/autorest v0.9.0
+require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/autorest/to/go.sum b/autorest/to/go.sum
index d7ee6b462..e69de29bb 100644
--- a/autorest/to/go.sum
+++ b/autorest/to/go.sum
@@ -1,17 +0,0 @@
-github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/autorest/to/go_mod_tidy_hack.go b/autorest/to/go_mod_tidy_hack.go
index 8e8292107..b7310f6b8 100644
--- a/autorest/to/go_mod_tidy_hack.go
+++ b/autorest/to/go_mod_tidy_hack.go
@@ -16,9 +16,9 @@ package to
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
 // the resultant binary.
 
 // Necessary for safely adding multi-module repo.
 // See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/go-autorest/autorest"
+import _ "github.com/Azure/go-autorest"
diff --git a/autorest/validation/go.mod b/autorest/validation/go.mod
index b3f9b6a09..a0a69e9ae 100644
--- a/autorest/validation/go.mod
+++ b/autorest/validation/go.mod
@@ -3,6 +3,6 @@ module github.com/Azure/go-autorest/autorest/validation
 go 1.12
 
 require (
-	github.com/Azure/go-autorest/autorest v0.9.0
+	github.com/Azure/go-autorest v14.2.0+incompatible
 	github.com/stretchr/testify v1.3.0
 )
diff --git a/autorest/validation/go.sum b/autorest/validation/go.sum
index 6b9010a73..4347755af 100644
--- a/autorest/validation/go.sum
+++ b/autorest/validation/go.sum
@@ -1,24 +1,7 @@
-github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/autorest/validation/go_mod_tidy_hack.go b/autorest/validation/go_mod_tidy_hack.go
index 2b2668581..cf1436291 100644
--- a/autorest/validation/go_mod_tidy_hack.go
+++ b/autorest/validation/go_mod_tidy_hack.go
@@ -16,9 +16,9 @@ package validation
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
 // the resultant binary.
 
 // Necessary for safely adding multi-module repo.
 // See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/go-autorest/autorest"
+import _ "github.com/Azure/go-autorest"
diff --git a/logger/go.mod b/logger/go.mod
index f22ed56bc..bedeaee03 100644
--- a/logger/go.mod
+++ b/logger/go.mod
@@ -1,3 +1,5 @@
 module github.com/Azure/go-autorest/logger
 
 go 1.12
+
+require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/logger/go_mod_tidy_hack.go b/logger/go_mod_tidy_hack.go
new file mode 100644
index 000000000..0aa27680d
--- /dev/null
+++ b/logger/go_mod_tidy_hack.go
@@ -0,0 +1,24 @@
+// +build modhack
+
+package logger
+
+// Copyright 2017 Microsoft Corporation
+//
+//  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.
+
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
+// the resultant binary.
+
+// Necessary for safely adding multi-module repo.
+// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
+import _ "github.com/Azure/go-autorest"
diff --git a/tracing/go.mod b/tracing/go.mod
index 25c34c108..a2cdec78c 100644
--- a/tracing/go.mod
+++ b/tracing/go.mod
@@ -1,3 +1,5 @@
 module github.com/Azure/go-autorest/tracing
 
 go 1.12
+
+require github.com/Azure/go-autorest v14.2.0+incompatible
diff --git a/tracing/go_mod_tidy_hack.go b/tracing/go_mod_tidy_hack.go
new file mode 100644
index 000000000..e163975cd
--- /dev/null
+++ b/tracing/go_mod_tidy_hack.go
@@ -0,0 +1,24 @@
+// +build modhack
+
+package tracing
+
+// Copyright 2017 Microsoft Corporation
+//
+//  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.
+
+// This file, and the github.com/Azure/go-autorest import, won't actually become part of
+// the resultant binary.
+
+// Necessary for safely adding multi-module repo.
+// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
+import _ "github.com/Azure/go-autorest"

From a67695fcf4af6900704b3fa9b6b94f81f8da1f4c Mon Sep 17 00:00:00 2001
From: Joel Hendrix <jhendrix@microsoft.com>
Date: Tue, 23 Jun 2020 09:21:32 -0700
Subject: [PATCH 2/2] Update go.sum files

---
 autorest/adal/go.sum       | 2 ++
 autorest/azure/auth/go.sum | 2 ++
 autorest/azure/cli/go.sum  | 2 ++
 autorest/date/go.sum       | 2 ++
 autorest/go.sum            | 2 ++
 autorest/mocks/go.sum      | 2 ++
 autorest/to/go.sum         | 2 ++
 autorest/validation/go.sum | 2 ++
 logger/go.sum              | 2 ++
 tracing/go.sum             | 2 ++
 10 files changed, 20 insertions(+)
 create mode 100644 logger/go.sum
 create mode 100644 tracing/go.sum

diff --git a/autorest/adal/go.sum b/autorest/adal/go.sum
index e43cf6498..59296a5a7 100644
--- a/autorest/adal/go.sum
+++ b/autorest/adal/go.sum
@@ -1,3 +1,5 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
diff --git a/autorest/azure/auth/go.sum b/autorest/azure/auth/go.sum
index 9ea3fa575..65edc27da 100644
--- a/autorest/azure/auth/go.sum
+++ b/autorest/azure/auth/go.sum
@@ -1,3 +1,5 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest v0.9.3 h1:OZEIaBbMdUE/Js+BQKlpO81XlISgipr6yDJ+PSwsgi4=
diff --git a/autorest/azure/cli/go.sum b/autorest/azure/cli/go.sum
index 542806b94..977fc8a2d 100644
--- a/autorest/azure/cli/go.sum
+++ b/autorest/azure/cli/go.sum
@@ -1,3 +1,5 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU=
diff --git a/autorest/date/go.sum b/autorest/date/go.sum
index e69de29bb..1fc56a962 100644
--- a/autorest/date/go.sum
+++ b/autorest/date/go.sum
@@ -0,0 +1,2 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
diff --git a/autorest/go.sum b/autorest/go.sum
index 37398d1d4..865e024d4 100644
--- a/autorest/go.sum
+++ b/autorest/go.sum
@@ -1,3 +1,5 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
diff --git a/autorest/mocks/go.sum b/autorest/mocks/go.sum
index e69de29bb..1fc56a962 100644
--- a/autorest/mocks/go.sum
+++ b/autorest/mocks/go.sum
@@ -0,0 +1,2 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
diff --git a/autorest/to/go.sum b/autorest/to/go.sum
index e69de29bb..1fc56a962 100644
--- a/autorest/to/go.sum
+++ b/autorest/to/go.sum
@@ -0,0 +1,2 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
diff --git a/autorest/validation/go.sum b/autorest/validation/go.sum
index 4347755af..6c1119aab 100644
--- a/autorest/validation/go.sum
+++ b/autorest/validation/go.sum
@@ -1,3 +1,5 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/logger/go.sum b/logger/go.sum
new file mode 100644
index 000000000..1fc56a962
--- /dev/null
+++ b/logger/go.sum
@@ -0,0 +1,2 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
diff --git a/tracing/go.sum b/tracing/go.sum
new file mode 100644
index 000000000..1fc56a962
--- /dev/null
+++ b/tracing/go.sum
@@ -0,0 +1,2 @@
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=