replace deprecated Int32Ptr/StringPtr to Int32/String

knative · Dec 9, 2022 · d22c904 · d22c904
1 parent 9df15e5
commit d22c904
Showing 1 changed file with 66 additions and 66 deletions.
diff --git a/pkg/apis/eventing/v1/broker_defaults_test.go b/pkg/apis/eventing/v1/broker_defaults_test.go
@@ -56,9 +56,9 @@ var (
 									APIVersion: "serving.knative.dev/v1",
 								},
 							},
-							Retry:         pointer.Int32Ptr(5),
-							BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-							BackoffDelay:  pointer.StringPtr("5s"),
+							Retry:         pointer.Int32(5),
+							BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+							BackoffDelay:  pointer.String("5s"),
 						},
 					},
 				},
@@ -80,9 +80,9 @@ var (
 									APIVersion: "serving.knative.dev/v1",
 								},
 							},
-							Retry:         pointer.Int32Ptr(3),
-							BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-							BackoffDelay:  pointer.StringPtr("3s"),
+							Retry:         pointer.Int32(3),
+							BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+							BackoffDelay:  pointer.String("3s"),
 						},
 					},
 				},
@@ -103,9 +103,9 @@ var (
 									APIVersion: "serving.knative.dev/v1",
 								},
 							},
-							Retry:         pointer.Int32Ptr(5),
-							BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("linear")),
-							BackoffDelay:  pointer.StringPtr("5s"),
+							Retry:         pointer.Int32(5),
+							BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("linear")),
+							BackoffDelay:  pointer.String("5s"),
 						},
 					},
 				},
@@ -128,9 +128,9 @@ var (
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(3),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(3),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -160,9 +160,9 @@ var (
 									APIVersion: "serving.knative.dev/v1",
 								},
 							},
-							Retry:         pointer.Int32Ptr(5),
-							BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-							BackoffDelay:  pointer.StringPtr("5s"),
+							Retry:         pointer.Int32(5),
+							BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+							BackoffDelay:  pointer.String("5s"),
 						},
 					},
 				},
@@ -208,9 +208,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(3),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(3),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -238,9 +238,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(3),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(3),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -284,9 +284,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(3),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(3),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -318,9 +318,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -352,9 +352,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("linear")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("linear")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -386,9 +386,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(3),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("3s"),
+						Retry:         pointer.Int32(3),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("3s"),
 					},
 				},
 			},
@@ -411,9 +411,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("linear")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("linear")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -441,9 +441,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("linear")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("linear")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -466,9 +466,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("linear")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("linear")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -496,9 +496,9 @@ func TestBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("linear")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("linear")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -532,9 +532,9 @@ func TestMultiBrokerSetDefaults(t *testing.T) {
 					APIVersion: "serving.knative.dev/v1",
 				},
 			},
-			Retry:         pointer.Int32Ptr(5),
-			BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-			BackoffDelay:  pointer.StringPtr("5s"),
+			Retry:         pointer.Int32(5),
+			BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+			BackoffDelay:  pointer.String("5s"),
 		},
 	}
 	brokerConfigSpec1 := &config.BrokerConfigSpec{
@@ -556,9 +556,9 @@ func TestMultiBrokerSetDefaults(t *testing.T) {
 					APIVersion: "serving.knative.dev/v1",
 				},
 			},
-			Retry:         pointer.Int32Ptr(5),
-			BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-			BackoffDelay:  pointer.StringPtr("5s"),
+			Retry:         pointer.Int32(5),
+			BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+			BackoffDelay:  pointer.String("5s"),
 		},
 	}
 	brokerConfigSpec2 := &config.BrokerConfigSpec{
@@ -604,9 +604,9 @@ func TestMultiBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("linear")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("linear")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -633,9 +633,9 @@ func TestMultiBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("linear")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("linear")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -668,9 +668,9 @@ func TestMultiBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -702,9 +702,9 @@ func TestMultiBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},
@@ -758,9 +758,9 @@ func TestMultiBrokerSetDefaults(t *testing.T) {
 								APIVersion: "serving.knative.dev/v1",
 							},
 						},
-						Retry:         pointer.Int32Ptr(5),
-						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.StringPtr("exponential")),
-						BackoffDelay:  pointer.StringPtr("5s"),
+						Retry:         pointer.Int32(5),
+						BackoffPolicy: (*eventingduckv1.BackoffPolicyType)(pointer.String("exponential")),
+						BackoffDelay:  pointer.String("5s"),
 					},
 				},
 			},