Resolving cloudwatch endpoint for all regions #4191
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1854,32 +1854,31 @@ func (engine *DockerTaskEngine) createContainer(task *apitask.Task, container *a | |
| } | ||
| } | ||
|
|
||
| // We're currently relying on AWS SDK Go V1 to obtain/format the correct cloudwatch endpoint. | ||
| // This is will need to be updated once we upgrade to AWS SDK Go V2. | ||
| if hostConfig.LogConfig.Type == logDriverTypeAwslogs { | ||
| region := hostConfig.LogConfig.Config["awslogs-region"] | ||
| endpoint := "" | ||
| dnsSuffix := "" | ||
| partition, ok := ep.PartitionForRegion(ep.DefaultPartitions(), region) | ||
| if !ok { | ||
| logger.Warn("No partition resolved for region. Using AWS default", logger.Fields{ | ||
| "region": region, | ||
| "defaultDNSSuffix": ep.AwsPartition().DNSSuffix(), | ||
| }) | ||
| dnsSuffix = ep.AwsPartition().DNSSuffix() | ||
| } else { | ||
| resolvedEndpoint, err := partition.EndpointFor("logs", region) | ||
| if err == nil { | ||
| endpoint = resolvedEndpoint.URL | ||
| } else { | ||
| dnsSuffix = partition.DNSSuffix() | ||
| } | ||
| } | ||
| if endpoint == "" { | ||
| endpoint = fmt.Sprintf("https://logs.%s.%s", region, dnsSuffix) | ||
|
There was a problem hiding this comment. INFO: Just asking to learn, is this the default format of the endpoint if its not found in partition.EndpointFor? Does this mean it's a special type of region/not-opt in region? There was a problem hiding this comment. Does this work in Non-Commercial regions? There was a problem hiding this comment. Yep, this is typically the format for all service endpoints. We're adding this in the case that AWS SDK Go V1 can't resolve it on it's own (i.e. the information for a new region aren't present). There was a problem hiding this comment.
As in isolated regions? If so then yes they do. This is more of a follow up to #4143. |
||
| } | ||
| hostConfig.LogConfig.Config["awslogs-endpoint"] = endpoint | ||
| } | ||
|
|
||
| //Apply the log driver secret into container's LogConfig and Env secrets to container.Environment | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2877,7 +2877,17 @@ func TestCreateContainerAwslogsLogDriver(t *testing.T) { | |
| { | ||
| name: "test container that uses awslogs log driver in IAD", | ||
| region: "us-east-1", | ||
| expectedLogConfigEndpoint: "https://logs.us-east-1.amazonaws.com", | ||
| }, | ||
| { | ||
| name: "test container that uses awslogs log driver in BJS", | ||
| region: "cn-north-1", | ||
|
There was a problem hiding this comment. Note: cn-north-1 and us-gov-east-1 are both available/published in https://github.com/aws/aws-sdk-go-v2, so we should be ok to use them in our test cases. |
||
| expectedLogConfigEndpoint: "https://logs.cn-north-1.amazonaws.com.cn", | ||
| }, | ||
| { | ||
| name: "test container that uses awslogs log driver in OSU", | ||
| region: "us-gov-east-1", | ||
| expectedLogConfigEndpoint: "https://logs.us-gov-east-1.amazonaws.com", | ||
| }, | ||
| { | ||
| name: "test container that uses awslogs log driver in NCL", | ||
|
|
@@ -2906,8 +2916,10 @@ func TestCreateContainerAwslogsLogDriver(t *testing.T) { | |
|
|
||
| rawHostConfigInput := dockercontainer.HostConfig{ | ||
| LogConfig: dockercontainer.LogConfig{ | ||
| Type: "awslogs", | ||
| Config: map[string]string{ | ||
| "awslogs-region": tc.region, | ||
| }, | ||
| }, | ||
| } | ||
| rawHostConfig, err := json.Marshal(&rawHostConfigInput) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would
hostConfig.LogConfig.Config["awslogs-region"]ever be empty or null? If yes, should fallback to useregion := engine.cfg.AWSRegionbefore moving to line 1863?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RIght so
awslogs-regionshouldn't be empty/null ever. If a customer were to omit this option from the task definition then it would be considered invalid.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My original thought process was to also default to
engine.cfg.AWSRegionbut after testing manually I couldn't find a scenario where this is not aparent from the task payload. Although I'm open to have this as a safety net or maybe fail the task.