Skip to content

Commit

Permalink
Update import paths to reflect repository relocation
Browse files Browse the repository at this point in the history
  • Loading branch information
skmcgrail committed Dec 22, 2020
1 parent 72b65f2 commit 74df8dd
Show file tree
Hide file tree
Showing 32 changed files with 53 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public final class SmithyGoDependency {

public static final GoDependency GO_JMESPATH = goJmespath(null);

private static final String SMITHY_SOURCE_PATH = "github.com/awslabs/smithy-go";
private static final String SMITHY_SOURCE_PATH = "github.com/aws/smithy-go";
private static final String GO_CMP_SOURCE_PATH = "github.com/google/go-cmp";
private static final String GO_JMESPATH_SOURCE_PATH = "github.com/jmespath/go-jmespath";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ public void testStandardLibraryDependency() {
public void testSingleDependency() {
GoDependency dependency = GoDependency.builder()
.type(GoDependency.Type.DEPENDENCY)
.sourcePath("github.com/awslabs/smithy-go")
.importPath("github.com/awslabs/smithy-go/middleware")
.sourcePath("github.com/aws/smithy-go")
.importPath("github.com/aws/smithy-go/middleware")
.version("1.2.3")
.build();
List<SymbolDependency> symbolDependencies = dependency.getDependencies();
assertThat(symbolDependencies.size(), Matchers.equalTo(1));
SymbolDependency symbolDependency = symbolDependencies.get(0);

assertThat(symbolDependency.getDependencyType(), Matchers.equalTo("dependency"));
assertThat(symbolDependency.getPackageName(), Matchers.equalTo("github.com/awslabs/smithy-go"));
assertThat(symbolDependency.getPackageName(), Matchers.equalTo("github.com/aws/smithy-go"));
assertThat(symbolDependency.getVersion(), Matchers.equalTo("1.2.3"));
}

Expand All @@ -66,8 +66,8 @@ public void testDependencyWithDependencies() {
.version("1.2.3")
.addDependency(GoDependency.builder()
.type(GoDependency.Type.DEPENDENCY)
.sourcePath("github.com/awslabs/smithy-go")
.importPath("github.com/awslabs/smithy-go/middleware")
.sourcePath("github.com/aws/smithy-go")
.importPath("github.com/aws/smithy-go/middleware")
.version("3.4.5")
.build())
.build();
Expand All @@ -81,7 +81,7 @@ public void testDependencyWithDependencies() {
.build()),
Matchers.equalTo(SymbolDependency.builder()
.dependencyType("dependency")
.packageName("github.com/awslabs/smithy-go")
.packageName("github.com/aws/smithy-go")
.version("3.4.5")
.build())
));
Expand All @@ -96,8 +96,8 @@ public void testDependencyWithNestedDependencies() {
.version("1.2.3")
.addDependency(GoDependency.builder()
.type(GoDependency.Type.DEPENDENCY)
.sourcePath("github.com/awslabs/smithy-go")
.importPath("github.com/awslabs/smithy-go/middleware")
.sourcePath("github.com/aws/smithy-go")
.importPath("github.com/aws/smithy-go/middleware")
.version("3.4.5")
.addDependency(GoDependency.builder()
.type(GoDependency.Type.DEPENDENCY)
Expand Down Expand Up @@ -128,7 +128,7 @@ public void testDependencyWithNestedDependencies() {
.build()),
Matchers.equalTo(SymbolDependency.builder()
.dependencyType("dependency")
.packageName("github.com/awslabs/smithy-go")
.packageName("github.com/aws/smithy-go")
.version("3.4.5")
.build()),
Matchers.equalTo(SymbolDependency.builder()
Expand Down
3 changes: 2 additions & 1 deletion encoding/json/decoder_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package json
import (
"bytes"
"encoding/json"
smithytesting "github.com/awslabs/smithy-go/testing"
"testing"

smithytesting "github.com/aws/smithy-go/testing"
)

func TestDiscardUnknownField(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion encoding/json/encoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"testing"

"github.com/awslabs/smithy-go/encoding/json"
"github.com/aws/smithy-go/encoding/json"
)

func TestEncoder(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion encoding/json/value.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"math/big"
"strconv"

"github.com/awslabs/smithy-go/encoding"
"github.com/aws/smithy-go/encoding"
)

// Value represents a JSON Value type
Expand Down
2 changes: 1 addition & 1 deletion encoding/xml/encoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"testing"

"github.com/awslabs/smithy-go/encoding/xml"
"github.com/aws/smithy-go/encoding/xml"
)

var root = xml.StartElement{Name: xml.Name{Local: "root"}}
Expand Down
2 changes: 1 addition & 1 deletion encoding/xml/value.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"math/big"
"strconv"

"github.com/awslabs/smithy-go/encoding"
"github.com/aws/smithy-go/encoding"
)

// Value represents an XML Value type
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/awslabs/smithy-go
module github.com/aws/smithy-go

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion logging/logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"testing"

"github.com/awslabs/smithy-go/logging"
"github.com/aws/smithy-go/logging"
)

func TestNewStandardLogger(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion middleware/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package middleware
import (
"context"

"github.com/awslabs/smithy-go/logging"
"github.com/aws/smithy-go/logging"
)

// loggerKey is the context value key for which the logger is associated with.
Expand Down
4 changes: 2 additions & 2 deletions middleware/logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io/ioutil"
"testing"

"github.com/awslabs/smithy-go/logging"
"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/logging"
"github.com/aws/smithy-go/middleware"
)

type mockWithContextLogger struct {
Expand Down
2 changes: 1 addition & 1 deletion ptr/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"text/template"

"github.com/awslabs/smithy-go/ptr"
"github.com/aws/smithy-go/ptr"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion rand/uuid_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"testing"

"github.com/awslabs/smithy-go/rand"
"github.com/aws/smithy-go/rand"
)

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

"github.com/awslabs/smithy-go/testing/xml"
"github.com/aws/smithy-go/testing/xml"

"github.com/google/go-cmp/cmp"
)
Expand Down
2 changes: 1 addition & 1 deletion transport/http/checksum_middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/middleware"
)

