prateekchaudhry · prateekchaudhry · Apr 13, 2022 · Apr 16, 2022
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ _bin/
 *.swp
 *.orig
 /agent/version/_version.go
+/ecs-init/version/version.go
 .agignore
 *.sublime-*
 .DS_Store

diff --git a/Makefile b/Makefile
@@ -239,18 +239,19 @@ cni-plugins: get-cni-sources .out-stamp build-ecs-cni-plugins build-vpc-cni-plug
 # dockerfree build process will build the agent container image from scratch
 # and with minimal dependencies
 # requires glibc-static
-
+# dockerfree-pause works for both amd64 and arm64
 dockerfree-pause:
-	GOOS=linux GOARCH=amd64 ./scripts/build-pause
+	./scripts/build-pause
 
+# dockerfree-certs works for both amd64 and arm64
 dockerfree-certs:
-	GOOS=linux GOARCH=amd64 ./scripts/get-host-certs
+	./scripts/get-host-certs
 
 dockerfree-cni-plugins: get-cni-sources
-	GOOS=linux GOARCH=amd64 ./scripts/build-cni-plugins
+	./scripts/build-cni-plugins
 
 dockerfree-agent-image: dockerfree-pause dockerfree-certs dockerfree-cni-plugins static-with-pause
-	GOOS=linux GOARCH=amd64 ./scripts/build-agent-image
+	./scripts/build-agent-image
 
 .PHONY: codebuild
 codebuild: .out-stamp
@@ -356,6 +357,36 @@ get-deps-init:
 	go get golang.org/x/tools/cmd/goimports
 	go get honnef.co/go/tools/cmd/staticcheck
 
+.amazon-linux-rpm-integrated-done:
+	./scripts/update-version.sh
+	cp packaging/amazon-linux-ami-integrated/ecs-init.spec ecs-init.spec
+	cp packaging/amazon-linux-ami-integrated/ecs.conf ecs.conf
+	cp packaging/amazon-linux-ami-integrated/ecs.service ecs.service
+	cp packaging/amazon-linux-ami-integrated/amazon-ecs-volume-plugin.conf amazon-ecs-volume-plugin.conf
+	cp packaging/amazon-linux-ami-integrated/amazon-ecs-volume-plugin.service amazon-ecs-volume-plugin.service
+	cp packaging/amazon-linux-ami-integrated/amazon-ecs-volume-plugin.socket amazon-ecs-volume-plugin.socket
+	tar -czf ./sources.tgz ecs-init scripts misc agent amazon-ecs-cni-plugins amazon-vpc-cni-plugins agent-container VERSION
+	test -e SOURCES || ln -s . SOURCES
+	rpmbuild --define "%_topdir $(PWD)" -bb ecs-init.spec
+	find RPMS/ -type f -exec cp {} . \;
+	touch .amazon-linux-rpm-integrated-done
+
+amazon-linux-rpm-integrated: .amazon-linux-rpm-integrated-done
+
+.generic-rpm-integrated-done:
+	./scripts/update-version.sh
+	cp packaging/generic-rpm-integrated/amazon-ecs-init.spec amazon-ecs-init.spec
+	cp packaging/generic-rpm-integrated/ecs.service ecs.service
+	cp packaging/generic-rpm-integrated/amazon-ecs-volume-plugin.service amazon-ecs-volume-plugin.service
+	cp packaging/generic-rpm-integrated/amazon-ecs-volume-plugin.socket amazon-ecs-volume-plugin.socket
+	tar -czf ./sources.tgz ecs-init scripts misc agent amazon-ecs-cni-plugins amazon-vpc-cni-plugins agent-container VERSION
+	test -e SOURCES || ln -s . SOURCES
+	rpmbuild --define "%_topdir $(PWD)" -bb amazon-ecs-init.spec
+	find RPMS/ -type f -exec cp {} . \;
+	touch .generic-rpm-integrated-done
+
+generic-rpm-integrated: .generic-rpm-integrated-done
+
 .generic-rpm-done:
 	./scripts/update-version.sh
 	cp packaging/generic-rpm/amazon-ecs-init.spec amazon-ecs-init.spec
@@ -366,12 +397,10 @@ get-deps-init:
 	test -e SOURCES || ln -s . SOURCES
 	rpmbuild --define "%_topdir $(PWD)" -bb amazon-ecs-init.spec
 	find RPMS/ -type f -exec cp {} . \;
-	touch .rpm-done
+	touch .generic-rpm-done
 
 generic-rpm: .generic-rpm-done
 
-dockerfree-all: dockerfree-agent-image generic-rpm
-
 .deb-done: BUILDROOT/ecs-agent.tar
 	./scripts/update-version.sh
 	tar -czf ./amazon-ecs-init_${VERSION}.orig.tar.gz ecs-init scripts README.md
@@ -428,4 +457,6 @@ clean:
 	-rm -f ./amazon-ecs-init_${VERSION}*
 	-rm -f .srpm-done .rpm-done .generic-rpm-done
 	-rm -f .deb-done
+	-rm -f .amazon-linux-rpm-integrated-done
+	-rm -f .generic-rpm-integrated-done
 	-rm -f amazon-ecs-volume-plugin
diff --git a/agent-container/agent-config.json b/agent-container/agent-config.json
@@ -1 +1 @@
-{"author":"Amazon Web Services, Inc.","config":{"Cmd":["/agent"],"ArgsEscaped":true},"created":"~~timestamp~~","history":[{"created":"~~timestamp~~","author":"Amazon Web Services, Inc.","created_by":"[] + [] === \"\"","empty_layer":true}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:~~digest~~"]}}
+{"author":"Amazon Web Services, Inc.","config":{"Cmd":["/agent"],"ArgsEscaped":true},"created":"~~timestamp~~","history":[{"created":"~~timestamp~~","author":"Amazon Web Services, Inc.","created_by":"°o°","empty_layer":true}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:~~digest~~"]}}
diff --git a/agent-container/agent-manifest.json b/agent-container/agent-manifest.json
@@ -1,2 +1 @@
-[{"Config":"config.json","RepoTags":["amazon/amazon-ecs-agent:~~agentversion~~"],"Layers":["rootfs/layer.tar"]}]
-
+[{"Config":"config.json","RepoTags":["amazon/amazon-ecs-agent:latest"],"Layers":["rootfs/layer.tar"]}]
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,5 @@
 //go:build linux && unit
+// +build linux,unit
 
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 //
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"author":"Amazon Web Services, Inc.","config":{"Cmd":["/agent"],"ArgsEscaped":true},"created":"~~timestamp~~","history":[{"created":"~~timestamp~~","author":"Amazon Web Services, Inc.","created_by":"[] + [] === \"\"","empty_layer":true}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:~~digest~~"]}}
		{"author":"Amazon Web Services, Inc.","config":{"Cmd":["/agent"],"ArgsEscaped":true},"created":"~~timestamp~~","history":[{"created":"~~timestamp~~","author":"Amazon Web Services, Inc.","created_by":"°o°","empty_layer":true}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:~~digest~~"]}}
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		[{"Config":"config.json","RepoTags":["amazon/amazon-ecs-agent:~~agentversion~~"],"Layers":["rootfs/layer.tar"]}]

		[{"Config":"config.json","RepoTags":["amazon/amazon-ecs-agent:latest"],"Layers":["rootfs/layer.tar"]}]