chore: add --proxy flag to run local, do host discovery for service connect services#5412
Merged
mergify[bot] merged 18 commits intoaws:mainlinefrom Oct 26, 2023
Merged
Conversation
|
🍕 Here are the new binary sizes!
|
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## mainline #5412 +/- ##
============================================
+ Coverage 69.88% 69.89% +0.01%
============================================
Files 299 299
Lines 45374 45465 +91
Branches 295 295
============================================
+ Hits 31708 31780 +72
- Misses 12122 12140 +18
- Partials 1544 1545 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
dannyrandall
changed the title
--proxy flag to run local, do host discovery to service connect services--proxy flag to run local, do host discovery for service connect services
Lou1415926
approved these changes
Oct 25, 2023
CaptainCarpensir
approved these changes
Oct 26, 2023
Contributor
CaptainCarpensir
left a comment
CaptainCarpensir
left a comment
There was a problem hiding this comment.
I like the changes to the runLocalOpts it makes more sense to just create the orchestrator once!
| if aws.StringValue(service.ServiceName) == serviceName { | ||
| svc := Service(*service) | ||
| return &svc, nil | ||
| if aws.StringValue(svcs[0].ServiceName) != serviceName { |
Contributor
There was a problem hiding this comment.
Can we check the length just in case 🥺
Comment on lines
+630
to
+631
| host: aws.StringValue(alias.DnsName), | ||
| port: strconv.Itoa(int(aws.Int64Value(alias.Port))), |
Contributor
There was a problem hiding this comment.
My concern is: this might be too Copilot specific assuming we always set sc service through ClientAliases. We can refactor later but we probably should add a comment for what assumption we make for now 🤔
Comment on lines
+618
to
+631
| for _, svc := range svcs { | ||
| // find the primary deployment with service connect enabled | ||
| idx := slices.IndexFunc(svc.Deployments, func(dep *sdkecs.Deployment) bool { | ||
| return aws.StringValue(dep.Status) == "PRIMARY" && aws.BoolValue(dep.ServiceConnectConfiguration.Enabled) | ||
| }) | ||
| if idx == -1 { | ||
| continue | ||
| } | ||
|
|
||
| for _, sc := range svc.Deployments[idx].ServiceConnectConfiguration.Services { | ||
| for _, alias := range sc.ClientAliases { | ||
| hosts = append(hosts, host{ | ||
| host: aws.StringValue(alias.DnsName), | ||
| port: strconv.Itoa(int(aws.Int64Value(alias.Port))), |
Contributor
There was a problem hiding this comment.
Also can we just move the logic into the ecs pkg? It seems to be less useful to return []awsecs.Service than the hosts.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the Apache 2.0 License.