const contentMD5Header = "Content-Md5"
Expand Down
4 changes: 2 additions & 2 deletions transport/http/checksum_middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"testing"

smithyio "github.com/awslabs/smithy-go/io"
"github.com/awslabs/smithy-go/middleware"
smithyio "github.com/aws/smithy-go/io"
"github.com/aws/smithy-go/middleware"
)

func TestChecksumMiddleware(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions transport/http/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net/http"

smithy "github.com/awslabs/smithy-go"
"github.com/awslabs/smithy-go/middleware"
smithy "github.com/aws/smithy-go"
"github.com/aws/smithy-go/middleware"
)

// ClientDo provides the interface for custom HTTP client implementations.
Expand Down
2 changes: 1 addition & 1 deletion transport/http/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"testing"

smithy "github.com/awslabs/smithy-go"
smithy "github.com/aws/smithy-go"
)

func TestClientHandler_Handle(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion transport/http/deserailize_example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"strconv"

"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/middleware"
)

func ExampleResponse_deserializeMiddleware() {
Expand Down
2 changes: 1 addition & 1 deletion transport/http/middleware_close_response_body.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/middleware"
)

// AddErrorCloseResponseBodyMiddleware adds the middleware to automatically
Expand Down
2 changes: 1 addition & 1 deletion transport/http/middleware_content_length.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/middleware"
)

// ComputeContentLength provides a middleware to set the content-length
Expand Down
2 changes: 1 addition & 1 deletion transport/http/middleware_content_length_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/middleware"
)

func TestContentLengthMiddleware(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion transport/http/middleware_headers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/middleware"
)

type headerValue struct {
Expand Down
4 changes: 2 additions & 2 deletions transport/http/middleware_headers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http"
"testing"

"github.com/awslabs/smithy-go/middleware"
smithyhttp "github.com/awslabs/smithy-go/transport/http"
"github.com/aws/smithy-go/middleware"
smithyhttp "github.com/aws/smithy-go/transport/http"
"github.com/google/go-cmp/cmp"
)

Expand Down
4 changes: 2 additions & 2 deletions transport/http/middleware_http_logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net/http/httputil"

"github.com/awslabs/smithy-go/logging"
"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/logging"
"github.com/aws/smithy-go/middleware"
)

// RequestResponseLogger is a deserialize middleware that will log the request and response HTTP messages and optionally
Expand Down
6 changes: 3 additions & 3 deletions transport/http/middleware_http_logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"net/url"
"testing"

"github.com/awslabs/smithy-go/logging"
"github.com/awslabs/smithy-go/middleware"
smithyhttp "github.com/awslabs/smithy-go/transport/http"
"github.com/aws/smithy-go/logging"
"github.com/aws/smithy-go/middleware"
smithyhttp "github.com/aws/smithy-go/transport/http"
"github.com/google/go-cmp/cmp"
)

Expand Down
2 changes: 1 addition & 1 deletion transport/http/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"net/url"

iointernal "github.com/awslabs/smithy-go/transport/http/internal/io"
iointernal "github.com/aws/smithy-go/transport/http/internal/io"
)

// Request provides the HTTP specific request structure for HTTP specific
Expand Down
4 changes: 2 additions & 2 deletions transport/http/response_error_example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"net/http"

"github.com/awslabs/smithy-go"
"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go"
"github.com/aws/smithy-go/middleware"
)

func ExampleResponseError() {
Expand Down
2 changes: 1 addition & 1 deletion transport/http/serialize_example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"strconv"

"github.com/awslabs/smithy-go/middleware"
"github.com/aws/smithy-go/middleware"
)

func ExampleRequest_serializeMiddleware() {
Expand Down
5 changes: 3 additions & 2 deletions waiter/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package waiter
import (
"context"
"fmt"
"github.com/awslabs/smithy-go/logging"
"github.com/awslabs/smithy-go/middleware"

"github.com/aws/smithy-go/logging"
"github.com/aws/smithy-go/middleware"
)

// Logger is the Logger middleware used by the waiter to log an attempt
Expand Down
3 changes: 2 additions & 1 deletion waiter/waiter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ package waiter

import (
"fmt"
"github.com/awslabs/smithy-go/rand"
"math"
"time"

"github.com/aws/smithy-go/rand"
)

// ComputeDelay computes delay between waiter attempts. The function takes in a current attempt count,
Expand Down
3 changes: 2 additions & 1 deletion waiter/waiter_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package waiter

import (
"github.com/awslabs/smithy-go/rand"
mathrand "math/rand"
"strings"
"testing"
"time"

"github.com/aws/smithy-go/rand"
)

func TestComputeDelay(t *testing.T) {
Expand Down

0 comments on commit 74df8dd

Please sign in to comment.