RSDK-11272: Modify Golang motion wrappers to send strings

app/billing_client.go

@@ -83,6 +83,8 @@ const (
 	PaymentMethodTypeUnspecified PaymentMethodType = iota
 	// PaymentMethodtypeCard represents a payment by card.
 	PaymentMethodtypeCard
+	// PaymentMethodTypeUSBankAccount represents a payment by US Bank Account.
+	PaymentMethodTypeUSBankAccount
 )
 
 // PaymentMethodCard holds the information of a card used for payment.
@@ -302,6 +304,8 @@ func paymentMethodTypeFromProto(methodType pb.PaymentMethodType) PaymentMethodTy
 		return PaymentMethodTypeUnspecified
 	case pb.PaymentMethodType_PAYMENT_METHOD_TYPE_CARD:
 		return PaymentMethodtypeCard
+	case pb.PaymentMethodType_PAYMENT_METHOD_TYPE_USBANKACCOUNT:
+		return PaymentMethodTypeUSBankAccount
 	default:
 		return PaymentMethodTypeUnspecified
 	}

cli/motion.go

@@ -7,7 +7,6 @@ import (
 	"go.viam.com/utils"
 
 	"go.viam.com/rdk/referenceframe"
-	"go.viam.com/rdk/robot"
 	"go.viam.com/rdk/services/motion"
 	"go.viam.com/rdk/spatialmath"
 )
