Skip to content

Commit 80f6b6b

Browse files
zphzph
authored
Merge pull request #1 from zph/zh-get-tests-running
Zh get tests running
2 parents 109cabb + 4e94009 commit 80f6b6b

36 files changed

+299
-203
lines changed

‎.github/workflows/release.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: goreleaser
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
goreleaser:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
with:
18+
fetch-depth: 0
19+
20+
- name: Set up Go
21+
uses: actions/setup-go@v4
22+
with:
23+
go-version: '>=1.20.0'
24+
25+
- name: Run GoReleaser
26+
uses: goreleaser/goreleaser-action@v5
27+
with:
28+
distribution: goreleaser
29+
version: latest
30+
args: release --clean
31+
env:
32+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@
1010
/vendor/pkg/
1111
bin/
1212
build
13-
vendor/src/github.com/aws/session-manager-plugin
13+
vendor/src/github.com/aws/session-manager-plugin
14+
# GoReleaser
15+
dist/

‎.goreleaser.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# This is an example .goreleaser.yml file with some sensible defaults.
2+
# Make sure to check the documentation at https://goreleaser.com
3+
version: 2
4+
before:
5+
hooks:
6+
- go run ./src/version/versiongenerator/version-gen.go
7+
- goimports -w ./src
8+
- gofmt -w ./src
9+
- go vet ./src/...
10+
# You may remove this if you don't use go modules.
11+
- go mod tidy
12+
13+
builds:
14+
- env:
15+
- CGO_ENABLED=0
16+
goos:
17+
- linux
18+
- darwin
19+
# Disabled because of existing compilation failures
20+
# - windows
21+
goarch:
22+
- amd64
23+
- arm64
24+
# Added ldflags configuration
25+
ldflags:
26+
- -s -w
27+
# Binary naming template
28+
binary: "{{ .ProjectName }}"
29+
# Main package path
30+
main: ./src/sessionmanagerplugin-main/main.go
31+
32+
archives:
33+
- format: tar.gz
34+
# this name template makes the OS and Arch compatible with the results of `uname`.
35+
name_template: >-
36+
{{ .ProjectName }}_
37+
{{- title .Os }}_
38+
{{- if eq .Arch "amd64" }}x86_64
39+
{{- else if eq .Arch "386" }}i386
40+
{{- else }}{{ .Arch }}{{ end }}
41+
files:
42+
- LICENSE
43+
- NOTICE
44+
- THIRD-PARTY
45+
- RELEASENOTES.md
46+
- README.md
47+
# use zip for windows archives
48+
format_overrides:
49+
- goos: windows
50+
format: zip
51+
52+
changelog:
53+
sort: asc
54+
filters:
55+
exclude:
56+
- '^docs:'
57+
- '^test:'
58+
- '^ci:'
59+
- '^chore:'
60+
61+
# Uncomment the following lines if you want to publish to GitHub
62+
# release:
63+
# github:
64+
# owner: zph
65+
# name: session-manager-plugin

‎THIRD-PARTY

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ or your relevant customer agreement with AWS, and is licensed to you under that
33

44
The Amazon Session Manager Plugin includes the following third-party software/licensing:
55

6-
** cihub/seelog - https://github.com/cihub/seelog
7-
Copyright (c) 2012, Cloud Instruments Co., Ltd. <info@cin.io>. All rights reserved.
86
** gorilla/websocket - https://github.com/gorilla/websocket
97
Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved.
108
** fsnotigy/fsnotify - https://github.com/fsnotify/fsnotify
@@ -109,4 +107,4 @@ Unless required by applicable law or agreed to in writing, software
109107
distributed under the License is distributed on an "AS IS" BASIS,
110108
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
111109
See the License for the specific language governing permissions and
112-
limitations under the License.
110+
limitations under the License.

‎Tools/src/checkstyle.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,4 @@ if [[ -n $unformatted ]]; then
2929
fi
3030

3131
echo "Run 'go vet'"
32-
ln -s `pwd` `pwd`/vendor/src/github.com/aws/session-manager-plugin
3332
go vet ./src/...

