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.

Sign up for GitHub

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

Modularise the repository #33

Open
wants to merge 2 commits into
base: mainline
Choose a base branch
from
Open

Modularise the repository #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4403e02
Modularise repository
chrisnovakovic Feb 11, 2022
a413d1b
Remove vendorised third-party code
chrisnovakovic Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 1 addition & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@
/Tools/src/golang.org/
bin/
build
/vendor/bin/
/vendor/pkg/
.vscode/
.vscode/
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,9 @@ The `ssmcli` binary is available for some operating systems for testing purposes

Source code

* `sessionmanagerplugin/session` contains the source code for core functionalities
* `communicator/` contains the source code for websocket related operations
* `vendor/src` contains the vendor package source code
* `packaging/` contains rpm and dpkg artifacts
* `pkg/communicator/` contains the source code for websocket related operations
* `pkg/sessionmanagerplugin/session/` contains the source code for core functionalities
* `Tools/src` contains build scripts

## Feedback
Expand Down
7 changes: 3 additions & 4 deletions Tools/src/checkstyle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ echo "Run checkstyle script"

# run gofmt
echo "Run 'gofmt'"
unformatted=$(gofmt -l `pwd`/src/)
unformatted=$(gofmt -l cmd pkg)
if [[ -n $unformatted ]]; then
echo >&2 "Error: Found files not formatted by gofmt"
for fi in $unformatted; do
Expand All @@ -18,7 +18,7 @@ echo "Try update 'goimports'"
GOPATH=`pwd`/Tools go get golang.org/x/tools/cmd/goimports

echo "Run 'goimports'"
unformatted=$(Tools/bin/goimports -l `pwd`/src/)
unformatted=$(Tools/bin/goimports -l cmd pkg)
if [[ -n $unformatted ]]; then
echo >&2 "Error: Found files not formatted by goimports"
for f in $unformatted; do
Expand All @@ -29,5 +29,4 @@ if [[ -n $unformatted ]]; then
fi

echo "Run 'go vet'"
ln -s `pwd` `pwd`/vendor/src/github.com/aws/SSMCLI
go vet ./src/...
go vet ./cmd/... ./pkg/...
6 changes: 3 additions & 3 deletions src/sessionmanagerplugin-main/main.go → cmd/session-manager-plugin/main.go
View file
Open in desktop
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/pkg/sessionmanagerplugin/session"
_ "github.com/aws/session-manager-plugin/pkg/sessionmanagerplugin/session/portsession"
_ "github.com/aws/session-manager-plugin/pkg/sessionmanagerplugin/session/shellsession"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion src/ssmcli-main/main.go → cmd/ssmcli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"os"

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

//Created a ssmcli binary, used for testing purpose only.
Expand Down
2 changes: 1 addition & 1 deletion src/version/versiongenerator/version-gen.go → cmd/versiongenerator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func main() {
log.Fatalf("Error writing to VERSION file. %v", err)
}

versionFilePath := filepath.Join("src", "version", "version.go")
versionFilePath := filepath.Join("pkg", "version", "version.go")