@@ -103,18 +102,12 @@ func motionPrintStatusAction(c *cli.Context, args motionPrintArgs) error {
 	for _, p := range frameSystem.Parts {
 		n := p.FrameConfig.Name()
 
-		theComponent, err := robot.ResourceByName(robotClient, n)
-		if err != nil {
-			logger.Debugf("no component for %v", n)
-			continue
-		}
-
-		pif, err := myMotion.GetPose(ctx, theComponent.Name(), "world", nil, nil)
+		pif, err := myMotion.GetPose(ctx, n, "world", nil, nil)
 		if err != nil {
 			return err
 		}
 
-		printf(c.App.Writer, "%20s : %v", theComponent.Name().ShortName(), prettyString(pif.Pose()))
+		printf(c.App.Writer, "%20s : %v", n, prettyString(pif.Pose()))
 	}
 
 	return nil
@@ -155,17 +148,12 @@ func motionGetPoseAction(c *cli.Context, args motionGetPoseArgs) error {
 		utils.UncheckedError(robotClient.Close(ctx))
 	}()
 
-	theComponent, err := robot.ResourceByName(robotClient, args.Component)
-	if err != nil {
-		return err
-	}
-
 	myMotion, err := motion.FromRobot(robotClient, "builtin")
 	if err != nil || myMotion == nil {
 		return fmt.Errorf("no motion: %w", err)
 	}
 
-	pif, err := myMotion.GetPose(ctx, theComponent.Name(), "world", nil, nil)
+	pif, err := myMotion.GetPose(ctx, args.Component, "world", nil, nil)
 	if err != nil {
 		return err
 	}
@@ -212,17 +200,12 @@ func motionSetPoseAction(c *cli.Context, args motionSetPoseArgs) error {
 		utils.UncheckedError(robotClient.Close(ctx))
 	}()
 
-	theComponent, err := robot.ResourceByName(robotClient, args.Component)
-	if err != nil {
-		return err
-	}
-
 	myMotion, err := motion.FromRobot(robotClient, "builtin")
 	if err != nil || myMotion == nil {
 		return fmt.Errorf("no motion: %w", err)
 	}
 
-	pose, err := myMotion.GetPose(ctx, theComponent.Name(), "world", nil, nil)
+	pose, err := myMotion.GetPose(ctx, args.Component, "world", nil, nil)
 	if err != nil {
 		return err
 	}
@@ -260,7 +243,7 @@ func motionSetPoseAction(c *cli.Context, args motionSetPoseArgs) error {
 	printf(c.App.Writer, "going to pose %v", pose)
 
 	req := motion.MoveReq{
-		ComponentName: theComponent.Name(),
+		ComponentName: args.Component,
 		Destination:   pose,
 	}
 	_, err = myMotion.Move(ctx, req)

go.mod

@@ -83,7 +83,7 @@ require (
 	go.uber.org/atomic v1.11.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
-	go.viam.com/api v0.1.475
+	go.viam.com/api v0.1.477
 	go.viam.com/test v1.2.4
 	go.viam.com/utils v0.1.167
 	goji.io v2.0.2+incompatible

go.sum

@@ -1532,8 +1532,8 @@ go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-go.viam.com/api v0.1.475 h1:d0lpY/Ibgbv7CzSsET+ujSDRbq1K+xXeV76XXHGcy3s=
-go.viam.com/api v0.1.475/go.mod h1:p/am76zx8SZ74V/F4rEAYQIpHaaLUwJgY2q3Uw3FIWk=
+go.viam.com/api v0.1.477 h1:huAOmn3iejrRapzlYSyB3R0S47itXTUkQ3+kt0Yx02I=
+go.viam.com/api v0.1.477/go.mod h1:p/am76zx8SZ74V/F4rEAYQIpHaaLUwJgY2q3Uw3FIWk=
 go.viam.com/test v1.2.4 h1:JYgZhsuGAQ8sL9jWkziAXN9VJJiKbjoi9BsO33TW3ug=
 go.viam.com/test v1.2.4/go.mod h1:zI2xzosHdqXAJ/kFqcN+OIF78kQuTV2nIhGZ8EzvaJI=
 go.viam.com/utils v0.1.167 h1:OnuC5u2YcLTMuwbvyky5yjNDEbQjf0kpoUHoLXhJWz8=

services/motion/builtin/builtin.go

@@ -137,9 +137,9 @@ type builtIn struct {
 	conf                    *Config
 	mu                      sync.RWMutex
 	fsService               framesystem.Service
-	movementSensors         map[resource.Name]movementsensor.MovementSensor
-	slamServices            map[resource.Name]slam.Service
-	visionServices          map[resource.Name]vision.Service
+	movementSensors         map[string]movementsensor.MovementSensor
+	slamServices            map[string]slam.Service
+	visionServices          map[string]vision.Service
 	components              map[string]resource.Resource
 	logger                  logging.Logger
 	state                   *state.State
@@ -185,22 +185,22 @@ func (ms *builtIn) Reconfigure(
 		ms.configuredDefaultExtras["num_threads"] = config.NumThreads
 	}
 
-	movementSensors := make(map[resource.Name]movementsensor.MovementSensor)
-	slamServices := make(map[resource.Name]slam.Service)
-	visionServices := make(map[resource.Name]vision.Service)
+	movementSensors := make(map[string]movementsensor.MovementSensor)
+	slamServices := make(map[string]slam.Service)
+	visionServices := make(map[string]vision.Service)
 	componentMap := make(map[string]resource.Resource)
 	for name, dep := range deps {
 		switch dep := dep.(type) {
 		case framesystem.Service:
 			ms.fsService = dep
 		case movementsensor.MovementSensor:
-			movementSensors[name] = dep
+			movementSensors[name.Name] = dep
 		case slam.Service:
-			slamServices[name] = dep
+			slamServices[name.Name] = dep
 		case vision.Service:
-			visionServices[name] = dep
+			visionServices[name.Name] = dep
 		default:
-			componentMap[name.ShortName()] = dep
+			componentMap[name.Name] = dep
 		}
 	}
 	ms.movementSensors = movementSensors
@@ -326,15 +326,15 @@ func (ms *builtIn) MoveOnGlobe(ctx context.Context, req motion.MoveOnGlobeReq) (
 // GetPose is deprecated.
 func (ms *builtIn) GetPose(
 	ctx context.Context,
-	componentName resource.Name,
+	componentName string,
 	destinationFrame string,
 	supplementalTransforms []*referenceframe.LinkInFrame,
 	extra map[string]interface{},
 ) (*referenceframe.PoseInFrame, error) {
 	ms.logger.Warn("GetPose is deprecated. Please switch to using the GetPose method defined on the FrameSystem service")
 	ms.mu.RLock()
 	defer ms.mu.RUnlock()
-	return ms.fsService.GetPose(ctx, componentName.ShortName(), destinationFrame, supplementalTransforms, extra)
+	return ms.fsService.GetPose(ctx, componentName, destinationFrame, supplementalTransforms, extra)
 }
 
 func (ms *builtIn) StopPlan(
@@ -480,9 +480,9 @@ func (ms *builtIn) plan(ctx context.Context, req motion.MoveReq, logger logging.
 	}
 	logger.CDebugf(ctx, "frame system inputs: %v", fsInputs)
 
-	movingFrame := frameSys.Frame(req.ComponentName.ShortName())
+	movingFrame := frameSys.Frame(req.ComponentName)
 	if movingFrame == nil {
-		return nil, fmt.Errorf("component named %s not found in robot frame system", req.ComponentName.ShortName())
+		return nil, fmt.Errorf("component named %s not found in robot frame system", req.ComponentName)
 	}
 
 	startState, waypoints, err := waypointsFromRequest(req, fsInputs)
@@ -720,7 +720,7 @@ func waypointsFromRequest(
 			return nil, nil, errors.New("extras goal_state could not be interpreted as map[string]interface{}")
 		}
 	} else if req.Destination != nil {
-		goalState := armplanning.NewPlanState(referenceframe.FrameSystemPoses{req.ComponentName.ShortName(): req.Destination}, nil)
+		goalState := armplanning.NewPlanState(referenceframe.FrameSystemPoses{req.ComponentName: req.Destination}, nil)
 		waypoints = append(waypoints, goalState)
 	}
 	return startState, waypoints, nil