Skip to content

Commit

Permalink
Update import path from SSMCLI to session-manager-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yangtao-Hua
Yangtao-Hua committed Oct 6, 2022
1 parent 164ea59 commit 6012984
Show file tree
Hide file tree
Showing 48 changed files with 145 additions and 144 deletions.
7 changes: 4 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
.DS_Store
.idea/
.vscode/
*.iml
/Tools/bin/
/Tools/pkg/
/Tools/src/github.com/
/Tools/src/golang.org/
bin/
build
/vendor/bin/
/vendor/pkg/
.vscode/
bin/
build
vendor/src/github.com/aws/session-manager-plugin
2 changes: 1 addition & 1 deletion Tools/src/checkstyle.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ if [[ -n $unformatted ]]; then
fi

echo "Run 'go vet'"
ln -s `pwd` `pwd`/vendor/src/github.com/aws/SSMCLI
ln -s `pwd` `pwd`/vendor/src/github.com/aws/session-manager-plugin
go vet ./src/...
6 changes: 3 additions & 3 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GOOS?=$(shell go env GOOS)

GO_SPACE?=$(CURDIR)
GOTEMPPATH?=$(GO_SPACE)/build/private
GOTEMPCOPYPATH?=$(GOTEMPPATH)/src/github.com/aws/SSMCLI
GOTEMPCOPYPATH?=$(GOTEMPPATH)/src/github.com/aws/session-manager-plugin
GOPATH:=$(GOTEMPPATH):$(GO_SPACE)/vendor:$(GOPATH)

export GOPATH
Expand Down Expand Up @@ -71,9 +71,9 @@ pre-release:
.PHONY: quick-test
quick-test:
# if you want to test a specific package, you can add the package name instead of the dots. Sample below
# go test -gcflags "-N -l" github.com/aws/SSMCLI/src/datachannel
# go test -gcflags "-N -l" github.com/aws/session-manager-plugin/src/datachannel
go clean -testcache
go test -cover -gcflags "-N -l" github.com/aws/SSMCLI/src/... -test.paniconexit0=false
go test -cover -gcflags "-N -l" github.com/aws/session-manager-plugin/src/... -test.paniconexit0=false

.PHONY: create-package-folder
create-package-folder:
Expand Down
2 changes: 1 addition & 1 deletion src/communicator/mocks/IWebSocketChannel.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/communicator/websocketchannel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"sync"
"time"

"github.com/aws/SSMCLI/src/config"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/websocketutil"
"github.com/aws/session-manager-plugin/src/config"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/websocketutil"
"github.com/gorilla/websocket"
)

Expand Down
2 changes: 1 addition & 1 deletion src/communicator/websocketchannel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sync"
"testing"

"github.com/aws/SSMCLI/src/log"
"github.com/aws/session-manager-plugin/src/log"
"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
8 changes: 4 additions & 4 deletions src/datachannel/mocks/IDataChannel.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions src/datachannel/streaming.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ import (
"sync"
"time"

"github.com/aws/SSMCLI/src/communicator"
"github.com/aws/SSMCLI/src/config"
"github.com/aws/SSMCLI/src/encryption"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/SSMCLI/src/service"
"github.com/aws/SSMCLI/src/version"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/kms/kmsiface"
"github.com/aws/session-manager-plugin/src/communicator"
"github.com/aws/session-manager-plugin/src/config"
"github.com/aws/session-manager-plugin/src/encryption"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/aws/session-manager-plugin/src/service"
"github.com/aws/session-manager-plugin/src/version"
"github.com/gorilla/websocket"
"github.com/twinj/uuid"
)
Expand Down
14 changes: 7 additions & 7 deletions src/datachannel/streaming_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (
"testing"
"time"

communicatorMocks "github.com/aws/SSMCLI/src/communicator/mocks"
"github.com/aws/SSMCLI/src/config"
"github.com/aws/SSMCLI/src/encryption"
"github.com/aws/SSMCLI/src/encryption/mocks"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/SSMCLI/src/version"
"github.com/aws/aws-sdk-go/service/kms/kmsiface"
communicatorMocks "github.com/aws/session-manager-plugin/src/communicator/mocks"
"github.com/aws/session-manager-plugin/src/config"
"github.com/aws/session-manager-plugin/src/encryption"
"github.com/aws/session-manager-plugin/src/encryption/mocks"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/aws/session-manager-plugin/src/version"
"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
2 changes: 1 addition & 1 deletion src/encryption/encrypter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"io"

"github.com/aws/SSMCLI/src/log"
"github.com/aws/aws-sdk-go/service/kms/kmsiface"
"github.com/aws/session-manager-plugin/src/log"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions src/encryption/kmsservice.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ package encryption
import (
"fmt"

"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/sdkutil"
sdkSession "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/kms"
"github.com/aws/aws-sdk-go/service/kms/kmsiface"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/sdkutil"
)

// KMSKeySizeInBytes is the key size that is fetched from KMS. 64 bytes key is split into two halves.
Expand Down
2 changes: 1 addition & 1 deletion src/encryption/mocks/IEncrypter.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/message/clientmessage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package message

import (
"github.com/aws/SSMCLI/src/log"
"github.com/aws/session-manager-plugin/src/log"
"github.com/twinj/uuid"
)

Expand Down
2 changes: 1 addition & 1 deletion src/message/messageparser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

"github.com/aws/SSMCLI/src/log"
"github.com/aws/session-manager-plugin/src/log"
"github.com/twinj/uuid"
)