// Generate version.go
type versionInfo struct {
Expand Down
19 changes: 19 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module github.com/aws/session-manager-plugin

go 1.15

require (
github.com/aws/aws-sdk-go v1.40.36
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
github.com/eiannone/keyboard v0.0.0-20200508000154-caf4b762e807
github.com/fsnotify/fsnotify v1.5.1
github.com/gorilla/websocket v1.4.2
github.com/stretchr/testify v1.7.0
github.com/twinj/uuid v0.0.0-20151029044442-89173bcdda19
github.com/xtaci/smux v1.5.15
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654
golang.org/x/text v0.3.7 // indirect
)
54 changes: 54 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
github.com/aws/aws-sdk-go v1.40.36 h1:EO6+pvuNlZwXi4qtUHYQRB10vH9Hq6fHC8nZHiPpRDI=
github.com/aws/aws-sdk-go v1.40.36/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs=
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo=
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/eiannone/keyboard v0.0.0-20200508000154-caf4b762e807 h1:jdjd5e68T4R/j4PWxfZqcKY8KtT9oo8IPNVuV4bSXDQ=
github.com/eiannone/keyboard v0.0.0-20200508000154-caf4b762e807/go.mod h1:Xoiu5VdKMvbRgHuY7+z64lhu/7lvax/22nzASF6GrO8=
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
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 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/twinj/uuid v0.0.0-20151029044442-89173bcdda19 h1:HlxV0XiEKMMyjS3gGtJmmFZsxQ22GsLvA7F980il+1w=
github.com/twinj/uuid v0.0.0-20151029044442-89173bcdda19/go.mod h1:mMgcE1RHFUFqe5AfiwlINXisXfDGro23fWdPUfOMjRY=
github.com/xtaci/smux v1.5.15 h1:6hMiXswcleXj5oNfcJc+DXS8Vj36XX2LaX98udog6Kc=
github.com/xtaci/smux v1.5.15/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
43 changes: 21 additions & 22 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
COPY := cp -p
GO_BUILD := go build -i
GO_BUILD := go build

# Default build configuration, can be overridden at build time.
GOARCH?=$(shell go env GOARCH)
GOOS?=$(shell go env GOOS)

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

export GOPATH
export GO_SPACE
Expand All @@ -26,7 +26,7 @@ package:: create-package-folder package-rpm-amd64 package-rpm-386 package-rpm-ar
release:: clean checkstyle release-test pre-release build prepack package copy-package-dependencies

clean:: remove-prepacked-folder
rm -rf build/* bin/ pkg/ vendor/bin/ vendor/pkg/ .cover/
rm -rf build/* bin/ pkg/ .cover/
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rm -rf build/* bin/ pkg/ .cover/
rm -rf build/* bin/ .cover/

It looks like some files that shouldn't be cleaned up have been moved into pkg

find . -type f -name '*.log' -delete

.PHONY: release-test
Expand All @@ -41,14 +41,14 @@ copy-src:
rm -rf $(GOTEMPCOPYPATH)
mkdir -p $(GOTEMPCOPYPATH)
@echo "copying files to $(GOTEMPCOPYPATH)"
$(COPY) -r $(GO_SPACE)/src $(GOTEMPCOPYPATH)
$(COPY) -r $(GO_SPACE)/pkg $(GOTEMPCOPYPATH)

.PHONY: pre-build
pre-build:
for file in $(GO_SPACE)/Tools/src/*.sh; do chmod 755 $$file; done
@echo "Build Session Manager Plugin "
@echo "GOPATH=$(GOPATH)"
rm -rf $(GO_SPACE)/build/bin/ $(GO_SPACE)/vendor/bin/
rm -rf $(GO_SPACE)/build/bin/
mkdir -p $(GO_SPACE)/bin/
$(COPY) $(GO_SPACE)/LICENSE $(GO_SPACE)/bin/
$(COPY) $(GO_SPACE)/NOTICE $(GO_SPACE)/bin/
Expand All @@ -59,21 +59,20 @@ pre-build:
$(COPY) $(GO_SPACE)/seelog_windows.xml.template $(GO_SPACE)/bin/

@echo "Regenerate version file during pre-release"
go run $(GO_SPACE)/src/version/versiongenerator/version-gen.go
go run $(GO_SPACE)/cmd/versiongenerator/main.go
$(COPY) $(GO_SPACE)/VERSION $(GO_SPACE)/bin/

.PHONY: pre-release
pre-release:
@echo "session-manager-plugin release build"
$(eval GO_BUILD := go build)
rm -rf $(GO_SPACE)/vendor/pkg

.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/datachannel
go clean -testcache
go test -cover -gcflags "-N -l" github.com/aws/SSMCLI/src/...
go test -cover -gcflags "-N -l" github.com/aws/session-manager-plugin/cmd/... github.com/aws/session-manager-plugin/pkg/...

.PHONY: create-package-folder
create-package-folder:
Expand All @@ -84,54 +83,54 @@ create-package-folder:
build-linux-amd64: checkstyle copy-src pre-build
@echo "Build for linux platform"
GOOS=linux GOARCH=amd64 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/linux_amd64_plugin/session-manager-plugin -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go
$(GO_SPACE)/cmd/session-manager-plugin/main.go
GOOS=linux GOARCH=amd64 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/linux_amd64/ssmcli -v \
$(GO_SPACE)/src/ssmcli-main/main.go
$(GO_SPACE)/cmd/ssmcli/main.go

.PHONY: build-linux-386
build-linux-386: checkstyle copy-src pre-build
@echo "Build for linux platform"
GOOS=linux GOARCH=386 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/linux_386_plugin/session-manager-plugin -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go
$(GO_SPACE)/cmd/session-manager-plugin/main.go
GOOS=linux GOARCH=386 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/linux_386/ssmcli -v \
$(GO_SPACE)/src/ssmcli-main/main.go
$(GO_SPACE)/cmd/ssmcli/main.go

.PHONY: build-arm
build-arm: checkstyle copy-src pre-build
@echo "Build for ARM platform"
GOOS=linux GOARCH=arm GOARM=6 $(GO_BUILD) -ldflags "-s -w -extldflags=-Wl,-z,now,-z,relro,-z,defs" -o $(GO_SPACE)/bin/linux_arm_plugin/session-manager-plugin -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go
$(GO_SPACE)/cmd/session-manager-plugin/main.go

.PHONY: build-arm64
build-arm64: checkstyle copy-src pre-build
@echo "Build for ARM64 platform"
GOOS=linux GOARCH=arm64 $(GO_BUILD) -ldflags "-s -w -extldflags=-Wl,-z,now,-z,relro,-z,defs" -o $(GO_SPACE)/bin/linux_arm64_plugin/session-manager-plugin -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go
$(GO_SPACE)/cmd/session-manager-plugin/main.go


.PHONY: build-darwin-amd64
build-darwin-amd64: checkstyle copy-src pre-build
@echo "Build for darwin platform"
GOOS=darwin GOARCH=amd64 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/darwin_amd64_plugin/session-manager-plugin -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go
$(GO_SPACE)/cmd/session-manager-plugin/main.go
GOOS=darwin GOARCH=amd64 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/darwin_amd64/ssmcli -v \
$(GO_SPACE)/src/ssmcli-main/main.go
$(GO_SPACE)/cmd/ssmcli/main.go

.PHONY: build-windows-amd64
build-windows-amd64: checkstyle copy-src pre-build
@echo "Build for windows platform"
GOOS=windows GOARCH=amd64 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/windows_amd64_plugin/session-manager-plugin.exe -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go
$(GO_SPACE)/cmd/session-manager-plugin/main.go
GOOS=windows GOARCH=amd64 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/windows_amd64/ssmcli.exe -v \
$(GO_SPACE)/src/ssmcli-main/main.go
$(GO_SPACE)/cmd/ssmcli/main.go

.PHONY: build-windows-386
build-windows-386: checkstyle copy-src pre-build
@echo "Build for windows platform"
GOOS=windows GOARCH=386 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/windows_386_plugin/session-manager-plugin.exe -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go
$(GO_SPACE)/cmd/session-manager-plugin/main.go
GOOS=windows GOARCH=386 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/windows_386/ssmcli.exe -v \
$(GO_SPACE)/src/ssmcli-main/main.go
$(GO_SPACE)/cmd/ssmcli/main.go


.PHONY: prepack-linux-amd64
Expand Down
2 changes: 1 addition & 1 deletion src/communicator/mocks/IWebSocketChannel.go → pkg/communicator/mocks/IWebSocketChannel.go
View file
Open in desktop

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 → pkg/communicator/websocketchannel.go
View file
Open in desktop
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/pkg/config"
"github.com/aws/session-manager-plugin/pkg/log"
"github.com/aws/session-manager-plugin/pkg/websocketutil"
"github.com/gorilla/websocket"
)

Expand Down
2 changes: 1 addition & 1 deletion src/communicator/websocketchannel_test.go → pkg/communicator/websocketchannel_test.go
View file
Open in desktop
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/pkg/log"
"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
0 src/config/config.go → pkg/config/config.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions src/datachannel/mocks/IDataChannel.go → pkg/datachannel/mocks/IDataChannel.go
View file
Open in desktop

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 → pkg/datachannel/streaming.go
View file
Open in desktop
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/pkg/communicator"
"github.com/aws/session-manager-plugin/pkg/config"
"github.com/aws/session-manager-plugin/pkg/encryption"
"github.com/aws/session-manager-plugin/pkg/log"
"github.com/aws/session-manager-plugin/pkg/message"
"github.com/aws/session-manager-plugin/pkg/service"
"github.com/aws/session-manager-plugin/pkg/version"
"github.com/gorilla/websocket"
"github.com/twinj/uuid"
)
Expand Down
14 changes: 7 additions & 7 deletions src/datachannel/streaming_test.go → pkg/datachannel/streaming_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,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/pkg/communicator/mocks"
"github.com/aws/session-manager-plugin/pkg/config"
"github.com/aws/session-manager-plugin/pkg/encryption"
"github.com/aws/session-manager-plugin/pkg/encryption/mocks"
"github.com/aws/session-manager-plugin/pkg/log"
"github.com/aws/session-manager-plugin/pkg/message"
"github.com/aws/session-manager-plugin/pkg/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 → pkg/encryption/encrypter.go
View file
Open in desktop
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/pkg/log"
)

const (
Expand Down
Loading