changes from feedback

hashicorp · Apr 27, 2020 · 3be2aaa · 3be2aaa
1 parent bf852ac
commit 3be2aaa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/plugin/path_config_test.go b/plugin/path_config_test.go
@@ -362,8 +362,12 @@ func TestConfig_Update(t *testing.T) {
 				tc.d.Schema = pathConfig(&b).Fields
 			}
 
-			if err := tc.new.Update(tc.d); (err != nil) != tc.err {
-				t.Fatal(err)
+			err := tc.new.Update(tc.d)
+			if tc.err && err == nil {
+				t.Fatalf("err expected, got nil")
+			}
+			if !tc.err && err != nil {
+				t.Fatalf("no error expected, got: %s", err)
 			}
 
 			if v, exp := tc.new.Credentials, tc.r.Credentials; !reflect.DeepEqual(v, exp) {

diff --git a/plugin/path_login.go b/plugin/path_login.go
@@ -350,7 +350,7 @@ func (b *GcpAuthBackend) pathIamLogin(ctx context.Context, req *logical.Request,
 	}
 	role.PopulateTokenAuth(auth)
 	if err := conf.IAMAuthMetadata.PopulateDesiredMetadata(auth, authMetadata(loginInfo, serviceAccount)); err != nil {
-		b.Logger().Warn(fmt.Sprintf("unable to populate iam metadata due to %s", err))
+		b.Logger().Warn("unable to populate iam metadata", "err", err.Error())
 	}
 
 	resp := &logical.Response{
@@ -504,7 +504,7 @@ func (b *GcpAuthBackend) pathGceLogin(ctx context.Context, req *logical.Request,
 	}
 	role.PopulateTokenAuth(auth)
 	if err := conf.GCEAuthMetadata.PopulateDesiredMetadata(auth, authMetadata(loginInfo, serviceAccount)); err != nil {
-		b.Logger().Warn(fmt.Sprintf("unable to populate gce metadata due to %s", err))
+		b.Logger().Warn("unable to populate gce metadata due", "err", err.Error())
 	}
 
 	resp := &logical.Response{