diff --git a/go.mod b/go.mod index 46743be934..2ad350d6fd 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/modern-go/reflect2 v1.0.1 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/pkg/errors v0.8.1 // indirect + github.com/pkg/errors v0.8.1 github.com/spf13/cobra v0.0.3 github.com/spf13/pflag v1.0.3 github.com/spf13/viper v1.3.1 diff --git a/pkg/errors/factory.go b/pkg/errors/factory.go index bcd5c032b1..7de7fe1a33 100644 --- a/pkg/errors/factory.go +++ b/pkg/errors/factory.go @@ -22,7 +22,7 @@ import ( func isCRDError(status api_errors.APIStatus) bool { for _, cause := range status.Status().Details.Causes { - if strings.HasPrefix(cause.Message, "404") && cause.Type == v1.CauseTypeUnexpectedServerResponse { + if strings.HasPrefix(cause.Message, "404") && cause.Type == v1.CauseTypeUnexpectedServerResponse { return true } } diff --git a/pkg/errors/factory_test.go b/pkg/errors/factory_test.go index 8f8eee4151..2079208933 100644 --- a/pkg/errors/factory_test.go +++ b/pkg/errors/factory_test.go @@ -30,7 +30,7 @@ func TestBuild(t *testing.T) { assert.Error(t, err, "my-custom-error") gv := schema.GroupResource{ - Group: "serving.knative.dev", + Group: "serving.knative.dev", Resource: "service", } @@ -38,7 +38,7 @@ func TestBuild(t *testing.T) { apiError := api_errors.NewNotFound(gv, "serv") apiError.Status().Details.Causes = []v1.StatusCause{ { - Type: "UnexpectedServerResponse", + Type: "UnexpectedServerResponse", Message: "404 page not found", }, } diff --git a/pkg/errors/types.go b/pkg/errors/types.go index 919e914563..ecc324ac1c 100644 --- a/pkg/errors/types.go +++ b/pkg/errors/types.go @@ -18,5 +18,5 @@ import api_errors "k8s.io/apimachinery/pkg/api/errors" type KNError struct { Status api_errors.APIStatus - msg string -} \ No newline at end of file + msg string +} diff --git a/pkg/serving/v1alpha1/client.go b/pkg/serving/v1alpha1/client.go index 63427174c3..f5cafe50f5 100644 --- a/pkg/serving/v1alpha1/client.go +++ b/pkg/serving/v1alpha1/client.go @@ -319,4 +319,3 @@ func serviceConditionExtractor(obj runtime.Object) (apis.Conditions, error) { } return apis.Conditions(service.Status.Conditions), nil } - diff --git a/vendor/modules.txt b/vendor/modules.txt index 46ab91caf7..e02bce184e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -205,11 +205,11 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 # k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc +k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/util/duration k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/runtime -k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/util/runtime @@ -217,13 +217,14 @@ k8s.io/apimachinery/pkg/runtime/schema k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/watch -k8s.io/apimachinery/pkg/api/equality -k8s.io/apimachinery/pkg/api/validation -k8s.io/apimachinery/pkg/runtime/serializer -k8s.io/apimachinery/pkg/types +k8s.io/apimachinery/pkg/util/validation/field k8s.io/apimachinery/pkg/conversion k8s.io/apimachinery/pkg/selection +k8s.io/apimachinery/pkg/types k8s.io/apimachinery/pkg/util/intstr +k8s.io/apimachinery/pkg/api/equality +k8s.io/apimachinery/pkg/api/validation +k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/strategicpatch k8s.io/apimachinery/pkg/util/errors @@ -232,16 +233,15 @@ k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/apis/meta/v1/unstructured k8s.io/apimachinery/pkg/conversion/queryparams k8s.io/apimachinery/pkg/util/naming -k8s.io/apimachinery/pkg/util/validation/field k8s.io/apimachinery/pkg/util/net k8s.io/apimachinery/pkg/util/yaml +k8s.io/apimachinery/third_party/forked/golang/reflect k8s.io/apimachinery/pkg/apis/meta/v1/validation k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/runtime/serializer/recognizer k8s.io/apimachinery/pkg/runtime/serializer/versioning k8s.io/apimachinery/pkg/runtime/serializer/streaming -k8s.io/apimachinery/third_party/forked/golang/reflect k8s.io/apimachinery/pkg/util/mergepatch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme