updating deps to knative eventing release v0.18.0

Scott Nichols · Scott Nichols · commit 9b531533d7fe · 2020-09-29T10:20:22.000-07:00
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2 // indirect
 	honnef.co/go/tools v0.0.1-2020.1.5 // indirect
-	knative.dev/eventing v0.17.1-0.20200923160140-40f5749cd065
+	knative.dev/eventing v0.18.0
 	knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab
 	knative.dev/test-infra v0.0.0-20200921012245-37f1a12adbd3
 )
diff --git a/go.sum b/go.sum
@@ -1899,8 +1899,8 @@ k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7Mpm
 k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
 knative.dev/caching v0.0.0-20200116200605-67bca2c83dfa/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
-knative.dev/eventing v0.17.1-0.20200923160140-40f5749cd065 h1:0Z5egMdGdGIu69m7xHVNtH+G54o2NSzJVF+wJc555AE=
-knative.dev/eventing v0.17.1-0.20200923160140-40f5749cd065/go.mod h1:Rv5V1Sk/XeG6vdEpRu+zDhEUDg2SgbkOJWRNssUyt50=
+knative.dev/eventing v0.18.0 h1:DKRDpIAYZtFt959m4m9oWHnNBBH97yMP+nekrqmjOF8=
+knative.dev/eventing v0.18.0/go.mod h1:Rv5V1Sk/XeG6vdEpRu+zDhEUDg2SgbkOJWRNssUyt50=
 knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
 knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
 knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
diff --git a/hack/update-deps.sh b/hack/update-deps.sh
@@ -30,8 +30,7 @@ VERSION="master"
 # float forward in this repository.
 FLOATING_DEPS=(
   "knative.dev/pkg@release-0.18"
-  "knative.dev/eventing@${VERSION}"
-  "knative.dev/serving@${VERSION}"
+  "knative.dev/eventing@v0.18.0"
   "knative.dev/test-infra@release-0.18"
 )
 
diff --git a/vendor/knative.dev/eventing/pkg/adapter/v2/cloudevents.go b/vendor/knative.dev/eventing/pkg/adapter/v2/cloudevents.go
@@ -78,14 +78,14 @@ var _ cloudevents.Client = (*client)(nil)
 
 // Send implements client.Send
 func (c *client) Send(ctx context.Context, out event.Event) protocol.Result {
-	c.applyOverrides(ctx, &out)
+	c.applyOverrides(&out)
 	res := c.ceClient.Send(ctx, out)
 	return c.reportCount(ctx, out, res)
 }
 
 // Request implements client.Request
 func (c *client) Request(ctx context.Context, out event.Event) (*event.Event, protocol.Result) {
-	c.applyOverrides(ctx, &out)
+	c.applyOverrides(&out)
 	resp, res := c.ceClient.Request(ctx, out)
 	return resp, c.reportCount(ctx, out, res)
 }
@@ -95,7 +95,7 @@ func (c *client) StartReceiver(ctx context.Context, fn interface{}) error {
 	return errors.New("not implemented")
 }
 
