chore: update files with goimport (#513)

* chore: update files with goimport

This should get https://github.com/knative-sandbox/kn-plugin-func/pull/509
happy and green.

Signed-off-by: Lance Ball <lball@redhat.com>

* fixup: remove extraneous print statements

Signed-off-by: Lance Ball <lball@redhat.com>
This commit is contained in:
Lance Ball 2021-09-08 09:53:45 -04:00 committed by GitHub
parent eb17fb819c
commit 71368c6a1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 60 additions and 54 deletions

View File

@ -8,9 +8,9 @@ import (
"io/ioutil"
"os"
"path/filepath"
"runtime"
"sort"
"sync"
"runtime"
"gopkg.in/yaml.v2"
)

View File

@ -2,6 +2,7 @@ package cmd
import (
"fmt"
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/ory/viper"
@ -23,7 +24,7 @@ type functionLoaderSaver interface {
functionSaver
}
type standardLoaderSaver struct {}
type standardLoaderSaver struct{}
func (s standardLoaderSaver) Load(path string) (fn.Function, error) {
f, err := fn.NewFunction(path)

View File

@ -4,15 +4,16 @@ package cmd
import (
"context"
"github.com/Netflix/go-expect"
"github.com/hinshun/vt10x"
"github.com/spf13/cobra"
fn "knative.dev/kn-plugin-func"
"os"
"reflect"
"sync"
"testing"
"time"
"github.com/Netflix/go-expect"
"github.com/hinshun/vt10x"
"github.com/spf13/cobra"
fn "knative.dev/kn-plugin-func"
)
type mockFunctionLoaderSaver struct {
@ -49,21 +50,21 @@ func createRunFunc(cmd *cobra.Command, t *testing.T) func(subcmd string, input .
wg.Add(1)
go func() {
//defer wg.Done()
_,_ = c.ExpectEOF()
_, _ = c.ExpectEOF()
}()
go func() {
defer wg.Done()
time.Sleep(time.Millisecond*50)
time.Sleep(time.Millisecond * 50)
for _, s := range input {
_, _ = c.Send(s)
time.Sleep(time.Millisecond*50)
time.Sleep(time.Millisecond * 50)
}
}()
a := []string{subcmd}
cmd.SetArgs(a)
func () {
func() {
defer withMockedStdio(t, c)()
err = cmd.ExecuteContext(ctx)
wg.Wait()
@ -93,9 +94,9 @@ func withMockedStdio(t *testing.T, c *expect.Console) func() {
}
const (
arrowUp = "\033[A"
arrowUp = "\033[A"
arrowDown = "\033[B"
enter = "\r"
enter = "\r"
)
func TestNewConfigLabelsCmd(t *testing.T) {
@ -107,33 +108,31 @@ func TestNewConfigLabelsCmd(t *testing.T) {
run := createRunFunc(cmd, t)
p := func (k,v string) fn.Label {
p := func(k, v string) fn.Label {
return fn.Label{Key: &k, Value: &v}
}
assertLabel := func (ps fn.Labels) {
assertLabel := func(ps fn.Labels) {
t.Helper()
assertLabelEq(t, *labels, ps)
}
run("add", enter, "a", enter, "b", enter)
assertLabel(fn.Labels{p("a","b")})
assertLabel(fn.Labels{p("a", "b")})
run("add", enter, enter, "c", enter, "d", enter)
assertLabel(fn.Labels{p("a","b"), p("c", "d")})
assertLabel(fn.Labels{p("a", "b"), p("c", "d")})
run("add", arrowUp, arrowUp, enter, enter, "e", enter, "f", enter)
assertLabel( fn.Labels{p("e","f"), p("a","b"), p("c", "d")})
assertLabel(fn.Labels{p("e", "f"), p("a", "b"), p("c", "d")})
run("remove", arrowDown, enter)
assertLabel(fn.Labels{p("e","f"), p("c", "d")})
assertLabel(fn.Labels{p("e", "f"), p("c", "d")})
}
func TestListLabels(t *testing.T) {
p := func (k,v string) fn.Label {
p := func(k, v string) fn.Label {
return fn.Label{Key: &k, Value: &v}
}
@ -154,7 +153,7 @@ func TestListLabels(t *testing.T) {
cmd.SetArgs(make([]string, 0))
errChan := make(chan error, 1)
func () {
func() {
var err error
defer func() {
errChan <- err
@ -183,7 +182,7 @@ func TestListLabels(t *testing.T) {
}
}
err = <- errChan
err = <-errChan
if err != nil {
t.Fatal(err)
}

View File

@ -2,10 +2,11 @@ package main
import (
"context"
"knative.dev/kn-plugin-func/cmd"
"os"
"os/signal"
"syscall"
"knative.dev/kn-plugin-func/cmd"
)
// Statically-populated build metadata set

View File

@ -25,9 +25,9 @@ func init() {
}
var versionCmd = &cobra.Command{
Use: "version",
Short: "Show the version",
Long: `Show the version
Use: "version",
Short: "Show the version",
Long: `Show the version
Use the --verbose option to include the build date stamp and commit hash"
`,

View File

@ -590,7 +590,7 @@ func Test_validateLabels(t *testing.T) {
},
},
1,
},{
}, {
"incorrect entry - missing multiple keys",
Labels{
Label{

View File

@ -3,12 +3,13 @@ package docker
import (
"encoding/json"
"fmt"
"github.com/containers/image/v5/types"
"github.com/docker/docker-credential-helpers/client"
"net/url"
"os"
"path/filepath"
"strings"
"github.com/containers/image/v5/types"
"github.com/docker/docker-credential-helpers/client"
)
func GetCredentialsFromCredsStore(registry string) (types.DockerAuthConfig, error) {

View File

@ -4,9 +4,9 @@ import "testing"
func Test_to2ndLevelDomain(t *testing.T) {
tests := []struct {
name string
name string
rawurl string
want string
want string
}{
{"2nd level", "quay.io", "quay.io"},
{"3nd level", "sub.quay.io", "quay.io"},
@ -27,4 +27,3 @@ func Test_to2ndLevelDomain(t *testing.T) {
})
}
}

View File

@ -7,7 +7,6 @@ import (
"k8s.io/client-go/tools/clientcmd"
)
func NewKubernetesClientset(namespace string) (*kubernetes.Clientset, error) {
restConfig, err := GetClientConfig().ClientConfig()

View File

@ -2,6 +2,7 @@ package knative
import (
"context"
corev1 "k8s.io/api/core/v1"
clientservingv1 "knative.dev/client/pkg/serving/v1"
"knative.dev/pkg/apis"

View File

@ -2,6 +2,7 @@ package mock
import (
"context"
fn "knative.dev/kn-plugin-func"
)

View File

@ -2,6 +2,7 @@ package mock
import (
"context"
fn "knative.dev/kn-plugin-func"
)

View File

@ -2,6 +2,7 @@ package mock
import (
"context"
fn "knative.dev/kn-plugin-func"
)

View File

@ -6,7 +6,7 @@ import (
)
// Build runs `func build' command for a given test project.
func Build(t *testing.T, knFunc *TestShellCmdRunner, project *FunctionTestProject) {
func Build(t *testing.T, knFunc *TestShellCmdRunner, project *FunctionTestProject) {
result := knFunc.Exec("build", "--path", project.ProjectPath, "--registry", GetRegistry())
if result.Error != nil {

View File

@ -5,7 +5,7 @@ import (
)
// Delete runs `func delete' command for a given test project and verifies it get deleted
func Delete(t *testing.T, knFunc *TestShellCmdRunner, project *FunctionTestProject) {
func Delete(t *testing.T, knFunc *TestShellCmdRunner, project *FunctionTestProject) {
// Invoke delete command
result := knFunc.Exec("delete", project.FunctionName)
if result.Error != nil && project.IsDeployed {

View File

@ -8,7 +8,7 @@ import (
// Deploy runs `func deploy' command for a given test project. It collects the URL from output
// and store on test project, so it can be used later by any another test
func Deploy(t *testing.T, knFunc *TestShellCmdRunner, project *FunctionTestProject) {
func Deploy(t *testing.T, knFunc *TestShellCmdRunner, project *FunctionTestProject) {
var result TestShellCmdResult
if project.IsBuilt {

View File

@ -13,7 +13,7 @@ func List(t *testing.T, knFunc *TestShellCmdRunner, project FunctionTestProject)
}
isProjectPresent := strings.Contains(result.Stdout, project.FunctionName)
if project.IsDeployed && !isProjectPresent {
t.Fatal("Deployed project expected")
t.Fatal("Deployed project expected")
}
if !project.IsDeployed && isProjectPresent {
t.Fatal("Project is not expected to appear in list output")

View File

@ -7,7 +7,7 @@ import (
// Intended to provide setup configuration for E2E tests
const (
defaultRegistry = "localhost:5000/user"
defaultRegistry = "localhost:5000/user"
testTemplateRepository = "http://github.com/boson-project/test-templates.git" //nolint:varcheck,deadcode
)

View File

@ -34,7 +34,7 @@ func TestRemoteRepository(t *testing.T) {
defer Delete(t, knFunc, &project)
ReadyCheck(t, knFunc, project)
functionRespValidator := FunctionHttpResponsivenessValidator{ runtime: "go", targetUrl: "%v", expects: "REMOTE_VALID" }
functionRespValidator := FunctionHttpResponsivenessValidator{runtime: "go", targetUrl: "%v", expects: "REMOTE_VALID"}
functionRespValidator.Validate(t, project)
}

View File

@ -13,7 +13,7 @@ import (
"testing"
)
func TestMain (t *testing.M) {
func TestMain(t *testing.M) {
if GetRegistry() == defaultRegistry {
err := patchOrCreateDockerConfigFile()
@ -76,7 +76,7 @@ func updateConfigAuth(dockerConfigFile string) error {
return err
}
content := string(bcontent)
if !strings.Contains(content, strings.Split(defaultRegistry,"/")[0]) {
if !strings.Contains(content, strings.Split(defaultRegistry, "/")[0]) {
// default registry is not present on .docker/config.json, so let's add it
log.Println("Updating ./docker/config.json file with default registry authentication.")
exp := regexp.MustCompile(`"auths"[\s]*?[:][\s]*?{`)
@ -86,14 +86,14 @@ func updateConfigAuth(dockerConfigFile string) error {
},`))
// Replace file content
_ = os.Rename(dockerConfigFile, dockerConfigFile + ".e2e")
_ = os.Rename(dockerConfigFile, dockerConfigFile+".e2e")
err := createConfigAuth(dockerConfigFile, string(newContent))
if err != nil {
// rollback config file
_ = os.Rename(dockerConfigFile + ".e2e", dockerConfigFile)
_ = os.Rename(dockerConfigFile+".e2e", dockerConfigFile)
return err
}
_ = os.Remove(dockerConfigFile + ".e2e")
}
return nil
}
}

View File

@ -1,16 +1,17 @@
package e2e
import (
"k8s.io/apimachinery/pkg/util/wait"
"regexp"
"testing"
"time"
"k8s.io/apimachinery/pkg/util/wait"
)
// ReadyCheck waits deployed function to report as ready.
func ReadyCheck(t *testing.T, knFunc *TestShellCmdRunner, project FunctionTestProject) {
expr := regexp.MustCompile("\n" + project.FunctionName + " .*True")
err := wait.PollImmediate(5 * time.Second, 1 * time.Minute, func() (done bool, err error) {
err := wait.PollImmediate(5*time.Second, 1*time.Minute, func() (done bool, err error) {
result := knFunc.Exec("list")
return result.Error == nil && expr.Match([]byte(result.Stdout)), result.Error
})

View File

@ -34,7 +34,7 @@ type TestShellCmdRunner struct {
type TestShellCmdResult struct {
Stdout string
Stderr string
Error error
Error error
}
func (r TestShellCmdResult) Dump(t *testing.T) {
@ -73,7 +73,6 @@ func (f *TestShellCmdRunner) FromDir(dir string) *TestShellCmdRunner {
return f
}
// Exec invokes go exec library and runs a shell command combining the binary args with args from method signature
func (f *TestShellCmdRunner) Exec(args ...string) TestShellCmdResult {
finalArgs := f.BinaryArgs
@ -101,7 +100,7 @@ func (f *TestShellCmdRunner) Exec(args ...string) TestShellCmdResult {
result := TestShellCmdResult{
Stdout: stdout.String(),
Stderr: stderr.String(),
Error: err,
Error: err,
}
if err == nil && f.ShouldDumpOnSuccess {

View File

@ -82,11 +82,11 @@ var defaultFunctionsHttpValidators = []FunctionHttpResponsivenessValidator{
targetUrl: "%s/health/readiness",
},
{runtime: "typescript",
targetUrl: "%s",
method: "POST",
targetUrl: "%s",
method: "POST",
contentType: "application/json",
bodyData: `{"message":"hello"}`,
expects: `{"message":"hello"}`,
bodyData: `{"message":"hello"}`,
expects: `{"message":"hello"}`,
},
}

View File

@ -0,0 +1 @@
package custom

View File

@ -0,0 +1 @@
package custom