Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix go modules import issues #524

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autorest/adal/cmd/adal.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"net/http"
"os/user"

"github.com/Azure/go-autorest/autorest/adal"
"github.com/Azure/go-autorest/v15/autorest/adal"
"golang.org/x/crypto/pkcs12"
)

Expand Down
2 changes: 1 addition & 1 deletion autorest/adal/devicetoken_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"
"time"

"github.com/Azure/go-autorest/autorest/mocks"
"github.com/Azure/go-autorest/v15/autorest/mocks"
)

const (
Expand Down
12 changes: 0 additions & 12 deletions autorest/adal/go.mod

This file was deleted.

28 changes: 0 additions & 28 deletions autorest/adal/go.sum

This file was deleted.

2 changes: 1 addition & 1 deletion autorest/adal/go_mod_tidy_hack.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ package adal

// 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/v15/autorest"
2 changes: 1 addition & 1 deletion autorest/adal/sender.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"net/http/cookiejar"
"sync"

"github.com/Azure/go-autorest/tracing"
"github.com/Azure/go-autorest/v15/tracing"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion autorest/adal/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"sync"
"time"

"github.com/Azure/go-autorest/autorest/date"
"github.com/Azure/go-autorest/v15/autorest/date"
"github.com/dgrijalva/jwt-go"
)

Expand Down
4 changes: 2 additions & 2 deletions autorest/adal/token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"testing"
"time"

"github.com/Azure/go-autorest/autorest/date"
"github.com/Azure/go-autorest/autorest/mocks"
"github.com/Azure/go-autorest/v15/autorest/date"
"github.com/Azure/go-autorest/v15/autorest/mocks"
jwt "github.com/dgrijalva/jwt-go"
)

Expand Down
2 changes: 1 addition & 1 deletion autorest/authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"net/url"
"strings"

"github.com/Azure/go-autorest/autorest/adal"
"github.com/Azure/go-autorest/v15/autorest/adal"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions autorest/authorization_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"testing"

"github.com/Azure/go-autorest/autorest/adal"
"github.com/Azure/go-autorest/autorest/mocks"
"github.com/Azure/go-autorest/v15/autorest/adal"
"github.com/Azure/go-autorest/v15/autorest/mocks"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion autorest/autorest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"net/http"
"testing"

"github.com/Azure/go-autorest/autorest/mocks"
"github.com/Azure/go-autorest/v15/autorest/mocks"
)

func TestResponseHasStatusCode(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions autorest/azure/async.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"time"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/tracing"
"github.com/Azure/go-autorest/v15/autorest"
"github.com/Azure/go-autorest/v15/tracing"
)

const (
Expand Down Expand Up @@ -81,7 +81,7 @@ func (f Future) PollingMethod() PollingMethodType {

// DoneWithContext queries the service to see if the operation has completed.
func (f *Future) DoneWithContext(ctx context.Context, sender autorest.Sender) (done bool, err error) {
ctx = tracing.StartSpan(ctx, "github.com/Azure/go-autorest/autorest/azure/async.DoneWithContext")
ctx = tracing.StartSpan(ctx, "github.com/Azure/go-autorest/v15/autorest/azure/async.DoneWithContext")
defer func() {
sc := -1
resp := f.Response()
Expand Down Expand Up @@ -150,7 +150,7 @@ func (f Future) GetPollingDelay() (time.Duration, bool) {
// If PollingDuration is greater than zero the value will be used as the context's timeout.
// If PollingDuration is zero then no default deadline will be used.
func (f *Future) WaitForCompletionRef(ctx context.Context, client autorest.Client) (err error) {
ctx = tracing.StartSpan(ctx, "github.com/Azure/go-autorest/autorest/azure/async.WaitForCompletionRef")
ctx = tracing.StartSpan(ctx, "github.com/Azure/go-autorest/v15/autorest/azure/async.WaitForCompletionRef")
defer func() {
sc := -1
resp := f.Response()
Expand Down
4 changes: 2 additions & 2 deletions autorest/azure/async_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"testing"
"time"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/mocks"
"github.com/Azure/go-autorest/v15/autorest"
"github.com/Azure/go-autorest/v15/autorest/mocks"
)

func TestCreateFromInvalidRequestVerb(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions autorest/azure/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"strings"
"unicode/utf16"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/adal"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/go-autorest/autorest/azure/cli"
"github.com/Azure/go-autorest/v15/autorest"
"github.com/Azure/go-autorest/v15/autorest/adal"
"github.com/Azure/go-autorest/v15/autorest/azure"
"github.com/Azure/go-autorest/v15/autorest/azure/cli"
"github.com/dimchansky/utfbom"
"golang.org/x/crypto/pkcs12"
)
Expand Down
4 changes: 2 additions & 2 deletions autorest/azure/auth/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"reflect"
"testing"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/go-autorest/v15/autorest"
"github.com/Azure/go-autorest/v15/autorest/azure"
)

var (
Expand Down
11 changes: 0 additions & 11 deletions autorest/azure/auth/go.mod

This file was deleted.

39 changes: 0 additions & 39 deletions autorest/azure/auth/go.sum

This file was deleted.

2 changes: 1 addition & 1 deletion autorest/azure/auth/go_mod_tidy_hack.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ package auth

// 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/v15/autorest"
2 changes: 1 addition & 1 deletion autorest/azure/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strconv"
"strings"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/v15/autorest"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions autorest/azure/azure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"testing"
"time"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/mocks"
"github.com/Azure/go-autorest/v15/autorest"
"github.com/Azure/go-autorest/v15/autorest/mocks"
)

const (
Expand Down
11 changes: 0 additions & 11 deletions autorest/azure/cli/go.mod

This file was deleted.

29 changes: 0 additions & 29 deletions autorest/azure/cli/go.sum

This file was deleted.

2 changes: 1 addition & 1 deletion autorest/azure/cli/go_mod_tidy_hack.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ package cli

// 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/v15/autorest"
4 changes: 2 additions & 2 deletions autorest/azure/cli/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"strconv"
"time"

"github.com/Azure/go-autorest/autorest/adal"
"github.com/Azure/go-autorest/autorest/date"
"github.com/Azure/go-autorest/v15/autorest/adal"
"github.com/Azure/go-autorest/v15/autorest/date"
"github.com/mitchellh/go-homedir"
)

Expand Down
6 changes: 3 additions & 3 deletions autorest/azure/example/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"net/http"
"strings"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/adal"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/go-autorest/v15/autorest"
"github.com/Azure/go-autorest/v15/autorest/adal"
"github.com/Azure/go-autorest/v15/autorest/azure"
"golang.org/x/crypto/pkcs12"
)

Expand Down
2 changes: 1 addition & 1 deletion autorest/azure/metadata_environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"strings"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/v15/autorest"
)

// Copyright 2017 Microsoft Corporation
Expand Down
2 changes: 1 addition & 1 deletion autorest/azure/rp.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"
"time"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/v15/autorest"
)

// DoRetryWithRegistration tries to register the resource provider in case it is unregistered.
Expand Down
4 changes: 2 additions & 2 deletions autorest/azure/rp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"testing"
"time"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/mocks"
"github.com/Azure/go-autorest/v15/autorest"
"github.com/Azure/go-autorest/v15/autorest/mocks"
)

func TestDoRetryWithRegistration(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion autorest/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"time"

"github.com/Azure/go-autorest/logger"
"github.com/Azure/go-autorest/v15/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion autorest/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"testing"
"time"

"github.com/Azure/go-autorest/autorest/mocks"
"github.com/Azure/go-autorest/v15/autorest/mocks"
)

func TestLoggingInspectorWithInspection(t *testing.T) {
Expand Down
5 changes: 0 additions & 5 deletions autorest/date/go.mod

This file was deleted.

Loading