Propagate error component from WaitForHealthy. (#335)

Reformat some files.
bazelbuild · Apr 3, 2019 · afa8c44 · afa8c44
1 parent 24771d4
commit afa8c44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/go/healthreporter/health_reporter.go b/go/healthreporter/health_reporter.go
@@ -67,9 +67,13 @@ func WaitForHealthy(ctx context.Context, h HealthReporter) error {
 		if errors.IsPermanent(err) {
 			return err
 		}
+		comp := errors.Component(err)
+		if comp == errors.DefaultComp {
+			comp = h.Name()
+		}
 		select {
 		case <-ctx.Done():
-			return errors.New(h.Name(), fmt.Errorf("%v waiting for healthy: %v", ctx.Err(), err))
+			return errors.New(comp, fmt.Errorf("%v waiting for healthy: %v", ctx.Err(), err))
 		case <-ticker.C:
 		}
 	}

diff --git a/go/metadata/capabilities/capabilities_test.go b/go/metadata/capabilities/capabilities_test.go
@@ -1082,7 +1082,7 @@ func TestStripAllPrefixedExcept(t *testing.T) {
 			exempt: []string{""},
 			out: &Capabilities{
 				AlwaysMatch: map[string]interface{}{},
-				FirstMatch:  []map[string]interface{}{map[string]interface{}{}},
+				FirstMatch:  []map[string]interface{}{{}},
 			},
 		},
 		{
@@ -1519,4 +1519,3 @@ func TestMergeUnder(t *testing.T) {
 		})
 	}
 }
-
diff --git a/go/wsl/driver/driver.go b/go/wsl/driver/driver.go
@@ -529,4 +529,3 @@ func (f *fakeResponseWriter) Write(b []byte) (int, error) {
 func (f *fakeResponseWriter) WriteHeader(statusCode int) {
 	log.Printf("%s status code: %d", f.prefix, statusCode)
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -529,4 +529,3 @@ func (f *fakeResponseWriter) Write(b []byte) (int, error) {
		func (f *fakeResponseWriter) WriteHeader(statusCode int) {
		log.Printf("%s status code: %d", f.prefix, statusCode)
		}