[patch] 🐛 fix agent sidecar behavior (#598)

Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com>
vdaas · Jul 28, 2020 · 1658914 · 1658914
1 parent 98074e3
commit 1658914
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/pkg/agent/sidecar/service/observer/observer.go b/pkg/agent/sidecar/service/observer/observer.go
@@ -318,7 +318,11 @@ func (o *observer) onWrite(ctx context.Context, name string) error {
 		}
 	}()
 
-	ok, err := o.isValidMetadata(name)
+	if name != o.metadataPath {
+		return nil
+	}
+
+	ok, err := o.isValidMetadata()
 	if err != nil {
 		return err
 	}
@@ -338,7 +342,11 @@ func (o *observer) onCreate(ctx context.Context, name string) error {
 		}
 	}()
 
-	ok, err := o.isValidMetadata(name)
+	if name != o.metadataPath {
+		return nil
+	}
+
+	ok, err := o.isValidMetadata()
 	if err != nil {
 		return err
 	}
@@ -350,11 +358,7 @@ func (o *observer) onCreate(ctx context.Context, name string) error {
 	return o.terminate()
 }
 
-func (o *observer) isValidMetadata(name string) (bool, error) {
-	if name != o.metadataPath {
-		return false, nil
-	}
-
+func (o *observer) isValidMetadata() (bool, error) {
 	metadata, err := metadata.Load(o.metadataPath)
 	if err != nil {
 		return false, err

diff --git a/pkg/agent/sidecar/service/observer/observer_test.go b/pkg/agent/sidecar/service/observer/observer_test.go
@@ -845,7 +845,6 @@ func Test_observer_onCreate(t *testing.T) {
 
 func Test_observer_isValidMetadata(t *testing.T) {
 	type args struct {
-		name string
 	}
 	type fields struct {
 		w               watch.Watcher
@@ -887,7 +886,6 @@ func Test_observer_isValidMetadata(t *testing.T) {
 		   {
 		       name: "test_case_1",
 		       args: args {
-		           name: "",
 		       },
 		       fields: fields {
 		           w: nil,
@@ -912,7 +910,6 @@ func Test_observer_isValidMetadata(t *testing.T) {
 		       return test {
 		           name: "test_case_2",
 		           args: args {
-		           name: "",
 		           },
 		           fields: fields {
 		           w: nil,
@@ -958,7 +955,7 @@ func Test_observer_isValidMetadata(t *testing.T) {
 				ch:              test.fields.ch,
 			}
 
-			got, err := o.isValidMetadata(test.args.name)
+			got, err := o.isValidMetadata()
 			if err := test.checkFunc(test.want, got, err); err != nil {
 				tt.Errorf("error = %v", err)
 			}