Clean Test Hosts In China

.github/workflows/clean-aws-resources.yml

@@ -136,9 +136,28 @@ jobs:
           role-to-assume: ${{ secrets[matrix.role_secret] }}
           aws-region: ${{ matrix.region }}
 
-      - name: Clean old dedicated host
+      - name: Clean old host
+        working-directory: tool/clean
+        run: go run ./clean_host/clean_host.go ${{ matrix.region }}
+
+  clean-hosts-china:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE_CN }}
+          aws-region: "cn-north-1"
+
+      - name: Clean old hosts
         working-directory: tool/clean
-        run: go run ./clean_host/clean_host.go --tags=clean
+        run: go run ./clean_host/clean_host.go cn-north-1
 
   clean-ecs-clusters:
     runs-on: ubuntu-latest

tool/clean/clean_host/clean_host.go

@@ -1,14 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT
-
-//go:build clean
-// +build clean
-
 package main
 
 import (
 	"context"
 	"log"
+	"os"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/config"
@@ -19,8 +16,6 @@ import (
 	"github.com/aws/amazon-cloudwatch-agent/tool/clean"
 )
 
-var REGIONS = []string{"us-east-1", "us-west-2"}
-
 // Clean integration hosts if they have been open longer than 1 day
 func main() {
 	err := cleanHost()
@@ -33,16 +28,13 @@ func cleanHost() error {
 	log.Print("Begin to clean EC2 Host")
 
 	cxt := context.Background()
-	var err error
-	for _, region := range REGIONS {
-		defaultConfig, err := config.LoadDefaultConfig(cxt, config.WithRegion(region))
-		if err != nil {
-			return err
-		}
-		ec2client := ec2.NewFromConfig(defaultConfig)
-
-		terminateInstances(cxt, ec2client)
+	defaultConfig, err := config.LoadDefaultConfig(cxt, config.WithRegion(os.Args[1]))
+	if err != nil {
+		return err
 	}
+	ec2client := ec2.NewFromConfig(defaultConfig)
+
+	terminateInstances(cxt, ec2client)
 	return err
 }