From 5ddc83b4f4225116770f87e47f6447c8accc5f38 Mon Sep 17 00:00:00 2001
From: Harsh Rawat <rawahars@amazon.com>
Date: Mon, 18 Oct 2021 16:29:10 -0700
Subject: [PATCH] Updating the go build tags as part of Linux Golang upgrade

Previously, the Linux was running on older version of Golang. With the Golang version upgrade to 1.17, the refactoring was done to change the build tags. This commit is for the same refactoring to older commits of ECS Exec on Windows feature.
---
 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, 11 insertions(+), 10 deletions(-)

diff --git a/agent/engine/execcmd/manager_init_task.go b/agent/engine/execcmd/manager_init_task.go
index 24808342a0d..e588baacfa4 100644
--- a/agent/engine/execcmd/manager_init_task.go
+++ b/agent/engine/execcmd/manager_init_task.go
@@ -1,4 +1,4 @@
-// +build linux windows
+//go: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 7c4548a16bd..3fe2912e3ab 100644
--- a/agent/engine/execcmd/manager_init_task_test.go
+++ b/agent/engine/execcmd/manager_init_task_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go: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 08bcc62f262..39dedf02915 100644
--- a/agent/engine/execcmd/manager_init_task_windows.go
+++ b/agent/engine/execcmd/manager_init_task_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go: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 0bc6f08a9dc..f1a5e89bf4d 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 @@
-// +build windows,unit
+//go: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 5984eceb97c..706d5da358e 100644
--- a/agent/engine/execcmd/manager_linux.go
+++ b/agent/engine/execcmd/manager_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+//go: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 57890c491f6..b1a46d18684 100644
--- a/agent/engine/execcmd/manager_start.go
+++ b/agent/engine/execcmd/manager_start.go
@@ -1,4 +1,4 @@
-// +build linux windows
+//go: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 3810ed25646..7f369eef24e 100644
--- a/agent/engine/execcmd/manager_start_test.go
+++ b/agent/engine/execcmd/manager_start_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go: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 a02ef67c34e..a111ec92bff 100644
--- a/agent/engine/execcmd/manager_start_windows.go
+++ b/agent/engine/execcmd/manager_start_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 //
@@ -12,6 +12,7 @@
 // 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 dec0d085cf2..c64c0963db0 100644
--- a/agent/engine/execcmd/manager_start_windows_test.go
+++ b/agent/engine/execcmd/manager_start_windows_test.go
@@ -1,4 +1,4 @@
-// +build windows,unit
+//go: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 085b52bbe26..ad364756bea 100644
--- a/agent/engine/execcmd/manager_windows.go
+++ b/agent/engine/execcmd/manager_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 //