[tilo][logger] Rename 'svc' field to 'client.
In a previous change, 'Service' was renamed to 'UploadClient'. This
fixes the name of Logger's Service field.
Change-Id: I2156866bbd35368aeacfb9483f248cf856875133
diff --git a/tilo/logger.go b/tilo/logger.go
index 66a78ba..b9bbd35 100644
--- a/tilo/logger.go
+++ b/tilo/logger.go
@@ -37,7 +37,7 @@
// TODO(IN-699): Define constants for the ResultStore backends and document them here.
func Start(ctx context.Context, environment resultstore.Environment, projectID string) (Logger, error) {
// Connect to ResultStore.
- svc, err := resultstore.Connect(ctx, environment)
+ client, err := resultstore.Connect(ctx, environment)
if err != nil {
return nil, err
}
@@ -49,7 +49,7 @@
return nil, err
}
- invocation, err := svc.CreateInvocation(ctx, &resultstore.Invocation{
+ invocation, err := client.CreateInvocation(ctx, &resultstore.Invocation{
ProjectID: projectID,
ID: uuid.New().String(),
StartTime: time.Now(),
@@ -67,17 +67,17 @@
con.SetInvocationID(invocation.ID)
con.SetInvocationName(invocation.Name)
- return &logger{con: con, svc: svc}, nil
+ return &logger{con: con, client: client}, nil
}
// Resume creates a new Logger for the Invocation identified by a resultstore.Context.
func Resume(ctx context.Context, con resultstore.Context) (Logger, error) {
- svc, err := resultstore.Connect(ctx, con.Environment())
+ client, err := resultstore.Connect(ctx, con.Environment())
if err != nil {
return nil, err
}
- return &logger{con: con, svc: svc}, nil
+ return &logger{con: con, client: client}, nil
}
// Logger is an interface for recording Fuchsia test events in ResultStore.
@@ -108,13 +108,13 @@
// The default Logger implementation
type logger struct {
- con resultstore.Context
- svc resultstore.UploadClient
+ con resultstore.Context
+ client resultstore.UploadClient
}
// NewLogger is Visible for testing. Use `Start` and `Resume` instead.
-func NewLogger(svc resultstore.UploadClient, con resultstore.Context) Logger {
- return &logger{con: con, svc: svc}
+func NewLogger(client resultstore.UploadClient, con resultstore.Context) Logger {
+ return &logger{con: con, client: client}
}
func (l *logger) Context() resultstore.Context {
@@ -208,7 +208,7 @@
Status: status,
}
- _, err = l.svc.UpdateInvocation(ctx, invocation, []string{statusAttributesField})
+ _, err = l.client.UpdateInvocation(ctx, invocation, []string{statusAttributesField})
return err
}
@@ -233,7 +233,7 @@
filesField,
}
- _, err = l.svc.UpdateTestAction(ctx, action, fieldsToUpdate)
+ _, err = l.client.UpdateTestAction(ctx, action, fieldsToUpdate)
return err
}
@@ -256,7 +256,7 @@
statusAttributesField,
}
- _, err = l.svc.UpdateConfiguredTarget(ctx, configuredTarget, fieldsToUpdate)
+ _, err = l.client.UpdateConfiguredTarget(ctx, configuredTarget, fieldsToUpdate)
return err
}
@@ -266,7 +266,7 @@
return err
}
- return l.svc.FinishConfiguredTarget(ctx, configuredTargetName)
+ return l.client.FinishConfiguredTarget(ctx, configuredTargetName)
}
func (l *logger) finishTarget(ctx context.Context, e TestFinishedEvent) error {
@@ -274,7 +274,7 @@
if err != nil {
return err
}
- return l.svc.FinishTarget(ctx, targetName)
+ return l.client.FinishTarget(ctx, targetName)
}
func (l *logger) updateTarget(ctx context.Context, e TestFinishedEvent) error {
@@ -296,7 +296,7 @@
statusAttributesField,
}
- _, err = l.svc.UpdateTarget(ctx, target, fieldsToUpdate)
+ _, err = l.client.UpdateTarget(ctx, target, fieldsToUpdate)
return err
}
@@ -311,7 +311,7 @@
StartTime: e.StartTime,
}
- _, err = l.svc.UpdateTarget(ctx, target, []string{startTimeField})
+ _, err = l.client.UpdateTarget(ctx, target, []string{startTimeField})
return err
}
@@ -332,7 +332,7 @@
Properties: l.dimensionSetToMap(e.Dimensions),
}
- _, err = l.svc.CreateConfiguration(ctx, config, invocationName)
+ _, err = l.client.CreateConfiguration(ctx, config, invocationName)
return err
}
@@ -355,7 +355,7 @@
StartTime: dummyStartTime,
}
- target, err = l.svc.CreateTarget(ctx, target, invocationName)
+ target, err = l.client.CreateTarget(ctx, target, invocationName)
if err != nil {
return err
}
@@ -387,7 +387,7 @@
StartTime: e.StartTime,
}
- configuredTarget, err = l.svc.CreateConfiguredTarget(ctx, configuredTarget, targetName)
+ configuredTarget, err = l.client.CreateConfiguredTarget(ctx, configuredTarget, targetName)
if err != nil {
return err
}
@@ -423,7 +423,7 @@
StartTime: e.StartTime,
}
- action, err = l.svc.CreateTestAction(ctx, action, configuredTargetName)
+ action, err = l.client.CreateTestAction(ctx, action, configuredTargetName)
if err != nil {
return err
}
@@ -455,7 +455,7 @@
return err
}
- return l.svc.FinishInvocation(ctx, invocationName)
+ return l.client.FinishInvocation(ctx, invocationName)
}
func (l *logger) invocationID() (string, error) {
