feat: fix backward compatibility for ApprovalTasks

- Fix backward compatibility for ApprovalTasks
- Handle missing Type field in utils, webhook, CLI, and actions

Signed-off-by: PuneetPunamiya <[email protected]>

Author: PuneetPunamiya

pkg/actions/actions.go

@@ -101,7 +101,7 @@ func Update(gr schema.GroupVersionResource, c *cli.Clients, opts *cli.Options) e
 
 func update(gvr *schema.GroupVersionResource, dynamic dynamic.Interface, at *v1alpha1.ApprovalTask, opts *cli.Options) error {
 	for i, approver := range at.Spec.Approvers {
-		switch approver.Type {
+		switch v1alpha1.DefaultedApproverType(approver.Type) {
 		case "User":
 			if approver.Name == opts.Username {
 				// return true

pkg/apis/approvaltask/v1alpha1/approvaltask_types.go

@@ -86,6 +86,15 @@ type ApproverState struct {
 	GroupMembers []GroupMemberState `json:"groupMembers,omitempty"`
 }
 
+// DefaultedApproverType returns "User" if the type field is empty (for v0.6.0 compatibility),
+// otherwise returns the provided type.
+func DefaultedApproverType(approverType string) string {
+	if approverType == "" {
+		return "User"
+	}
+	return approverType
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ApprovalTaskList contains a list of ApprovalTasks

pkg/cli/cmd/describe/describe.go

@@ -60,9 +60,9 @@ func pendingApprovals(at *v1alpha1.ApprovalTask) int {
 	respondedUsers := make(map[string]bool)
 
 	for _, approver := range at.Status.ApproversResponse {
-		if approver.Type == "User" {
+		if v1alpha1.DefaultedApproverType(approver.Type) == "User" {
 			respondedUsers[approver.Name] = true
-		} else if approver.Type == "Group" {
+		} else if v1alpha1.DefaultedApproverType(approver.Type) == "Group" {
 			// Count individual group members who have responded
 			for _, member := range approver.GroupMembers {
 				if member.Response == "approved" || member.Response == "rejected" {

pkg/cli/cmd/list/list.go

@@ -45,9 +45,9 @@ func pendingApprovals(at *v1alpha1.ApprovalTask) int {
 	respondedUsers := make(map[string]bool)
 
 	for _, approver := range at.Status.ApproversResponse {
-		if approver.Type == "User" {
+		if v1alpha1.DefaultedApproverType(approver.Type) == "User" {
 			respondedUsers[approver.Name] = true
-		} else if approver.Type == "Group" {
+		} else if v1alpha1.DefaultedApproverType(approver.Type) == "Group" {
 			// Count individual group members who have responded
 			for _, member := range approver.GroupMembers {
 				if member.Response == "approved" || member.Response == "rejected" {
@@ -65,12 +65,12 @@ func rejected(at *v1alpha1.ApprovalTask) int {
 	rejectedUsers := make(map[string]bool)
 
 	for _, approver := range at.Status.ApproversResponse {
-		if approver.Type == "User" && approver.Response == "rejected" {
+		if v1alpha1.DefaultedApproverType(approver.Type) == "User" && approver.Response == "rejected" {
 			if !rejectedUsers[approver.Name] {
 				rejectedUsers[approver.Name] = true
 				count++
 			}
-		} else if approver.Type == "Group" {
+		} else if v1alpha1.DefaultedApproverType(approver.Type) == "Group" {
 			// Count individual group members who have rejected
 			for _, member := range approver.GroupMembers {
 				if member.Response == "rejected" {

pkg/reconciler/approvaltask/utils.go

@@ -292,9 +292,9 @@ func approvalTaskHasTrueInput(approvalTask v1alpha1.ApprovalTask) bool {
 			continue
 		}
 
-		if approver.Type == "User" {
+		if v1alpha1.DefaultedApproverType(approver.Type) == "User" {
 			approvedUsers[approver.Name] = true
-		} else if approver.Type == "Group" {
+		} else if v1alpha1.DefaultedApproverType(approver.Type) == "Group" {
 			for _, user := range approver.Users {
 				if user.Input == hasApproved {
 					approvedUsers[user.Name] = true
@@ -315,9 +315,9 @@ func countApprovalsReceived(approvalTask v1alpha1.ApprovalTask) int {
 			continue
 		}
 
-		if approver.Type == "User" {
+		if v1alpha1.DefaultedApproverType(approver.Type) == "User" {
 			approvedUsers[approver.Name] = true
-		} else if approver.Type == "Group" {
+		} else if v1alpha1.DefaultedApproverType(approver.Type) == "Group" {
 			for _, user := range approver.Users {
 				if user.Input == hasApproved {
 					approvedUsers[user.Name] = true
@@ -377,7 +377,7 @@ func updateApprovalState(ctx context.Context, approvaltaskClientSet versioned.In
 			}
 
 			// If it's a group, iterate over the users
-			if approver.Type == "Group" {
+			if v1alpha1.DefaultedApproverType(approver.Type) == "Group" {
 				groupMembers := []v1alpha1.GroupMemberState{}
 				groupResponse := ""
 				hasApprovals := false
@@ -418,7 +418,7 @@ func updateApprovalState(ctx context.Context, approvaltaskClientSet versioned.In
 						GroupMembers: groupMembers,
 					}
 				}
-			} else if approver.Type == "User" {
+			} else if v1alpha1.DefaultedApproverType(approver.Type) == "User" {
 				currentApprovers[approver.Name] = v1alpha1.ApproverState{
 					Name:     approver.Name,
 					Type:     "User",

pkg/reconciler/webhook/webhook.go

@@ -234,7 +234,7 @@ func ifUserExists(approvals []v1alpha1.ApproverDetails, request *admissionv1.Adm
 		return true
 	}
 	for _, approval := range approvals {
-		switch approval.Type {
+		switch v1alpha1.DefaultedApproverType(approval.Type) {
 		case "User":
 			if approval.Name == request.UserInfo.Username {
 				return true
@@ -291,11 +291,11 @@ func hasOnlyInputChanged(oldObjApprover, newObjApprover v1alpha1.ApproverDetails
 func IsUserApprovalChanged(oldObjApprovers, newObjApprovers []v1alpha1.ApproverDetails, request *admissionv1.AdmissionRequest) (bool, error) {
 	currentUser := request.UserInfo.Username
 	for i, approver := range oldObjApprovers {
-		if approver.Name == currentUser && approver.Type == "User" {
+		if approver.Name == currentUser && v1alpha1.DefaultedApproverType(approver.Type) == "User" {
 			return hasOnlyInputChanged(approver, newObjApprovers[i])
 		}
 
-		if approver.Type == "Group" {
+		if v1alpha1.DefaultedApproverType(approver.Type) == "Group" {
 			// Check if current user is a member of this group
 			isUserInGroup := false
 
@@ -404,13 +404,13 @@ func IsUserApprovalChanged(oldObjApprovers, newObjApprovers []v1alpha1.ApproverD
 func CheckOtherUsersForInvalidChanges(oldObjApprovers, newObjApprover []v1alpha1.ApproverDetails, request *admissionv1.AdmissionRequest) bool {
 	currentUser := request.UserInfo.Username
 	for i, approver := range oldObjApprovers {
-		if approver.Type == "User" && approver.Name != currentUser {
+		if v1alpha1.DefaultedApproverType(approver.Type) == "User" && approver.Name != currentUser {
 			if oldObjApprovers[i].Input != newObjApprover[i].Input {
 				return false
 			}
 		}
 
-		if approver.Type == "Group" {
+		if v1alpha1.DefaultedApproverType(approver.Type) == "Group" {
 			// Check if current user is a member of this group
 			isUserInGroup := false