‎Tools/src/create_darwin_amd64_bundle_plugin.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ cp ${GO_SPACE}/README.md ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bund
1818
cp ${GO_SPACE}/RELEASENOTES.md ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bundle/RELEASENOTES.md
1919
cp ${GO_SPACE}/VERSION ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bundle/VERSION
2020
cp ${GO_SPACE}/bin/darwin_amd64_plugin/session-manager-plugin ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bundle/bin/session-manager-plugin
21-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bundle/seelog.xml.template
2221

2322
echo "Copying install script"
2423

‎Tools/src/create_darwin_arm64_bundle_plugin.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ cp ${GO_SPACE}/README.md ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bund
1818
cp ${GO_SPACE}/RELEASENOTES.md ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/RELEASENOTES.md
1919
cp ${GO_SPACE}/VERSION ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/VERSION
2020
cp ${GO_SPACE}/bin/darwin_arm64_plugin/session-manager-plugin ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/bin/session-manager-plugin
21-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/seelog.xml.template
2221

2322
echo "Copying install script"
2423

‎Tools/src/create_deb_386_plugin.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ echo "Copying application files"
1818

1919
cp ${GO_SPACE}/bin/linux_386_plugin/session-manager-plugin ${GO_SPACE}/bin/debian_386/debian/usr/local/sessionmanagerplugin/bin/
2020
cd ${GO_SPACE}/bin/debian_386/debian/usr/local/sessionmanagerplugin/bin/; strip --strip-unneeded session-manager-plugin; cd ~-
21-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/debian_386/debian/usr/local/sessionmanagerplugin/seelog.xml.template
2221
cp ${GO_SPACE}/packaging/ubuntu_plugin/session-manager-plugin.conf ${GO_SPACE}/bin/debian_386/debian/etc/init/
2322
cp ${GO_SPACE}/packaging/ubuntu_plugin/session-manager-plugin.service ${GO_SPACE}/bin/debian_386/debian/lib/systemd/system/
2423

‎Tools/src/create_deb_amd64_plugin.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ echo "Copying application files"
1818

1919
cp ${GO_SPACE}/bin/linux_amd64_plugin/session-manager-plugin ${GO_SPACE}/bin/debian_amd64/debian/usr/local/sessionmanagerplugin/bin/
2020
cd ${GO_SPACE}/bin/debian_amd64/debian/usr/local/sessionmanagerplugin/bin/; strip --strip-unneeded session-manager-plugin; cd ~-
21-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/debian_amd64/debian/usr/local/sessionmanagerplugin/seelog.xml.template
2221
cp ${GO_SPACE}/packaging/ubuntu_plugin/session-manager-plugin.conf ${GO_SPACE}/bin/debian_amd64/debian/etc/init/
2322
cp ${GO_SPACE}/packaging/ubuntu_plugin/session-manager-plugin.service ${GO_SPACE}/bin/debian_amd64/debian/lib/systemd/system/
2423

‎Tools/src/create_deb_arm64_plugin.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ echo "Copying application files"
1818

1919
cp ${GO_SPACE}/bin/linux_arm64_plugin/session-manager-plugin ${GO_SPACE}/bin/debian_arm64/debian/usr/local/sessionmanagerplugin/bin/
2020
cd ${GO_SPACE}/bin/debian_arm64/debian/usr/local/sessionmanagerplugin/bin/; strip --strip-unneeded session-manager-plugin; cd ~-
21-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/debian_arm64/debian/usr/local/sessionmanagerplugin/seelog.xml.template
2221
cp ${GO_SPACE}/packaging/ubuntu_plugin/session-manager-plugin.conf ${GO_SPACE}/bin/debian_arm64/debian/etc/init/
2322
cp ${GO_SPACE}/packaging/ubuntu_plugin/session-manager-plugin.service ${GO_SPACE}/bin/debian_arm64/debian/lib/systemd/system/
2423

‎Tools/src/create_deb_arm_plugin.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ echo "Copying application files"
1818

