Skip to content

Modify CW endpoint short term solution to include more regions #4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mye956 merged 1 commit into from
Apr 14, 2025
Merged

Modify CW endpoint short term solution to include more regions #4569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions agent/engine/docker_task_engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,21 @@ const (
mediaTypeSignedManifestV1 = "application/vnd.docker.distribution.manifest.v1+prettyjws"
)

var newExponentialBackoff = retry.NewExponentialBackoff
var (
newExponentialBackoff = retry.NewExponentialBackoff

// List of isolated regions where AWS SDK Go V1 cannot resolve the endpoints for.
// This is a short term solution only for specific regions and ideally we should not be keeping a list of hardcoded regions.
unresolvedIsolatedRegions = map[string]bool{
"us-isob-east-1": true,
"us-iso-east-1": true,
"us-iso-west-1": true,
"eu-isoe-west-1": true,
"us-isof-south-1": true,
"us-isof-east-1": true,
"us-isob-west-1": true,
}
)

// DockerTaskEngine is a state machine for managing a task and its containers
// in ECS.
Expand Down Expand Up @@ -1903,7 +1917,7 @@ func (engine *DockerTaskEngine) createContainer(task *apitask.Task, container *a
// This is a short term solution only for specific regions
if hostConfig.LogConfig.Type == logDriverTypeAwslogs {
region := engine.cfg.AWSRegion
if region == "us-isob-east-1" || region == "us-iso-east-1" || region == "us-iso-west-1" || region == "eu-isoe-west-1" || region == "us-isof-south-1" || region == "us-isof-east-1" {
if _, ok := unresolvedIsolatedRegions[region]; ok {
endpoint := ""
dnsSuffix := ""
partition, ok := ep.PartitionForRegion(ep.DefaultPartitions(), region)
Expand Down
5 changes: 5 additions & 0 deletions agent/engine/docker_task_engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2993,6 +2993,11 @@ func TestCreateContainerAwslogsLogDriver(t *testing.T) {
region: "us-iso-west-1",
expectedLogConfigEndpoint: "https://logs.us-iso-west-1.c2s.ic.gov",
},
{
name: "test container that uses awslogs log driver in FFZ",
region: "us-isob-west-1",
expectedLogConfigEndpoint: "https://logs.us-isob-west-1.sc2s.sgov.gov",
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
Expand Down
Loading