Another branch

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2025-05-13T05:08:46Z"
-  build_hash: 55bf57b2806c33a7fcd074be403f26ce3f8e58db
-  go_version: go1.24.2
-  version: v0.46.2
+  build_date: "2025-05-22T21:41:04Z"
+  build_hash: ed3e8afd0209bee26809ca6d6a72b1a8e3e05ede
+  go_version: go1.24.3
+  version: v0.46.2-5-ged3e8af-dirty
 api_directory_checksum: e0465b8e0cf7076ab51e30604f13a32cdf4957ae
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6

pkg/resource/function/hooks.go

@@ -69,36 +69,38 @@ func (rm *resourceManager) customUpdateFunction(
 	exit := rlog.Trace("rm.customUpdateFunction")
 	defer exit(err)
 
-	if isFunctionPending(desired) {
-		return nil, requeueWaitWhilePending
+	updatedStatusResource := rm.concreteResource(desired.DeepCopy())
+	updatedStatusResource.SetStatus(latest)
+	if isFunctionPending(latest) {
+		return updatedStatusResource, requeueWaitWhilePending
 	}
 
 	if delta.DifferentAt("Spec.Tags") {
 		err = rm.updateFunctionTags(ctx, latest, desired)
 		if err != nil {
-			return nil, err
+			return updatedStatusResource, err
 		}
 	}
 	if delta.DifferentAt("Spec.ReservedConcurrentExecutions") {
 		err = rm.updateFunctionConcurrency(ctx, desired)
 		if err != nil {
-			return nil, err
+			return updatedStatusResource, err
 		}
 	}
 	if delta.DifferentAt("Spec.FunctionEventInvokeConfig") {
 		err = rm.syncFunctionEventInvokeConfig(ctx, desired)
 		if err != nil {
-			return nil, err
+			return updatedStatusResource, err
 		}
 	}
 	if delta.DifferentAt("Spec.CodeSigningConfigARN") {
 		if desired.ko.Spec.PackageType != nil && *desired.ko.Spec.PackageType == "Image" &&
 			desired.ko.Spec.CodeSigningConfigARN != nil && *desired.ko.Spec.CodeSigningConfigARN != "" {
-			return nil, ackerr.NewTerminalError(ErrCannotSetFunctionCSC)
+			return updatedStatusResource, ackerr.NewTerminalError(ErrCannotSetFunctionCSC)
 		} else {
 			err = rm.updateFunctionCodeSigningConfig(ctx, desired)
 			if err != nil {
-				return nil, err
+				return updatedStatusResource, err
 			}
 		}
 	}
@@ -112,9 +114,9 @@ func (rm *resourceManager) customUpdateFunction(
 		err = rm.updateFunctionCode(ctx, desired, delta, latest)
 		if err != nil {
 			if strings.Contains(err.Error(), "Provide a valid source image.") {
-				return nil, requeueWaitWhileSourceImageDoesNotExist
+				return updatedStatusResource, requeueWaitWhileSourceImageDoesNotExist
 			} else {
-				return nil, err
+				return updatedStatusResource, err
 			}
 		}
 	case delta.DifferentExcept(
@@ -125,13 +127,13 @@ func (rm *resourceManager) customUpdateFunction(
 		"Spec.CodeSigningConfigARN"):
 		err = rm.updateFunctionConfiguration(ctx, desired, delta)
 		if err != nil {
-			return nil, err
+			return updatedStatusResource, err
 		}
 	}
 
 	readOneLatest, err := rm.ReadOne(ctx, desired)
 	if err != nil {
-		return nil, err
+		return updatedStatusResource, err
 	}
 	return rm.concreteResource(readOneLatest), nil
 }

templates/hooks/function/sdk_read_one_post_set_output.go.tpl

@@ -51,5 +51,5 @@
 		ko.Spec.Tags = expectedOutput  
 	}
 	if err := rm.setResourceAdditionalFields(ctx, ko); err != nil {
-		return nil, err
-	}
+		return &resource{ko}, err
+	}