1919
cp ${GO_SPACE}/bin/linux_arm_plugin/session-manager-plugin ${GO_SPACE}/bin/debian_arm/debian/usr/local/sessionmanagerplugin/bin/
2020
cd ${GO_SPACE}/bin/debian_arm/debian/usr/local/sessionmanagerplugin/bin/; strip --strip-unneeded session-manager-plugin; cd ~-
21-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/debian_arm/debian/usr/local/sessionmanagerplugin/seelog.xml.template
2221
cp ${GO_SPACE}/packaging/ubuntu_plugin/session-manager-plugin.conf ${GO_SPACE}/bin/debian_arm/debian/etc/init/
2322
cp ${GO_SPACE}/packaging/ubuntu_plugin/session-manager-plugin.service ${GO_SPACE}/bin/debian_arm/debian/lib/systemd/system/
2423

‎Tools/src/create_rpm_386.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ mkdir -p ${GO_SPACE}/bin/linux_386/linux/var/lib/amazon/ssmcli/
2222
echo "Copying application files"
2323

2424
cp ${GO_SPACE}/bin/linux_386/ssmcli ${GO_SPACE}/bin/linux_386/linux/usr/bin/
25-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/linux_386/linux/etc/amazon/ssmcli/seelog.xml.template
2625
cp ${GO_SPACE}/packaging/linux/ssmcli.conf ${GO_SPACE}/bin/linux_386/linux/etc/init/
2726
cp ${GO_SPACE}/packaging/linux/ssmcli.service ${GO_SPACE}/bin/linux_386/linux/etc/systemd/system/
2827
cd ${GO_SPACE}/bin/linux_386/linux/usr/bin/; strip --strip-unneeded ssmcli; cd ~-
@@ -51,4 +50,4 @@ echo "Zip rpm, install and uninstall files"
5150
tar -zcvf ${GO_SPACE}/bin/updates/ssmcli/`cat ${GO_SPACE}/VERSION`/ssmcli-linux-386.tar.gz -C ${GO_SPACE}/bin/linux_386/ ssmcli.rpm install.sh uninstall.sh
5251

5352
rm ${GO_SPACE}/bin/linux_386/install.sh
54-
rm ${GO_SPACE}/bin/linux_386/uninstall.sh
53+
rm ${GO_SPACE}/bin/linux_386/uninstall.sh

‎Tools/src/create_rpm_386_plugin.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ cp ${GO_SPACE}/RELEASENOTES.md ${GO_SPACE}/bin/linux_386_plugin/linux/usr/local/
2929
cp ${GO_SPACE}/THIRD-PARTY ${GO_SPACE}/bin/linux_386_plugin/linux/usr/local/sessionmanagerplugin/THIRD-PARTY
3030
cp ${GO_SPACE}/VERSION ${GO_SPACE}/bin/linux_386_plugin/linux/usr/local/sessionmanagerplugin/VERSION
3131
cp ${GO_SPACE}/bin/linux_386_plugin/session-manager-plugin ${GO_SPACE}/bin/linux_386_plugin/linux/usr/local/sessionmanagerplugin/bin/
32-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/linux_386_plugin/linux/usr/local/sessionmanagerplugin/seelog.xml.template
3332
cp ${GO_SPACE}/packaging/linux_plugin/session-manager-plugin.conf ${GO_SPACE}/bin/linux_386_plugin/linux/etc/init/
3433
cp ${GO_SPACE}/packaging/linux_plugin/session-manager-plugin.service ${GO_SPACE}/bin/linux_386_plugin/linux/etc/systemd/system/
3534
cd ${GO_SPACE}/bin/linux_386_plugin/linux/usr/local/sessionmanagerplugin/bin/; strip --strip-unneeded session-manager-plugin; cd ~-
@@ -58,4 +57,4 @@ echo "Zip rpm, install and uninstall files"
5857
tar -zcvf ${GO_SPACE}/bin/updates/sessionmanagerplugin/`cat ${GO_SPACE}/VERSION`/session-manager-plugin-linux-386.tar.gz -C ${GO_SPACE}/bin/linux_386_plugin/ session-manager-plugin.rpm install.sh uninstall.sh
5958

