Merge branch 'main' into grpc-streaming-timeout

Author: jukie

internal/provider/file/store.go

@@ -139,133 +139,133 @@ func (r *resourcesStore) storeResources(ctx context.Context, re *resource.Resour
 		collectKeys = sets.New[storeKey]()
 	)
 
-	if err := r.stroeObjectWithKeys(ctx, re.EnvoyProxyForGatewayClass, collectKeys); err != nil {
+	if err := r.storeObjectWithKeys(ctx, re.EnvoyProxyForGatewayClass, collectKeys); err != nil {
 		errs = errors.Join(errs, err)
 	}
 
-	if err := r.stroeObjectWithKeys(ctx, re.GatewayClass, collectKeys); err != nil {
+	if err := r.storeObjectWithKeys(ctx, re.GatewayClass, collectKeys); err != nil {
 		errs = errors.Join(errs, err)
 	}
 
 	for _, obj := range re.EnvoyProxiesForGateways {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.Gateways {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.HTTPRoutes {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.GRPCRoutes {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.TLSRoutes {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.TCPRoutes {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.UDPRoutes {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.ReferenceGrants {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.Namespaces {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.Secrets {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.ConfigMaps {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.EnvoyPatchPolicies {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.ClientTrafficPolicies {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.BackendTrafficPolicies {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.SecurityPolicies {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.BackendTLSPolicies {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.EnvoyExtensionPolicies {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.Backends {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	for _, obj := range re.HTTPRouteFilters {
-		if err := r.stroeObjectWithKeys(ctx, obj, collectKeys); err != nil {
+		if err := r.storeObjectWithKeys(ctx, obj, collectKeys); err != nil {
 			errs = errors.Join(errs, err)
 		}
 	}
 
 	return collectKeys, errs
 }
 
-// stroeObjectWithKeys stores object while collecting its key.
-func (r *resourcesStore) stroeObjectWithKeys(ctx context.Context, obj client.Object, keys sets.Set[storeKey]) error {
+// storeObjectWithKeys stores object while collecting its key.
+func (r *resourcesStore) storeObjectWithKeys(ctx context.Context, obj client.Object, keys sets.Set[storeKey]) error {
 	key, err := r.storeObject(ctx, obj)
 	if err != nil && key != nil {
 		return fmt.Errorf("failed to store %s %s: %w", key.Kind, key.NamespacedName.String(), err)