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.
aws · Oct 18, 2021 · 5ddc83b · 5ddc83b
1 parent 915556d
commit 5ddc83b
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 //