Move duplicate awsrulesfn package to the ecs-agent module (#4661)

* remove duplicate awsrulesfn to ecs-agent

* go mod

Author: Yiyuanzzz

agent/engine/serviceconnect/manager_linux.go

@@ -26,7 +26,6 @@ import (
 	apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
 	apiserviceconnect "github.com/aws/amazon-ecs-agent/agent/api/serviceconnect"
 	apitask "github.com/aws/amazon-ecs-agent/agent/api/task"
-	"github.com/aws/amazon-ecs-agent/agent/awsrulesfn"
 	"github.com/aws/amazon-ecs-agent/agent/config"
 	"github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi"
 	"github.com/aws/amazon-ecs-agent/agent/taskresource"
@@ -35,6 +34,7 @@ import (
 	apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs"
 	apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/ipcompatibility"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"

agent/taskresource/volume/dockervolume_efs.go

@@ -17,8 +17,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/aws/amazon-ecs-agent/agent/awsrulesfn"
 	"github.com/aws/amazon-ecs-agent/agent/config"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn"
 
 	"github.com/cihub/seelog"
 )

agent/awsrulesfn/awspartition.go renamed to agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn/awspartition.go

@@ -25,6 +25,7 @@ github.com/aws/amazon-ecs-agent/ecs-agent/api/errors
 github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status
 github.com/aws/amazon-ecs-agent/ecs-agent/async
 github.com/aws/amazon-ecs-agent/ecs-agent/async/mocks
+github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn
 github.com/aws/amazon-ecs-agent/ecs-agent/config
 github.com/aws/amazon-ecs-agent/ecs-agent/credentials
 github.com/aws/amazon-ecs-agent/ecs-agent/credentials/mocks

agent/awsrulesfn/generate_partitions.go renamed to agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn/generate_partitions.go

@@ -2,9 +2,14 @@ package awsrulesfn
 
 import "regexp"
 
-// aws-sdk-go-v2 does not export partition metadata, so copy the files from vendor to make it accessible.
+const (
+	// Partition identifiers
+	AwsPartitionID      = "aws"        // AWS Standard partition.
+	AwsCnPartitionID    = "aws-cn"     // AWS China partition.
+	AwsUsGovPartitionID = "aws-us-gov" // AWS GovCloud (US) partition.
 
-//go:generate cp ../../vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn/partition.go ../../vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn/partitions.go .
+	DnsSuffix = "amazonaws.com" // Default DNS suffix for AWS Standard partition.
+)
 
 // GetPartitionForRegion returns an AWS partition for the region provided.
 // Unlike GetPartition, this function

agent/awsrulesfn/partition.go renamed to agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn/partition.go

@@ -0,0 +1,5 @@
+package awsrulesfn
+
+// aws-sdk-go-v2 does not export partition metadata, so copy the files from vendor to make it accessible.
+//go:generate bash -c "echo '// Code generated by go generate; DO NOT EDIT.' > partition.go && cat ../vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn/partition.go >> partition.go"
+//go:generate bash -c "echo '// Code generated by go generate; DO NOT EDIT.' > partitions.go && cat ../vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn/partitions.go >> partitions.go"

agent/awsrulesfn/partitions.go renamed to agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn/partitions.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/aws/amazon-ecs-agent/ecs-init/config/awsrulesfn"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn"
 	"github.com/cihub/seelog"
 	godocker "github.com/fsouza/go-dockerclient"
 	"github.com/pkg/errors"