6059
rm ${GO_SPACE}/bin/linux_386_plugin/install.sh
61-
rm ${GO_SPACE}/bin/linux_386_plugin/uninstall.sh
60+
rm ${GO_SPACE}/bin/linux_386_plugin/uninstall.sh

‎Tools/src/create_rpm_amd64.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ mkdir -p ${GO_SPACE}/bin/linux_amd64/linux/var/lib/amazon/ssmcli/
2222
echo "Copying application files"
2323

2424
cp ${GO_SPACE}/bin/linux_amd64/ssmcli ${GO_SPACE}/bin/linux_amd64/linux/usr/bin/
25-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/linux_amd64/linux/etc/amazon/ssmcli/seelog.xml.template
2625
cp ${GO_SPACE}/packaging/linux/ssmcli.conf ${GO_SPACE}/bin/linux_amd64/linux/etc/init/
2726
cp ${GO_SPACE}/packaging/linux/ssmcli.service ${GO_SPACE}/bin/linux_amd64/linux/etc/systemd/system/
2827
cd ${GO_SPACE}/bin/linux_amd64/linux/usr/bin/; strip --strip-unneeded ssmcli; cd ~-
@@ -51,4 +50,4 @@ echo "Zip rpm, install and uninstall files"
5150
tar -zcvf ${GO_SPACE}/bin/updates/ssmcli/`cat ${GO_SPACE}/VERSION`/ssmcli-linux-amd64.tar.gz -C ${GO_SPACE}/bin/linux_amd64/ ssmcli.rpm install.sh uninstall.sh
5251

5352
rm ${GO_SPACE}/bin/linux_amd64/install.sh
54-
rm ${GO_SPACE}/bin/linux_amd64/uninstall.sh
53+
rm ${GO_SPACE}/bin/linux_amd64/uninstall.sh

‎Tools/src/create_rpm_amd64_plugin.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ cp ${GO_SPACE}/RELEASENOTES.md ${GO_SPACE}/bin/linux_amd64_plugin/linux/usr/loca
2929
cp ${GO_SPACE}/THIRD-PARTY ${GO_SPACE}/bin/linux_amd64_plugin/linux/usr/local/sessionmanagerplugin/THIRD-PARTY
3030
cp ${GO_SPACE}/VERSION ${GO_SPACE}/bin/linux_amd64_plugin/linux/usr/local/sessionmanagerplugin/VERSION
3131
cp ${GO_SPACE}/bin/linux_amd64_plugin/session-manager-plugin ${GO_SPACE}/bin/linux_amd64_plugin/linux/usr/local/sessionmanagerplugin/bin/
32-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/linux_amd64_plugin/linux/usr/local/sessionmanagerplugin/seelog.xml.template
3332
cp ${GO_SPACE}/packaging/linux_plugin/session-manager-plugin.conf ${GO_SPACE}/bin/linux_amd64_plugin/linux/etc/init/
3433
cp ${GO_SPACE}/packaging/linux_plugin/session-manager-plugin.service ${GO_SPACE}/bin/linux_amd64_plugin/linux/etc/systemd/system/
3534
cd ${GO_SPACE}/bin/linux_amd64_plugin/linux/usr/local/sessionmanagerplugin/bin/; strip --strip-unneeded session-manager-plugin; cd ~-
@@ -58,4 +57,4 @@ echo "Zip rpm, install and uninstall files"
5857
tar -zcvf ${GO_SPACE}/bin/updates/sessionmanagerplugin/`cat ${GO_SPACE}/VERSION`/session-manager-plugin-linux-amd64.tar.gz -C ${GO_SPACE}/bin/linux_amd64_plugin/ session-manager-plugin.rpm install.sh uninstall.sh
5958