-func (c *client) applyOverrides(ctx context.Context, event *cloudevents.Event) {
+func (c *client) applyOverrides(event *cloudevents.Event) {
 	if c.ceOverrides != nil && c.ceOverrides.Extensions != nil {
 		for n, v := range c.ceOverrides.Extensions {
 			event.SetExtension(n, v)
diff --git a/vendor/knative.dev/eventing/pkg/apis/duck/v1/fuzzer.go b/vendor/knative.dev/eventing/pkg/apis/duck/v1/fuzzer.go
@@ -41,6 +41,7 @@ var FuzzerFuncs = fuzzer.MergeFuzzerFuncs(
 				if ds.BackoffPolicy != nil && *ds.BackoffPolicy == "" {
 					ds.BackoffPolicy = nil
 				} else {
+					// nolint:gosec // Cryptographic randomness is not necessary.
 					ds.BackoffPolicy = bops[rand.Intn(3)]
 				}
 			},
diff --git a/vendor/knative.dev/eventing/pkg/apis/duck/v1beta1/subscribable_types_conversion.go b/vendor/knative.dev/eventing/pkg/apis/duck/v1beta1/subscribable_types_conversion.go
@@ -136,8 +136,8 @@ func (sink *SubscribableSpec) ConvertFrom(ctx context.Context, obj apis.Converti
 	case *eventingduckv1.SubscribableSpec:
 		if len(source.Subscribers) > 0 {
 			sink.Subscribers = make([]SubscriberSpec, len(source.Subscribers))
-			for i, s := range source.Subscribers {
-				if err := sink.Subscribers[i].ConvertFrom(ctx, &s); err != nil {
+			for i := range source.Subscribers {
+				if err := sink.Subscribers[i].ConvertFrom(ctx, &source.Subscribers[i]); err != nil {
 					return err
 				}
 			}
@@ -172,9 +172,9 @@ func (sink *SubscribableStatus) ConvertFrom(ctx context.Context, obj apis.Conver
 	case *eventingduckv1.SubscribableStatus:
 		if len(source.Subscribers) > 0 {
 			sink.Subscribers = make([]SubscriberStatus, len(source.Subscribers))
-			for i, ss := range source.Subscribers {
+			for i := range source.Subscribers {
 				sink.Subscribers[i] = SubscriberStatus{}
-				if err := sink.Subscribers[i].ConvertFrom(ctx, &ss); err != nil {
+				if err := sink.Subscribers[i].ConvertFrom(ctx, &source.Subscribers[i]); err != nil {
 					return err
 				}
 			}
diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1alpha2/container_validation.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1alpha2/container_validation.go
@@ -38,8 +38,8 @@ func (cs *ContainerSourceSpec) Validate(ctx context.Context) *apis.FieldError {
 		fe := apis.ErrMissingField("containers")
 		errs = errs.Also(fe)
 	} else {
-		for i, c := range cs.Template.Spec.Containers {
-			if ce := isValidContainer(&c); ce != nil {
+		for i := range cs.Template.Spec.Containers {
+			if ce := isValidContainer(&cs.Template.Spec.Containers[i]); ce != nil {
 				errs = errs.Also(ce.ViaFieldIndex("containers", i))
 			}
 		}
diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta1/container_validation.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta1/container_validation.go
@@ -38,8 +38,8 @@ func (cs *ContainerSourceSpec) Validate(ctx context.Context) *apis.FieldError {
 		fe := apis.ErrMissingField("containers")
 		errs = errs.Also(fe)
 	} else {
-		for i, c := range cs.Template.Spec.Containers {
-			if ce := isValidContainer(&c); ce != nil {
+		for i := range cs.Template.Spec.Containers {
+			if ce := isValidContainer(&cs.Template.Spec.Containers[i]); ce != nil {
 				errs = errs.Also(ce.ViaFieldIndex("containers", i))
 			}
 		}
diff --git a/vendor/knative.dev/eventing/pkg/kncloudevents/message_sender.go b/vendor/knative.dev/eventing/pkg/kncloudevents/message_sender.go
@@ -150,6 +150,8 @@ func RetryConfigFromDeliverySpec(spec duckv1.DeliverySpec) (RetryConfig, error)
 
 	retryConfig := NoRetries()
 
+	retryConfig.CheckRetry = checkRetry
+
 	if spec.Retry != nil {
 		retryConfig.RetryMax = int(*spec.Retry)
 	}
@@ -165,7 +167,7 @@ func RetryConfigFromDeliverySpec(spec duckv1.DeliverySpec) (RetryConfig, error)
 		switch *spec.BackoffPolicy {
 		case duckv1.BackoffPolicyExponential:
 			retryConfig.Backoff = func(attemptNum int, resp *nethttp.Response) time.Duration {
-				return time.Duration(math.Pow(float64(delayDuration*2), float64(attemptNum)))
+				return delayDuration * time.Duration(math.Exp2(float64(attemptNum)))
 			}
 		case duckv1.BackoffPolicyLinear:
 			retryConfig.Backoff = func(attemptNum int, resp *nethttp.Response) time.Duration {
@@ -176,3 +178,7 @@ func RetryConfigFromDeliverySpec(spec duckv1.DeliverySpec) (RetryConfig, error)
 
 	return retryConfig, nil
 }
+
+func checkRetry(_ context.Context, resp *nethttp.Response, _ error) (bool, error) {
+	return resp != nil && resp.StatusCode >= 300, nil
+}
diff --git a/vendor/knative.dev/eventing/pkg/tracing/setup.go b/vendor/knative.dev/eventing/pkg/tracing/setup.go
@@ -56,20 +56,17 @@ var (
 // still need to generate the traces, this just ensures that if generated, they are collected
 // appropriately. This is normally done by using tracing.HTTPSpanMiddleware as a middleware HTTP
 // handler.
-func setupPublishing(serviceName string, logger *zap.SugaredLogger) (*tracing.OpenCensusTracer, error) {
-	return tracing.NewOpenCensusTracer(tracing.WithExporter(serviceName, logger)), nil
+func setupPublishing(serviceName string, logger *zap.SugaredLogger) *tracing.OpenCensusTracer {
+	return tracing.NewOpenCensusTracer(tracing.WithExporter(serviceName, logger))
 }
 
 // SetupStaticPublishing sets up trace publishing for the process. Note that other
 // pieces still need to generate the traces, this just ensures that if generated, they are collected
 // appropriately. This is normally done by using tracing.HTTPSpanMiddleware as a middleware HTTP
 // handler. The configuration will not be dynamically updated.
 func SetupStaticPublishing(logger *zap.SugaredLogger, serviceName string, cfg *tracingconfig.Config) error {
-	oct, err := setupPublishing(serviceName, logger)
-	if err != nil {
-		return err
-	}
-	err = oct.ApplyConfig(cfg)
+	oct := setupPublishing(serviceName, logger)
+	err := oct.ApplyConfig(cfg)
 	if err != nil {
 		return fmt.Errorf("unable to set OpenCensusTracing config: %v", err)
 	}
@@ -82,16 +79,13 @@ func SetupStaticPublishing(logger *zap.SugaredLogger, serviceName string, cfg *t
 // tracing.HTTPSpanMiddleware as a middleware HTTP handler. The configuration will be dynamically
 // updated when the ConfigMap is updated.
 func SetupDynamicPublishing(logger *zap.SugaredLogger, configMapWatcher *configmap.InformedWatcher, serviceName, tracingConfigName string) error {
-	oct, err := setupPublishing(serviceName, logger)
-	if err != nil {
-		return err
-	}
+	oct := setupPublishing(serviceName, logger)
 
 	tracerUpdater := func(name string, value interface{}) {
 		if name == tracingConfigName {
 			cfg := value.(*tracingconfig.Config)
 			logger.Debugw("Updating tracing config", zap.Any("cfg", cfg))
-			err = oct.ApplyConfig(cfg)
+			err := oct.ApplyConfig(cfg)
 			if err != nil {
 				logger.Errorw("Unable to apply open census tracer config", zap.Error(err))
 				return
diff --git a/vendor/knative.dev/eventing/test/lib/duck/resource_checks.go b/vendor/knative.dev/eventing/test/lib/duck/resource_checks.go
@@ -22,6 +22,7 @@ package duck
 import (
 	"time"
 
+	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -60,7 +61,7 @@ func WaitForResourcesReady(dynamicClient dynamic.Interface, objList *resources.M
 	})
 }
 
-// isResourceReady leverage duck-type to check if the given MetaResource is in ready state
+// isResourceReady leverage duck-type to check if the given obj is in ready state
 func isResourceReady(obj runtime.Object, err error) (bool, error) {
 	if k8serrors.IsNotFound(err) {
 		// Return false as we are not done yet.
@@ -72,7 +73,16 @@ func isResourceReady(obj runtime.Object, err error) (bool, error) {
 		return false, err
 	}
 
+	if pod, isPod := obj.(*corev1.Pod); isPod {
+		return isPodRunning(pod), nil
+	}
+
 	kr := obj.(*duckv1beta1.KResource)
 	ready := kr.Status.GetCondition(apis.ConditionReady)
 	return ready != nil && ready.IsTrue(), nil
 }
+
+// isPodRunning will check the status conditions of the pod and return true if it's Running or Succeeded.
+func isPodRunning(pod *corev1.Pod) bool {
+	return pod.Status.Phase == corev1.PodRunning || pod.Status.Phase == corev1.PodSucceeded
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -888,7 +888,7 @@ k8s.io/utils/buffer
 k8s.io/utils/integer
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# knative.dev/eventing v0.17.1-0.20200923160140-40f5749cd065
+# knative.dev/eventing v0.18.0
 ## explicit
 knative.dev/eventing/pkg/adapter/v2
 knative.dev/eventing/pkg/adapter/v2/test

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ require (`
`11`	`11`	`golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 // indirect`
`12`	`12`	`gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2 // indirect`
`13`	`13`	`honnef.co/go/tools v0.0.1-2020.1.5 // indirect`
`14`		`- knative.dev/eventing v0.17.1-0.20200923160140-40f5749cd065`
	`14`	`+ knative.dev/eventing v0.18.0`
`15`	`15`	`knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab`
`16`	`16`	`knative.dev/test-infra v0.0.0-20200921012245-37f1a12adbd3`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ VERSION="master"`
`30`	`30`	`# float forward in this repository.`
`31`	`31`	`FLOATING_DEPS=(`
`32`	`32`	`"knative.dev/pkg@release-0.18"`
`33`		`- "knative.dev/eventing@${VERSION}"`
`34`		`- "knative.dev/serving@${VERSION}"`
	`33`	`+ "knative.dev/eventing@v0.18.0"`
`35`	`34`	`"knative.dev/test-infra@release-0.18"`
`36`	`35`	`)`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ var FuzzerFuncs = fuzzer.MergeFuzzerFuncs(`
`41`	`41`	`if ds.BackoffPolicy != nil && *ds.BackoffPolicy == "" {`
`42`	`42`	`ds.BackoffPolicy = nil`
`43`	`43`	`} else {`
	`44`	`+ // nolint:gosec // Cryptographic randomness is not necessary.`
`44`	`45`	`ds.BackoffPolicy = bops[rand.Intn(3)]`
`45`	`46`	`}`
`46`	`47`	`},`
Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,8 @@ func (sink *SubscribableSpec) ConvertFrom(ctx context.Context, obj apis.Converti`
`136`	`136`	`case *eventingduckv1.SubscribableSpec:`
`137`	`137`	`if len(source.Subscribers) > 0 {`
`138`	`138`	`sink.Subscribers = make([]SubscriberSpec, len(source.Subscribers))`
`139`		`- for i, s := range source.Subscribers {`
`140`		`- if err := sink.Subscribers[i].ConvertFrom(ctx, &s); err != nil {`
	`139`	`+ for i := range source.Subscribers {`
	`140`	`+ if err := sink.Subscribers[i].ConvertFrom(ctx, &source.Subscribers[i]); err != nil {`
`141`	`141`	`return err`
`142`	`142`	`}`
`143`	`143`	`}`
`@@ -172,9 +172,9 @@ func (sink *SubscribableStatus) ConvertFrom(ctx context.Context, obj apis.Conver`
`172`	`172`	`case *eventingduckv1.SubscribableStatus:`
`173`	`173`	`if len(source.Subscribers) > 0 {`
`174`	`174`	`sink.Subscribers = make([]SubscriberStatus, len(source.Subscribers))`
`175`		`- for i, ss := range source.Subscribers {`
	`175`	`+ for i := range source.Subscribers {`
`176`	`176`	`sink.Subscribers[i] = SubscriberStatus{}`
`177`		`- if err := sink.Subscribers[i].ConvertFrom(ctx, &ss); err != nil {`
	`177`	`+ if err := sink.Subscribers[i].ConvertFrom(ctx, &source.Subscribers[i]); err != nil {`
`178`	`178`	`return err`
`179`	`179`	`}`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ func (cs ContainerSourceSpec) Validate(ctx context.Context) apis.FieldError {`
`38`	`38`	`fe := apis.ErrMissingField("containers")`
`39`	`39`	`errs = errs.Also(fe)`
`40`	`40`	`} else {`
`41`		`- for i, c := range cs.Template.Spec.Containers {`
`42`		`- if ce := isValidContainer(&c); ce != nil {`
	`41`	`+ for i := range cs.Template.Spec.Containers {`
	`42`	`+ if ce := isValidContainer(&cs.Template.Spec.Containers[i]); ce != nil {`
`43`	`43`	`errs = errs.Also(ce.ViaFieldIndex("containers", i))`
`44`	`44`	`}`
`45`	`45`	`}`