mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-12 07:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/amazon-ssm-agent: update to 3.2.985.0

Browse Source 
Use Go 1.19 as Go 1.12 does not exist.
Update amazon-ssm-agent to 3.2.985.0, because 2.3.1319.0 does not work
with Go 1.19.
Clean up unnecessary patches.
This commit is contained in:
Dongsu Park 2023-05-26 09:22:54 +02:00 committed by Sayan Chowdhury
parent 57fbd63a3b
commit 077433411e
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/Manifest vendored
View File

@ -1 +1 @@
DIST amazon-ssm-agent-2.3.1319.0.tar.gz 22207875 BLAKE2B 9c94f6837079d8117dffea09b1f793d261ac0cb2321c5e0f5a422ea1c57f5abeb3eb38fae74f91481d70ab3bb55dd2098fca4136c37a692d182b45560ed05900 SHA512 bb1d09704981277701bd0b70fadb8c6c917b72fce3f228511def621ea85ee4f401b20456e82bd7e9eed28350260b63076d49cf5f4004555fa16d645bafbecc41 DIST amazon-ssm-agent-3.2.985.0.tar.gz 25648180 BLAKE2B 8081de8ab39b06ad554fa74b551ad23cf2df3755ce2c382b17beb599cad8c6b9f6520277c889eea5fcff7f96507f2c76d6cb2b67e857e8f8faa2e2e20cd9a5b4 SHA512 6ca37bcc072b03981e9047a8b04d102aa6174de30b926c392d9492e81e90595716f5c08ab0d8371ae016b54f45c9b989870120326a325a69e22e939c03abc672

5
sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-2.3.1319.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-3.2.985.0.ebuild vendored
View File

@ -3,7 +3,7 @@
EAPI=7 EAPI=7
COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.12" COREOS_GO_VERSION="go1.19"
inherit coreos-go-depend golang-vcs-snapshot inherit coreos-go-depend golang-vcs-snapshot
@ -18,8 +18,6 @@ KEYWORDS="amd64 arm64"
S="${WORKDIR}/${PN}-${PV}/src/${EGO_PN}" S="${WORKDIR}/${PN}-${PV}/src/${EGO_PN}"
PATCHES=( PATCHES=(
# patch generated by `goimports -w ./agent` command
"${FILESDIR}"/${P}-goimports.patch
) )
src_prepare() { src_prepare() {
@ -34,7 +32,6 @@ src_compile() {
# but without network activity during build phase # but without network activity during build phase
local GO_LDFLAGS="-s -w -extldflags=-Wl,-z,now,-z,relro,-z,defs" local GO_LDFLAGS="-s -w -extldflags=-Wl,-z,now,-z,relro,-z,defs"
export GOPATH="${WORKDIR}/${PN}-${PV}" export GOPATH="${WORKDIR}/${PN}-${PV}"
export GO111MODULE="off"
# set agent release version # set agent release version
BRAZIL_PACKAGE_VERSION=${PV} ${EGO} run ./agent/version/versiongenerator/version-gen.go BRAZIL_PACKAGE_VERSION=${PV} ${EGO} run ./agent/version/versiongenerator/version-gen.go
# build all the tools # build all the tools

23
sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/files/amazon-ssm-agent-2.3.1319.0-goimports.patch vendored
View File

@ -1,23 +0,0 @@
diff --git a/agent/plugins/inventory/gatherers/application/dataProvider.go b/agent/plugins/inventory/gatherers/application/dataProvider.go
index d252ffb4..d1a010ed 100644
--- a/agent/plugins/inventory/gatherers/application/dataProvider.go
+++ b/agent/plugins/inventory/gatherers/application/dataProvider.go
@@ -7,7 +7,6 @@ import (
"fmt"
"github.com/aws/amazon-ssm-agent/agent/context"
- "github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"
"github.com/aws/amazon-ssm-agent/agent/plugins/inventory/model"
)
diff --git a/agent/plugins/inventory/gatherers/application/dataProvider_unix_test.go b/agent/plugins/inventory/gatherers/application/dataProvider_unix_test.go
index af51fa2d..a2757005 100644
--- a/agent/plugins/inventory/gatherers/application/dataProvider_unix_test.go
+++ b/agent/plugins/inventory/gatherers/application/dataProvider_unix_test.go
@@ -241,4 +241,4 @@ func TestApplicationDataWithPackageRepositoryData(t *testing.T) {
data := CollectApplicationData(mockContext)
assert.Equal(t, len(sampleDataParsed), len(data))
assert.NotEqual(t, len(mockData), len(data))
-}
\ No newline at end of file
+}