Default requireApproverJustification to false before diffing

GoogleCloudPlatform · Dec 19, 2024 · ace49eb · ace49eb
1 parent 80e33b5
commit ace49eb
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 0 deletions.
diff --git a/pkg/controller/direct/privilegedaccessmanager/entitlement_controller.go b/pkg/controller/direct/privilegedaccessmanager/entitlement_controller.go
@@ -320,6 +320,8 @@ func (a *Adapter) Update(ctx context.Context, updateOp *directbase.UpdateOperati
 		log.V(2).Info("'spec.additionalNotificationTargets' field is updated (-old +new)", cmp.Diff(parsedActual.AdditionalNotificationTargets, parsedDesired.Spec.AdditionalNotificationTargets))
 		updateMask.Paths = append(updateMask.Paths, "additional_notification_targets")
 	}
+	defaultApprovalWorkflowManualApprovalsRequireApproverJustification(parsedActual)
+	defaultApprovalWorkflowManualApprovalsRequireApproverJustification(&parsedDesired.Spec)
 	if !reflect.DeepEqual(parsedActual.ApprovalWorkflow, parsedDesired.Spec.ApprovalWorkflow) {
 		log.V(2).Info("'spec.approvalWorkflow' field is updated (-old +new)", cmp.Diff(parsedActual.ApprovalWorkflow, parsedDesired.Spec.ApprovalWorkflow))
 		updateMask.Paths = append(updateMask.Paths, "approval_workflow")
@@ -387,6 +389,26 @@ func (a *Adapter) Update(ctx context.Context, updateOp *directbase.UpdateOperati
 	return setStatus(u, status)
 }
 
+func defaultApprovalWorkflowManualApprovalsRequireApproverJustification(spec *krm.PrivilegedAccessManagerEntitlementSpec) {
+	if spec.ApprovalWorkflow == nil {
+		spec.ApprovalWorkflow = &krm.ApprovalWorkflow{
+			ManualApprovals: &krm.ManualApprovals{
+				RequireApproverJustification: direct.PtrTo(false),
+			},
+		}
+		return
+	}
+	if spec.ApprovalWorkflow.ManualApprovals == nil {
+		spec.ApprovalWorkflow.ManualApprovals = &krm.ManualApprovals{
+			RequireApproverJustification: direct.PtrTo(false),
+		}
+		return
+	}
+	if spec.ApprovalWorkflow.ManualApprovals.RequireApproverJustification == nil {
+		spec.ApprovalWorkflow.ManualApprovals.RequireApproverJustification = direct.PtrTo(false)
+	}
+}
+
 func (a *Adapter) Export(ctx context.Context) (*unstructured.Unstructured, error) {
 	if a.actual == nil {
 		return nil, fmt.Errorf("Find() not called")

diff --git a/...anagerentitlementbasicproject.golden.yaml → ...anagerentitlementbasicproject.golden.yaml b/...anagerentitlementbasicproject.golden.yaml → ...anagerentitlementbasicproject.golden.yaml
diff --git a/...smanagerentitlementbasicproject/_http.log → ...smanagerentitlementbasicproject/_http.log b/...smanagerentitlementbasicproject/_http.log → ...smanagerentitlementbasicproject/_http.log
diff --git a/...anagerentitlementbasicproject/create.yaml → ...anagerentitlementbasicproject/create.yaml b/...anagerentitlementbasicproject/create.yaml → ...anagerentitlementbasicproject/create.yaml
diff --git a/...entitlementbasicproject/dependencies.yaml → ...entitlementbasicproject/dependencies.yaml b/...entitlementbasicproject/dependencies.yaml → ...entitlementbasicproject/dependencies.yaml
diff --git a/...anagerentitlementbasicproject/update.yaml → ...anagerentitlementbasicproject/update.yaml b/...anagerentitlementbasicproject/update.yaml → ...anagerentitlementbasicproject/update.yaml
diff --git a/...smanagerentitlementfullfolder.golden.yaml → ...smanagerentitlementfullfolder.golden.yaml b/...smanagerentitlementfullfolder.golden.yaml → ...smanagerentitlementfullfolder.golden.yaml
diff --git a/...essmanagerentitlementfullfolder/_http.log → ...essmanagerentitlementfullfolder/_http.log b/...essmanagerentitlementfullfolder/_http.log → ...essmanagerentitlementfullfolder/_http.log
diff --git a/...smanagerentitlementfullfolder/create.yaml → ...smanagerentitlementfullfolder/create.yaml b/...smanagerentitlementfullfolder/create.yaml → ...smanagerentitlementfullfolder/create.yaml
diff --git a/...erentitlementfullfolder/dependencies.yaml → ...erentitlementfullfolder/dependencies.yaml b/...erentitlementfullfolder/dependencies.yaml → ...erentitlementfullfolder/dependencies.yaml
diff --git a/...smanagerentitlementfullfolder/update.yaml → ...smanagerentitlementfullfolder/update.yaml b/...smanagerentitlementfullfolder/update.yaml → ...smanagerentitlementfullfolder/update.yaml
diff --git a/...cessmanagerentitlementfullorg.golden.yaml → ...cessmanagerentitlementfullorg.golden.yaml b/...cessmanagerentitlementfullorg.golden.yaml → ...cessmanagerentitlementfullorg.golden.yaml
diff --git a/...accessmanagerentitlementfullorg/_http.log → ...accessmanagerentitlementfullorg/_http.log b/...accessmanagerentitlementfullorg/_http.log → ...accessmanagerentitlementfullorg/_http.log
diff --git a/...cessmanagerentitlementfullorg/create.yaml → ...cessmanagerentitlementfullorg/create.yaml b/...cessmanagerentitlementfullorg/create.yaml → ...cessmanagerentitlementfullorg/create.yaml
diff --git a/...nagerentitlementfullorg/dependencies.yaml → ...nagerentitlementfullorg/dependencies.yaml b/...nagerentitlementfullorg/dependencies.yaml → ...nagerentitlementfullorg/dependencies.yaml
diff --git a/...cessmanagerentitlementfullorg/update.yaml → ...cessmanagerentitlementfullorg/update.yaml b/...cessmanagerentitlementfullorg/update.yaml → ...cessmanagerentitlementfullorg/update.yaml