[RSDK-8294] Use Global Connection to App in Internal Cloud Service and Local Robot #4782
Conversation
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
viambot
added
safe to test
bashar-515
force-pushed
the
RSDK-8294
branch
from
51a1242 to
edca01a
Compare
viambot
added
safe to test
viambot
added
safe to test
bashar-515
force-pushed
the
RSDK-8294
branch
from
37a88e2 to
c6a7cb3
Compare
viambot
added
safe to test
viambot
removed
the
safe to test
bashar-515
commented
Feb 13, 2025
robot/impl/local_robot.go
Outdated
| } | ||
|
|
||
| // RobotFromConfig is a helper to process a config and then create a robot based on it. | ||
| func RobotFromConfig(ctx context.Context, cfg *config.Config, logger logging.Logger, opts ...Option) (robot.LocalRobot, error) { | ||
| func RobotFromConfig(ctx context.Context, cfg *config.Config, conn rpc.ClientConn, logger logging.Logger, opts ...Option) (robot.LocalRobot, error) { |
There was a problem hiding this comment.
There is a code path where this function might be called in a scenario where a connection to App is expected (i.e., the config might have a cloud component), so I am including the parameter here.
viambot
added
safe to test
viambot
added
safe to test
viambot
added
safe to test
bashar-515
commented
Feb 13, 2025
| @@ -529,7 +529,7 @@ func (s *robotServer) serveWeb(ctx context.Context, cfg *config.Config) (err err | |||
| // state of initializing until reconfigured with full config. | |||
| minimalProcessedConfig.Initial = true | |||
|
|
|||
| myRobot, err := robotimpl.New(ctx, &minimalProcessedConfig, s.logger, robotOptions...) | |||
| myRobot, err := robotimpl.New(ctx, &minimalProcessedConfig, s.conn, s.logger, robotOptions...) | |||
benjirewis
reviewed
Feb 13, 2025
There was a problem hiding this comment.
Off-topic, but any context on the purpose of this example @cheukt ? Still necessary to keep around ?
robot/impl/local_robot.go
Outdated
| @@ -434,6 +435,12 @@ func newWithResources( | |||
| r.packageManager = packages.NewDeferredPackageManager( | |||
| ctx, | |||
| func(ctx context.Context) (packagespb.PackageServiceClient, error) { | |||
| if conn != nil { | |||
There was a problem hiding this comment.
Spoke offline, but these few lines are probably unnecessary if AcquireConnection gets the global app connection.
| @@ -529,7 +529,7 @@ func (s *robotServer) serveWeb(ctx context.Context, cfg *config.Config) (err err | |||
| // state of initializing until reconfigured with full config. | |||
| minimalProcessedConfig.Initial = true | |||
|
|
|||
| myRobot, err := robotimpl.New(ctx, &minimalProcessedConfig, s.logger, robotOptions...) | |||
| myRobot, err := robotimpl.New(ctx, &minimalProcessedConfig, s.conn, s.logger, robotOptions...) | |||
viambot
added
safe to test
viambot
added
safe to test
viambot
added
safe to test
viambot
added
safe to test
viambot
added
safe to test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The function
AcquireConnection(), is directly called in two places. This PR eliminates one of said calls by ensuring all code paths that lead to the call have their own global connection that propagates down to where the function executes to replace the call. All of these paths except for one stem from either a test or code in our examples subdirectory. In many of the tests, a nil connection is sufficient. For the few where this is not true (i.e., the ones that expect to use a connection to app--determined by the existence of a "Cloud" component within the config used to define the robot being tested), a catch-all call toAcquireConnection()is made, giving the local robot its own connection to manage. This call is marked with a comment in the code.