diff --git a/packages/aws-iam-authenticator/Cargo.toml b/packages/aws-iam-authenticator/Cargo.toml index efa126f5bc7..4304e9f36d0 100644 --- a/packages/aws-iam-authenticator/Cargo.toml +++ b/packages/aws-iam-authenticator/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.5/aws-iam-authenticator-0.5.5.tar.gz" -sha512 = "24c2a7fd141f921e18c17f4c7e90bbf5325cc6fad3b35753c0da2d879cf64d8f6af0130f8c45ec7693d6fce043181abbd04a911e6fa778f686bd5c313631ed0f" +url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.5.7/aws-iam-authenticator-0.5.7.tar.gz" +sha512 = "64d0959555a39f0fd1f55e689495507a3d1fd005ced4287ea853750915c1953a328f794a37799b4f0936fca2a009fa7d7fdb432be79468b643f5f967edaf8f9c" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/aws-iam-authenticator/aws-iam-authenticator.spec b/packages/aws-iam-authenticator/aws-iam-authenticator.spec index 48abafb3a7a..5db1634d766 100644 --- a/packages/aws-iam-authenticator/aws-iam-authenticator.spec +++ b/packages/aws-iam-authenticator/aws-iam-authenticator.spec @@ -2,7 +2,7 @@ %global gorepo aws-iam-authenticator %global goimport %{goproject}/%{gorepo} -%global gover 0.5.5 +%global gover 0.5.7 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 diff --git a/packages/ca-certificates/Cargo.toml b/packages/ca-certificates/Cargo.toml index cf6228a1877..92de39e4b3e 100644 --- a/packages/ca-certificates/Cargo.toml +++ b/packages/ca-certificates/Cargo.toml @@ -12,5 +12,5 @@ path = "pkg.rs" releases-url = "https://curl.se/docs/caextract.html" [[package.metadata.build-package.external-files]] -url = "https://curl.haxx.se/ca/cacert-2022-03-18.pem" -sha512 = "ef82868c7d0ea1ff708a4f63cd8f10158384931f39ba2300bbf1ffcc3ff3fea2282f8f78cf74a78d0b93d83297e2cfcabb7427a463d3199087b708b624aabc42" +url = "https://curl.haxx.se/ca/cacert-2022-04-26.pem" +sha512 = "91266bcf97d879828c26beba82e15ff73aa676d800e11401da22b0a565e980912222e02e9a9cc7daff7ceddf78309d8fb0adef6a4eaff9cefa73b72a97281bc2" diff --git a/packages/ca-certificates/ca-certificates.spec b/packages/ca-certificates/ca-certificates.spec index 14dbf1fa243..7ab8ee2b800 100644 --- a/packages/ca-certificates/ca-certificates.spec +++ b/packages/ca-certificates/ca-certificates.spec @@ -1,12 +1,12 @@ Name: %{_cross_os}ca-certificates -Version: 2022.03.18 +Version: 2022.04.26 Release: 1%{?dist} Summary: CA certificates extracted from Mozilla License: MPL-2.0 # Note: You can see changes here: # https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt URL: https://curl.haxx.se/docs/caextract.html -Source0: https://curl.haxx.se/ca/cacert-2022-03-18.pem +Source0: https://curl.haxx.se/ca/cacert-2022-04-26.pem Source1: ca-certificates-tmpfiles.conf %description diff --git a/packages/coreutils/1001-gnulib-simple-backup-fix.patch b/packages/coreutils/1001-gnulib-simple-backup-fix.patch new file mode 100644 index 00000000000..9c2d8a7cc0f --- /dev/null +++ b/packages/coreutils/1001-gnulib-simple-backup-fix.patch @@ -0,0 +1,36 @@ +commit 7347caeb9d902d3fca2c11f69a55a3e578d93bfe +Author: Paul Eggert +Date: Wed Apr 20 19:34:57 2022 -0700 + + backupfile: fix bug when renaming simple backups + + * lib/backupfile.c (backupfile_internal): Fix bug when RENAME + and when doing simple backups. Problem reported by Steve Ward in: + https://bugs.gnu.org/55029 + +diff --git a/lib/backupfile.c b/lib/backupfile.c +index 1e9290a187..d9f465a3e0 100644 +--- a/lib/backupfile.c ++++ b/lib/backupfile.c +@@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char const *file, + return s; + + DIR *dirp = NULL; +- int sdir = AT_FDCWD; ++ int sdir = dir_fd; + idx_t base_max = 0; + while (true) + { +@@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char const *file, + if (! rename) + break; + +- int olddirfd = sdir < 0 ? dir_fd : sdir; +- idx_t offset = sdir < 0 ? 0 : base_offset; ++ idx_t offset = backup_type == simple_backups ? 0 : base_offset; + unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE; +- if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0) ++ if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0) + break; + int e = errno; + if (! (e == EEXIST && extended)) diff --git a/packages/coreutils/Cargo.toml b/packages/coreutils/Cargo.toml index 5f424f107b4..c051080343c 100644 --- a/packages/coreutils/Cargo.toml +++ b/packages/coreutils/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://ftp.gnu.org/gnu/coreutils" [[package.metadata.build-package.external-files]] -url = "https://ftp.gnu.org/gnu/coreutils/coreutils-9.0.tar.xz" -sha512 = "9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03" +url = "https://ftp.gnu.org/gnu/coreutils/coreutils-9.1.tar.xz" +sha512 = "a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/coreutils/coreutils.spec b/packages/coreutils/coreutils.spec index 120cdb12544..255b91c51a9 100644 --- a/packages/coreutils/coreutils.spec +++ b/packages/coreutils/coreutils.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}coreutils -Version: 9.0 +Version: 9.1 Release: 1%{?dist} Summary: A set of basic GNU tools License: GPL-3.0-or-later @@ -17,6 +17,9 @@ Requires: %{_cross_os}libcap Requires: %{_cross_os}libselinux Requires: %{_cross_os}libxcrypt +# Include patch from Fedora 37, fix for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55029 +Patch1001: 1001-gnulib-simple-backup-fix.patch + %description %{summary}. diff --git a/packages/ecs-agent/0001-bottlerocket-default-filesystem-locations.patch b/packages/ecs-agent/0001-bottlerocket-default-filesystem-locations.patch index 307a4f54a99..8ffd60de321 100644 --- a/packages/ecs-agent/0001-bottlerocket-default-filesystem-locations.patch +++ b/packages/ecs-agent/0001-bottlerocket-default-filesystem-locations.patch @@ -1,17 +1,19 @@ -From c6cbf43d62a587b7a7672b726c4513005c9b77e8 Mon Sep 17 00:00:00 2001 +From 9c29e409e68789b2bae933e5be4f0c8828a3f59a Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Wed, 8 Jul 2020 11:18:35 -0700 Subject: [PATCH 1/5] bottlerocket: default filesystem locations +Signed-off-by: Sean P. Kelly --- - agent/config/config.go | 6 +++--- - agent/config/config_unix.go | 4 ++-- - agent/ecscni/plugin.go | 2 +- - agent/utils/license.go | 6 +++--- - 4 files changed, 9 insertions(+), 9 deletions(-) + agent/config/config.go | 6 +++--- + agent/config/config_unix.go | 6 +++--- + agent/ecscni/plugin_linux.go | 2 +- + agent/ecscni/plugin_unsupported.go | 2 +- + agent/utils/license.go | 6 +++--- + 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/agent/config/config.go b/agent/config/config.go -index 3178c63f2..810eb31b4 100644 +index 4b308bb..5d0aa36 100644 --- a/agent/config/config.go +++ b/agent/config/config.go @@ -51,7 +51,7 @@ const ( @@ -40,10 +42,10 @@ index 3178c63f2..810eb31b4 100644 // DefaultTaskMetadataSteadyStateRate is set as 40. This is arrived from our benchmarking // results where task endpoint can handle 4000 rps effectively. Here, 100 containers diff --git a/agent/config/config_unix.go b/agent/config/config_unix.go -index 080f18c4d..ef14970ce 100644 +index 8f6b801..b8e7f93 100644 --- a/agent/config/config_unix.go +++ b/agent/config/config_unix.go -@@ -27,10 +27,10 @@ const ( +@@ -29,10 +29,10 @@ const ( // AgentCredentialsAddress is used to serve the credentials for tasks. AgentCredentialsAddress = "" // this is left blank right now for net=bridge // defaultAuditLogFile specifies the default audit log filename @@ -54,9 +56,9 @@ index 080f18c4d..ef14970ce 100644 - defaultRuntimeStatsLogFile = `/log/agent-runtime-stats.log` + defaultRuntimeStatsLogFile = `/var/log/ecs/agent-runtime-stats.log` - // DefaultTaskCgroupPrefix is default cgroup prefix for ECS tasks - DefaultTaskCgroupPrefix = "/ecs" -@@ -56,7 +56,7 @@ func DefaultConfig() Config { + // DefaultTaskCgroupV1Prefix is default cgroup v1 prefix for ECS tasks + DefaultTaskCgroupV1Prefix = "/ecs" +@@ -63,7 +63,7 @@ func DefaultConfig() Config { DockerEndpoint: "unix:///var/run/docker.sock", ReservedPorts: []uint16{SSHPort, DockerReservedPort, DockerReservedSSLPort, AgentIntrospectionPort, AgentCredentialsPort}, ReservedPortsUDP: []uint16{}, @@ -66,10 +68,10 @@ index 080f18c4d..ef14970ce 100644 DisableMetrics: BooleanDefaultFalse{Value: ExplicitlyDisabled}, ReservedMemory: 0, diff --git a/agent/ecscni/plugin_linux.go b/agent/ecscni/plugin_linux.go -index 6fc0111d..d3ef6641 100644 +index aa56d0a..e8f71b4 100644 --- a/agent/ecscni/plugin_linux.go +++ b/agent/ecscni/plugin_linux.go -@@ -32,7 +32,7 @@ import ( +@@ -33,7 +33,7 @@ import ( const ( vpcCNIPluginInterfaceType = "vlan" // vpcCNIPluginPath is the path of the cni plugin's log file. @@ -79,10 +81,10 @@ index 6fc0111d..d3ef6641 100644 // newCNIGuard returns a new instance of CNI guard for the CNI client. diff --git a/agent/ecscni/plugin_unsupported.go b/agent/ecscni/plugin_unsupported.go -index 6289877a..fcebedfe 100644 +index e156b75..55d1a3c 100644 --- a/agent/ecscni/plugin_unsupported.go +++ b/agent/ecscni/plugin_unsupported.go -@@ -25,7 +25,7 @@ import ( +@@ -26,7 +26,7 @@ import ( const ( // vpcCNIPluginPath is the path of the cni plugin's log file. @@ -92,7 +94,7 @@ index 6289877a..fcebedfe 100644 // newCNIGuard returns a new instance of CNI guard for the CNI client. diff --git a/agent/utils/license.go b/agent/utils/license.go -index 6eccff6ac..324307cd3 100644 +index 6eccff6..324307c 100644 --- a/agent/utils/license.go +++ b/agent/utils/license.go @@ -24,9 +24,9 @@ type LicenseProvider interface { diff --git a/packages/ecs-agent/0002-bottlerocket-remove-unsupported-capabilities.patch b/packages/ecs-agent/0002-bottlerocket-remove-unsupported-capabilities.patch index 46551e1f95c..7e3bf712da9 100644 --- a/packages/ecs-agent/0002-bottlerocket-remove-unsupported-capabilities.patch +++ b/packages/ecs-agent/0002-bottlerocket-remove-unsupported-capabilities.patch @@ -1,4 +1,4 @@ -From ab4d702e78c1730f96deb7662201630f60b77e8c Mon Sep 17 00:00:00 2001 +From 331c76247d4c4c0f8fb968e21db85e28b991b716 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Wed, 1 Dec 2021 19:19:52 +0000 Subject: [PATCH 2/5] bottlerocket: remove unsupported capabilities @@ -8,10 +8,10 @@ Subject: [PATCH 2/5] bottlerocket: remove unsupported capabilities 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/agent/app/agent_capability.go b/agent/app/agent_capability.go -index cc90dc8..a6a5891 100644 +index 5febc49..48cf468 100644 --- a/agent/app/agent_capability.go +++ b/agent/app/agent_capability.go -@@ -231,36 +231,36 @@ func (agent *ecsAgent) capabilities() ([]*ecs.Attribute, error) { +@@ -233,36 +233,36 @@ func (agent *ecsAgent) capabilities() ([]*ecs.Attribute, error) { capabilities = agent.appendPIDAndIPCNamespaceSharingCapabilities(capabilities) // ecs agent version 1.26.0 supports aws-appmesh cni plugin diff --git a/packages/ecs-agent/0003-bottlerocket-bind-introspection-to-localhost.patch b/packages/ecs-agent/0003-bottlerocket-bind-introspection-to-localhost.patch index c79d5bc5703..26612f830f6 100644 --- a/packages/ecs-agent/0003-bottlerocket-bind-introspection-to-localhost.patch +++ b/packages/ecs-agent/0003-bottlerocket-bind-introspection-to-localhost.patch @@ -1,4 +1,4 @@ -From b1b730a48bfb2164b08ffa4a862f2c7621b44b28 Mon Sep 17 00:00:00 2001 +From 709aa50f6cefbb860fdc38894d1d82907444343f Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Fri, 21 Aug 2020 11:07:32 -0700 Subject: [PATCH 3/5] bottlerocket: bind introspection to localhost @@ -8,7 +8,7 @@ Subject: [PATCH 3/5] bottlerocket: bind introspection to localhost 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/handlers/introspection_server_setup.go b/agent/handlers/introspection_server_setup.go -index 3ca0ecc7..b7f70e92 100644 +index 3ca0ecc..b7f70e9 100644 --- a/agent/handlers/introspection_server_setup.go +++ b/agent/handlers/introspection_server_setup.go @@ -88,7 +88,7 @@ func introspectionServerSetup(containerInstanceArn *string, taskEngine handlersu diff --git a/packages/ecs-agent/0004-bottlerocket-remove-unsupported-CNI-plugins.patch b/packages/ecs-agent/0004-bottlerocket-remove-unsupported-CNI-plugins.patch index cf1974be3e9..c973d2aa30f 100644 --- a/packages/ecs-agent/0004-bottlerocket-remove-unsupported-CNI-plugins.patch +++ b/packages/ecs-agent/0004-bottlerocket-remove-unsupported-CNI-plugins.patch @@ -1,4 +1,4 @@ -From 58a3f6b6b64db3054c225e1081d66273a9fc2a2b Mon Sep 17 00:00:00 2001 +From efe908afd97346ff3e3efff87700bb07d46e7e08 Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Fri, 26 Mar 2021 17:05:21 -0700 Subject: [PATCH 4/5] bottlerocket: remove unsupported CNI plugins @@ -9,10 +9,10 @@ Bottlerocket is enabling support for awsvpc mode, but not AppMesh yet. 1 file changed, 1 deletion(-) diff --git a/agent/app/agent_unix.go b/agent/app/agent_unix.go -index 42c947015..917a61ecc 100644 +index 0d8ae66..bc3daed 100644 --- a/agent/app/agent_unix.go +++ b/agent/app/agent_unix.go -@@ -48,7 +48,6 @@ const initPID = 1 +@@ -46,7 +46,6 @@ const initPID = 1 var awsVPCCNIPlugins = []string{ecscni.ECSENIPluginName, ecscni.ECSBridgePluginName, ecscni.ECSIPAMPluginName, diff --git a/packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch b/packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch index f83ab50fbe9..bfc07306e8b 100644 --- a/packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch +++ b/packages/ecs-agent/0005-bottlerocket-fix-procfs-path-on-host.patch @@ -1,4 +1,4 @@ -From a07bc91f65387a0c4472796a9c673e52596a601f Mon Sep 17 00:00:00 2001 +From c8214dc68af21b4ea22c652f3e30caba5fdeef42 Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Fri, 26 Mar 2021 17:48:28 -0700 Subject: [PATCH 5/5] bottlerocket: fix procfs path on host @@ -14,10 +14,10 @@ ECS agent in a container, the ECS agent can directly read the host's 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/ecscni/types_linux.go b/agent/ecscni/types_linux.go -index 06a134f4..3705ad24 100644 +index 2ad6583..118e6aa 100644 --- a/agent/ecscni/types_linux.go +++ b/agent/ecscni/types_linux.go -@@ -39,7 +39,7 @@ const ( +@@ -40,7 +40,7 @@ const ( // ECSBranchENIPluginName is the binary of the branch-eni plugin ECSBranchENIPluginName = "vpc-branch-eni" // NetnsFormat is used to construct the path to cotainer network namespace diff --git a/packages/ecs-agent/0006-bottlerocket-Revert-removing-duplicate-build-tags.patch b/packages/ecs-agent/0006-bottlerocket-Revert-removing-duplicate-build-tags.patch deleted file mode 100644 index 1b14078d5aa..00000000000 --- a/packages/ecs-agent/0006-bottlerocket-Revert-removing-duplicate-build-tags.patch +++ /dev/null @@ -1,3523 +0,0 @@ -From 4f2d5933ef3192983fc4f6c81323488df1286f0d Mon Sep 17 00:00:00 2001 -From: "Sean P. Kelly" -Date: Wed, 1 Dec 2021 19:49:43 +0000 -Subject: [PATCH] bottlerocket: Revert "removing duplicate build tags" - -This reverts commit 225e27c676c7b12a9db20fec46396c00629ad3df. ---- - agent/acs/client/acs_client_test.go | 1 + - agent/acs/client/acs_error_test.go | 1 + - agent/acs/handler/acs_handler_test.go | 1 + - agent/acs/handler/attach_eni_handler_common_test.go | 1 + - agent/acs/handler/attach_instance_eni_handler_test.go | 1 + - agent/acs/handler/attach_task_eni_handler_test.go | 1 + - agent/acs/handler/heartbeat_handler_test.go | 1 + - agent/acs/handler/payload_handler_test.go | 1 + - agent/acs/handler/refresh_credentials_handler_test.go | 1 + - agent/acs/handler/task_manifest_handler_test.go | 1 + - agent/acs/update_handler/updater_test.go | 1 + - agent/api/appmesh/appmesh_test.go | 1 + - agent/api/container/container_test.go | 1 + - agent/api/container/container_unix.go | 1 + - agent/api/container/container_windows.go | 1 + - agent/api/container/container_windows_test.go | 1 + - agent/api/container/containeroverrides_test.go | 1 + - agent/api/container/containertype_test.go | 1 + - agent/api/container/port_binding_test.go | 1 + - agent/api/container/status/containerstatus_test.go | 1 + - agent/api/container/status/managedagentstatus_test.go | 1 + - agent/api/container/transitiondependency_test.go | 1 + - agent/api/container/transport_test.go | 1 + - agent/api/ecsclient/client_test.go | 1 + - agent/api/ecsclient/retry_handler_test.go | 1 + - agent/api/ecsclient/utils_amd64_test.go | 1 + - agent/api/ecsclient/utils_arm64_test.go | 1 + - agent/api/eni/eni_test.go | 1 + - agent/api/eni/eniattachment_test.go | 1 + - agent/api/eni/enistatus_test.go | 1 + - agent/api/statechange_test.go | 1 + - agent/api/task/association_test.go | 1 + - agent/api/task/status/statusmapping_test.go | 1 + - agent/api/task/status/taskstatus_test.go | 1 + - agent/api/task/task_linux.go | 1 + - agent/api/task/task_linux_test.go | 1 + - agent/api/task/task_test.go | 1 + - agent/api/task/task_test_utils.go | 1 + - agent/api/task/task_unsupported.go | 1 + - agent/api/task/task_windows.go | 1 + - agent/api/task/task_windows_test.go | 1 + - agent/api/task/taskvolume_test.go | 1 + - agent/api/task/taskvolume_windows_test.go | 1 + - agent/api/task/types_unmarshal_test.go | 1 + - agent/api/task/util_test.go | 1 + - agent/api/testutils/container_equal_test.go | 1 + - agent/api/testutils/task_equal_test.go | 1 + - agent/app/agent_capability_test.go | 1 + - agent/app/agent_capability_unix.go | 1 + - agent/app/agent_capability_unix_test.go | 1 + - agent/app/agent_capability_unspecified.go | 1 + - agent/app/agent_capability_windows.go | 1 + - agent/app/agent_capability_windows_test.go | 1 + - agent/app/agent_compatibility_linux.go | 1 + - agent/app/agent_compatibility_linux_test.go | 1 + - agent/app/agent_compatibility_unspecified.go | 1 + - agent/app/agent_integ_test.go | 1 + - agent/app/agent_test.go | 1 + - agent/app/agent_unix.go | 1 + - agent/app/agent_unix_test.go | 1 + - agent/app/agent_unspecified.go | 1 + - agent/app/agent_windows.go | 1 + - agent/app/agent_windows_test.go | 1 + - agent/app/data_test.go | 1 + - agent/asm/asm_test.go | 1 + - agent/async/lru_cache_test.go | 1 + - agent/config/conditional_test.go | 1 + - agent/config/config_test.go | 1 + - agent/config/config_unix.go | 1 + - agent/config/config_unix_test.go | 1 + - agent/config/config_windows.go | 1 + - agent/config/config_windows_test.go | 1 + - agent/config/const_linux.go | 1 + - agent/config/const_unknown.go | 1 + - agent/config/const_windows.go | 1 + - agent/config/os_family_windows.go | 1 + - agent/config/os_family_windows_test.go | 1 + - agent/config/parse_linux.go | 1 + - agent/config/parse_unsupported.go | 1 + - agent/config/parse_windows.go | 1 + - agent/config/parse_windows_test.go | 1 + - agent/config/sensitive_test.go | 1 + - agent/config/types_unix.go | 1 + - agent/config/types_windows.go | 1 + - agent/containermetadata/manager_test.go | 1 + - agent/containermetadata/manager_unix_test.go | 1 + - agent/containermetadata/manager_windows_test.go | 1 + - agent/containermetadata/parse_metadata_test.go | 1 + - agent/containermetadata/types_test.go | 1 + - agent/containermetadata/utils_test.go | 1 + - agent/containermetadata/write_metadata_test.go | 1 + - agent/containermetadata/write_metadata_unix.go | 1 + - agent/containermetadata/write_metadata_unix_test.go | 1 + - agent/containermetadata/write_metadata_windows.go | 1 + - agent/containermetadata/write_metadata_windows_test.go | 1 + - agent/credentials/instancecreds/instancecreds_test.go | 1 + - agent/credentials/manager_test.go | 1 + - .../providers/rotating_shared_credentials_provider_test.go | 1 + - agent/data/client_test.go | 1 + - agent/data/container_client_test.go | 1 + - agent/data/eniattachment_client_test.go | 1 + - agent/data/helpers_test.go | 1 + - agent/data/imagestate_client_test.go | 1 + - agent/data/metadata_client_test.go | 1 + - agent/data/task_client_test.go | 1 + - agent/dockerclient/dockerapi/docker_client_test.go | 1 + - agent/dockerclient/dockerapi/docker_events_buffer_test.go | 1 + - agent/dockerclient/dockerapi/errors_test.go | 1 + - .../dockerclient/dockerapi/inactivity_timeout_handler_test.go | 1 + - agent/dockerclient/dockerapi_compare_versions_test.go | 1 + - agent/dockerclient/dockerauth/dockerauth_test.go | 1 + - agent/dockerclient/dockerauth/ecr_test.go | 1 + - agent/dockerclient/sdkclientfactory/sdkclientfactory_test.go | 1 + - .../sdkclientfactory/sdkclientfactory_unix_test.go | 1 + - .../sdkclientfactory/sdkclientfactory_windows_test.go | 1 + - agent/dockerclient/sdkclientfactory/versionsupport_unix.go | 1 + - agent/dockerclient/sdkclientfactory/versionsupport_windows.go | 1 + - agent/ec2/ec2_client_test.go | 1 + - agent/ec2/ec2_metadata_client_test.go | 1 + - agent/ecr/client_test.go | 1 + - agent/ecr/factory_test.go | 1 + - agent/ecscni/namespace_helper_linux.go | 1 + - agent/ecscni/namespace_helper_unsupported.go | 1 + - agent/ecscni/namespace_helper_windows.go | 1 + - agent/ecscni/namespace_helper_windows_test.go | 1 + - agent/ecscni/netconfig_linux.go | 1 + - agent/ecscni/netconfig_windows.go | 1 + - agent/ecscni/netconfig_windows_test.go | 1 + - agent/ecscni/plugin_linux.go | 1 + - agent/ecscni/plugin_linux_test.go | 1 + - agent/ecscni/plugin_test.go | 1 + - agent/ecscni/plugin_unsupported.go | 1 + - agent/ecscni/plugin_windows.go | 1 + - agent/ecscni/plugin_windows_test.go | 1 + - agent/ecscni/types_linux.go | 1 + - agent/ecscni/types_windows.go | 1 + - agent/engine/common_integ_test.go | 1 + - agent/engine/common_unix_integ_test.go | 2 ++ - agent/engine/data_test.go | 1 + - agent/engine/dependencygraph/graph_test.go | 1 + - agent/engine/dependencygraph/graph_unix_test.go | 1 + - agent/engine/docker_image_manager_data_test.go | 1 + - agent/engine/docker_image_manager_integ_test.go | 1 + - agent/engine/docker_image_manager_test.go | 1 + - agent/engine/docker_image_manager_unix_integ_test.go | 1 + - agent/engine/docker_image_manager_windows_integ_test.go | 1 + - agent/engine/docker_task_engine_linux.go | 1 + - agent/engine/docker_task_engine_linux_test.go | 1 + - agent/engine/docker_task_engine_test.go | 1 + - agent/engine/docker_task_engine_unsupported.go | 1 + - agent/engine/docker_task_engine_windows.go | 1 + - agent/engine/docker_task_engine_windows_test.go | 1 + - agent/engine/dockerstate/dockerstate_test.go | 1 + - agent/engine/dockerstate/json_test.go | 1 + - agent/engine/dockerstate/testutils/json_test.go | 1 + - agent/engine/engine_integ_test.go | 1 + - agent/engine/engine_sudo_linux_integ_test.go | 1 + - agent/engine/engine_unix_integ_test.go | 1 + - agent/engine/engine_windows_integ_test.go | 1 + - agent/engine/execcmd/manager_init_task_linux.go | 1 + - agent/engine/execcmd/manager_init_task_linux_test.go | 1 + - agent/engine/execcmd/manager_start_linux.go | 1 + - agent/engine/execcmd/manager_start_linux_test.go | 1 + - agent/engine/execcmd/manager_unsupported.go | 3 ++- - agent/engine/ordering_integ_test.go | 1 + - agent/engine/ordering_integ_unix_test.go | 1 + - agent/engine/ordering_integ_windows_test.go | 1 + - agent/engine/task_manager_data_test.go | 1 + - agent/engine/task_manager_test.go | 1 + - agent/engine/task_manager_unix_test.go | 1 + - agent/eni/iphelperwrapper/iphelper_windows.go | 1 + - agent/eni/iphelperwrapper/iphelper_windows_test.go | 1 + - agent/eni/iphelperwrapper/mibIpInterfaceRow_windows.go | 1 + - agent/eni/netlinkwrapper/netlink_linux.go | 1 + - agent/eni/networkutils/utils_linux.go | 1 + - agent/eni/networkutils/utils_linux_test.go | 1 + - agent/eni/networkutils/utils_windows.go | 1 + - agent/eni/networkutils/utils_windows_test.go | 1 + - agent/eni/pause/error_test.go | 1 + - agent/eni/pause/load_test.go | 1 + - agent/eni/pause/pause_linux.go | 1 + - agent/eni/pause/pause_linux_test.go | 1 + - agent/eni/pause/pause_unsupported.go | 1 + - agent/eni/pause/pause_windows.go | 1 + - agent/eni/udevwrapper/udev_linux.go | 1 + - agent/eni/udevwrapper/udev_unsupported.go | 1 + - agent/eni/watcher/watcher_linux.go | 1 + - agent/eni/watcher/watcher_linux_test.go | 1 + - agent/eni/watcher/watcher_test.go | 1 + - agent/eni/watcher/watcher_unsupported.go | 1 + - agent/eni/watcher/watcher_windows.go | 1 + - agent/eni/watcher/watcher_windows_test.go | 1 + - agent/eventhandler/attachment_handler_test.go | 1 + - agent/eventhandler/handler_test.go | 1 + - agent/eventhandler/task_handler_test.go | 1 + - agent/eventhandler/task_handler_types_test.go | 1 + - agent/eventstream/eventstream_test.go | 1 + - agent/fsx/fsx_test.go | 1 + - agent/gogenerate/awssdk.go | 1 + - agent/gpu/generate_mocks.go | 1 + - agent/gpu/nvidia_gpu_manager_unix.go | 1 + - agent/gpu/nvidia_gpu_manager_unix_test.go | 1 + - agent/handlers/introspection_server_setup_test.go | 1 + - agent/handlers/task_server_setup_test.go | 1 + - agent/handlers/utils/helpers_test.go | 1 + - agent/handlers/v1/license_handler_test.go | 1 + - agent/handlers/v1/response_test.go | 1 + - agent/handlers/v2/response_test.go | 1 + - agent/handlers/v2/stats_response_test.go | 1 + - agent/handlers/v3/response_test.go | 1 + - agent/handlers/v4/response_test.go | 1 + - agent/httpclient/httpclient_test.go | 1 + - agent/logger/audit/audit_log_test.go | 1 + - agent/logger/buffer_pool_test.go | 1 + - agent/logger/eventlog_windows.go | 1 + - agent/logger/format_test.go | 1 + - agent/logger/global_test.go | 1 + - agent/logger/log_init_test.go | 1 + - agent/logger/log_test.go | 1 + - agent/logger/log_unix_test.go | 1 + - agent/logger/log_windows_test.go | 1 + - agent/logger/platform_unix.go | 1 + - agent/logger/structured_logger_test.go | 1 + - agent/metrics/metrics_test.go | 1 + - agent/s3/s3_test.go | 1 + - agent/sighandlers/debug_handler.go | 1 + - agent/sighandlers/debug_handler_windows.go | 1 + - agent/sighandlers/termination_handler_test.go | 1 + - agent/ssm/ssm_test.go | 1 + - agent/statemanager/dependencies/dependencies_windows.go | 1 + - agent/statemanager/helper_unix_test.go | 1 + - agent/statemanager/helper_windows_test.go | 1 + - agent/statemanager/state_manager_test.go | 1 + - agent/statemanager/state_manager_unix.go | 1 + - agent/statemanager/state_manager_unix_test.go | 1 + - agent/statemanager/state_manager_win_test.go | 1 + - agent/statemanager/state_manager_windows.go | 1 + - agent/statemanager/state_manager_windows_test.go | 1 + - agent/stats/common_unix_test.go | 1 + - agent/stats/common_windows_test.go | 1 + - agent/stats/container_test.go | 1 + - agent/stats/engine_integ_test.go | 1 + - agent/stats/engine_test.go | 1 + - agent/stats/engine_unix_integ_test.go | 1 + - agent/stats/engine_unix_test.go | 1 + - agent/stats/queue_test.go | 1 + - agent/stats/task_linux.go | 1 + - agent/stats/task_linux_test.go | 1 + - agent/stats/task_unspecified.go | 1 + - agent/stats/utils_test.go | 1 + - agent/stats/utils_unix.go | 1 + - agent/stats/utils_unix_test.go | 1 + - agent/stats/utils_windows.go | 1 + - agent/stats/utils_windows_test.go | 1 + - agent/taskresource/asmauth/asmauth_test.go | 1 + - agent/taskresource/asmauth/asmauthstatus_test.go | 1 + - agent/taskresource/asmsecret/asmsecret_test.go | 1 + - agent/taskresource/asmsecret/asmsecretstatus_test.go | 1 + - agent/taskresource/cgroup/cgroup.go | 1 + - agent/taskresource/cgroup/cgroup_test.go | 1 + - agent/taskresource/cgroup/cgroup_unsupported.go | 1 + - agent/taskresource/cgroup/cgroupstatus.go | 1 + - agent/taskresource/cgroup/cgroupstatus_test.go | 1 + - agent/taskresource/cgroup/control/cgroup_controller_linux.go | 1 + - .../cgroup/control/cgroup_controller_linux_test.go | 1 + - agent/taskresource/cgroup/control/factory/factory_linux.go | 1 + - .../cgroup/control/factory/generate_mocks_linux.go | 1 + - agent/taskresource/cgroup/control/generate_mocks_linux.go | 1 + - agent/taskresource/cgroup/control/init_linux.go | 1 + - agent/taskresource/cgroup/control/init_linux_test.go | 1 + - agent/taskresource/cgroup/control/types_linux.go | 1 + - .../taskresource/credentialspec/credentialspec_unsupported.go | 1 + - agent/taskresource/credentialspec/credentialspec_windows.go | 1 + - .../taskresource/credentialspec/credentialspec_windows_test.go | 1 + - agent/taskresource/envFiles/envfile_test.go | 1 + - agent/taskresource/envFiles/envfilestatus_test.go | 1 + - agent/taskresource/firelens/firelens_unimplemented.go | 1 + - agent/taskresource/firelens/firelens_unix.go | 1 + - agent/taskresource/firelens/firelens_unix_test.go | 1 + - agent/taskresource/firelens/firelensconfig_unix.go | 1 + - agent/taskresource/firelens/firelensconfig_unix_test.go | 1 + - agent/taskresource/firelens/firelensstatus_test.go | 1 + - agent/taskresource/firelens/json_unix.go | 1 + - agent/taskresource/firelens/json_unix_test.go | 1 + - .../fsxwindowsfileserver/fsxwindowsfileserver_unsupported.go | 1 + - .../fsxwindowsfileserver/fsxwindowsfileserver_windows.go | 1 + - .../fsxwindowsfileserver/fsxwindowsfileserver_windows_test.go | 1 + - .../fsxwindowsfileserver/fsxwindowsfileserverstatus_test.go | 1 + - agent/taskresource/ssmsecret/ssmsecret_test.go | 1 + - agent/taskresource/ssmsecret/ssmsecretstatus_test.go | 1 + - agent/taskresource/types/types_linux_test.go | 1 + - agent/taskresource/types/types_test.go | 1 + - agent/taskresource/types_unix.go | 1 + - agent/taskresource/types_unsupported.go | 1 + - agent/taskresource/types_windows.go | 1 + - agent/taskresource/volume/dockervolume_test.go | 1 + - agent/taskresource/volume/volumestatus_test.go | 1 + - agent/tcs/client/client_test.go | 1 + - agent/tcs/handler/handler_test.go | 1 + - agent/tcs/handler/types_test.go | 1 + - agent/tools.go | 1 + - agent/utils/compare_versions_test.go | 1 + - agent/utils/cpuinfo.go | 1 + - agent/utils/cpuinfo_test.go | 1 + - agent/utils/json_test.go | 1 + - agent/utils/license_test.go | 1 + - agent/utils/nswrapper/ns_linux.go | 1 + - agent/utils/retry/backoff_test.go | 1 + - agent/utils/retry/exponential_backoff_test.go | 1 + - agent/utils/retry/retry_test.go | 1 + - agent/utils/sync/sequential_waitgroup_test.go | 1 + - agent/utils/ticker_test.go | 1 + - agent/utils/utils_linux.go | 1 + - agent/utils/utils_linux_test.go | 1 + - agent/utils/utils_test.go | 1 + - agent/utils/utils_unsupported.go | 1 + - agent/utils/utils_windows.go | 1 + - agent/utils/utils_windows_test.go | 1 + - agent/wsclient/client_test.go | 1 + - 319 files changed, 321 insertions(+), 1 deletion(-) - -diff --git a/agent/acs/client/acs_client_test.go b/agent/acs/client/acs_client_test.go -index 6e56e84f..9efa8abe 100644 ---- a/agent/acs/client/acs_client_test.go -+++ b/agent/acs/client/acs_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/client/acs_error_test.go b/agent/acs/client/acs_error_test.go -index c8c63104..1ba77736 100644 ---- a/agent/acs/client/acs_error_test.go -+++ b/agent/acs/client/acs_error_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/handler/acs_handler_test.go b/agent/acs/handler/acs_handler_test.go -index b086a86a..ed25e268 100644 ---- a/agent/acs/handler/acs_handler_test.go -+++ b/agent/acs/handler/acs_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/handler/attach_eni_handler_common_test.go b/agent/acs/handler/attach_eni_handler_common_test.go -index 6453ebc0..fddbf3f8 100644 ---- a/agent/acs/handler/attach_eni_handler_common_test.go -+++ b/agent/acs/handler/attach_eni_handler_common_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/handler/attach_instance_eni_handler_test.go b/agent/acs/handler/attach_instance_eni_handler_test.go -index 0a51baef..b834eddb 100644 ---- a/agent/acs/handler/attach_instance_eni_handler_test.go -+++ b/agent/acs/handler/attach_instance_eni_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/handler/attach_task_eni_handler_test.go b/agent/acs/handler/attach_task_eni_handler_test.go -index fbe240e7..cdcda4bd 100644 ---- a/agent/acs/handler/attach_task_eni_handler_test.go -+++ b/agent/acs/handler/attach_task_eni_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/handler/heartbeat_handler_test.go b/agent/acs/handler/heartbeat_handler_test.go -index ac3a7eb7..176de61a 100644 ---- a/agent/acs/handler/heartbeat_handler_test.go -+++ b/agent/acs/handler/heartbeat_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/handler/payload_handler_test.go b/agent/acs/handler/payload_handler_test.go -index b265efb9..5f96f911 100644 ---- a/agent/acs/handler/payload_handler_test.go -+++ b/agent/acs/handler/payload_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/handler/refresh_credentials_handler_test.go b/agent/acs/handler/refresh_credentials_handler_test.go -index d7fa8f88..a87df989 100644 ---- a/agent/acs/handler/refresh_credentials_handler_test.go -+++ b/agent/acs/handler/refresh_credentials_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/handler/task_manifest_handler_test.go b/agent/acs/handler/task_manifest_handler_test.go -index 545bb46c..cce4b9c2 100644 ---- a/agent/acs/handler/task_manifest_handler_test.go -+++ b/agent/acs/handler/task_manifest_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/acs/update_handler/updater_test.go b/agent/acs/update_handler/updater_test.go -index adeff445..48d53621 100644 ---- a/agent/acs/update_handler/updater_test.go -+++ b/agent/acs/update_handler/updater_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/appmesh/appmesh_test.go b/agent/api/appmesh/appmesh_test.go -index 846c9036..90614996 100644 ---- a/agent/api/appmesh/appmesh_test.go -+++ b/agent/api/appmesh/appmesh_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/container_test.go b/agent/api/container/container_test.go -index 76d248b1..5aa8f2a7 100644 ---- a/agent/api/container/container_test.go -+++ b/agent/api/container/container_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/container_unix.go b/agent/api/container/container_unix.go -index a105be71..defdaf30 100644 ---- a/agent/api/container/container_unix.go -+++ b/agent/api/container/container_unix.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/container_windows.go b/agent/api/container/container_windows.go -index 3b81dbb5..f481aaab 100644 ---- a/agent/api/container/container_windows.go -+++ b/agent/api/container/container_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/container_windows_test.go b/agent/api/container/container_windows_test.go -index 89aa2f08..669019ad 100644 ---- a/agent/api/container/container_windows_test.go -+++ b/agent/api/container/container_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/containeroverrides_test.go b/agent/api/container/containeroverrides_test.go -index c7479c7d..da40ea00 100644 ---- a/agent/api/container/containeroverrides_test.go -+++ b/agent/api/container/containeroverrides_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/containertype_test.go b/agent/api/container/containertype_test.go -index 41298acf..5681df63 100644 ---- a/agent/api/container/containertype_test.go -+++ b/agent/api/container/containertype_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/port_binding_test.go b/agent/api/container/port_binding_test.go -index 5648e4f0..603490dd 100644 ---- a/agent/api/container/port_binding_test.go -+++ b/agent/api/container/port_binding_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/status/containerstatus_test.go b/agent/api/container/status/containerstatus_test.go -index 10cd9b94..0016f1cf 100644 ---- a/agent/api/container/status/containerstatus_test.go -+++ b/agent/api/container/status/containerstatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/status/managedagentstatus_test.go b/agent/api/container/status/managedagentstatus_test.go -index 15131236..332c11d1 100644 ---- a/agent/api/container/status/managedagentstatus_test.go -+++ b/agent/api/container/status/managedagentstatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/transitiondependency_test.go b/agent/api/container/transitiondependency_test.go -index 093f8dbc..e4466988 100644 ---- a/agent/api/container/transitiondependency_test.go -+++ b/agent/api/container/transitiondependency_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/container/transport_test.go b/agent/api/container/transport_test.go -index 5e230054..2f21240e 100644 ---- a/agent/api/container/transport_test.go -+++ b/agent/api/container/transport_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/ecsclient/client_test.go b/agent/api/ecsclient/client_test.go -index 2457c809..5060ae60 100644 ---- a/agent/api/ecsclient/client_test.go -+++ b/agent/api/ecsclient/client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/ecsclient/retry_handler_test.go b/agent/api/ecsclient/retry_handler_test.go -index 24f523a0..2194355f 100644 ---- a/agent/api/ecsclient/retry_handler_test.go -+++ b/agent/api/ecsclient/retry_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/ecsclient/utils_amd64_test.go b/agent/api/ecsclient/utils_amd64_test.go -index 7ecd0e2b..5bb95300 100644 ---- a/agent/api/ecsclient/utils_amd64_test.go -+++ b/agent/api/ecsclient/utils_amd64_test.go -@@ -1,4 +1,5 @@ - //go:build amd64 && unit -+// +build amd64,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/ecsclient/utils_arm64_test.go b/agent/api/ecsclient/utils_arm64_test.go -index 37d680ad..1a46f134 100644 ---- a/agent/api/ecsclient/utils_arm64_test.go -+++ b/agent/api/ecsclient/utils_arm64_test.go -@@ -1,4 +1,5 @@ - //go:build arm64 && unit -+// +build arm64,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/eni/eni_test.go b/agent/api/eni/eni_test.go -index 11b4a3fe..2ed2f0b3 100644 ---- a/agent/api/eni/eni_test.go -+++ b/agent/api/eni/eni_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/eni/eniattachment_test.go b/agent/api/eni/eniattachment_test.go -index 4c188fd5..6f46caec 100644 ---- a/agent/api/eni/eniattachment_test.go -+++ b/agent/api/eni/eniattachment_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/eni/enistatus_test.go b/agent/api/eni/enistatus_test.go -index c76acc3b..1f42345a 100644 ---- a/agent/api/eni/enistatus_test.go -+++ b/agent/api/eni/enistatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/statechange_test.go b/agent/api/statechange_test.go -index 72ed57f0..42657e16 100644 ---- a/agent/api/statechange_test.go -+++ b/agent/api/statechange_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/association_test.go b/agent/api/task/association_test.go -index a3056eae..0544af0a 100644 ---- a/agent/api/task/association_test.go -+++ b/agent/api/task/association_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/status/statusmapping_test.go b/agent/api/task/status/statusmapping_test.go -index a4f345f3..0d5c757b 100644 ---- a/agent/api/task/status/statusmapping_test.go -+++ b/agent/api/task/status/statusmapping_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/status/taskstatus_test.go b/agent/api/task/status/taskstatus_test.go -index 270223be..4a993858 100644 ---- a/agent/api/task/status/taskstatus_test.go -+++ b/agent/api/task/status/taskstatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/task_linux.go b/agent/api/task/task_linux.go -index 40016268..b3bd47a7 100644 ---- a/agent/api/task/task_linux.go -+++ b/agent/api/task/task_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/task_linux_test.go b/agent/api/task/task_linux_test.go -index a241ee5d..de1c38e9 100644 ---- a/agent/api/task/task_linux_test.go -+++ b/agent/api/task/task_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/task_test.go b/agent/api/task/task_test.go -index bc80206e..b7eaa320 100644 ---- a/agent/api/task/task_test.go -+++ b/agent/api/task/task_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/task_test_utils.go b/agent/api/task/task_test_utils.go -index 66707a2b..d8c3ec97 100644 ---- a/agent/api/task/task_test_utils.go -+++ b/agent/api/task/task_test_utils.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/task_unsupported.go b/agent/api/task/task_unsupported.go -index 33c3636e..8ea6cb31 100644 ---- a/agent/api/task/task_unsupported.go -+++ b/agent/api/task/task_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/task_windows.go b/agent/api/task/task_windows.go -index 766a4855..178049da 100644 ---- a/agent/api/task/task_windows.go -+++ b/agent/api/task/task_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/task_windows_test.go b/agent/api/task/task_windows_test.go -index cde35b42..78e8122f 100644 ---- a/agent/api/task/task_windows_test.go -+++ b/agent/api/task/task_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/taskvolume_test.go b/agent/api/task/taskvolume_test.go -index dac7a2bf..737dd8e1 100644 ---- a/agent/api/task/taskvolume_test.go -+++ b/agent/api/task/taskvolume_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/taskvolume_windows_test.go b/agent/api/task/taskvolume_windows_test.go -index b85bcb44..2d02669b 100644 ---- a/agent/api/task/taskvolume_windows_test.go -+++ b/agent/api/task/taskvolume_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/types_unmarshal_test.go b/agent/api/task/types_unmarshal_test.go -index 04890be8..bd2c3d06 100644 ---- a/agent/api/task/types_unmarshal_test.go -+++ b/agent/api/task/types_unmarshal_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/task/util_test.go b/agent/api/task/util_test.go -index 1b17240e..8c440971 100644 ---- a/agent/api/task/util_test.go -+++ b/agent/api/task/util_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/testutils/container_equal_test.go b/agent/api/testutils/container_equal_test.go -index b1162560..5e7a90e5 100644 ---- a/agent/api/testutils/container_equal_test.go -+++ b/agent/api/testutils/container_equal_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/api/testutils/task_equal_test.go b/agent/api/testutils/task_equal_test.go -index 069e583e..68300334 100644 ---- a/agent/api/testutils/task_equal_test.go -+++ b/agent/api/testutils/task_equal_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_capability_test.go b/agent/app/agent_capability_test.go -index 0753f391..a0e558e6 100644 ---- a/agent/app/agent_capability_test.go -+++ b/agent/app/agent_capability_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_capability_unix.go b/agent/app/agent_capability_unix.go -index b7fed896..f7c2b318 100644 ---- a/agent/app/agent_capability_unix.go -+++ b/agent/app/agent_capability_unix.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_capability_unix_test.go b/agent/app/agent_capability_unix_test.go -index 98f281d7..fc476506 100644 ---- a/agent/app/agent_capability_unix_test.go -+++ b/agent/app/agent_capability_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_capability_unspecified.go b/agent/app/agent_capability_unspecified.go -index 28cfb80d..de0c37f8 100644 ---- a/agent/app/agent_capability_unspecified.go -+++ b/agent/app/agent_capability_unspecified.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_capability_windows.go b/agent/app/agent_capability_windows.go -index 99225922..749b0c3a 100644 ---- a/agent/app/agent_capability_windows.go -+++ b/agent/app/agent_capability_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_capability_windows_test.go b/agent/app/agent_capability_windows_test.go -index 747a4db3..c5568537 100644 ---- a/agent/app/agent_capability_windows_test.go -+++ b/agent/app/agent_capability_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_compatibility_linux.go b/agent/app/agent_compatibility_linux.go -index 4c493ff1..716b91f8 100644 ---- a/agent/app/agent_compatibility_linux.go -+++ b/agent/app/agent_compatibility_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_compatibility_linux_test.go b/agent/app/agent_compatibility_linux_test.go -index f20c4af0..d1ef20e9 100644 ---- a/agent/app/agent_compatibility_linux_test.go -+++ b/agent/app/agent_compatibility_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_compatibility_unspecified.go b/agent/app/agent_compatibility_unspecified.go -index dce18e76..0911e725 100644 ---- a/agent/app/agent_compatibility_unspecified.go -+++ b/agent/app/agent_compatibility_unspecified.go -@@ -1,4 +1,5 @@ - //go:build !linux -+// +build !linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_integ_test.go b/agent/app/agent_integ_test.go -index a158a739..416b1077 100644 ---- a/agent/app/agent_integ_test.go -+++ b/agent/app/agent_integ_test.go -@@ -1,4 +1,5 @@ - //go:build integration -+// +build integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_test.go b/agent/app/agent_test.go -index e12cecad..b8ae1ed0 100644 ---- a/agent/app/agent_test.go -+++ b/agent/app/agent_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_unix.go b/agent/app/agent_unix.go -index 9dda0d1b..8858bcee 100644 ---- a/agent/app/agent_unix.go -+++ b/agent/app/agent_unix.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_unix_test.go b/agent/app/agent_unix_test.go -index 25933a72..e67d49f3 100644 ---- a/agent/app/agent_unix_test.go -+++ b/agent/app/agent_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_unspecified.go b/agent/app/agent_unspecified.go -index 34bf5d35..876bfefd 100644 ---- a/agent/app/agent_unspecified.go -+++ b/agent/app/agent_unspecified.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_windows.go b/agent/app/agent_windows.go -index 5f1421e5..673736a1 100644 ---- a/agent/app/agent_windows.go -+++ b/agent/app/agent_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/agent_windows_test.go b/agent/app/agent_windows_test.go -index 55952d01..fa71c244 100644 ---- a/agent/app/agent_windows_test.go -+++ b/agent/app/agent_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/app/data_test.go b/agent/app/data_test.go -index d201f49e..db9c88be 100644 ---- a/agent/app/data_test.go -+++ b/agent/app/data_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/asm/asm_test.go b/agent/asm/asm_test.go -index d3e18bfd..95bb3cfc 100644 ---- a/agent/asm/asm_test.go -+++ b/agent/asm/asm_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/async/lru_cache_test.go b/agent/async/lru_cache_test.go -index 12591307..7e863acd 100644 ---- a/agent/async/lru_cache_test.go -+++ b/agent/async/lru_cache_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/conditional_test.go b/agent/config/conditional_test.go -index 601bf94e..e9cda03b 100644 ---- a/agent/config/conditional_test.go -+++ b/agent/config/conditional_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/config_test.go b/agent/config/config_test.go -index 1664cf17..ca267eac 100644 ---- a/agent/config/config_test.go -+++ b/agent/config/config_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/config_unix.go b/agent/config/config_unix.go -index 506c67f7..f70efc0d 100644 ---- a/agent/config/config_unix.go -+++ b/agent/config/config_unix.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/config_unix_test.go b/agent/config/config_unix_test.go -index d39a0966..e35d9bbf 100644 ---- a/agent/config/config_unix_test.go -+++ b/agent/config/config_unix_test.go -@@ -1,4 +1,5 @@ - //go:build !windows && unit -+// +build !windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/config_windows.go b/agent/config/config_windows.go -index 181c9545..d35ec960 100644 ---- a/agent/config/config_windows.go -+++ b/agent/config/config_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/config_windows_test.go b/agent/config/config_windows_test.go -index f4ad9898..f2c4a323 100644 ---- a/agent/config/config_windows_test.go -+++ b/agent/config/config_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/const_linux.go b/agent/config/const_linux.go -index 2b9289e1..1ea8885b 100644 ---- a/agent/config/const_linux.go -+++ b/agent/config/const_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/const_unknown.go b/agent/config/const_unknown.go -index 37f31d03..53841f47 100644 ---- a/agent/config/const_unknown.go -+++ b/agent/config/const_unknown.go -@@ -1,4 +1,5 @@ - //go:build !windows && !linux -+// +build !windows,!linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/const_windows.go b/agent/config/const_windows.go -index 71ab60ce..3606476f 100644 ---- a/agent/config/const_windows.go -+++ b/agent/config/const_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/os_family_windows.go b/agent/config/os_family_windows.go -index 5bc773a7..d7b2218d 100644 ---- a/agent/config/os_family_windows.go -+++ b/agent/config/os_family_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/os_family_windows_test.go b/agent/config/os_family_windows_test.go -index 68e14f16..9b6208cd 100644 ---- a/agent/config/os_family_windows_test.go -+++ b/agent/config/os_family_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/parse_linux.go b/agent/config/parse_linux.go -index 255163de..5ab45d3c 100644 ---- a/agent/config/parse_linux.go -+++ b/agent/config/parse_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/parse_unsupported.go b/agent/config/parse_unsupported.go -index 732fae35..45d71156 100644 ---- a/agent/config/parse_unsupported.go -+++ b/agent/config/parse_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/parse_windows.go b/agent/config/parse_windows.go -index fbdc2ade..6040cb5d 100644 ---- a/agent/config/parse_windows.go -+++ b/agent/config/parse_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/parse_windows_test.go b/agent/config/parse_windows_test.go -index 618ae726..d4604840 100644 ---- a/agent/config/parse_windows_test.go -+++ b/agent/config/parse_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/sensitive_test.go b/agent/config/sensitive_test.go -index a5c00fe6..f0f13b2a 100644 ---- a/agent/config/sensitive_test.go -+++ b/agent/config/sensitive_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/types_unix.go b/agent/config/types_unix.go -index 887e35ea..164fa4aa 100644 ---- a/agent/config/types_unix.go -+++ b/agent/config/types_unix.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/config/types_windows.go b/agent/config/types_windows.go -index 90ca8b25..df04eeda 100644 ---- a/agent/config/types_windows.go -+++ b/agent/config/types_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/manager_test.go b/agent/containermetadata/manager_test.go -index cfb1f7b1..737dbf55 100644 ---- a/agent/containermetadata/manager_test.go -+++ b/agent/containermetadata/manager_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/manager_unix_test.go b/agent/containermetadata/manager_unix_test.go -index 2c787e40..ad3399cc 100644 ---- a/agent/containermetadata/manager_unix_test.go -+++ b/agent/containermetadata/manager_unix_test.go -@@ -1,4 +1,5 @@ - //go:build unit && !windows -+// +build unit,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/manager_windows_test.go b/agent/containermetadata/manager_windows_test.go -index 8174b4a0..296f5621 100644 ---- a/agent/containermetadata/manager_windows_test.go -+++ b/agent/containermetadata/manager_windows_test.go -@@ -1,4 +1,5 @@ - //go:build unit && windows -+// +build unit,windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/parse_metadata_test.go b/agent/containermetadata/parse_metadata_test.go -index 73770de9..7a3357f7 100644 ---- a/agent/containermetadata/parse_metadata_test.go -+++ b/agent/containermetadata/parse_metadata_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/types_test.go b/agent/containermetadata/types_test.go -index 12b25486..5aebbd84 100644 ---- a/agent/containermetadata/types_test.go -+++ b/agent/containermetadata/types_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/utils_test.go b/agent/containermetadata/utils_test.go -index dba39d36..df3ad60c 100644 ---- a/agent/containermetadata/utils_test.go -+++ b/agent/containermetadata/utils_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/write_metadata_test.go b/agent/containermetadata/write_metadata_test.go -index b3ab5e0b..adeeb1c8 100644 ---- a/agent/containermetadata/write_metadata_test.go -+++ b/agent/containermetadata/write_metadata_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/write_metadata_unix.go b/agent/containermetadata/write_metadata_unix.go -index d3b32dde..1c9e7990 100644 ---- a/agent/containermetadata/write_metadata_unix.go -+++ b/agent/containermetadata/write_metadata_unix.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/write_metadata_unix_test.go b/agent/containermetadata/write_metadata_unix_test.go -index 9603e71f..5d6eb54e 100644 ---- a/agent/containermetadata/write_metadata_unix_test.go -+++ b/agent/containermetadata/write_metadata_unix_test.go -@@ -1,4 +1,5 @@ - //go:build unit && !windows -+// +build unit,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/write_metadata_windows.go b/agent/containermetadata/write_metadata_windows.go -index 357ff630..85efa3c6 100644 ---- a/agent/containermetadata/write_metadata_windows.go -+++ b/agent/containermetadata/write_metadata_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/containermetadata/write_metadata_windows_test.go b/agent/containermetadata/write_metadata_windows_test.go -index 2e86c31b..3a906b3d 100644 ---- a/agent/containermetadata/write_metadata_windows_test.go -+++ b/agent/containermetadata/write_metadata_windows_test.go -@@ -1,4 +1,5 @@ - //go:build unit && windows -+// +build unit,windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/credentials/instancecreds/instancecreds_test.go b/agent/credentials/instancecreds/instancecreds_test.go -index 4c4f6428..7632faa2 100644 ---- a/agent/credentials/instancecreds/instancecreds_test.go -+++ b/agent/credentials/instancecreds/instancecreds_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/credentials/manager_test.go b/agent/credentials/manager_test.go -index b30284c0..40f3ca75 100644 ---- a/agent/credentials/manager_test.go -+++ b/agent/credentials/manager_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/credentials/providers/rotating_shared_credentials_provider_test.go b/agent/credentials/providers/rotating_shared_credentials_provider_test.go -index 404701cf..246adc66 100644 ---- a/agent/credentials/providers/rotating_shared_credentials_provider_test.go -+++ b/agent/credentials/providers/rotating_shared_credentials_provider_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/data/client_test.go b/agent/data/client_test.go -index 27b8a399..ab5d0d91 100644 ---- a/agent/data/client_test.go -+++ b/agent/data/client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/data/container_client_test.go b/agent/data/container_client_test.go -index 9d1c325c..cd11908a 100644 ---- a/agent/data/container_client_test.go -+++ b/agent/data/container_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/data/eniattachment_client_test.go b/agent/data/eniattachment_client_test.go -index 58fbd80a..cac248e8 100644 ---- a/agent/data/eniattachment_client_test.go -+++ b/agent/data/eniattachment_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/data/helpers_test.go b/agent/data/helpers_test.go -index efae4878..fad4799a 100644 ---- a/agent/data/helpers_test.go -+++ b/agent/data/helpers_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/data/imagestate_client_test.go b/agent/data/imagestate_client_test.go -index c5ddaacb..69619131 100644 ---- a/agent/data/imagestate_client_test.go -+++ b/agent/data/imagestate_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/data/metadata_client_test.go b/agent/data/metadata_client_test.go -index 6d5b3272..f9a6b754 100644 ---- a/agent/data/metadata_client_test.go -+++ b/agent/data/metadata_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/data/task_client_test.go b/agent/data/task_client_test.go -index 5134b1ed..6d727827 100644 ---- a/agent/data/task_client_test.go -+++ b/agent/data/task_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/dockerapi/docker_client_test.go b/agent/dockerclient/dockerapi/docker_client_test.go -index 5f9c7676..6375d607 100644 ---- a/agent/dockerclient/dockerapi/docker_client_test.go -+++ b/agent/dockerclient/dockerapi/docker_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/dockerapi/docker_events_buffer_test.go b/agent/dockerclient/dockerapi/docker_events_buffer_test.go -index 1f9042fd..4ca0003f 100644 ---- a/agent/dockerclient/dockerapi/docker_events_buffer_test.go -+++ b/agent/dockerclient/dockerapi/docker_events_buffer_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/dockerapi/errors_test.go b/agent/dockerclient/dockerapi/errors_test.go -index 6aa59375..1bdd65a1 100644 ---- a/agent/dockerclient/dockerapi/errors_test.go -+++ b/agent/dockerclient/dockerapi/errors_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/dockerapi/inactivity_timeout_handler_test.go b/agent/dockerclient/dockerapi/inactivity_timeout_handler_test.go -index 4fb9e5b2..eaea8ec1 100644 ---- a/agent/dockerclient/dockerapi/inactivity_timeout_handler_test.go -+++ b/agent/dockerclient/dockerapi/inactivity_timeout_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/dockerapi_compare_versions_test.go b/agent/dockerclient/dockerapi_compare_versions_test.go -index 792e4b94..46e077ef 100644 ---- a/agent/dockerclient/dockerapi_compare_versions_test.go -+++ b/agent/dockerclient/dockerapi_compare_versions_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/dockerauth/dockerauth_test.go b/agent/dockerclient/dockerauth/dockerauth_test.go -index f8fa5072..f1d9fb01 100644 ---- a/agent/dockerclient/dockerauth/dockerauth_test.go -+++ b/agent/dockerclient/dockerauth/dockerauth_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/dockerauth/ecr_test.go b/agent/dockerclient/dockerauth/ecr_test.go -index 2f6ca978..d394421d 100644 ---- a/agent/dockerclient/dockerauth/ecr_test.go -+++ b/agent/dockerclient/dockerauth/ecr_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/sdkclientfactory/sdkclientfactory_test.go b/agent/dockerclient/sdkclientfactory/sdkclientfactory_test.go -index e983af5f..bc6664d6 100644 ---- a/agent/dockerclient/sdkclientfactory/sdkclientfactory_test.go -+++ b/agent/dockerclient/sdkclientfactory/sdkclientfactory_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/sdkclientfactory/sdkclientfactory_unix_test.go b/agent/dockerclient/sdkclientfactory/sdkclientfactory_unix_test.go -index 82d4732f..4c88e871 100644 ---- a/agent/dockerclient/sdkclientfactory/sdkclientfactory_unix_test.go -+++ b/agent/dockerclient/sdkclientfactory/sdkclientfactory_unix_test.go -@@ -1,4 +1,5 @@ - //go:build unit && !windows -+// +build unit,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/sdkclientfactory/sdkclientfactory_windows_test.go b/agent/dockerclient/sdkclientfactory/sdkclientfactory_windows_test.go -index 3c0effd4..23aba519 100644 ---- a/agent/dockerclient/sdkclientfactory/sdkclientfactory_windows_test.go -+++ b/agent/dockerclient/sdkclientfactory/sdkclientfactory_windows_test.go -@@ -1,4 +1,5 @@ - //go:build unit && windows -+// +build unit,windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/sdkclientfactory/versionsupport_unix.go b/agent/dockerclient/sdkclientfactory/versionsupport_unix.go -index 884dc94c..9117a7d7 100644 ---- a/agent/dockerclient/sdkclientfactory/versionsupport_unix.go -+++ b/agent/dockerclient/sdkclientfactory/versionsupport_unix.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/dockerclient/sdkclientfactory/versionsupport_windows.go b/agent/dockerclient/sdkclientfactory/versionsupport_windows.go -index 5857b085..afc83054 100644 ---- a/agent/dockerclient/sdkclientfactory/versionsupport_windows.go -+++ b/agent/dockerclient/sdkclientfactory/versionsupport_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ec2/ec2_client_test.go b/agent/ec2/ec2_client_test.go -index 089b487a..00ed5d5c 100644 ---- a/agent/ec2/ec2_client_test.go -+++ b/agent/ec2/ec2_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ec2/ec2_metadata_client_test.go b/agent/ec2/ec2_metadata_client_test.go -index ed87ad10..d583e368 100644 ---- a/agent/ec2/ec2_metadata_client_test.go -+++ b/agent/ec2/ec2_metadata_client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecr/client_test.go b/agent/ecr/client_test.go -index d56d8332..17e729b6 100644 ---- a/agent/ecr/client_test.go -+++ b/agent/ecr/client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecr/factory_test.go b/agent/ecr/factory_test.go -index 5eac709a..324ec90e 100644 ---- a/agent/ecr/factory_test.go -+++ b/agent/ecr/factory_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/namespace_helper_linux.go b/agent/ecscni/namespace_helper_linux.go -index ff508cfd..7f4479ef 100644 ---- a/agent/ecscni/namespace_helper_linux.go -+++ b/agent/ecscni/namespace_helper_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/namespace_helper_unsupported.go b/agent/ecscni/namespace_helper_unsupported.go -index 19d5666d..bc10fce1 100644 ---- a/agent/ecscni/namespace_helper_unsupported.go -+++ b/agent/ecscni/namespace_helper_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/namespace_helper_windows.go b/agent/ecscni/namespace_helper_windows.go -index 763dcc4a..a552e148 100644 ---- a/agent/ecscni/namespace_helper_windows.go -+++ b/agent/ecscni/namespace_helper_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/namespace_helper_windows_test.go b/agent/ecscni/namespace_helper_windows_test.go -index 8d430017..a777d39a 100644 ---- a/agent/ecscni/namespace_helper_windows_test.go -+++ b/agent/ecscni/namespace_helper_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/netconfig_linux.go b/agent/ecscni/netconfig_linux.go -index b9596d97..283e8a68 100644 ---- a/agent/ecscni/netconfig_linux.go -+++ b/agent/ecscni/netconfig_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/netconfig_windows.go b/agent/ecscni/netconfig_windows.go -index 2949379f..4d266d7e 100644 ---- a/agent/ecscni/netconfig_windows.go -+++ b/agent/ecscni/netconfig_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/netconfig_windows_test.go b/agent/ecscni/netconfig_windows_test.go -index 86a35953..4f81fa9b 100644 ---- a/agent/ecscni/netconfig_windows_test.go -+++ b/agent/ecscni/netconfig_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/plugin_linux.go b/agent/ecscni/plugin_linux.go -index df9f86c8..aa56d0a6 100644 ---- a/agent/ecscni/plugin_linux.go -+++ b/agent/ecscni/plugin_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/plugin_linux_test.go b/agent/ecscni/plugin_linux_test.go -index e7744fa6..be2e0efc 100644 ---- a/agent/ecscni/plugin_linux_test.go -+++ b/agent/ecscni/plugin_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/plugin_test.go b/agent/ecscni/plugin_test.go -index 963b5eeb..764220f3 100644 ---- a/agent/ecscni/plugin_test.go -+++ b/agent/ecscni/plugin_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/plugin_unsupported.go b/agent/ecscni/plugin_unsupported.go -index 67b2ba87..e156b75c 100644 ---- a/agent/ecscni/plugin_unsupported.go -+++ b/agent/ecscni/plugin_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/plugin_windows.go b/agent/ecscni/plugin_windows.go -index 948715e9..4aed39d1 100644 ---- a/agent/ecscni/plugin_windows.go -+++ b/agent/ecscni/plugin_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/plugin_windows_test.go b/agent/ecscni/plugin_windows_test.go -index e82541f7..04420ba7 100644 ---- a/agent/ecscni/plugin_windows_test.go -+++ b/agent/ecscni/plugin_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/types_linux.go b/agent/ecscni/types_linux.go -index 1a07be23..2ad65834 100644 ---- a/agent/ecscni/types_linux.go -+++ b/agent/ecscni/types_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ecscni/types_windows.go b/agent/ecscni/types_windows.go -index 61871805..4a2218f2 100644 ---- a/agent/ecscni/types_windows.go -+++ b/agent/ecscni/types_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/common_integ_test.go b/agent/engine/common_integ_test.go -index 1e6b65ec..73d9c7e4 100644 ---- a/agent/engine/common_integ_test.go -+++ b/agent/engine/common_integ_test.go -@@ -1,4 +1,5 @@ - //go:build sudo || integration -+// +build sudo integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/common_unix_integ_test.go b/agent/engine/common_unix_integ_test.go -index 53d81706..0b83295f 100644 ---- a/agent/engine/common_unix_integ_test.go -+++ b/agent/engine/common_unix_integ_test.go -@@ -1,4 +1,6 @@ - //go:build linux && (sudo || integration) -+// +build linux -+// +build sudo integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/data_test.go b/agent/engine/data_test.go -index 7b29e975..049c190d 100644 ---- a/agent/engine/data_test.go -+++ b/agent/engine/data_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/dependencygraph/graph_test.go b/agent/engine/dependencygraph/graph_test.go -index bf3fad7a..af6d8d21 100644 ---- a/agent/engine/dependencygraph/graph_test.go -+++ b/agent/engine/dependencygraph/graph_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/dependencygraph/graph_unix_test.go b/agent/engine/dependencygraph/graph_unix_test.go -index b777d4be..0c173e59 100644 ---- a/agent/engine/dependencygraph/graph_unix_test.go -+++ b/agent/engine/dependencygraph/graph_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_image_manager_data_test.go b/agent/engine/docker_image_manager_data_test.go -index 05354ec8..d322d52f 100644 ---- a/agent/engine/docker_image_manager_data_test.go -+++ b/agent/engine/docker_image_manager_data_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_image_manager_integ_test.go b/agent/engine/docker_image_manager_integ_test.go -index 1cd64a07..bea1debe 100644 ---- a/agent/engine/docker_image_manager_integ_test.go -+++ b/agent/engine/docker_image_manager_integ_test.go -@@ -1,4 +1,5 @@ - //go:build integration -+// +build integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_image_manager_test.go b/agent/engine/docker_image_manager_test.go -index 06662ea9..91ca9a9e 100644 ---- a/agent/engine/docker_image_manager_test.go -+++ b/agent/engine/docker_image_manager_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_image_manager_unix_integ_test.go b/agent/engine/docker_image_manager_unix_integ_test.go -index 849b9127..b9871ebb 100644 ---- a/agent/engine/docker_image_manager_unix_integ_test.go -+++ b/agent/engine/docker_image_manager_unix_integ_test.go -@@ -1,4 +1,5 @@ - //go:build !windows && integration -+// +build !windows,integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_image_manager_windows_integ_test.go b/agent/engine/docker_image_manager_windows_integ_test.go -index cade2206..77a53c7c 100644 ---- a/agent/engine/docker_image_manager_windows_integ_test.go -+++ b/agent/engine/docker_image_manager_windows_integ_test.go -@@ -1,4 +1,5 @@ - //go:build windows && integration -+// +build windows,integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_task_engine_linux.go b/agent/engine/docker_task_engine_linux.go -index 1d27300f..56298a6b 100644 ---- a/agent/engine/docker_task_engine_linux.go -+++ b/agent/engine/docker_task_engine_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_task_engine_linux_test.go b/agent/engine/docker_task_engine_linux_test.go -index 120eae89..37e912e2 100644 ---- a/agent/engine/docker_task_engine_linux_test.go -+++ b/agent/engine/docker_task_engine_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_task_engine_test.go b/agent/engine/docker_task_engine_test.go -index 86f9980d..22abbdec 100644 ---- a/agent/engine/docker_task_engine_test.go -+++ b/agent/engine/docker_task_engine_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_task_engine_unsupported.go b/agent/engine/docker_task_engine_unsupported.go -index cebf2985..c59db83f 100644 ---- a/agent/engine/docker_task_engine_unsupported.go -+++ b/agent/engine/docker_task_engine_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_task_engine_windows.go b/agent/engine/docker_task_engine_windows.go -index 1e64df89..2c11a08d 100644 ---- a/agent/engine/docker_task_engine_windows.go -+++ b/agent/engine/docker_task_engine_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/docker_task_engine_windows_test.go b/agent/engine/docker_task_engine_windows_test.go -index e11e7e67..4adbe809 100644 ---- a/agent/engine/docker_task_engine_windows_test.go -+++ b/agent/engine/docker_task_engine_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/dockerstate/dockerstate_test.go b/agent/engine/dockerstate/dockerstate_test.go -index fc5c94d5..7fe6a5ba 100644 ---- a/agent/engine/dockerstate/dockerstate_test.go -+++ b/agent/engine/dockerstate/dockerstate_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/dockerstate/json_test.go b/agent/engine/dockerstate/json_test.go -index 7a1f26ee..c584c357 100644 ---- a/agent/engine/dockerstate/json_test.go -+++ b/agent/engine/dockerstate/json_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/dockerstate/testutils/json_test.go b/agent/engine/dockerstate/testutils/json_test.go -index adeb0fa1..158eb2a2 100644 ---- a/agent/engine/dockerstate/testutils/json_test.go -+++ b/agent/engine/dockerstate/testutils/json_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/engine_integ_test.go b/agent/engine/engine_integ_test.go -index b6d543a2..09d4b384 100644 ---- a/agent/engine/engine_integ_test.go -+++ b/agent/engine/engine_integ_test.go -@@ -1,4 +1,5 @@ - //go:build integration -+// +build integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/engine_sudo_linux_integ_test.go b/agent/engine/engine_sudo_linux_integ_test.go -index 2eec610d..ef735ecc 100644 ---- a/agent/engine/engine_sudo_linux_integ_test.go -+++ b/agent/engine/engine_sudo_linux_integ_test.go -@@ -1,4 +1,5 @@ - //go:build linux && sudo -+// +build linux,sudo - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/engine_unix_integ_test.go b/agent/engine/engine_unix_integ_test.go -index 9aa7a25e..4e771f3e 100644 ---- a/agent/engine/engine_unix_integ_test.go -+++ b/agent/engine/engine_unix_integ_test.go -@@ -1,4 +1,5 @@ - //go:build !windows && integration -+// +build !windows,integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/engine_windows_integ_test.go b/agent/engine/engine_windows_integ_test.go -index 59bae72a..4f263505 100644 ---- a/agent/engine/engine_windows_integ_test.go -+++ b/agent/engine/engine_windows_integ_test.go -@@ -1,4 +1,5 @@ - //go:build windows && integration -+// +build windows,integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_init_task_linux.go b/agent/engine/execcmd/manager_init_task_linux.go -index 6398bf9b..05af1582 100644 ---- a/agent/engine/execcmd/manager_init_task_linux.go -+++ b/agent/engine/execcmd/manager_init_task_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_init_task_linux_test.go b/agent/engine/execcmd/manager_init_task_linux_test.go -index cb242d99..564e58ba 100644 ---- a/agent/engine/execcmd/manager_init_task_linux_test.go -+++ b/agent/engine/execcmd/manager_init_task_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_start_linux.go b/agent/engine/execcmd/manager_start_linux.go -index b98634c8..774c3435 100644 ---- a/agent/engine/execcmd/manager_start_linux.go -+++ b/agent/engine/execcmd/manager_start_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_start_linux_test.go b/agent/engine/execcmd/manager_start_linux_test.go -index 2613f9ab..061617a6 100644 ---- a/agent/engine/execcmd/manager_start_linux_test.go -+++ b/agent/engine/execcmd/manager_start_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_unsupported.go b/agent/engine/execcmd/manager_unsupported.go -index 4a8124c3..2ec46aca 100644 ---- a/agent/engine/execcmd/manager_unsupported.go -+++ b/agent/engine/execcmd/manager_unsupported.go -@@ -1,4 +1,5 @@ --//go:build !linux && !windows -+//go:build !linux -+// +build !linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/ordering_integ_test.go b/agent/engine/ordering_integ_test.go -index 25e787e3..31162998 100644 ---- a/agent/engine/ordering_integ_test.go -+++ b/agent/engine/ordering_integ_test.go -@@ -1,4 +1,5 @@ - //go:build integration -+// +build integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/ordering_integ_unix_test.go b/agent/engine/ordering_integ_unix_test.go -index 2f8d0a2b..1878e4bd 100644 ---- a/agent/engine/ordering_integ_unix_test.go -+++ b/agent/engine/ordering_integ_unix_test.go -@@ -1,4 +1,5 @@ - //go:build integration && !windows -+// +build integration,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/ordering_integ_windows_test.go b/agent/engine/ordering_integ_windows_test.go -index 89a1515c..b411c377 100644 ---- a/agent/engine/ordering_integ_windows_test.go -+++ b/agent/engine/ordering_integ_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && integration -+// +build windows,integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/task_manager_data_test.go b/agent/engine/task_manager_data_test.go -index a60ebaa6..f6726d7b 100644 ---- a/agent/engine/task_manager_data_test.go -+++ b/agent/engine/task_manager_data_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/task_manager_test.go b/agent/engine/task_manager_test.go -index 1ab79ddf..4b4f0838 100644 ---- a/agent/engine/task_manager_test.go -+++ b/agent/engine/task_manager_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/task_manager_unix_test.go b/agent/engine/task_manager_unix_test.go -index 47665655..03d22797 100644 ---- a/agent/engine/task_manager_unix_test.go -+++ b/agent/engine/task_manager_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/iphelperwrapper/iphelper_windows.go b/agent/eni/iphelperwrapper/iphelper_windows.go -index 1c77ff19..6bf45de2 100644 ---- a/agent/eni/iphelperwrapper/iphelper_windows.go -+++ b/agent/eni/iphelperwrapper/iphelper_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/iphelperwrapper/iphelper_windows_test.go b/agent/eni/iphelperwrapper/iphelper_windows_test.go -index d0628291..adbd8aa4 100644 ---- a/agent/eni/iphelperwrapper/iphelper_windows_test.go -+++ b/agent/eni/iphelperwrapper/iphelper_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/iphelperwrapper/mibIpInterfaceRow_windows.go b/agent/eni/iphelperwrapper/mibIpInterfaceRow_windows.go -index c27c5bee..1112094b 100644 ---- a/agent/eni/iphelperwrapper/mibIpInterfaceRow_windows.go -+++ b/agent/eni/iphelperwrapper/mibIpInterfaceRow_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/netlinkwrapper/netlink_linux.go b/agent/eni/netlinkwrapper/netlink_linux.go -index 54f14be1..74713472 100644 ---- a/agent/eni/netlinkwrapper/netlink_linux.go -+++ b/agent/eni/netlinkwrapper/netlink_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/networkutils/utils_linux.go b/agent/eni/networkutils/utils_linux.go -index 9a04d2c5..10a7a212 100644 ---- a/agent/eni/networkutils/utils_linux.go -+++ b/agent/eni/networkutils/utils_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/networkutils/utils_linux_test.go b/agent/eni/networkutils/utils_linux_test.go -index f94e1242..39e5f771 100644 ---- a/agent/eni/networkutils/utils_linux_test.go -+++ b/agent/eni/networkutils/utils_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/networkutils/utils_windows.go b/agent/eni/networkutils/utils_windows.go -index 402e4a39..4c4e68d3 100644 ---- a/agent/eni/networkutils/utils_windows.go -+++ b/agent/eni/networkutils/utils_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/networkutils/utils_windows_test.go b/agent/eni/networkutils/utils_windows_test.go -index 352cccc7..755ccb35 100644 ---- a/agent/eni/networkutils/utils_windows_test.go -+++ b/agent/eni/networkutils/utils_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/pause/error_test.go b/agent/eni/pause/error_test.go -index 5a7cad12..72de9f05 100644 ---- a/agent/eni/pause/error_test.go -+++ b/agent/eni/pause/error_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/pause/load_test.go b/agent/eni/pause/load_test.go -index 32a88e0c..3203a923 100644 ---- a/agent/eni/pause/load_test.go -+++ b/agent/eni/pause/load_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/pause/pause_linux.go b/agent/eni/pause/pause_linux.go -index c983c24a..cb983ccc 100644 ---- a/agent/eni/pause/pause_linux.go -+++ b/agent/eni/pause/pause_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/pause/pause_linux_test.go b/agent/eni/pause/pause_linux_test.go -index 6cb77251..00ad512f 100644 ---- a/agent/eni/pause/pause_linux_test.go -+++ b/agent/eni/pause/pause_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/pause/pause_unsupported.go b/agent/eni/pause/pause_unsupported.go -index bc5eafd7..8616f5fb 100644 ---- a/agent/eni/pause/pause_unsupported.go -+++ b/agent/eni/pause/pause_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/pause/pause_windows.go b/agent/eni/pause/pause_windows.go -index 9f640857..05eac213 100644 ---- a/agent/eni/pause/pause_windows.go -+++ b/agent/eni/pause/pause_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/udevwrapper/udev_linux.go b/agent/eni/udevwrapper/udev_linux.go -index 32cf01f4..9d696c9f 100644 ---- a/agent/eni/udevwrapper/udev_linux.go -+++ b/agent/eni/udevwrapper/udev_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/udevwrapper/udev_unsupported.go b/agent/eni/udevwrapper/udev_unsupported.go -index 09c70ab7..452edf7a 100644 ---- a/agent/eni/udevwrapper/udev_unsupported.go -+++ b/agent/eni/udevwrapper/udev_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux -+// +build !linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/watcher/watcher_linux.go b/agent/eni/watcher/watcher_linux.go -index 795bf91c..b94d8242 100644 ---- a/agent/eni/watcher/watcher_linux.go -+++ b/agent/eni/watcher/watcher_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/watcher/watcher_linux_test.go b/agent/eni/watcher/watcher_linux_test.go -index ce17f13b..469555b4 100644 ---- a/agent/eni/watcher/watcher_linux_test.go -+++ b/agent/eni/watcher/watcher_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/watcher/watcher_test.go b/agent/eni/watcher/watcher_test.go -index 9fda7494..9bd90c17 100644 ---- a/agent/eni/watcher/watcher_test.go -+++ b/agent/eni/watcher/watcher_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/watcher/watcher_unsupported.go b/agent/eni/watcher/watcher_unsupported.go -index 222653c8..7adae3c5 100644 ---- a/agent/eni/watcher/watcher_unsupported.go -+++ b/agent/eni/watcher/watcher_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/watcher/watcher_windows.go b/agent/eni/watcher/watcher_windows.go -index 3a712955..04e6a1fd 100644 ---- a/agent/eni/watcher/watcher_windows.go -+++ b/agent/eni/watcher/watcher_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eni/watcher/watcher_windows_test.go b/agent/eni/watcher/watcher_windows_test.go -index 97d5c772..8313d07e 100644 ---- a/agent/eni/watcher/watcher_windows_test.go -+++ b/agent/eni/watcher/watcher_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eventhandler/attachment_handler_test.go b/agent/eventhandler/attachment_handler_test.go -index 3ddadb7f..3a5303e0 100644 ---- a/agent/eventhandler/attachment_handler_test.go -+++ b/agent/eventhandler/attachment_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eventhandler/handler_test.go b/agent/eventhandler/handler_test.go -index 1698b372..1d85fa99 100644 ---- a/agent/eventhandler/handler_test.go -+++ b/agent/eventhandler/handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eventhandler/task_handler_test.go b/agent/eventhandler/task_handler_test.go -index 4c9ded19..ba1277e0 100644 ---- a/agent/eventhandler/task_handler_test.go -+++ b/agent/eventhandler/task_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eventhandler/task_handler_types_test.go b/agent/eventhandler/task_handler_types_test.go -index e745249e..b9bad21c 100644 ---- a/agent/eventhandler/task_handler_types_test.go -+++ b/agent/eventhandler/task_handler_types_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/eventstream/eventstream_test.go b/agent/eventstream/eventstream_test.go -index 032e10f3..1b9e5768 100644 ---- a/agent/eventstream/eventstream_test.go -+++ b/agent/eventstream/eventstream_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/fsx/fsx_test.go b/agent/fsx/fsx_test.go -index c2987443..e7e9349b 100644 ---- a/agent/fsx/fsx_test.go -+++ b/agent/fsx/fsx_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/gogenerate/awssdk.go b/agent/gogenerate/awssdk.go -index fee08b8d..fbd8706a 100644 ---- a/agent/gogenerate/awssdk.go -+++ b/agent/gogenerate/awssdk.go -@@ -1,4 +1,5 @@ - //go:build codegen -+// +build codegen - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/gpu/generate_mocks.go b/agent/gpu/generate_mocks.go -index 26dadfa7..f609d8ff 100644 ---- a/agent/gpu/generate_mocks.go -+++ b/agent/gpu/generate_mocks.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/gpu/nvidia_gpu_manager_unix.go b/agent/gpu/nvidia_gpu_manager_unix.go -index 9c5b385e..c18d6d20 100644 ---- a/agent/gpu/nvidia_gpu_manager_unix.go -+++ b/agent/gpu/nvidia_gpu_manager_unix.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/gpu/nvidia_gpu_manager_unix_test.go b/agent/gpu/nvidia_gpu_manager_unix_test.go -index 70b674a8..ededb252 100644 ---- a/agent/gpu/nvidia_gpu_manager_unix_test.go -+++ b/agent/gpu/nvidia_gpu_manager_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/introspection_server_setup_test.go b/agent/handlers/introspection_server_setup_test.go -index d8a90bbf..e6d0b4c3 100644 ---- a/agent/handlers/introspection_server_setup_test.go -+++ b/agent/handlers/introspection_server_setup_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/task_server_setup_test.go b/agent/handlers/task_server_setup_test.go -index 46ae12d8..b0e62e07 100644 ---- a/agent/handlers/task_server_setup_test.go -+++ b/agent/handlers/task_server_setup_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/utils/helpers_test.go b/agent/handlers/utils/helpers_test.go -index 1b691a82..7be7c9c5 100644 ---- a/agent/handlers/utils/helpers_test.go -+++ b/agent/handlers/utils/helpers_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/v1/license_handler_test.go b/agent/handlers/v1/license_handler_test.go -index 51c7b94e..13812bd9 100644 ---- a/agent/handlers/v1/license_handler_test.go -+++ b/agent/handlers/v1/license_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/v1/response_test.go b/agent/handlers/v1/response_test.go -index 34bfff87..2d6ac6de 100644 ---- a/agent/handlers/v1/response_test.go -+++ b/agent/handlers/v1/response_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/v2/response_test.go b/agent/handlers/v2/response_test.go -index 718dcd74..3fea7f23 100644 ---- a/agent/handlers/v2/response_test.go -+++ b/agent/handlers/v2/response_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/v2/stats_response_test.go b/agent/handlers/v2/stats_response_test.go -index b3ca475b..b1d2635d 100644 ---- a/agent/handlers/v2/stats_response_test.go -+++ b/agent/handlers/v2/stats_response_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/v3/response_test.go b/agent/handlers/v3/response_test.go -index 3039a57a..38d5b278 100644 ---- a/agent/handlers/v3/response_test.go -+++ b/agent/handlers/v3/response_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/handlers/v4/response_test.go b/agent/handlers/v4/response_test.go -index e99b5243..103eaf6a 100644 ---- a/agent/handlers/v4/response_test.go -+++ b/agent/handlers/v4/response_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/httpclient/httpclient_test.go b/agent/httpclient/httpclient_test.go -index 362722da..e8967718 100644 ---- a/agent/httpclient/httpclient_test.go -+++ b/agent/httpclient/httpclient_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/audit/audit_log_test.go b/agent/logger/audit/audit_log_test.go -index f2a6b530..c88ea4ee 100644 ---- a/agent/logger/audit/audit_log_test.go -+++ b/agent/logger/audit/audit_log_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/buffer_pool_test.go b/agent/logger/buffer_pool_test.go -index 9cca77e8..9eeb9797 100644 ---- a/agent/logger/buffer_pool_test.go -+++ b/agent/logger/buffer_pool_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/eventlog_windows.go b/agent/logger/eventlog_windows.go -index f920da0c..f72539c1 100644 ---- a/agent/logger/eventlog_windows.go -+++ b/agent/logger/eventlog_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/format_test.go b/agent/logger/format_test.go -index 80e43d58..91445da5 100644 ---- a/agent/logger/format_test.go -+++ b/agent/logger/format_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/global_test.go b/agent/logger/global_test.go -index 032a9691..05435114 100644 ---- a/agent/logger/global_test.go -+++ b/agent/logger/global_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/log_init_test.go b/agent/logger/log_init_test.go -index 0148f1db..496c1b07 100644 ---- a/agent/logger/log_init_test.go -+++ b/agent/logger/log_init_test.go -@@ -1,4 +1,5 @@ - //go:build unit || integration -+// +build unit integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/log_test.go b/agent/logger/log_test.go -index 61e6747a..8d25cd43 100644 ---- a/agent/logger/log_test.go -+++ b/agent/logger/log_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/log_unix_test.go b/agent/logger/log_unix_test.go -index 64be35cf..0b063d18 100644 ---- a/agent/logger/log_unix_test.go -+++ b/agent/logger/log_unix_test.go -@@ -1,4 +1,5 @@ - //go:build !windows && unit -+// +build !windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/log_windows_test.go b/agent/logger/log_windows_test.go -index 9f2fe12c..c763d595 100644 ---- a/agent/logger/log_windows_test.go -+++ b/agent/logger/log_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/platform_unix.go b/agent/logger/platform_unix.go -index 8b8ef812..85cb4385 100644 ---- a/agent/logger/platform_unix.go -+++ b/agent/logger/platform_unix.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/logger/structured_logger_test.go b/agent/logger/structured_logger_test.go -index d51c2a76..94e1bd8d 100644 ---- a/agent/logger/structured_logger_test.go -+++ b/agent/logger/structured_logger_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/metrics/metrics_test.go b/agent/metrics/metrics_test.go -index 6f454da9..e9271853 100644 ---- a/agent/metrics/metrics_test.go -+++ b/agent/metrics/metrics_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/s3/s3_test.go b/agent/s3/s3_test.go -index 636bd8cc..b44a2216 100644 ---- a/agent/s3/s3_test.go -+++ b/agent/s3/s3_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/sighandlers/debug_handler.go b/agent/sighandlers/debug_handler.go -index cdb15a47..790e61b1 100644 ---- a/agent/sighandlers/debug_handler.go -+++ b/agent/sighandlers/debug_handler.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/sighandlers/debug_handler_windows.go b/agent/sighandlers/debug_handler_windows.go -index 27f38305..2c414848 100644 ---- a/agent/sighandlers/debug_handler_windows.go -+++ b/agent/sighandlers/debug_handler_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/sighandlers/termination_handler_test.go b/agent/sighandlers/termination_handler_test.go -index 86369e27..610ae69b 100644 ---- a/agent/sighandlers/termination_handler_test.go -+++ b/agent/sighandlers/termination_handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/ssm/ssm_test.go b/agent/ssm/ssm_test.go -index 4028b8c5..2699083b 100644 ---- a/agent/ssm/ssm_test.go -+++ b/agent/ssm/ssm_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/dependencies/dependencies_windows.go b/agent/statemanager/dependencies/dependencies_windows.go -index 7d920a24..709bcf0d 100644 ---- a/agent/statemanager/dependencies/dependencies_windows.go -+++ b/agent/statemanager/dependencies/dependencies_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/helper_unix_test.go b/agent/statemanager/helper_unix_test.go -index f141753b..9c164e1f 100644 ---- a/agent/statemanager/helper_unix_test.go -+++ b/agent/statemanager/helper_unix_test.go -@@ -1,4 +1,5 @@ - //go:build !windows && unit -+// +build !windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/helper_windows_test.go b/agent/statemanager/helper_windows_test.go -index 4d4539c7..178cc6b0 100644 ---- a/agent/statemanager/helper_windows_test.go -+++ b/agent/statemanager/helper_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/state_manager_test.go b/agent/statemanager/state_manager_test.go -index bec7cec5..b4d297ca 100644 ---- a/agent/statemanager/state_manager_test.go -+++ b/agent/statemanager/state_manager_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/state_manager_unix.go b/agent/statemanager/state_manager_unix.go -index 7bd207fe..ddf9ebfe 100644 ---- a/agent/statemanager/state_manager_unix.go -+++ b/agent/statemanager/state_manager_unix.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/state_manager_unix_test.go b/agent/statemanager/state_manager_unix_test.go -index 209422b4..0b72687d 100644 ---- a/agent/statemanager/state_manager_unix_test.go -+++ b/agent/statemanager/state_manager_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/state_manager_win_test.go b/agent/statemanager/state_manager_win_test.go -index 68bf2a18..33abcdcc 100644 ---- a/agent/statemanager/state_manager_win_test.go -+++ b/agent/statemanager/state_manager_win_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/state_manager_windows.go b/agent/statemanager/state_manager_windows.go -index cc79d160..09362c5f 100644 ---- a/agent/statemanager/state_manager_windows.go -+++ b/agent/statemanager/state_manager_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/statemanager/state_manager_windows_test.go b/agent/statemanager/state_manager_windows_test.go -index b347501f..0d31c4b8 100644 ---- a/agent/statemanager/state_manager_windows_test.go -+++ b/agent/statemanager/state_manager_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/common_unix_test.go b/agent/stats/common_unix_test.go -index fe488de2..92836421 100644 ---- a/agent/stats/common_unix_test.go -+++ b/agent/stats/common_unix_test.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/common_windows_test.go b/agent/stats/common_windows_test.go -index 349aec3f..e818904a 100644 ---- a/agent/stats/common_windows_test.go -+++ b/agent/stats/common_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/container_test.go b/agent/stats/container_test.go -index 9adfb90e..bba649b0 100644 ---- a/agent/stats/container_test.go -+++ b/agent/stats/container_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/engine_integ_test.go b/agent/stats/engine_integ_test.go -index fa344c9b..05918a3b 100644 ---- a/agent/stats/engine_integ_test.go -+++ b/agent/stats/engine_integ_test.go -@@ -1,4 +1,5 @@ - //go:build integration -+// +build integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/engine_test.go b/agent/stats/engine_test.go -index 00a03076..cafe17ea 100644 ---- a/agent/stats/engine_test.go -+++ b/agent/stats/engine_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/engine_unix_integ_test.go b/agent/stats/engine_unix_integ_test.go -index 578e5719..152b1d91 100644 ---- a/agent/stats/engine_unix_integ_test.go -+++ b/agent/stats/engine_unix_integ_test.go -@@ -1,4 +1,5 @@ - //go:build !windows && integration -+// +build !windows,integration - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/engine_unix_test.go b/agent/stats/engine_unix_test.go -index 657c9999..073f5195 100644 ---- a/agent/stats/engine_unix_test.go -+++ b/agent/stats/engine_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/queue_test.go b/agent/stats/queue_test.go -index d727b774..919c5a35 100644 ---- a/agent/stats/queue_test.go -+++ b/agent/stats/queue_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/task_linux.go b/agent/stats/task_linux.go -index e617d790..edc81271 100644 ---- a/agent/stats/task_linux.go -+++ b/agent/stats/task_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/task_linux_test.go b/agent/stats/task_linux_test.go -index 45f70140..5e553a56 100644 ---- a/agent/stats/task_linux_test.go -+++ b/agent/stats/task_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/task_unspecified.go b/agent/stats/task_unspecified.go -index b23fcdf9..1e73e997 100644 ---- a/agent/stats/task_unspecified.go -+++ b/agent/stats/task_unspecified.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/utils_test.go b/agent/stats/utils_test.go -index 3210c0ee..bdca0e16 100644 ---- a/agent/stats/utils_test.go -+++ b/agent/stats/utils_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/utils_unix.go b/agent/stats/utils_unix.go -index c89bf5af..28dbcc5f 100644 ---- a/agent/stats/utils_unix.go -+++ b/agent/stats/utils_unix.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/utils_unix_test.go b/agent/stats/utils_unix_test.go -index 84fa3a83..414554cb 100644 ---- a/agent/stats/utils_unix_test.go -+++ b/agent/stats/utils_unix_test.go -@@ -1,4 +1,5 @@ - //go:build !windows && unit -+// +build !windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/utils_windows.go b/agent/stats/utils_windows.go -index b8b202ff..9e054572 100644 ---- a/agent/stats/utils_windows.go -+++ b/agent/stats/utils_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/stats/utils_windows_test.go b/agent/stats/utils_windows_test.go -index 792c500e..6d611bb2 100644 ---- a/agent/stats/utils_windows_test.go -+++ b/agent/stats/utils_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/asmauth/asmauth_test.go b/agent/taskresource/asmauth/asmauth_test.go -index 09c032e9..73f14fba 100644 ---- a/agent/taskresource/asmauth/asmauth_test.go -+++ b/agent/taskresource/asmauth/asmauth_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/asmauth/asmauthstatus_test.go b/agent/taskresource/asmauth/asmauthstatus_test.go -index 54882cb7..e35218bf 100644 ---- a/agent/taskresource/asmauth/asmauthstatus_test.go -+++ b/agent/taskresource/asmauth/asmauthstatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/asmsecret/asmsecret_test.go b/agent/taskresource/asmsecret/asmsecret_test.go -index 59fbd012..d1b093a5 100644 ---- a/agent/taskresource/asmsecret/asmsecret_test.go -+++ b/agent/taskresource/asmsecret/asmsecret_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/asmsecret/asmsecretstatus_test.go b/agent/taskresource/asmsecret/asmsecretstatus_test.go -index dac469c8..b779aea9 100644 ---- a/agent/taskresource/asmsecret/asmsecretstatus_test.go -+++ b/agent/taskresource/asmsecret/asmsecretstatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/cgroup.go b/agent/taskresource/cgroup/cgroup.go -index e4ebcdc7..6fe0a820 100644 ---- a/agent/taskresource/cgroup/cgroup.go -+++ b/agent/taskresource/cgroup/cgroup.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/cgroup_test.go b/agent/taskresource/cgroup/cgroup_test.go -index 7aa409a5..f37accd6 100644 ---- a/agent/taskresource/cgroup/cgroup_test.go -+++ b/agent/taskresource/cgroup/cgroup_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/cgroup_unsupported.go b/agent/taskresource/cgroup/cgroup_unsupported.go -index 6208687b..544130a6 100644 ---- a/agent/taskresource/cgroup/cgroup_unsupported.go -+++ b/agent/taskresource/cgroup/cgroup_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux -+// +build !linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/cgroupstatus.go b/agent/taskresource/cgroup/cgroupstatus.go -index 156e7ac6..6e6e0df8 100644 ---- a/agent/taskresource/cgroup/cgroupstatus.go -+++ b/agent/taskresource/cgroup/cgroupstatus.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/cgroupstatus_test.go b/agent/taskresource/cgroup/cgroupstatus_test.go -index 482e4535..065b3df2 100644 ---- a/agent/taskresource/cgroup/cgroupstatus_test.go -+++ b/agent/taskresource/cgroup/cgroupstatus_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/control/cgroup_controller_linux.go b/agent/taskresource/cgroup/control/cgroup_controller_linux.go -index 915363b1..18542c35 100644 ---- a/agent/taskresource/cgroup/control/cgroup_controller_linux.go -+++ b/agent/taskresource/cgroup/control/cgroup_controller_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/control/cgroup_controller_linux_test.go b/agent/taskresource/cgroup/control/cgroup_controller_linux_test.go -index 027f5912..9e46dfa3 100644 ---- a/agent/taskresource/cgroup/control/cgroup_controller_linux_test.go -+++ b/agent/taskresource/cgroup/control/cgroup_controller_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/control/factory/factory_linux.go b/agent/taskresource/cgroup/control/factory/factory_linux.go -index 6e9e3f89..6ce587e7 100644 ---- a/agent/taskresource/cgroup/control/factory/factory_linux.go -+++ b/agent/taskresource/cgroup/control/factory/factory_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/control/factory/generate_mocks_linux.go b/agent/taskresource/cgroup/control/factory/generate_mocks_linux.go -index 31143cc3..e36c74e5 100644 ---- a/agent/taskresource/cgroup/control/factory/generate_mocks_linux.go -+++ b/agent/taskresource/cgroup/control/factory/generate_mocks_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/control/generate_mocks_linux.go b/agent/taskresource/cgroup/control/generate_mocks_linux.go -index 38219dc0..7b7a341a 100644 ---- a/agent/taskresource/cgroup/control/generate_mocks_linux.go -+++ b/agent/taskresource/cgroup/control/generate_mocks_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/control/init_linux.go b/agent/taskresource/cgroup/control/init_linux.go -index f06a15ca..f71eebbf 100644 ---- a/agent/taskresource/cgroup/control/init_linux.go -+++ b/agent/taskresource/cgroup/control/init_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/control/init_linux_test.go b/agent/taskresource/cgroup/control/init_linux_test.go -index fc218362..6d0a3d27 100644 ---- a/agent/taskresource/cgroup/control/init_linux_test.go -+++ b/agent/taskresource/cgroup/control/init_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/cgroup/control/types_linux.go b/agent/taskresource/cgroup/control/types_linux.go -index d6c08426..50a6a6df 100644 ---- a/agent/taskresource/cgroup/control/types_linux.go -+++ b/agent/taskresource/cgroup/control/types_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/credentialspec/credentialspec_unsupported.go b/agent/taskresource/credentialspec/credentialspec_unsupported.go -index fc48ea5e..62ac2555 100644 ---- a/agent/taskresource/credentialspec/credentialspec_unsupported.go -+++ b/agent/taskresource/credentialspec/credentialspec_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/credentialspec/credentialspec_windows.go b/agent/taskresource/credentialspec/credentialspec_windows.go -index 72ac9d22..b7b69d92 100644 ---- a/agent/taskresource/credentialspec/credentialspec_windows.go -+++ b/agent/taskresource/credentialspec/credentialspec_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/credentialspec/credentialspec_windows_test.go b/agent/taskresource/credentialspec/credentialspec_windows_test.go -index dfe6a49a..3741dca2 100644 ---- a/agent/taskresource/credentialspec/credentialspec_windows_test.go -+++ b/agent/taskresource/credentialspec/credentialspec_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/envFiles/envfile_test.go b/agent/taskresource/envFiles/envfile_test.go -index ad7943c1..6e15702d 100644 ---- a/agent/taskresource/envFiles/envfile_test.go -+++ b/agent/taskresource/envFiles/envfile_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/envFiles/envfilestatus_test.go b/agent/taskresource/envFiles/envfilestatus_test.go -index 1bbbb7a0..2c87ad70 100644 ---- a/agent/taskresource/envFiles/envfilestatus_test.go -+++ b/agent/taskresource/envFiles/envfilestatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/firelens/firelens_unimplemented.go b/agent/taskresource/firelens/firelens_unimplemented.go -index b6a69a67..36adcf28 100644 ---- a/agent/taskresource/firelens/firelens_unimplemented.go -+++ b/agent/taskresource/firelens/firelens_unimplemented.go -@@ -1,4 +1,5 @@ - //go:build !linux -+// +build !linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/firelens/firelens_unix.go b/agent/taskresource/firelens/firelens_unix.go -index 1646ed71..7c53139f 100644 ---- a/agent/taskresource/firelens/firelens_unix.go -+++ b/agent/taskresource/firelens/firelens_unix.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/firelens/firelens_unix_test.go b/agent/taskresource/firelens/firelens_unix_test.go -index a4573152..d7cf8624 100644 ---- a/agent/taskresource/firelens/firelens_unix_test.go -+++ b/agent/taskresource/firelens/firelens_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/firelens/firelensconfig_unix.go b/agent/taskresource/firelens/firelensconfig_unix.go -index 1ed4d75b..dbc1709d 100644 ---- a/agent/taskresource/firelens/firelensconfig_unix.go -+++ b/agent/taskresource/firelens/firelensconfig_unix.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/firelens/firelensconfig_unix_test.go b/agent/taskresource/firelens/firelensconfig_unix_test.go -index 9fed0fae..1a18f0cf 100644 ---- a/agent/taskresource/firelens/firelensconfig_unix_test.go -+++ b/agent/taskresource/firelens/firelensconfig_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/firelens/firelensstatus_test.go b/agent/taskresource/firelens/firelensstatus_test.go -index d128f54a..5a171aa5 100644 ---- a/agent/taskresource/firelens/firelensstatus_test.go -+++ b/agent/taskresource/firelens/firelensstatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/firelens/json_unix.go b/agent/taskresource/firelens/json_unix.go -index 8ee89d2c..ba3d8c6b 100644 ---- a/agent/taskresource/firelens/json_unix.go -+++ b/agent/taskresource/firelens/json_unix.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/firelens/json_unix_test.go b/agent/taskresource/firelens/json_unix_test.go -index 4cd5ba12..dec3cdbf 100644 ---- a/agent/taskresource/firelens/json_unix_test.go -+++ b/agent/taskresource/firelens/json_unix_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_unsupported.go b/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_unsupported.go -index 6d45f55d..1e2bee5e 100644 ---- a/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_unsupported.go -+++ b/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !windows -+// +build !windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_windows.go b/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_windows.go -index 1350d520..cd2175c5 100644 ---- a/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_windows.go -+++ b/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_windows_test.go b/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_windows_test.go -index 0d369c76..e55116ad 100644 ---- a/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_windows_test.go -+++ b/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserver_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserverstatus_test.go b/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserverstatus_test.go -index 276d29e3..0f9e0bce 100644 ---- a/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserverstatus_test.go -+++ b/agent/taskresource/fsxwindowsfileserver/fsxwindowsfileserverstatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/ssmsecret/ssmsecret_test.go b/agent/taskresource/ssmsecret/ssmsecret_test.go -index 8c530bc0..de1f13f4 100644 ---- a/agent/taskresource/ssmsecret/ssmsecret_test.go -+++ b/agent/taskresource/ssmsecret/ssmsecret_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/ssmsecret/ssmsecretstatus_test.go b/agent/taskresource/ssmsecret/ssmsecretstatus_test.go -index 3e1722fb..4a86aea2 100644 ---- a/agent/taskresource/ssmsecret/ssmsecretstatus_test.go -+++ b/agent/taskresource/ssmsecret/ssmsecretstatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/types/types_linux_test.go b/agent/taskresource/types/types_linux_test.go -index 7f3a683a..a5facfa1 100644 ---- a/agent/taskresource/types/types_linux_test.go -+++ b/agent/taskresource/types/types_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/types/types_test.go b/agent/taskresource/types/types_test.go -index f90c4754..98553b83 100644 ---- a/agent/taskresource/types/types_test.go -+++ b/agent/taskresource/types/types_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/types_unix.go b/agent/taskresource/types_unix.go -index bf9489b8..a509a9d9 100644 ---- a/agent/taskresource/types_unix.go -+++ b/agent/taskresource/types_unix.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/types_unsupported.go b/agent/taskresource/types_unsupported.go -index 106d78d4..749ff5b8 100644 ---- a/agent/taskresource/types_unsupported.go -+++ b/agent/taskresource/types_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/types_windows.go b/agent/taskresource/types_windows.go -index f189f231..810f57f3 100644 ---- a/agent/taskresource/types_windows.go -+++ b/agent/taskresource/types_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/volume/dockervolume_test.go b/agent/taskresource/volume/dockervolume_test.go -index 2b7b5f29..952c0774 100644 ---- a/agent/taskresource/volume/dockervolume_test.go -+++ b/agent/taskresource/volume/dockervolume_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/taskresource/volume/volumestatus_test.go b/agent/taskresource/volume/volumestatus_test.go -index f2bbc093..4fb1fc92 100644 ---- a/agent/taskresource/volume/volumestatus_test.go -+++ b/agent/taskresource/volume/volumestatus_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/tcs/client/client_test.go b/agent/tcs/client/client_test.go -index 883b8c82..17a6110e 100644 ---- a/agent/tcs/client/client_test.go -+++ b/agent/tcs/client/client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/tcs/handler/handler_test.go b/agent/tcs/handler/handler_test.go -index e815b148..3d5278fa 100644 ---- a/agent/tcs/handler/handler_test.go -+++ b/agent/tcs/handler/handler_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/tcs/handler/types_test.go b/agent/tcs/handler/types_test.go -index 98ac4a09..6879f5c1 100644 ---- a/agent/tcs/handler/types_test.go -+++ b/agent/tcs/handler/types_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/tools.go b/agent/tools.go -index bb248e6b..4a6061cd 100644 ---- a/agent/tools.go -+++ b/agent/tools.go -@@ -1,4 +1,5 @@ - //go:build tools -+// +build tools - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/compare_versions_test.go b/agent/utils/compare_versions_test.go -index d9b7883d..b00b10b1 100644 ---- a/agent/utils/compare_versions_test.go -+++ b/agent/utils/compare_versions_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/cpuinfo.go b/agent/utils/cpuinfo.go -index 39076804..0fa8f845 100644 ---- a/agent/utils/cpuinfo.go -+++ b/agent/utils/cpuinfo.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/cpuinfo_test.go b/agent/utils/cpuinfo_test.go -index bf86ee28..d629ec94 100644 ---- a/agent/utils/cpuinfo_test.go -+++ b/agent/utils/cpuinfo_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/json_test.go b/agent/utils/json_test.go -index 6e4c6803..b9746c2e 100644 ---- a/agent/utils/json_test.go -+++ b/agent/utils/json_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/license_test.go b/agent/utils/license_test.go -index d66f674d..7403ce27 100644 ---- a/agent/utils/license_test.go -+++ b/agent/utils/license_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/nswrapper/ns_linux.go b/agent/utils/nswrapper/ns_linux.go -index 03e7b2f6..630adfc5 100644 ---- a/agent/utils/nswrapper/ns_linux.go -+++ b/agent/utils/nswrapper/ns_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/retry/backoff_test.go b/agent/utils/retry/backoff_test.go -index 23234965..d68ccde8 100644 ---- a/agent/utils/retry/backoff_test.go -+++ b/agent/utils/retry/backoff_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/retry/exponential_backoff_test.go b/agent/utils/retry/exponential_backoff_test.go -index 7583eb9f..5571f490 100644 ---- a/agent/utils/retry/exponential_backoff_test.go -+++ b/agent/utils/retry/exponential_backoff_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/retry/retry_test.go b/agent/utils/retry/retry_test.go -index 4a5546bc..c6533560 100644 ---- a/agent/utils/retry/retry_test.go -+++ b/agent/utils/retry/retry_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/sync/sequential_waitgroup_test.go b/agent/utils/sync/sequential_waitgroup_test.go -index 31f713e2..ff289f36 100644 ---- a/agent/utils/sync/sequential_waitgroup_test.go -+++ b/agent/utils/sync/sequential_waitgroup_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/ticker_test.go b/agent/utils/ticker_test.go -index 535eb629..6dc65e89 100644 ---- a/agent/utils/ticker_test.go -+++ b/agent/utils/ticker_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/utils_linux.go b/agent/utils/utils_linux.go -index 281f4135..aaa2931a 100644 ---- a/agent/utils/utils_linux.go -+++ b/agent/utils/utils_linux.go -@@ -1,4 +1,5 @@ - //go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/utils_linux_test.go b/agent/utils/utils_linux_test.go -index 73b24be1..ea369097 100644 ---- a/agent/utils/utils_linux_test.go -+++ b/agent/utils/utils_linux_test.go -@@ -1,4 +1,5 @@ - //go:build linux && unit -+// +build linux,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/utils_test.go b/agent/utils/utils_test.go -index 0b3fd704..83fceab8 100644 ---- a/agent/utils/utils_test.go -+++ b/agent/utils/utils_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/utils_unsupported.go b/agent/utils/utils_unsupported.go -index 6109dff4..cc93b15e 100644 ---- a/agent/utils/utils_unsupported.go -+++ b/agent/utils/utils_unsupported.go -@@ -1,4 +1,5 @@ - //go:build !linux && !windows -+// +build !linux,!windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/utils_windows.go b/agent/utils/utils_windows.go -index 072df48b..938db186 100644 ---- a/agent/utils/utils_windows.go -+++ b/agent/utils/utils_windows.go -@@ -1,4 +1,5 @@ - //go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/utils/utils_windows_test.go b/agent/utils/utils_windows_test.go -index ad22e500..6b09d902 100644 ---- a/agent/utils/utils_windows_test.go -+++ b/agent/utils/utils_windows_test.go -@@ -1,4 +1,5 @@ - //go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/wsclient/client_test.go b/agent/wsclient/client_test.go -index 8f66140b..54ee2aa7 100644 ---- a/agent/wsclient/client_test.go -+++ b/agent/wsclient/client_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // --- -2.32.0 - diff --git a/packages/ecs-agent/0007-bottlerocket-Revert-Updating-the-go-build-tags-as-pa.patch b/packages/ecs-agent/0007-bottlerocket-Revert-Updating-the-go-build-tags-as-pa.patch deleted file mode 100644 index 8e5a251315f..00000000000 --- a/packages/ecs-agent/0007-bottlerocket-Revert-Updating-the-go-build-tags-as-pa.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 094533eddd935954f115f36090e2feb571792be8 Mon Sep 17 00:00:00 2001 -From: "Sean P. Kelly" -Date: Wed, 1 Dec 2021 19:56:25 +0000 -Subject: [PATCH 2/2] bottlerocket: Revert "Updating the go build tags as part - of Linux Golang upgrade" - -This reverts commit 5ddc83b4f4225116770f87e47f6447c8accc5f38. ---- - agent/engine/execcmd/manager_init_task.go | 2 +- - agent/engine/execcmd/manager_init_task_test.go | 2 +- - agent/engine/execcmd/manager_init_task_windows.go | 2 +- - agent/engine/execcmd/manager_init_task_windows_test.go | 2 +- - agent/engine/execcmd/manager_linux.go | 2 +- - agent/engine/execcmd/manager_start.go | 2 +- - agent/engine/execcmd/manager_start_test.go | 2 +- - agent/engine/execcmd/manager_start_windows.go | 3 +-- - agent/engine/execcmd/manager_start_windows_test.go | 2 +- - agent/engine/execcmd/manager_windows.go | 2 +- - 10 files changed, 10 insertions(+), 11 deletions(-) - -diff --git a/agent/engine/execcmd/manager_init_task.go b/agent/engine/execcmd/manager_init_task.go -index e588baac..24808342 100644 ---- a/agent/engine/execcmd/manager_init_task.go -+++ b/agent/engine/execcmd/manager_init_task.go -@@ -1,4 +1,4 @@ --//go:build linux || windows -+// +build linux windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_init_task_test.go b/agent/engine/execcmd/manager_init_task_test.go -index 3fe2912e..7c4548a1 100644 ---- a/agent/engine/execcmd/manager_init_task_test.go -+++ b/agent/engine/execcmd/manager_init_task_test.go -@@ -1,4 +1,4 @@ --//go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_init_task_windows.go b/agent/engine/execcmd/manager_init_task_windows.go -index 39dedf02..08bcc62f 100644 ---- a/agent/engine/execcmd/manager_init_task_windows.go -+++ b/agent/engine/execcmd/manager_init_task_windows.go -@@ -1,4 +1,4 @@ --//go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_init_task_windows_test.go b/agent/engine/execcmd/manager_init_task_windows_test.go -index f1a5e89b..0bc6f08a 100644 ---- a/agent/engine/execcmd/manager_init_task_windows_test.go -+++ b/agent/engine/execcmd/manager_init_task_windows_test.go -@@ -1,4 +1,4 @@ --//go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_linux.go b/agent/engine/execcmd/manager_linux.go -index 706d5da3..5984eceb 100644 ---- a/agent/engine/execcmd/manager_linux.go -+++ b/agent/engine/execcmd/manager_linux.go -@@ -1,4 +1,4 @@ --//go:build linux -+// +build linux - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_start.go b/agent/engine/execcmd/manager_start.go -index b1a46d18..57890c49 100644 ---- a/agent/engine/execcmd/manager_start.go -+++ b/agent/engine/execcmd/manager_start.go -@@ -1,4 +1,4 @@ --//go:build linux || windows -+// +build linux windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_start_test.go b/agent/engine/execcmd/manager_start_test.go -index 7f369eef..3810ed25 100644 ---- a/agent/engine/execcmd/manager_start_test.go -+++ b/agent/engine/execcmd/manager_start_test.go -@@ -1,4 +1,4 @@ --//go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_start_windows.go b/agent/engine/execcmd/manager_start_windows.go -index a111ec92..a02ef67c 100644 ---- a/agent/engine/execcmd/manager_start_windows.go -+++ b/agent/engine/execcmd/manager_start_windows.go -@@ -1,4 +1,4 @@ --//go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -@@ -12,7 +12,6 @@ - // on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - // express or implied. See the License for the specific language governing - // permissions and limitations under the License. -- - package execcmd - - import apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container" -diff --git a/agent/engine/execcmd/manager_start_windows_test.go b/agent/engine/execcmd/manager_start_windows_test.go -index c64c0963..dec0d085 100644 ---- a/agent/engine/execcmd/manager_start_windows_test.go -+++ b/agent/engine/execcmd/manager_start_windows_test.go -@@ -1,4 +1,4 @@ --//go:build windows && unit -+// +build windows,unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // -diff --git a/agent/engine/execcmd/manager_windows.go b/agent/engine/execcmd/manager_windows.go -index ad364756..085b52bb 100644 ---- a/agent/engine/execcmd/manager_windows.go -+++ b/agent/engine/execcmd/manager_windows.go -@@ -1,4 +1,4 @@ --//go:build windows -+// +build windows - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // --- -2.32.0 - diff --git a/packages/ecs-agent/0008-bottlerocket-Add-missing-go-build-tags.patch b/packages/ecs-agent/0008-bottlerocket-Add-missing-go-build-tags.patch deleted file mode 100644 index 43cb4370665..00000000000 --- a/packages/ecs-agent/0008-bottlerocket-Add-missing-go-build-tags.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c4cc8914418857649958fabd789b6e61453a0ada Mon Sep 17 00:00:00 2001 -From: "Sean P. Kelly" -Date: Wed, 23 Mar 2022 11:39:32 +0000 -Subject: [PATCH 8/8] bottlerocket Add missing go build tags - ---- - agent/async/ttl_cache_test.go | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/agent/async/ttl_cache_test.go b/agent/async/ttl_cache_test.go -index 0a319d7..dbf6794 100644 ---- a/agent/async/ttl_cache_test.go -+++ b/agent/async/ttl_cache_test.go -@@ -1,4 +1,5 @@ - //go:build unit -+// +build unit - - // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. - // --- -2.32.0 - diff --git a/packages/ecs-agent/Cargo.toml b/packages/ecs-agent/Cargo.toml index 6986170dc7b..6c8c8b56c2d 100644 --- a/packages/ecs-agent/Cargo.toml +++ b/packages/ecs-agent/Cargo.toml @@ -13,8 +13,8 @@ path = "pkg.rs" releases-url = "https://github.com/aws/amazon-ecs-agent/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/aws/amazon-ecs-agent/archive/v1.60.0/amazon-ecs-agent-v1.60.0.tar.gz" -sha512 = "0734544463d52d264ef058386766cfdfc9db119e842ddb9a6c0d61f2e089946343693e78e1c5ad966dacfafd42bc6014d359b843f83193f3eb92f763491d6dc6" +url = "https://github.com/aws/amazon-ecs-agent/archive/v1.61.2/amazon-ecs-agent-v1.61.2.tar.gz" +sha512 = "0b51cbd6dbc9056305a5b04d41156c7ae7460d11e8717c295567a0d4ed781fe654f97594759621a6713b580ea4d598c072f311fea900dc72b09b05d63e771fe5" # The ECS agent repository includes two CNI plugins as git submodules. git # archive does not include submodules, so the tarball above does not include diff --git a/packages/ecs-agent/ecs-agent.spec b/packages/ecs-agent/ecs-agent.spec index 8d18135f299..54275bf22ba 100644 --- a/packages/ecs-agent/ecs-agent.spec +++ b/packages/ecs-agent/ecs-agent.spec @@ -2,9 +2,9 @@ %global agent_gorepo amazon-ecs-agent %global agent_goimport %{agent_goproject}/%{agent_gorepo} -%global agent_gover 1.60.0 +%global agent_gover 1.61.2 # git rev-parse --short=8 -%global agent_gitrev f5ac255d +%global agent_gitrev 71a0f676 %global ecscni_goproject github.com/aws %global ecscni_gorepo amazon-ecs-cni-plugins @@ -67,11 +67,6 @@ Patch0004: 0004-bottlerocket-remove-unsupported-CNI-plugins.patch # Bottlerocket-specific - fix procfs path for non-containerized ECS agent Patch0005: 0005-bottlerocket-fix-procfs-path-on-host.patch -# Bottlerocket-specific - add duplicate +build directives to support Go 1.16 -Patch0006: 0006-bottlerocket-Revert-removing-duplicate-build-tags.patch -Patch0007: 0007-bottlerocket-Revert-Updating-the-go-build-tags-as-pa.patch -Patch0008: 0008-bottlerocket-Add-missing-go-build-tags.patch - # Bottlerocket-specific - filesystem location for ECS CNI plugins Patch1001: 1001-bottlerocket-default-filesystem-locations.patch diff --git a/packages/iproute/0001-skip-libelf-check.patch b/packages/iproute/0001-skip-libelf-check.patch index e4267cf4812..38111ecee10 100644 --- a/packages/iproute/0001-skip-libelf-check.patch +++ b/packages/iproute/0001-skip-libelf-check.patch @@ -1,4 +1,4 @@ -From 24224b70389c05d5aa573047d450e1fe82021bbe Mon Sep 17 00:00:00 2001 +From 83c4c40aa5a8b1fc7573f2b7a4e37c84427d148a Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Fri, 23 Aug 2019 22:14:50 +0000 Subject: [PATCH] skip libelf check @@ -6,17 +6,18 @@ Subject: [PATCH] skip libelf check The host library is detected, but it is not available for the target. Signed-off-by: Ben Cressey +Signed-off-by: Sean P. Kelly --- configure | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure b/configure -index 45fcffb6..ae130c5c 100755 +index 440facb..0d78271 100755 --- a/configure +++ b/configure -@@ -383,9 +383,6 @@ check_setns - echo -n "SELinux support: " - check_selinux +@@ -619,9 +619,6 @@ check_tirpc + echo -n "libbpf support: " + check_libbpf -echo -n "ELF support: " -check_elf @@ -25,5 +26,5 @@ index 45fcffb6..ae130c5c 100755 check_mnl -- -2.21.0 +2.32.0 diff --git a/packages/iproute/Cargo.toml b/packages/iproute/Cargo.toml index 377c843ae0d..cfe8c5637ee 100644 --- a/packages/iproute/Cargo.toml +++ b/packages/iproute/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "http://kernel.org/pub/linux/utils/net/iproute2" [[package.metadata.build-package.external-files]] -url = "http://kernel.org/pub/linux/utils/net/iproute2/iproute2-5.9.0.tar.xz" -sha512 = "bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50" +url = "http://kernel.org/pub/linux/utils/net/iproute2/iproute2-5.18.0.tar.xz" +sha512 = "7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/iproute/iproute.spec b/packages/iproute/iproute.spec index 93192373459..a855e6c6971 100644 --- a/packages/iproute/iproute.spec +++ b/packages/iproute/iproute.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}iproute -Version: 5.9.0 +Version: 5.18.0 Release: 1%{?dist} Summary: Tools for advanced IP routing and network device configuration License: GPL-2.0-or-later AND GPL-2.0-only @@ -38,7 +38,7 @@ export PKG_CONFIG_PATH='%{_cross_pkgconfigdir}' \\\ %build %set_env %set_cross_build_flags -./configure +./configure --libdir '%{_cross_libdir}' %make_build %install @@ -58,23 +58,22 @@ done %{_cross_attribution_file} %{_cross_sbindir}/bridge %{_cross_sbindir}/ctstat +%{_cross_sbindir}/dcb %{_cross_sbindir}/devlink %{_cross_sbindir}/genl -%{_cross_sbindir}/ifcfg %{_cross_sbindir}/ifstat %{_cross_sbindir}/ip %{_cross_sbindir}/lnstat %{_cross_sbindir}/nstat %{_cross_sbindir}/rdma -%{_cross_sbindir}/routef %{_cross_sbindir}/routel %{_cross_sbindir}/rtacct %{_cross_sbindir}/rtmon -%{_cross_sbindir}/rtpr %{_cross_sbindir}/rtstat %{_cross_sbindir}/ss %{_cross_sbindir}/tc %{_cross_sbindir}/tipc +%{_cross_sbindir}/vdpa %dir %{_cross_libdir}/tc %{_cross_libdir}/tc/* %dir %{_cross_factorydir}%{_cross_sysconfdir}/iproute2 diff --git a/packages/iptables/1001-xshared-Fix-build-for-Werror-format-security.patch b/packages/iptables/1001-xshared-Fix-build-for-Werror-format-security.patch new file mode 100644 index 00000000000..c0845dcedf3 --- /dev/null +++ b/packages/iptables/1001-xshared-Fix-build-for-Werror-format-security.patch @@ -0,0 +1,28 @@ +From fe9bd3b29dd7661e6f74c24db8356014798d1d78 Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Fri, 13 May 2022 16:51:58 +0200 +Subject: [PATCH] xshared: Fix build for -Werror=format-security + +Gcc complains about the omitted format string. + +Signed-off-by: Phil Sutter +(cherry picked from commit b72eb12ea5a61df0655ad99d5048994e916be83a) +--- + iptables/xshared.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iptables/xshared.c b/iptables/xshared.c +index fae5ddd5df93e..a8512d3808154 100644 +--- a/iptables/xshared.c ++++ b/iptables/xshared.c +@@ -1307,7 +1307,7 @@ static void check_empty_interface(struct xtables_args *args, const char *arg) + return; + + if (args->family != NFPROTO_ARP) +- xtables_error(PARAMETER_PROBLEM, msg); ++ xtables_error(PARAMETER_PROBLEM, "%s", msg); + + fprintf(stderr, "%s", msg); + } +-- +2.34.1 diff --git a/packages/iptables/Cargo.toml b/packages/iptables/Cargo.toml index 08b0e129f98..8950022dab0 100644 --- a/packages/iptables/Cargo.toml +++ b/packages/iptables/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "http://www.netfilter.org/projects/iptables/files" [[package.metadata.build-package.external-files]] -url = "http://www.netfilter.org/projects/iptables/files/iptables-1.8.7.tar.bz2" -sha512 = "c0a33fafbf1139157a9f52860938ebedc282a1394a68dcbd58981159379eb525919f999b25925f2cb4d6b18089bd99a94b00b3e73cff5cb0a0e47bdff174ed75" +url = "http://www.netfilter.org/projects/iptables/files/iptables-1.8.8.tar.bz2" +sha512 = "f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/iptables/iptables.spec b/packages/iptables/iptables.spec index aea9d358472..3dd7cdc6e10 100644 --- a/packages/iptables/iptables.spec +++ b/packages/iptables/iptables.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}iptables -Version: 1.8.7 +Version: 1.8.8 Release: 1%{?dist} Summary: Tools for managing Linux kernel packet filtering capabilities License: GPL-2.0-or-later AND GPL-2.0-only @@ -16,6 +16,8 @@ Requires: %{_cross_os}libnfnetlink Requires: %{_cross_os}libnftnl Requires: %{_cross_os}libnetfilter_conntrack +Patch1001: 1001-xshared-Fix-build-for-Werror-format-security.patch + %description %{summary}. diff --git a/packages/kernel-5.10/Cargo.toml b/packages/kernel-5.10/Cargo.toml index 9e0bf10e440..1c012b2065e 100644 --- a/packages/kernel-5.10/Cargo.toml +++ b/packages/kernel-5.10/Cargo.toml @@ -13,8 +13,8 @@ path = "pkg.rs" [[package.metadata.build-package.external-files]] # Use latest-srpm-url.sh to get this. -url = "https://cdn.amazonlinux.com/blobstore/3479900579a0dbe61cbe7e6d76620774513369246def8bae42ec791865d68df9/kernel-5.10.109-104.500.amzn2.src.rpm" -sha512 = "66c840eee5333bb77f8661b14ec07b33ea7b6d9db82c89370c8109c0a315c6ad532364d0c879efd45fff0bfe3855876bbf53b11b5107b0dc55f9d2ac1a59cc6d" +url = "https://cdn.amazonlinux.com/blobstore/70822ee2bc85888532dc1238257e5dd10ba67243f849a6a8d17cac89ae1663b6/kernel-5.10.112-108.499.amzn2.src.rpm" +sha512 = "0ec959cdc92684bbc4a1dc758f84ebd12e085a951c7425d9783daf5932eb27a026e2cbb6c1f7bacd9ac5f47b6c9ecaad020d07e7641294f1cad072163e71385e" [build-dependencies] microcode = { path = "../microcode" } diff --git a/packages/kernel-5.10/kernel-5.10.spec b/packages/kernel-5.10/kernel-5.10.spec index 64769bd8822..d809e248d7c 100644 --- a/packages/kernel-5.10/kernel-5.10.spec +++ b/packages/kernel-5.10/kernel-5.10.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} Name: %{_cross_os}kernel-5.10 -Version: 5.10.109 +Version: 5.10.112 Release: 1%{?dist} Summary: The Linux kernel License: GPL-2.0 WITH Linux-syscall-note URL: https://www.kernel.org/ # Use latest-srpm-url.sh to get this. -Source0: https://cdn.amazonlinux.com/blobstore/3479900579a0dbe61cbe7e6d76620774513369246def8bae42ec791865d68df9/kernel-5.10.109-104.500.amzn2.src.rpm +Source0: https://cdn.amazonlinux.com/blobstore/70822ee2bc85888532dc1238257e5dd10ba67243f849a6a8d17cac89ae1663b6/kernel-5.10.112-108.499.amzn2.src.rpm Source100: config-bottlerocket # Help out-of-tree module builds run `make prepare` automatically. diff --git a/packages/kernel-5.4/Cargo.toml b/packages/kernel-5.4/Cargo.toml index 0dd8e40547b..0ee77825f9b 100644 --- a/packages/kernel-5.4/Cargo.toml +++ b/packages/kernel-5.4/Cargo.toml @@ -13,8 +13,8 @@ path = "pkg.rs" [[package.metadata.build-package.external-files]] # Use latest-srpm-url.sh to get this. -url = "https://cdn.amazonlinux.com/blobstore/a120999c2cd538adae1c97c87e6d60f3bcf6f761064204638a5647e06aea1aad/kernel-5.4.188-104.359.amzn2.src.rpm" -sha512 = "ebb6f8460ddfccc50e89b499563dfa64f1c3228e9fe3cabd20ec1561ca8bf3764a50853b35085742dde3a219ad9314033d8c12cbc2d615f463aab0e062d9a229" +url = "https://cdn.amazonlinux.com/blobstore/ef7cb8ef41ebe7e5edc8bbf23eebc16600d6a8e21f8b468723b31fb32ef3e583/kernel-5.4.190-107.353.amzn2.src.rpm" +sha512 = "8682ee3ec20558b4e82d688fe83134ee01b6379b7da8cb7a367f1534000891384b5364b8ef991d8bd88ab53ad83d8984014f284f43ea13952b0e36bf3b6f2cd7" [build-dependencies] microcode = { path = "../microcode" } diff --git a/packages/kernel-5.4/kernel-5.4.spec b/packages/kernel-5.4/kernel-5.4.spec index e1145c69d72..5a8cc3b72c0 100644 --- a/packages/kernel-5.4/kernel-5.4.spec +++ b/packages/kernel-5.4/kernel-5.4.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} Name: %{_cross_os}kernel-5.4 -Version: 5.4.188 +Version: 5.4.190 Release: 1%{?dist} Summary: The Linux kernel License: GPL-2.0 WITH Linux-syscall-note URL: https://www.kernel.org/ # Use latest-srpm-url.sh to get this. -Source0: https://cdn.amazonlinux.com/blobstore/a120999c2cd538adae1c97c87e6d60f3bcf6f761064204638a5647e06aea1aad/kernel-5.4.188-104.359.amzn2.src.rpm +Source0: https://cdn.amazonlinux.com/blobstore/ef7cb8ef41ebe7e5edc8bbf23eebc16600d6a8e21f8b468723b31fb32ef3e583/kernel-5.4.190-107.353.amzn2.src.rpm Source100: config-bottlerocket # Help out-of-tree module builds run `make prepare` automatically. diff --git a/packages/kexec-tools/Cargo.toml b/packages/kexec-tools/Cargo.toml index 60a9863747e..15a8118724c 100644 --- a/packages/kexec-tools/Cargo.toml +++ b/packages/kexec-tools/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://kernel.org/pub/linux/utils/kernel/kexec" [[package.metadata.build-package.external-files]] -url = "https://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.23.tar.xz" -sha512 = "b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8" +url = "https://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.24.tar.xz" +sha512 = "ef7cf78246e2d729d81a3649791a5a23c385353cc75cbe8ef279616329fdaccc876d614c7f51e1456822a13a11520296070d9897467d24310399909e049c3822" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/kexec-tools/kexec-tools.spec b/packages/kexec-tools/kexec-tools.spec index ba24e31f3f4..d91507f6476 100644 --- a/packages/kexec-tools/kexec-tools.spec +++ b/packages/kexec-tools/kexec-tools.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}kexec-tools -Version: 2.0.23 +Version: 2.0.24 Release: 1%{?dist} Summary: Linux tool to load kernels from the running system License: GPL-2.0-or-later AND GPL-2.0-only diff --git a/packages/kubernetes-1.21/Cargo.toml b/packages/kubernetes-1.21/Cargo.toml index d7a70c54d88..e7e948a2173 100644 --- a/packages/kubernetes-1.21/Cargo.toml +++ b/packages/kubernetes-1.21/Cargo.toml @@ -15,8 +15,8 @@ package-name = "kubernetes-1.21" releases-url = "https://github.com/kubernetes/kubernetes/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/kubernetes/kubernetes/archive/v1.21.11/kubernetes-1.21.11.tar.gz" -sha512 = "9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6" +url = "https://github.com/kubernetes/kubernetes/archive/v1.21.13/kubernetes-1.21.13.tar.gz" +sha512 = "cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd" # RPM BuildRequires [build-dependencies] diff --git a/packages/kubernetes-1.21/kubernetes-1.21.spec b/packages/kubernetes-1.21/kubernetes-1.21.spec index c6da928f0b1..fc01883953f 100644 --- a/packages/kubernetes-1.21/kubernetes-1.21.spec +++ b/packages/kubernetes-1.21/kubernetes-1.21.spec @@ -2,7 +2,7 @@ %global gorepo kubernetes %global goimport %{goproject}/%{gorepo} -%global gover 1.21.11 +%global gover 1.21.13 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 diff --git a/packages/kubernetes-1.22/Cargo.toml b/packages/kubernetes-1.22/Cargo.toml index bf52e18518d..22d804c1b98 100644 --- a/packages/kubernetes-1.22/Cargo.toml +++ b/packages/kubernetes-1.22/Cargo.toml @@ -14,8 +14,8 @@ path = "pkg.rs" package-name = "kubernetes-1.22" [[package.metadata.build-package.external-files]] -url = "https://distro.eks.amazonaws.com/kubernetes-1-22/releases/1/artifacts/kubernetes/v1.22.6/kubernetes-src.tar.gz" -sha512 = "c9ef9f2e5fdee0d513ec7d910bda260adbd57c37a7b87575ae6c6f16a916c643decdbc2476e55393ce6b413e1c529cb68cbf211e6fd66748e4e64f170b93830f" +url = "https://distro.eks.amazonaws.com/kubernetes-1-22/releases/7/artifacts/kubernetes/v1.22.9/kubernetes-src.tar.gz" +sha512 = "39175e19fe96c704e0c6c31c844c517288d6655d10cc609e6cc11cdd5e6fb0665b7c2d6e4cc161945b7f8bd34e6c7236674c19705cc72f449080c27bd434def5" # RPM BuildRequires [build-dependencies] diff --git a/packages/kubernetes-1.22/kubernetes-1.22.spec b/packages/kubernetes-1.22/kubernetes-1.22.spec index cc5977f7c9e..3b29cd4720c 100644 --- a/packages/kubernetes-1.22/kubernetes-1.22.spec +++ b/packages/kubernetes-1.22/kubernetes-1.22.spec @@ -2,7 +2,7 @@ %global gorepo kubernetes %global goimport %{goproject}/%{gorepo} -%global gover 1.22.6 +%global gover 1.22.9 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 @@ -24,7 +24,7 @@ Summary: Container cluster management # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause License: Apache-2.0 AND BSD-3-Clause URL: https://%{goimport} -Source0: https://eks-d-postsubmit-artifacts.s3.us-west-2.amazonaws.com/kubernetes-1-22/releases/2/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz +Source0: https://distro.eks.amazonaws.com/kubernetes-1-22/releases/7/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz Source1: kubelet.service Source2: kubelet-env Source3: kubelet-config diff --git a/packages/libaudit/Cargo.toml b/packages/libaudit/Cargo.toml index 8601a5db571..8ebc1b9308f 100644 --- a/packages/libaudit/Cargo.toml +++ b/packages/libaudit/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/linux-audit/audit-userspace/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/linux-audit/audit-userspace/archive/v3.0.7/audit-userspace-3.0.7.tar.gz" -sha512 = "1582fada809f83fb89ed6baedd3bc51a67c88ce9cc2dc041ec51c5da89855b14c080cc6dffa1310c96f894cc2ac8b5e709fb4577d0dc9536f28a9617138db405" +url = "https://github.com/linux-audit/audit-userspace/archive/v3.0.8/audit-userspace-3.0.8.tar.gz" +sha512 = "494edfb358350fc3117614a95cd8855751896e05d92fe9efb93e1582f9ded02e5f17f359328c973afc4200b00dc0d482eb5b1c25c5fc7d440184f71e055ed3ef" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libaudit/libaudit.spec b/packages/libaudit/libaudit.spec index d1bb4ea90fd..f4f027ccddd 100644 --- a/packages/libaudit/libaudit.spec +++ b/packages/libaudit/libaudit.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libaudit -Version: 3.0.7 +Version: 3.0.8 Release: 1%{?dist} Summary: Library for the audit subsystem License: GPL-2.0-or-later AND LGPL-2.1-or-later diff --git a/packages/libcap/Cargo.toml b/packages/libcap/Cargo.toml index 333c57076e2..becf30496d8 100644 --- a/packages/libcap/Cargo.toml +++ b/packages/libcap/Cargo.toml @@ -9,11 +9,12 @@ build = "build.rs" path = "pkg.rs" [package.metadata.build-package] -releases-url = "https://sites.google.com/site/fullycapable/release-notes-for-libcap" +releases-url = "https://cdn.kernel.org/pub/linux/libs/security/linux-privs/libcap2/" +# Changelog can be found here: https://sites.google.com/site/fullycapable/release-notes-for-libcap [[package.metadata.build-package.external-files]] -url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.63.tar.gz" -sha512 = "0db42bc9079c75b539fd7511531a2088ba37f8d4fe75799606976a3f36bc240c4b7c87402c4b71b9c455daed098a3ddaa31687d70ed45168d471df131e2898f1" +url = "https://cdn.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.64.tar.gz" +sha512 = "628ba25c2736e5fe6469c3e1d9b28855f5d2e7e75c91d5d46cc0c01e539f3cccd00356937acffde518eb83f55e5d6124eefd53199aba705fedd520982db48652" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libcap/libcap.spec b/packages/libcap/libcap.spec index 89b2a606e86..a6b60932153 100644 --- a/packages/libcap/libcap.spec +++ b/packages/libcap/libcap.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libcap -Version: 2.63 +Version: 2.64 Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities License: GPL-2.0-only OR BSD-3-Clause diff --git a/packages/libelf/Cargo.toml b/packages/libelf/Cargo.toml index c2c98ed7a7c..102820a6f0b 100644 --- a/packages/libelf/Cargo.toml +++ b/packages/libelf/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://sourceware.org/elfutils/ftp/" [[package.metadata.build-package.external-files]] -url = "https://sourceware.org/elfutils/ftp/0.186/elfutils-0.186.tar.bz2" -sha512 = "c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78" +url = "https://sourceware.org/elfutils/ftp/0.187/elfutils-0.187.tar.bz2" +sha512 = "a9b9e32b503b8b50a62d4e4001097ed2721d3475232a6380e6b9853bd1647aec016440c0ca7ceb950daf1144f8db9814ab43cf33cc0ebef7fc91e9e775c9e874" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libelf/libelf.spec b/packages/libelf/libelf.spec index cb0720a5340..536cc6df5b3 100644 --- a/packages/libelf/libelf.spec +++ b/packages/libelf/libelf.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libelf -Version: 0.186 +Version: 0.187 Release: 1%{?dist} Summary: Library for ELF files License: GPL-2.0-or-later OR LGPL-3.0-or-later diff --git a/packages/libexpat/Cargo.toml b/packages/libexpat/Cargo.toml index e92daf0192e..3992d7c7c9e 100644 --- a/packages/libexpat/Cargo.toml +++ b/packages/libexpat/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/libexpat/libexpat/releases/" [[package.metadata.build-package.external-files]] -url = "https://github.com/libexpat/libexpat/releases/download/R_2_4_7/expat-2.4.7.tar.xz" -sha512 = "e1a16cd48fcd6c4974dc7058d2e0284e0f91565835ec93f16d3f2c79647124470e5edb9f88f1ab9df5f403883a527750a4d63b941bd26fd43c05cd6f42bdcc48" +url = "https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz" +sha512 = "d19b0d6469537aed20c54bd9cfa4089d39e4acaaddde57809de7c6aec55dc870677c02480e7f65dac5620bd5454b889370453613518f9da647c74a831a2a1b7b" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libexpat/libexpat.spec b/packages/libexpat/libexpat.spec index 50bbb235444..1234c2b44fc 100644 --- a/packages/libexpat/libexpat.spec +++ b/packages/libexpat/libexpat.spec @@ -1,4 +1,4 @@ -%global unversion 2_4_7 +%global unversion 2_4_8 Name: %{_cross_os}libexpat Version: %(echo %{unversion} | sed 's/_/./g') diff --git a/packages/libmnl/Cargo.toml b/packages/libmnl/Cargo.toml index 55d5f5e2f10..8a1bc1f0e73 100644 --- a/packages/libmnl/Cargo.toml +++ b/packages/libmnl/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "http://netfilter.org/projects/libmnl/files" [[package.metadata.build-package.external-files]] -url = "http://netfilter.org/projects/libmnl/files/libmnl-1.0.4.tar.bz2" -sha512 = "e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9" +url = "http://netfilter.org/projects/libmnl/files/libmnl-1.0.5.tar.bz2" +sha512 = "16fa48e74c9da7724a85c655dfb0abd8369392627934639d65de951543e1447ac3e048d231248f1ce8861443c2ef62654a85a81feeedbbffaf2e5744f6cf4c9f" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libmnl/libmnl.spec b/packages/libmnl/libmnl.spec index 1d0633b0fd9..f2a0866c7ad 100644 --- a/packages/libmnl/libmnl.spec +++ b/packages/libmnl/libmnl.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libmnl -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} Summary: Library for netlink License: LGPL-2.1-or-later diff --git a/packages/libnetfilter_cthelper/Cargo.toml b/packages/libnetfilter_cthelper/Cargo.toml index b1549da8337..4aedd38d65c 100644 --- a/packages/libnetfilter_cthelper/Cargo.toml +++ b/packages/libnetfilter_cthelper/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://netfilter.org/projects/libnetfilter_cthelper/files" [[package.metadata.build-package.external-files]] -url = "https://netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2" -sha512 = "f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45" +url = "https://netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.1.tar.bz2" +sha512 = "f0591edd579aee92b62446e2b8fef6af9c404848c42c8da76850bb01aec3567442612f53cf8d3af6ba4d6d920487bff310a4e547bccf595478b1f96b4280eada" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libnetfilter_cthelper/libnetfilter_cthelper.spec b/packages/libnetfilter_cthelper/libnetfilter_cthelper.spec index a1420762894..1bdbdb0258d 100644 --- a/packages/libnetfilter_cthelper/libnetfilter_cthelper.spec +++ b/packages/libnetfilter_cthelper/libnetfilter_cthelper.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libnetfilter_cthelper -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Library for netfilter cthelper License: GPL-2.0-or-later diff --git a/packages/libnetfilter_cttimeout/Cargo.toml b/packages/libnetfilter_cttimeout/Cargo.toml index f89ddb04dcb..339da4fa732 100644 --- a/packages/libnetfilter_cttimeout/Cargo.toml +++ b/packages/libnetfilter_cttimeout/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://netfilter.org/projects/libnetfilter_cttimeout/files" [[package.metadata.build-package.external-files]] -url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2" -sha512 = "d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85" +url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.1.tar.bz2" +sha512 = "3f7886b2b8c67fb45d9f6d03f8a327d0f04072abf75ec0fa310f4a321a1749607e79b48f47c8b8488f9833734689419264afada0cbc1f0360a5ae9e17d4a1100" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libnetfilter_cttimeout/libnetfilter_cttimeout.spec b/packages/libnetfilter_cttimeout/libnetfilter_cttimeout.spec index b53c79085c9..b5bdb06511b 100644 --- a/packages/libnetfilter_cttimeout/libnetfilter_cttimeout.spec +++ b/packages/libnetfilter_cttimeout/libnetfilter_cttimeout.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libnetfilter_cttimeout -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Library for netfilter cttimeout License: GPL-2.0-or-later diff --git a/packages/libnfnetlink/Cargo.toml b/packages/libnfnetlink/Cargo.toml index 74757852a7e..8ad1898ec1d 100644 --- a/packages/libnfnetlink/Cargo.toml +++ b/packages/libnfnetlink/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "http://netfilter.org/projects/libnfnetlink/files" [[package.metadata.build-package.external-files]] -url = "http://netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.1.tar.bz2" -sha512 = "2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104" +url = "http://netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.2.tar.bz2" +sha512 = "a5e9ae22831f1d17703f83953f3b0ef898e8b3fa7f0f771b038db51816ddae3158574380ac4d45c09fb8fbb8677e2ccdcc5c4736e3b09de06eac99f899130854" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libnfnetlink/libnfnetlink.spec b/packages/libnfnetlink/libnfnetlink.spec index 4e2701d3ca2..d8c1a3f2fe6 100644 --- a/packages/libnfnetlink/libnfnetlink.spec +++ b/packages/libnfnetlink/libnfnetlink.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libnfnetlink -Version: 1.0.1 +Version: 1.0.2 Release: 1%{?dist} Summary: Library for netfilter netlink License: GPL-2.0-only diff --git a/packages/libpcre/Cargo.toml b/packages/libpcre/Cargo.toml index 4bdbb11b07e..58571588e03 100644 --- a/packages/libpcre/Cargo.toml +++ b/packages/libpcre/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/PhilipHazel/pcre2/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.tar.bz2" -sha512 = "b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4" +url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2" +sha512 = "00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libpcre/libpcre.spec b/packages/libpcre/libpcre.spec index 26fc1c3ffd6..3bb4130717f 100644 --- a/packages/libpcre/libpcre.spec +++ b/packages/libpcre/libpcre.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libpcre -Version: 10.39 +Version: 10.40 Release: 1%{?dist} Summary: Library for regular expressions License: BSD-3-Clause diff --git a/packages/libseccomp/Cargo.toml b/packages/libseccomp/Cargo.toml index fcb9f2f85c6..84ae21f396a 100644 --- a/packages/libseccomp/Cargo.toml +++ b/packages/libseccomp/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/seccomp/libseccomp/releases/" [[package.metadata.build-package.external-files]] -url = "https://github.com/seccomp/libseccomp/releases/download/v2.5.3/libseccomp-2.5.3.tar.gz" -sha512 = "00170fe2360f0c0b33293dccfcc33e98fabb99619f34ecefbcc92bfdaa249ba91e7433226545b842b71542a3b224b6e980ea2ae656c4addf07e84a0def1870a0" +url = "https://github.com/seccomp/libseccomp/releases/download/v2.5.4/libseccomp-2.5.4.tar.gz" +sha512 = "92650bd7d1d48b383f402a536b97a017fd0f6ad1234daf4b938d01c92e8d134a01d2f2dd45fd9e2d025d7556bd1386ec360402145a87f20580c85949d62cea0e" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libseccomp/libseccomp.spec b/packages/libseccomp/libseccomp.spec index c0d4f45bb49..f05cb375ca0 100644 --- a/packages/libseccomp/libseccomp.spec +++ b/packages/libseccomp/libseccomp.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libseccomp -Version: 2.5.3 +Version: 2.5.4 Release: 1%{?dist} Summary: Library for enhanced seccomp License: LGPL-2.1-only diff --git a/packages/libz/Cargo.toml b/packages/libz/Cargo.toml index 49909a09cfb..24353e43602 100644 --- a/packages/libz/Cargo.toml +++ b/packages/libz/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://www.zlib.net" [[package.metadata.build-package.external-files]] -url = "https://www.zlib.net/zlib-1.2.11.tar.xz" -sha512 = "b7f50ada138c7f93eb7eb1631efccd1d9f03a5e77b6c13c8b757017b2d462e19d2d3e01c50fad60a4ae1bc86d431f6f94c72c11ff410c25121e571953017cb67" +url = "https://www.zlib.net/zlib-1.2.12.tar.xz" +sha512 = "12940e81e988f7661da52fa20bdc333314ae86a621fdb748804a20840b065a1d6d984430f2d41f3a057de0effc6ff9bcf42f9ee9510b88219085f59cbbd082bd" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/libz/libz.spec b/packages/libz/libz.spec index c71201aaaf0..441db8c9080 100644 --- a/packages/libz/libz.spec +++ b/packages/libz/libz.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}libz -Version: 1.2.11 +Version: 1.2.12 Release: 1%{?dist} Summary: Library for zlib compression URL: https://www.zlib.net/ diff --git a/packages/makedumpfile/Cargo.toml b/packages/makedumpfile/Cargo.toml index ec7f6b4ca99..17b6b6bbb13 100644 --- a/packages/makedumpfile/Cargo.toml +++ b/packages/makedumpfile/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://github.com/makedumpfile/makedumpfile/releases" [[package.metadata.build-package.external-files]] -url = "https://github.com/makedumpfile/makedumpfile/archive/1.7.0/makedumpfile-1.7.0.tar.gz" -sha512 = "579a1fb79d023a1419fc8612a02a04dda3e3b3d72455566433ab6bec08627aa9a176c55566393a081a7aae3fd0543800196596b25445b21b16346556723e9cf7" +url = "https://github.com/makedumpfile/makedumpfile/archive/1.7.1/makedumpfile-1.7.1.tar.gz" +sha512 = "93e36487b71f567d3685b151459806cf36017e52bf3ee68dd448382b279a422d1a8abef72e291ccb8206f2149ccd08ba484ec0027d1caab3fa1edbc3d28c3632" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/makedumpfile/makedumpfile.spec b/packages/makedumpfile/makedumpfile.spec index 5e3c3400bf3..4bc481476ed 100644 --- a/packages/makedumpfile/makedumpfile.spec +++ b/packages/makedumpfile/makedumpfile.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}makedumpfile -Version: 1.7.0 +Version: 1.7.1 Release: 1%{?dist} Summary: Tool to create dumps from kernel memory images License: GPL-2.0-or-later AND GPL-2.0-only diff --git a/packages/strace/Cargo.toml b/packages/strace/Cargo.toml index e432a5185c1..8c23c02ae98 100644 --- a/packages/strace/Cargo.toml +++ b/packages/strace/Cargo.toml @@ -12,8 +12,8 @@ path = "pkg.rs" releases-url = "https://strace.io/files" [[package.metadata.build-package.external-files]] -url = "https://strace.io/files/5.16/strace-5.16.tar.xz" -sha512 = "db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817" +url = "https://strace.io/files/5.17/strace-5.17.tar.xz" +sha512 = "1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44" [build-dependencies] glibc = { path = "../glibc" } diff --git a/packages/strace/strace.spec b/packages/strace/strace.spec index e75811f80ea..64c1946cdc2 100644 --- a/packages/strace/strace.spec +++ b/packages/strace/strace.spec @@ -1,5 +1,5 @@ Name: %{_cross_os}strace -Version: 5.16 +Version: 5.17 Release: 1%{?dist} Summary: Linux syscall tracer License: LGPL-2.1-or-later