Skip to content

Commit 943e141

Browse files
kooooshpiyush-jena
authored andcommitted
amazon-ssm-agent: bump to v3.3.3185.0
Signed-off-by: Kush Upadhyay <[email protected]>
1 parent 549b375 commit 943e141

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

packages/amazon-ssm-agent/0001-agent-Add-config-to-make-shell-optional.patch

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
1-
From 096dad878552ea342ddad9f3132453fd7cc4e08b Mon Sep 17 00:00:00 2001
1+
From fe944258e663e182404f2fa2d6bbefc36a97854b Mon Sep 17 00:00:00 2001
22
From: Kush Upadhyay <[email protected]>
3-
Date: Mon, 7 Oct 2024 09:13:38 +0000
3+
Date: Tue, 7 Oct 2025 11:39:00 +0000
44
Subject: [PATCH] agent: Add config to make shell optional
55

66
Signed-off-by: Kush Upadhyay <[email protected]>
7+
[Update to 3.3.2746.0]
78
Signed-off-by: Yutong Sun <[email protected]>
9+
[Update to 3.3.3185.0]
10+
Signed-off-by: Kush Upadhyay <[email protected]>
811
---
912
agent/appconfig/appconfig.go | 1 +
1013
agent/appconfig/contracts.go | 2 ++
1114
agent/plugins/runscript/runscript.go | 36 +++++++++++++++++++---------
1215
3 files changed, 28 insertions(+), 11 deletions(-)
1316

1417
diff --git a/agent/appconfig/appconfig.go b/agent/appconfig/appconfig.go
15-
index 6b278f50..2013cf92 100644
18+
index e848450..3a90745 100644
1619
--- a/agent/appconfig/appconfig.go
1720
+++ b/agent/appconfig/appconfig.go
1821
@@ -120,6 +120,7 @@ func DefaultConfig() SsmagentConfig {
1922
PluginLocalOutputCleanup: DefaultPluginOutputRetention,
2023
OrchestrationDirectoryCleanup: DefaultOrchestrationDirCleanup,
2124
SessionHandshakeTimeoutSeconds: DefaultSessionHandshakeTimeoutSeconds,
2225
+ UseShell: false,
26+
CredentialRetryMaxSleepSeconds: DefaultCredentialRetryMaxSleepSeconds,
2327
}
2428
agent := AgentInfo{
25-
Name: "amazon-ssm-agent",
2629
diff --git a/agent/appconfig/contracts.go b/agent/appconfig/contracts.go
27-
index 69501310..bf42380f 100644
30+
index 7142151..997406a 100644
2831
--- a/agent/appconfig/contracts.go
2932
+++ b/agent/appconfig/contracts.go
3033
@@ -55,6 +55,8 @@ type SsmCfg struct {
@@ -33,11 +36,11 @@ index 69501310..bf42380f 100644
3336
OrchestrationDirectoryCleanup string
3437
+ // Flag for shell dependency
3538
+ UseShell bool
39+
// Max sleep duration in seconds for credential retry before attempting to refresh credentials on failure
40+
CredentialRetryMaxSleepSeconds int
3641
}
37-
38-
// AgentInfo represents metadata for amazon-ssm-agent
3942
diff --git a/agent/plugins/runscript/runscript.go b/agent/plugins/runscript/runscript.go
40-
index c89bf92a..b56e973a 100644
43+
index c89bf92..b56e973 100644
4144
--- a/agent/plugins/runscript/runscript.go
4245
+++ b/agent/plugins/runscript/runscript.go
4346
@@ -177,23 +177,37 @@ func (p *Plugin) runCommands(pluginID string, pluginInput RunScriptPluginInput,
@@ -90,5 +93,5 @@ index c89bf92a..b56e973a 100644
9093
exitCode, err := p.CommandExecuter.NewExecute(p.Context, workingDir, output.GetStdoutWriter(), output.GetStderrWriter(), cancelFlag, executionTimeout, commandName, commandArguments, pluginInput.Environment)
9194

9295
--
93-
2.47.0
96+
2.50.1
9497

packages/amazon-ssm-agent/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ path = "../packages.rs"
1212
releases-url = "https://github.com/aws/amazon-ssm-agent/releases"
1313

1414
[[package.metadata.build-package.external-files]]
15-
url = "https://github.com/aws/amazon-ssm-agent/archive/3.3.2746.0/amazon-ssm-agent-3.3.2746.0.tar.gz"
16-
sha512 = "a0f2af7cf5cb9a8466f6ec8ed79fa3f4f00633c43d772624bdf1f71dc75967e760a997a7e37138bbc2197945848a9278fec0c2f21146945849bda64b8803b6dc"
15+
url = "https://github.com/aws/amazon-ssm-agent/archive/3.3.3185.0/amazon-ssm-agent-3.3.3185.0.tar.gz"
16+
sha512 = "527044b12aa84bb1a748628c94c02eb4633d26dfe4c96763cd82656a6c0de610e75b8110b944c10d134ad198b564a416f53424bc823f5a3fb846d5fc4f47dc59"
1717

1818
[build-dependencies]
1919
glibc = { path = "../glibc" }

packages/amazon-ssm-agent/amazon-ssm-agent.spec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%global goimport %{goproject}/%{gorepo}
44

55
Name: %{_cross_os}amazon-ssm-agent
6-
Version: 3.3.2746.0
6+
Version: 3.3.3185.0
77
Release: 1%{?dist}
88
Summary: An agent to enable remote management of EC2 instances
99
License: Apache-2.0
@@ -68,6 +68,8 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-plugin-bin)
6868
%autosetup -n %{gorepo}-%{version} -p1
6969

7070
%build
71+
export GO_MAJOR="1.24"
72+
7173
%set_cross_go_flags
7274

7375
go build -ldflags "${GOLDFLAGS}" -o amazon-ssm-agent \

0 commit comments

Comments
 (0)