6059
rm ${GO_SPACE}/bin/linux_amd64_plugin/install.sh
61-
rm ${GO_SPACE}/bin/linux_amd64_plugin/uninstall.sh
60+
rm ${GO_SPACE}/bin/linux_amd64_plugin/uninstall.sh

‎Tools/src/create_rpm_arm64_plugin.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ cp ${GO_SPACE}/RELEASENOTES.md ${GO_SPACE}/bin/linux_arm64_plugin/linux/usr/loca
2929
cp ${GO_SPACE}/THIRD-PARTY ${GO_SPACE}/bin/linux_arm64_plugin/linux/usr/local/sessionmanagerplugin/THIRD-PARTY
3030
cp ${GO_SPACE}/VERSION ${GO_SPACE}/bin/linux_arm64_plugin/linux/usr/local/sessionmanagerplugin/VERSION
3131
cp ${GO_SPACE}/bin/linux_arm64_plugin/session-manager-plugin ${GO_SPACE}/bin/linux_arm64_plugin/linux/usr/local/sessionmanagerplugin/bin/
32-
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/linux_arm64_plugin/linux/usr/local/sessionmanagerplugin/seelog.xml.template
3332
cp ${GO_SPACE}/packaging/linux_plugin/session-manager-plugin.conf ${GO_SPACE}/bin/linux_arm64_plugin/linux/etc/init/
3433
cp ${GO_SPACE}/packaging/linux_plugin/session-manager-plugin.service ${GO_SPACE}/bin/linux_arm64_plugin/linux/etc/systemd/system/
3534
cd ${GO_SPACE}/bin/linux_arm64_plugin/linux/usr/local/sessionmanagerplugin/bin/; strip --strip-unneeded session-manager-plugin; cd ~-
@@ -58,4 +57,4 @@ echo "Zip rpm, install and uninstall files"
5857
tar -zcvf ${GO_SPACE}/bin/updates/sessionmanagerplugin/`cat ${GO_SPACE}/VERSION`/session-manager-plugin-linux-arm64.tar.gz -C ${GO_SPACE}/bin/linux_arm64_plugin/ session-manager-plugin.rpm install.sh uninstall.sh
5958

6059
rm ${GO_SPACE}/bin/linux_arm64_plugin/install.sh
61-
rm ${GO_SPACE}/bin/linux_arm64_plugin/uninstall.sh
60+
rm ${GO_SPACE}/bin/linux_arm64_plugin/uninstall.sh

‎Tools/src/create_win_386_plugin.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ echo "Copying application files"
1717

1818
mkdir -p ${PACKAGE_FOLDER}/bin
1919
cp ${BUILD_FOLDER}/session-manager-plugin.exe ${PACKAGE_FOLDER}/bin/session-manager-plugin.exe
20-
cp ${GO_SPACE}/seelog_windows.xml.template ${PACKAGE_FOLDER}/seelog.xml.template
2120

2221
echo "Copying windows package config files"
2322

@@ -45,4 +44,4 @@ zip -j ${WINDOWS_386_ZIP} ${PACKAGE_FOLDER}/install.bat
4544
zip -j ${WINDOWS_386_ZIP} ${PACKAGE_FOLDER}/uninstall.bat
4645

4746
cp ${WINDOWS_386_ZIP} ${BUILD_FOLDER}
48-
rm -rf ${PACKAGE_FOLDER}
47+
rm -rf ${PACKAGE_FOLDER}

‎Tools/src/create_win_amd64_plugin.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ echo "Copying application files"
1717

1818
mkdir -p ${PACKAGE_FOLDER}/bin
1919
cp ${BUILD_FOLDER}/session-manager-plugin.exe ${PACKAGE_FOLDER}/bin/session-manager-plugin.exe
20-
cp ${GO_SPACE}/seelog_windows.xml.template ${PACKAGE_FOLDER}/seelog.xml.template
2120

2221
echo "Copying windows package config files"
2322

@@ -45,4 +44,4 @@ zip -j ${WINDOWS_AMD64_ZIP} ${PACKAGE_FOLDER}/install.bat
4544
zip -j ${WINDOWS_AMD64_ZIP} ${PACKAGE_FOLDER}/uninstall.bat
4645

