From 996755ee03e4dbe5a23605cb0fcbd998faa9cb6c Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Wed, 18 Dec 2019 11:17:30 -0800 Subject: [PATCH] Auto-update dependencies (#164) Produced via: `dep ensure -update knative.dev/test-infra knative.dev/pkg` /assign n3wscott /cc n3wscott --- Gopkg.lock | 6 +++--- vendor/knative.dev/pkg/Gopkg.lock | 1 - vendor/knative.dev/pkg/Gopkg.toml | 1 - vendor/knative.dev/pkg/profiling/server.go | 4 ++-- vendor/knative.dev/pkg/test/spoof/spoof.go | 3 +-- .../test/webhook-apicoverage/tools/tools.go | 21 +++++++++---------- .../clustermanager/perf-tests/pkg/cluster.go | 7 ++++--- .../pkg/webhook/psbinding/reconciler.go | 3 +-- 8 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index d5db33bf..9373118b 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -931,7 +931,7 @@ [[projects]] branch = "master" - digest = "1:f0466ac8909dad0b72cfd8ebd048d6005585df65cbdca891f61fde2844456fc0" + digest = "1:2a1f47dba842efe06d9fa10c0323f7b8f39a6b6e86e944a40668679f102f413e" name = "knative.dev/pkg" packages = [ "apis", @@ -950,7 +950,7 @@ "metrics/metricskey", ] pruneopts = "T" - revision = "b26ddf762bc9232b297f77f9766e248dfb186aac" + revision = "0094d3a89242cddcd8532df4632fb619b2d7da09" [[projects]] branch = "master" @@ -961,7 +961,7 @@ "tools/dep-collector", ] pruneopts = "UT" - revision = "71df8cbc28daf5dcf8c9b1ff2dfebdc553dc4bee" + revision = "9ea943f31f1b149ab3f853f228e6fb7e59ba9a59" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index cd0c864b..fb8c2a68 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1319,7 +1319,6 @@ "github.com/openzipkin/zipkin-go/reporter", "github.com/openzipkin/zipkin-go/reporter/http", "github.com/openzipkin/zipkin-go/reporter/recorder", - "github.com/pkg/errors", "github.com/prometheus/client_golang/api", "github.com/prometheus/client_golang/api/prometheus/v1", "github.com/prometheus/common/model", diff --git a/vendor/knative.dev/pkg/Gopkg.toml b/vendor/knative.dev/pkg/Gopkg.toml index 68d60f7f..600e618b 100644 --- a/vendor/knative.dev/pkg/Gopkg.toml +++ b/vendor/knative.dev/pkg/Gopkg.toml @@ -12,7 +12,6 @@ required = [ "github.com/evanphx/json-patch", "knative.dev/test-infra/scripts", "knative.dev/test-infra/tools/dep-collector", - "github.com/pkg/errors", "github.com/gogo/protobuf/proto", ] diff --git a/vendor/knative.dev/pkg/profiling/server.go b/vendor/knative.dev/pkg/profiling/server.go index fb27a518..1bb1d8d1 100644 --- a/vendor/knative.dev/pkg/profiling/server.go +++ b/vendor/knative.dev/pkg/profiling/server.go @@ -17,12 +17,12 @@ limitations under the License. package profiling import ( + "fmt" "net/http" "net/http/pprof" "strconv" "sync" - perrors "github.com/pkg/errors" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" ) @@ -83,7 +83,7 @@ func ReadProfilingFlag(config map[string]string) (bool, error) { } enabled, err := strconv.ParseBool(profiling) if err != nil { - return false, perrors.Wrapf(err, "failed to parse the profiling flag") + return false, fmt.Errorf("failed to parse the profiling flag: %w", err) } return enabled, nil } diff --git a/vendor/knative.dev/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go index f7ac6a51..56798cc7 100644 --- a/vendor/knative.dev/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -27,7 +27,6 @@ import ( "strings" "time" - "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" "knative.dev/pkg/test/ingress" @@ -241,7 +240,7 @@ func (sc *SpoofingClient) Poll(req *http.Request, inState ResponseChecker) (*Res } if err != nil { - return resp, errors.Wrapf(err, "response: %s did not pass checks", resp) + return resp, fmt.Errorf("response: %s did not pass checks: %w", resp, err) } return resp, nil } diff --git a/vendor/knative.dev/pkg/test/webhook-apicoverage/tools/tools.go b/vendor/knative.dev/pkg/test/webhook-apicoverage/tools/tools.go index 457b8783..3b7c520f 100644 --- a/vendor/knative.dev/pkg/test/webhook-apicoverage/tools/tools.go +++ b/vendor/knative.dev/pkg/test/webhook-apicoverage/tools/tools.go @@ -28,7 +28,6 @@ import ( "path/filepath" "regexp" - "github.com/pkg/errors" "knative.dev/pkg/test/webhook-apicoverage/coveragecalculator" "knative.dev/pkg/test/webhook-apicoverage/view" "knative.dev/pkg/test/webhook-apicoverage/webhook" @@ -119,7 +118,7 @@ func GetResourceCoverage(webhookIP string, resourceName string) (string, error) } resp, err := client.Get(fmt.Sprintf(WebhookResourceCoverageEndPoint, webhookIP, resourceName)) if err != nil { - return "", errors.Wrap(err, "encountered error making resource coverage request") + return "", fmt.Errorf("encountered error making resource coverage request: %w", err) } if resp.StatusCode != http.StatusOK { return "", fmt.Errorf("invalid HTTP Status received for resource coverage request. Status: %d", resp.StatusCode) @@ -127,7 +126,7 @@ func GetResourceCoverage(webhookIP string, resourceName string) (string, error) var body []byte if body, err = ioutil.ReadAll(resp.Body); err != nil { - return "", errors.Wrap(err, "Failed reading resource coverage response") + return "", fmt.Errorf("failed reading resource coverage response: %w", err) } return string(body), nil @@ -156,7 +155,7 @@ func GetTotalCoverage(webhookIP string) (*coveragecalculator.CoverageValues, err resp, err := client.Get(fmt.Sprintf(WebhookTotalCoverageEndPoint, webhookIP)) if err != nil { - return nil, errors.Wrap(err, "encountered error making total coverage request") + return nil, fmt.Errorf("encountered error making total coverage request") } if resp.StatusCode != http.StatusOK { return nil, fmt.Errorf("invalid HTTP Status received for total coverage request. Status: %d", resp.StatusCode) @@ -169,7 +168,7 @@ func GetTotalCoverage(webhookIP string) (*coveragecalculator.CoverageValues, err var coverage coveragecalculator.CoverageValues if err = json.Unmarshal(body, &coverage); err != nil { - return nil, errors.Wrap(err, "Failed unmarshalling response to CoverageValues instance") + return nil, fmt.Errorf("failed unmarshalling response to CoverageValues instance: %w", err) } return &coverage, nil @@ -188,7 +187,7 @@ func GetAndWriteTotalCoverage(webhookIP string, outputFile string) error { htmlData, err := view.GetHTMLCoverageValuesDisplay(totalCoverage) if err != nil { - return errors.Wrap(err, "Failed building html file from total coverage. error") + return fmt.Errorf("failed building html file from total coverage: %w", err) } return ioutil.WriteFile(outputFile, []byte(htmlData), 0400) @@ -206,21 +205,21 @@ func GetResourcePercentages(webhookIP string) ( resp, err := client.Get(fmt.Sprintf(WebhookResourcePercentageCoverageEndPoint, webhookIP)) if err != nil { - return nil, errors.Wrap(err, "encountered error making resource percentage coverage request") + return nil, fmt.Errorf("encountered error making resource percentage coverage request: %w", err) } if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("Invalid HTTP Status received for resource"+ + return nil, fmt.Errorf("invalid HTTP Status received for resource"+ " percentage coverage request. Status: %d", resp.StatusCode) } var body []byte if body, err = ioutil.ReadAll(resp.Body); err != nil { - return nil, errors.Wrap(err, "Failed reading resource percentage coverage response") + return nil, fmt.Errorf("failed reading resource percentage coverage response: %w", err) } coveragePercentages := &coveragecalculator.CoveragePercentages{} if err = json.Unmarshal(body, coveragePercentages); err != nil { - return nil, errors.Wrap(err, "Failed unmarshalling response to CoveragePercentages instance") + return nil, fmt.Errorf("failed unmarshalling response to CoveragePercentages instance: %w", err) } return coveragePercentages, nil @@ -231,7 +230,7 @@ func WriteResourcePercentages(outputFile string, coveragePercentages *coveragecalculator.CoveragePercentages) error { htmlData, err := view.GetCoveragePercentageXMLDisplay(coveragePercentages) if err != nil { - errors.Wrap(err, "Failed building coverage percentage xml file") + return fmt.Errorf("failed building coverage percentage xml file: %w", err) } return ioutil.WriteFile(outputFile, []byte(htmlData), 0400) diff --git a/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/cluster.go b/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/cluster.go index fff45f53..65e0ae44 100644 --- a/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/cluster.go +++ b/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/cluster.go @@ -56,15 +56,16 @@ func NewClient() (*gkeClient, error) { return client, nil } -// RecreateClusters will delete and recreate the existing clusters. +// RecreateClusters will delete and recreate the existing clusters, it will also create the clusters if they do +// not exist for the corresponding benchmarks. func (gc *gkeClient) RecreateClusters(gcpProject, repo, benchmarkRoot string) error { handleExistingCluster := func(cluster container.Cluster, configExists bool, config ClusterConfig) error { // always delete the cluster, even if the cluster config is unchanged return gc.handleExistingClusterHelper(gcpProject, cluster, configExists, config, false) } handleNewClusterConfig := func(clusterName string, clusterConfig ClusterConfig) error { - // for now, do nothing to the new cluster config - return nil + // create a new cluster with the new cluster config + return gc.createClusterWithRetries(gcpProject, clusterName, clusterConfig) } return gc.processClusters(gcpProject, repo, benchmarkRoot, handleExistingCluster, handleNewClusterConfig) } diff --git a/vendor/knative.dev/pkg/webhook/psbinding/reconciler.go b/vendor/knative.dev/pkg/webhook/psbinding/reconciler.go index 5569e21b..2c328c4b 100644 --- a/vendor/knative.dev/pkg/webhook/psbinding/reconciler.go +++ b/vendor/knative.dev/pkg/webhook/psbinding/reconciler.go @@ -22,7 +22,6 @@ import ( "fmt" "reflect" - "github.com/pkg/errors" "go.uber.org/zap" "golang.org/x/sync/errgroup" corev1 "k8s.io/api/core/v1" @@ -322,7 +321,7 @@ func (r *BaseReconciler) ReconcileSubject(ctx context.Context, fb Bindable, muta _, err = r.DynamicClient.Resource(gvr).Namespace(ps.Namespace).Patch( ps.Name, types.JSONPatchType, patchBytes, metav1.PatchOptions{}) if err != nil { - return errors.Wrap(err, "failed binding subject "+ps.Name) + return fmt.Errorf("failed binding subject %s: %w", ps.Name, err) } return nil })