Skip to content

Commit

Permalink
Update v2 import path
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasdel
jasdel committed Oct 11, 2017
1 parent 1d3a1b3 commit 07472e4
Show file tree
Hide file tree
Showing 697 changed files with 2,659 additions and 2,661 deletions.
4 changes: 1 addition & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ dist
Gemfile.lock
awstesting/integration/smoke/**/importmarker__.go
awstesting/integration/smoke/_test/
/vendor/bin/
/vendor/pkg/
/vendor/src/
/vendor
/private/model/cli/gen-api/gen-api
2 changes: 1 addition & 1 deletion aws/awsutil/copy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/aws/aws-sdk-go/aws/awsutil"
"github.com/aws/aws-sdk-go-v2/aws/awsutil"
)

func ExampleCopy() {
Expand Down
4 changes: 2 additions & 2 deletions aws/awsutil/equal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package awsutil_test
import (
"testing"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awsutil"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/awsutil"
)

func TestDeepEqual(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion aws/awsutil/path_value_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"github.com/aws/aws-sdk-go/aws/awsutil"
"github.com/aws/aws-sdk-go-v2/aws/awsutil"
)

type Struct struct {
Expand Down
6 changes: 3 additions & 3 deletions aws/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package client
import (
"fmt"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/client/metadata"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/client/metadata"
"github.com/aws/aws-sdk-go-v2/aws/request"
)

// A Config provides configuration to a service client instance.
Expand Down
6 changes: 3 additions & 3 deletions aws/client/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package client
import (
"testing"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/client/metadata"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/client/metadata"
"github.com/aws/aws-sdk-go-v2/aws/request"
)

func pushBackTestHandler(name string, list *request.HandlerList) *bool {
Expand Down
2 changes: 1 addition & 1 deletion aws/client/default_retryer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"time"

"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go-v2/aws/request"
)

// DefaultRetryer implements basic retry logic using exponential backoff for
Expand Down
4 changes: 2 additions & 2 deletions aws/client/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"io/ioutil"
"net/http/httputil"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/request"
)

const logReqMsg = `DEBUG: Request %s/%s Details:
Expand Down
4 changes: 2 additions & 2 deletions aws/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"net/http"
"time"

"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/endpoints"
)

// UseServiceDefaultRetries instructs the config to use the service's own
Expand Down
2 changes: 1 addition & 1 deletion aws/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
)

var testCredentials = credentials.NewStaticCredentials("AKID", "SECRET", "SESSION")
Expand Down
4 changes: 2 additions & 2 deletions aws/context_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/awstesting"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/internal/awstesting"
)

func TestSleepWithContext(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions aws/corehandlers/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"strconv"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/request"
)

// Interface for matching types which also have a Len method.
Expand Down
12 changes: 6 additions & 6 deletions aws/corehandlers/handlers_1_8_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"net/http"
"testing"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/awstesting"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/request"
"github.com/aws/aws-sdk-go-v2/aws/session"
"github.com/aws/aws-sdk-go-v2/internal/awstesting"
"github.com/aws/aws-sdk-go-v2/service/s3"
"golang.org/x/net/http2"
)

Expand Down
16 changes: 8 additions & 8 deletions aws/corehandlers/handlers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import (
"testing"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/corehandlers"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/awstesting"
"github.com/aws/aws-sdk-go/awstesting/unit"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/corehandlers"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/request"
"github.com/aws/aws-sdk-go-v2/internal/awstesting"
"github.com/aws/aws-sdk-go-v2/internal/awstesting/unit"
"github.com/aws/aws-sdk-go-v2/service/s3"
)

func TestValidateEndpointHandler(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion aws/corehandlers/param_validator.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package corehandlers

import "github.com/aws/aws-sdk-go/aws/request"
import "github.com/aws/aws-sdk-go-v2/aws/request"

// ValidateParametersHandler is a request handler to validate the input parameters.
// Validating parameters only has meaning if done prior to the request being sent.
Expand Down
16 changes: 8 additions & 8 deletions aws/corehandlers/param_validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"testing"
"reflect"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/client"
"github.com/aws/aws-sdk-go/aws/client/metadata"
"github.com/aws/aws-sdk-go/aws/corehandlers"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/awstesting/unit"
"github.com/aws/aws-sdk-go/service/kinesis"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/client"
"github.com/aws/aws-sdk-go-v2/aws/client/metadata"
"github.com/aws/aws-sdk-go-v2/aws/corehandlers"
"github.com/aws/aws-sdk-go-v2/aws/request"
"github.com/aws/aws-sdk-go-v2/internal/awstesting/unit"
"github.com/aws/aws-sdk-go-v2/service/kinesis"
)

var testSvc = func() *client.Client {
Expand Down
2 changes: 1 addition & 1 deletion aws/credentials/chain_provider.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package credentials

import (
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion aws/credentials/chain_provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package credentials
import (
"testing"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion aws/credentials/credentials_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package credentials
import (
"testing"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/stretchr/testify/assert"
)

Expand Down
8 changes: 4 additions & 4 deletions aws/credentials/ec2rolecreds/ec2_role_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strings"
"time"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/client"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/client"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/ec2metadata"
)

// ProviderName provides a name of EC2Role provider
Expand Down
10 changes: 5 additions & 5 deletions aws/credentials/ec2rolecreds/ec2_role_provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (

"github.com/stretchr/testify/assert"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/awstesting/unit"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go-v2/aws/ec2metadata"
"github.com/aws/aws-sdk-go-v2/internal/awstesting/unit"
)

const credsRespTmpl = `{
Expand Down
12 changes: 6 additions & 6 deletions aws/credentials/endpointcreds/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ import (
"encoding/json"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/client"
"github.com/aws/aws-sdk-go/aws/client/metadata"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/client"
"github.com/aws/aws-sdk-go-v2/aws/client/metadata"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/request"
)

// ProviderName is the name of the credentials provider.
Expand Down
6 changes: 3 additions & 3 deletions aws/credentials/endpointcreds/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/credentials/endpointcreds"
"github.com/aws/aws-sdk-go/awstesting/unit"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/credentials/endpointcreds"
"github.com/aws/aws-sdk-go-v2/internal/awstesting/unit"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion aws/credentials/env_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package credentials
import (
"os"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
)

// EnvProviderName provides a name of Env provider
Expand Down
4 changes: 2 additions & 2 deletions aws/credentials/plugincreds/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ import (
"fmt"
"plugin"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
)

// ProviderSymbolName the symbol name the SDK will use to lookup the plugin
Expand Down
4 changes: 2 additions & 2 deletions aws/credentials/plugincreds/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"testing"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
)

func TestProvider_Passthrough(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions aws/credentials/shared_credentials_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/go-ini/ini"

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/internal/shareddefaults"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/internal/shareddefaults"
)

// SharedCredsProviderName provides a name of SharedCreds provider
Expand Down
2 changes: 1 addition & 1 deletion aws/credentials/shared_credentials_provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path/filepath"
"testing"

"github.com/aws/aws-sdk-go/internal/shareddefaults"
"github.com/aws/aws-sdk-go-v2/internal/shareddefaults"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion aws/credentials/static_provider.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package credentials

import (
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
)

// StaticProviderName provides a name of Static provider
Expand Down
10 changes: 5 additions & 5 deletions aws/credentials/stscreds/assume_role_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ import (
"fmt"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/client"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/service/sts"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/awserr"
"github.com/aws/aws-sdk-go-v2/aws/client"
"github.com/aws/aws-sdk-go-v2/aws/credentials"
"github.com/aws/aws-sdk-go-v2/service/sts"
)

// StdinTokenProvider will prompt on stdout and read from stdin for a string value.
Expand Down
4 changes: 2 additions & 2 deletions aws/credentials/stscreds/assume_role_provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/sts"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/stretchr/testify/assert"
)

Expand Down
Loading

0 comments on commit 07472e4

Please sign in to comment.