github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-24 06:07:48 +00:00
Code Issues Projects Releases Wiki Activity

client-go exec: fix metrics related to plugin not found

Browse Source 
These were missed because our tests did not pass in the correct test
data input (the command to execute).

Signed-off-by: Monis Khan <mok@vmware.com>

Kubernetes-commit: a6ac42082b4d7c0057b52900736bd7fbc2c44241
This commit is contained in:
Monis Khan 2021-07-14 12:34:56 -04:00 committed by Kubernetes Publisher
parent 7a90b08589
commit ef1d5d2691
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/client/auth/exec/metrics.go
View File

@ -18,6 +18,7 @@ package exec
import (
"errors"
"io/fs"
"os/exec"
"reflect"
"sync"
@ -92,6 +93,7 @@ func (c *certificateExpirationTracker) set(a *Authenticator, t time.Time) {
func incrementCallsMetric(err error) {
execExitError := &exec.ExitError{}
execError := &exec.Error{}
pathError := &fs.PathError{}
switch {
case err == nil: // Binary execution succeeded.
metrics.ExecPluginCalls.Increment(successExitCode, noError)
@ -99,7 +101,7 @@ func incrementCallsMetric(err error) {
case errors.As(err, &execExitError): // Binary execution failed (see "os/exec".Cmd.Run()).
metrics.ExecPluginCalls.Increment(execExitError.ExitCode(), pluginExecutionError)
case errors.As(err, &execError): // Binary does not exist (see exec.Error).
case errors.As(err, &execError), errors.As(err, &pathError): // Binary does not exist (see exec.Error, fs.PathError).
metrics.ExecPluginCalls.Increment(failureExitCode, pluginNotFoundError)
default: // We don't know about this error type.

5
plugin/pkg/client/auth/exec/metrics_test.go
View File

@ -18,6 +18,7 @@ package exec
import (
"fmt"
"io"
"testing"
"time"
@ -147,6 +148,7 @@ func TestCallsMetric(t *testing.T) {
if err != nil {
t.Fatal(err)
}
a.stderr = io.Discard
// Run refresh creds twice so that our test validates that the metrics are set correctly twice
// in a row with the same authenticator.
@ -172,7 +174,7 @@ func TestCallsMetric(t *testing.T) {
// metric values.
refreshCreds := func(command string) {
c := api.ExecConfig{
Command: "does not exist",
Command: command,
APIVersion: "client.authentication.k8s.io/v1beta1",
InteractiveMode: api.IfAvailableExecInteractiveMode,
}
@ -180,6 +182,7 @@ func TestCallsMetric(t *testing.T) {
if err != nil {
t.Fatal(err)
}
a.stderr = io.Discard
if err := a.refreshCredsLocked(&clientauthentication.Response{}); err == nil {
t.Fatal("expected the authenticator to fail because the plugin does not exist")
}