Expand Down
2 changes: 1 addition & 1 deletion src/message/messageparser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"
"time"

"github.com/aws/SSMCLI/src/log"
"github.com/aws/session-manager-plugin/src/log"
"github.com/stretchr/testify/assert"
"github.com/twinj/uuid"
)
Expand Down
2 changes: 1 addition & 1 deletion src/retry/retry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package retry
import (
"time"

"github.com/aws/SSMCLI/src/log"
"github.com/aws/session-manager-plugin/src/log"
)

const sleepConstant = 2
Expand Down
2 changes: 1 addition & 1 deletion src/retry/retryer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"math/rand"
"testing"

"github.com/aws/SSMCLI/src/config"
"github.com/aws/session-manager-plugin/src/config"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion src/sdkutil/awsconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"
"time"

"github.com/aws/SSMCLI/src/sdkutil/retryer"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/session-manager-plugin/src/sdkutil/retryer"
)

var defaultRegion string
Expand Down
6 changes: 3 additions & 3 deletions src/sessionmanagerplugin-main/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package main
import (
"os"

"github.com/aws/SSMCLI/src/sessionmanagerplugin/session"
_ "github.com/aws/SSMCLI/src/sessionmanagerplugin/session/portsession"
_ "github.com/aws/SSMCLI/src/sessionmanagerplugin/session/shellsession"
"github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session"
_ "github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session/portsession"
_ "github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session/shellsession"
)

func main() {
Expand Down
12 changes: 6 additions & 6 deletions src/sessionmanagerplugin/session/portsession/basicportforwarding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"strconv"
"time"

"github.com/aws/SSMCLI/src/config"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/SSMCLI/src/sessionmanagerplugin/session"
"github.com/aws/SSMCLI/src/sessionmanagerplugin/session/sessionutil"
"github.com/aws/SSMCLI/src/version"
"github.com/aws/session-manager-plugin/src/config"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session"
"github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session/sessionutil"
"github.com/aws/session-manager-plugin/src/version"
)

// BasicPortForwarding is type of port session
Expand Down
2 changes: 1 addition & 1 deletion src/sessionmanagerplugin/session/portsession/basicportforwarding_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"
"time"

"github.com/aws/SSMCLI/src/log"
"github.com/aws/session-manager-plugin/src/log"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
12 changes: 6 additions & 6 deletions src/sessionmanagerplugin/session/portsession/muxportforwarding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import (
"sync"
"time"

"github.com/aws/SSMCLI/src/config"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/SSMCLI/src/sessionmanagerplugin/session"
"github.com/aws/SSMCLI/src/sessionmanagerplugin/session/sessionutil"
"github.com/aws/SSMCLI/src/version"
"github.com/aws/session-manager-plugin/src/config"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session"
"github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session/sessionutil"
"github.com/aws/session-manager-plugin/src/version"
"github.com/xtaci/smux"
"golang.org/x/sync/errgroup"
)
Expand Down
6 changes: 3 additions & 3 deletions src/sessionmanagerplugin/session/portsession/muxportforwarding_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"testing"
"time"

"github.com/aws/SSMCLI/src/datachannel"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/session-manager-plugin/src/datachannel"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/stretchr/testify/assert"
)

Expand Down
12 changes: 6 additions & 6 deletions src/sessionmanagerplugin/session/portsession/portsession.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
package portsession

import (
"github.com/aws/SSMCLI/src/config"
"github.com/aws/SSMCLI/src/jsonutil"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/SSMCLI/src/sessionmanagerplugin/session"
"github.com/aws/SSMCLI/src/version"
"github.com/aws/session-manager-plugin/src/config"
"github.com/aws/session-manager-plugin/src/jsonutil"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session"
"github.com/aws/session-manager-plugin/src/version"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions src/sessionmanagerplugin/session/portsession/portsession_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"testing"
"time"

"github.com/aws/SSMCLI/src/datachannel"
"github.com/aws/SSMCLI/src/jsonutil"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/session-manager-plugin/src/datachannel"
"github.com/aws/session-manager-plugin/src/jsonutil"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
8 changes: 4 additions & 4 deletions src/sessionmanagerplugin/session/portsession/standardstreamforwarding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"os"
"time"

"github.com/aws/SSMCLI/src/config"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/SSMCLI/src/sessionmanagerplugin/session"
"github.com/aws/session-manager-plugin/src/config"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session"
)

type StandardStreamForwarding struct {
Expand Down
6 changes: 3 additions & 3 deletions src/sessionmanagerplugin/session/portsession/standardstreamforwarding_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"testing"
"time"

"github.com/aws/SSMCLI/src/datachannel"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/session-manager-plugin/src/datachannel"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/stretchr/testify/assert"
)

Expand Down
10 changes: 5 additions & 5 deletions src/sessionmanagerplugin/session/portsession/test_portsession.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package portsession

import (
"github.com/aws/SSMCLI/src/communicator/mocks"
"github.com/aws/SSMCLI/src/datachannel"
"github.com/aws/SSMCLI/src/log"
"github.com/aws/SSMCLI/src/message"
"github.com/aws/SSMCLI/src/sessionmanagerplugin/session"
"github.com/aws/session-manager-plugin/src/communicator/mocks"
"github.com/aws/session-manager-plugin/src/datachannel"
"github.com/aws/session-manager-plugin/src/log"
"github.com/aws/session-manager-plugin/src/message"
"github.com/aws/session-manager-plugin/src/sessionmanagerplugin/session"
)

var (
Expand Down
Loading

0 comments on commit 6012984

Please sign in to comment.