-
Notifications
You must be signed in to change notification settings - Fork 97
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.
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
Support direct route connection in AppGraph #7072
Merged
youngbupark
merged 5 commits into
radius-project:main
from
youngbupark:youngp/fix-dir-route
Jan 25, 2024
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
|
@@ -19,6 +19,7 @@ package applications | |
import ( | ||
"context" | ||
"encoding/json" | ||
"net/url" | ||
"sort" | ||
"strings" | ||
|
||
|
@@ -29,6 +30,7 @@ import ( | |
aztoken "github.com/radius-project/radius/pkg/azure/tokencredentials" | ||
"github.com/radius-project/radius/pkg/cli/clients_new/generated" | ||
corerpv20231001preview "github.com/radius-project/radius/pkg/corerp/api/v20231001preview" | ||
"github.com/radius-project/radius/pkg/to" | ||
"github.com/radius-project/radius/pkg/ucp/resources" | ||
) | ||
|
||
|
@@ -208,11 +210,11 @@ func computeGraph(applicationName string, applicationResources []generated.Gener | |
resources = append(resources, resource) | ||
|
||
// Application-scoped resources are by definition "in" the application | ||
resourcesByIDInApplication[*resource.ID] = true | ||
resourcesByIDInApplication[to.String(resource.ID)] = true | ||
} | ||
|
||
for _, resource := range environmentResources { | ||
_, found := resourcesByIDInApplication[*resource.ID] | ||
_, found := resourcesByIDInApplication[to.String(resource.ID)] | ||
if found { | ||
// Appears in both application and environment lists, avoid duplicates. | ||
continue | ||
|
@@ -221,7 +223,7 @@ func computeGraph(applicationName string, applicationResources []generated.Gener | |
// This is an environment-scoped resource. We need to process the connections | ||
// to determine if it's part of the application. | ||
resources = append(resources, resource) | ||
resourcesByIDInApplication[*resource.ID] = false | ||
resourcesByIDInApplication[to.String(resource.ID)] = false | ||
} | ||
|
||
// Next we need to process each entry in the resources list and build up the application graph. | ||
|
@@ -240,11 +242,11 @@ func computeGraph(applicationName string, applicationResources []generated.Gener | |
applicationGraphResource.ProvisioningState = &state | ||
} | ||
|
||
connections := connectionsFromAPIData(resource) // Outbound connections based on 'connections' | ||
connections := connectionsFromAPIData(resource, resources) // Outbound connections based on 'connections' | ||
connections = append(connections, providesFromAPIData(resource)...) // Inbound connections based on 'provides' | ||
|
||
sort.Slice(connections, func(i, j int) bool { | ||
return *connections[i].ID < *connections[j].ID | ||
return to.String(connections[i].ID) < to.String(connections[j].ID) | ||
}) | ||
|
||
applicationGraphResource.Connections = connections | ||
|
@@ -275,8 +277,8 @@ func computeGraph(applicationName string, applicationResources []generated.Gener | |
// First process add resources we *know* are in the application to the queue. As we explore the graph we'll | ||
// visit resources outside the application if necessary. | ||
for _, entry := range applicationGraphResourcesByID { | ||
if resourcesByIDInApplication[*entry.ID] { | ||
queue = append(queue, *entry.ID) | ||
if resourcesByIDInApplication[to.String(entry.ID)] { | ||
queue = append(queue, to.String(entry.ID)) | ||
} | ||
} | ||
|
||
|
@@ -357,7 +359,7 @@ func computeGraph(applicationName string, applicationResources []generated.Gener | |
// Print connections in stable order. | ||
sort.Slice(entry.Connections, func(i, j int) bool { | ||
// Connections are guaranteed to have a name. | ||
return *entry.Connections[i].ID < *entry.Connections[j].ID | ||
return to.String(entry.Connections[i].ID) < to.String(entry.Connections[j].ID) | ||
}) | ||
|
||
graph.Resources = append(graph.Resources, &entry) | ||
|
@@ -372,29 +374,21 @@ func applicationGraphResourceFromID(id string) *corerpv20231001preview.Applicati | |
return nil // Invalid resource ID, skip | ||
} | ||
|
||
appName := application.Name() | ||
appType := application.Type() | ||
provisioningState := string(v1.ProvisioningStateSucceeded) | ||
|
||
return &corerpv20231001preview.ApplicationGraphResource{ID: &id, | ||
Name: &appName, | ||
Type: &appType, | ||
ProvisioningState: &provisioningState, | ||
return &corerpv20231001preview.ApplicationGraphResource{ | ||
ID: to.Ptr(id), | ||
Name: to.Ptr(application.Name()), | ||
Type: to.Ptr(application.Type()), | ||
ProvisioningState: to.Ptr(string(v1.ProvisioningStateSucceeded)), | ||
} | ||
|
||
} | ||
|
||
// outputResourceEntryFromID creates a outputResourceEntry from a resource ID. | ||
func outputResourceEntryFromID(id resources.ID) corerpv20231001preview.ApplicationGraphOutputResource { | ||
orID := id.String() | ||
orName := id.Name() | ||
orType := id.Type() | ||
entry := corerpv20231001preview.ApplicationGraphOutputResource{ID: &orID, | ||
Name: &orName, | ||
Type: &orType, | ||
return corerpv20231001preview.ApplicationGraphOutputResource{ | ||
ID: to.Ptr(id.String()), | ||
Name: to.Ptr(id.Name()), | ||
Type: to.Ptr(id.Type()), | ||
} | ||
|
||
return entry | ||
} | ||
|
||
// outputResourcesFromAPIData processes the generic resource representation returned by the Radius API | ||
|
@@ -447,13 +441,13 @@ func outputResourcesFromAPIData(resource generated.GenericResource) []*corerpv20 | |
|
||
// Produce a stable output | ||
sort.Slice(entries, func(i, j int) bool { | ||
if entries[i].Type != entries[j].Type { | ||
return *entries[i].Type < *entries[j].Type | ||
if to.String(entries[i].Type) != to.String(entries[j].Type) { | ||
return to.String(entries[i].Type) < to.String(entries[j].Type) | ||
} | ||
if entries[i].Name != entries[j].Name { | ||
return *entries[i].Name < *entries[j].Name | ||
if to.String(entries[i].Name) != to.String(entries[j].Name) { | ||
return to.String(entries[i].Name) < to.String(entries[j].Name) | ||
} | ||
return *entries[i].ID < *entries[j].ID | ||
return to.String(entries[i].ID) < to.String(entries[j].ID) | ||
|
||
}) | ||
|
||
|
@@ -464,7 +458,7 @@ func outputResourcesFromAPIData(resource generated.GenericResource) []*corerpv20 | |
// For example if the resource is an 'Applications.Core/container' then this function can find it's connections | ||
// to other resources like databases. Conversely if the resource is a database then this function | ||
// will not find any connections (because they are inbound). Inbound connections are processed later. | ||
func connectionsFromAPIData(resource generated.GenericResource) []*corerpv20231001preview.ApplicationGraphConnection { | ||
func connectionsFromAPIData(resource generated.GenericResource, allResources []generated.GenericResource) []*corerpv20231001preview.ApplicationGraphConnection { | ||
// We need to access the connections in a weakly-typed way since the data type we're | ||
// working with is a property bag. | ||
// | ||
|
@@ -497,21 +491,55 @@ func connectionsFromAPIData(resource generated.GenericResource) []*corerpv202310 | |
data := corerpv20231001preview.ConnectionProperties{} | ||
err := toStronglyTypedData(connection, &data) | ||
if err == nil { | ||
sourceID, _ := findSourceResource(to.String(data.Source), allResources) | ||
|
||
entries = append(entries, &corerpv20231001preview.ApplicationGraphConnection{ | ||
ID: data.Source, | ||
Direction: &dir, | ||
ID: to.Ptr(sourceID), | ||
Direction: to.Ptr(dir), | ||
}) | ||
} | ||
} | ||
|
||
// Produce a stable output | ||
sort.Slice(entries, func(i, j int) bool { | ||
return *entries[i].ID < *entries[j].ID | ||
return to.String(entries[i].ID) < to.String(entries[j].ID) | ||
}) | ||
|
||
return entries | ||
} | ||
|
||
// findSourceResource finds resource id by using source string by the following criteria: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This PR is to support direct route scenario. The wrong connection direction bug will be fixed once this is merged. |
||
// 1. It immediately returns return the resource ID if the source is a resource ID. | ||
// 2. Parse the hostname and look up the hostname from the resource list if the source is an URL. | ||
// 3. Otherwise, return the original source string with false boolean value. | ||
youngbupark marked this conversation as resolved.
Show resolved
Hide resolved
|
||
func findSourceResource(source string, allResources []generated.GenericResource) (string, bool) { | ||
// 1. Return if the source is a resource ID | ||
id, err := resources.Parse(source) | ||
if err == nil && id.IsResource() { | ||
return id.String(), true | ||
} | ||
|
||
// 2. Parse hostname from source and look up hostname from resource list. | ||
orig := source | ||
|
||
// Add "//" to source to enable url.Parse to parse source correctly if the scheme is not given. | ||
if !strings.Contains(source, "//") { | ||
source = "//" + source | ||
} | ||
|
||
sourceURL, err := url.Parse(source) | ||
if err == nil { | ||
rynowak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
for _, resource := range allResources { | ||
if to.String(resource.Name) == sourceURL.Hostname() { | ||
return to.String(resource.ID), true | ||
} | ||
} | ||
} | ||
|
||
// 3. Return the original source string with false boolean value. | ||
return orig, false | ||
} | ||
|
||
// providesFromAPIData is specifically to support HTTPRoute. | ||
func providesFromAPIData(resource generated.GenericResource) []*corerpv20231001preview.ApplicationGraphConnection { | ||
// Any Radius resource type that exposes a port uses the following property path to return them. | ||
|
@@ -550,19 +578,20 @@ func providesFromAPIData(resource generated.GenericResource) []*corerpv20231001p | |
data := corerpv20231001preview.ContainerPortProperties{} | ||
err := toStronglyTypedData(connection, &data) | ||
if err == nil { | ||
if *data.Provides == "" { | ||
if to.String(data.Provides) == "" { | ||
continue | ||
} | ||
|
||
entries = append(entries, &corerpv20231001preview.ApplicationGraphConnection{ | ||
ID: data.Provides, | ||
Direction: &dir, | ||
Direction: to.Ptr(dir), | ||
}) | ||
} | ||
} | ||
|
||
// Produce a stable output | ||
sort.Slice(entries, func(i, j int) bool { | ||
return *entries[i].ID < *entries[j].ID | ||
return to.String(entries[i].ID) < to.String(entries[j].ID) | ||
}) | ||
|
||
return entries | ||
|
Oops, something went wrong.
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.
This seems to be the place where we are marking the dierction wrong, connection is an outbound correct?
containerA{ .. connection: { source} ...} => containerA ---> containerB as a service