4746
cp ${WINDOWS_AMD64_ZIP} ${BUILD_FOLDER}
48-
rm -rf ${PACKAGE_FOLDER}
47+
rm -rf ${PACKAGE_FOLDER}

‎Tools/src/darwin/install

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ It also creates a symlink session-manager-plugin in the /usr/local/bin directory
1313
PLUGIN_FILE = "session-manager-plugin"
1414
VERSION_FILE = "VERSION"
1515
LICENSE_FILE = "LICENSE"
16-
SEELOG_FILE = "seelog.xml.template"
1716

1817
INSTALL_DIR = "/usr/local/sessionmanagerplugin"
1918
SYMLINK_NAME = "/usr/local/bin/{}".format(PLUGIN_FILE)
@@ -57,10 +56,6 @@ def main():
5756
shutil.copy2(current_bin_location, install_bin_folder)
5857
current_bin_folder = install_bin_folder
5958

60-
# Copy see_log file
61-
seelog_location = os.path.join(current_working_directory, SEELOG_FILE)
62-
shutil.copy2(seelog_location, options.install_dir)
63-
6459
# Copy Version File
6560
version_file_location = os.path.join(current_working_directory, VERSION_FILE)
6661
shutil.copy2(version_file_location, options.install_dir)

‎Tools/src/update/windows/uninstall.bat

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ setlocal
44
set ServiceName=session-manager-plugin
55
set ProgramFilesAmazonFolder=%PROGRAMFILES%\Amazon
66
set ProgramFilesSSMCLIFolder=%ProgramFilesAmazonFolder%\SessionManagerPlugin
7-
set CustomizedSeelog=%ProgramFilesSSMCLIFolder%\seelog.xml
87

98
:BEGIN
109
echo [INFO] Detecting administrative permissions...
@@ -45,7 +44,6 @@ rem Loop through non-folders, keep the customized files.
4544
set HasCustomizedSettings=
4645
for /f "delims=" %%i in ('dir /b /a:-d "%ProgramFilesSSMCLIFolder%\*.*"') do (
4746
set IsCustomized=
48-
if /I "%ProgramFilesSSMCLIFolder%\%%i" equ "%CustomizedSeelog%" set IsCustomized=1
4947
if defined IsCustomized (
5048
set HasCustomizedSettings=1
5149
echo [INFO] Keep %ProgramFilesSSMCLIFolder%\%%i.

‎go.mod

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/aws/session-manager-plugin
22

3-
go 1.23.5
3+
go 1.24
4+
5+
toolchain go1.24.0
46

57
require (
68
github.com/aws/aws-sdk-go v1.55.6
@@ -11,8 +13,8 @@ require (
1113
github.com/stretchr/testify v1.10.0
1214
github.com/xtaci/smux v1.5.33
1315
golang.org/x/crypto v0.32.0
14-
golang.org/x/sync v0.10.0
15-
golang.org/x/sys v0.29.0
16+
golang.org/x/sync v0.11.0
17+
golang.org/x/sys v0.30.0
1618
)
1719

1820
require (
@@ -25,3 +27,6 @@ require (
2527
golang.org/x/term v0.28.0 // indirect
2628
gopkg.in/yaml.v3 v3.0.1 // indirect
2729
)
30+
31+
// TODO(zph): Remove this once the PR is merged
32+
replace github.com/aws/session-manager-plugin => github.com/zph/session-manager-plugin v0.0.0-20250224205035-af1c585d288e

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ github.com/xtaci/smux v1.5.33 h1:xosoZt0AUZdIXEB6z09kt1bge+l1L8wzMtJdPB6GAPI=
3535
github.com/xtaci/smux v1.5.33/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY=
3636
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
3737
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
38-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
39-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
38+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
39+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
4040
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4141
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4242
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
43-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
44-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
43+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
44+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4545
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
4646
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
4747
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

0 commit comments

Comments
 (0)