CLOUDP-369800-backup-compliance-policy few enhancements

Author: ParthasarathyV

cfn-resources/backup-compliance-policy/cmd/resource/handlers.go

@@ -82,7 +82,7 @@ func checkPolicyNotFound(policy *admin.DataProtectionSettings20231001, apiResp *
 
 func HandleCreate(req *handler.Request, client *util.MongoDBClient, model *Model) handler.ProgressEvent {
 	if IsCallback(req) {
-		return validateProgress(client, model, false)
+		return validateProgress(client, model, false, constants.CREATE)
 	}
 
 	ctx := context.Background()
@@ -145,7 +145,7 @@ func HandleRead(req *handler.Request, client *util.MongoDBClient, model *Model)
 
 func HandleUpdate(req *handler.Request, client *util.MongoDBClient, model *Model) handler.ProgressEvent {
 	if IsCallback(req) {
-		return validateProgress(client, model, false)
+		return validateProgress(client, model, false, constants.UPDATE)
 	}
 
 	ctx := context.Background()
@@ -179,7 +179,7 @@ func HandleUpdate(req *handler.Request, client *util.MongoDBClient, model *Model
 
 func HandleDelete(req *handler.Request, client *util.MongoDBClient, model *Model) handler.ProgressEvent {
 	if IsCallback(req) {
-		return validateProgress(client, model, true)
+		return validateProgress(client, model, true, constants.DELETE)
 	}
 
 	ctx := context.Background()
@@ -269,7 +269,7 @@ func inProgressEvent(model *Model, policy *admin.DataProtectionSettings20231001)
 	}
 }
 
-func validateProgress(client *util.MongoDBClient, model *Model, isDelete bool) handler.ProgressEvent {
+func validateProgress(client *util.MongoDBClient, model *Model, isDelete bool, operation constants.CfnFunctions) handler.ProgressEvent {
 	ctx := context.Background()
 	projectID := *model.ProjectId
 
@@ -281,7 +281,7 @@ func validateProgress(client *util.MongoDBClient, model *Model, isDelete bool) h
 		if isPendingActionError(err) {
 			return inProgressEvent(model, policy)
 		}
-		return handleError(resp, constants.CREATE, err)
+		return handleError(resp, operation, err)
 	}
 
 	if isDelete && policyDeleted {

cfn-resources/backup-compliance-policy/cmd/resource/mappings.go

@@ -233,6 +233,11 @@ func ExpandOnDemandPolicyItem(item *OnDemandPolicyItem) *admin.BackupComplianceO
 }
 
 func ExpandScheduledPolicyItem(item *ScheduledPolicyItem, frequencyType string) admin.BackupComplianceScheduledPolicyItem {
+	if item == nil {
+		return admin.BackupComplianceScheduledPolicyItem{
+			FrequencyType: frequencyType,
+		}
+	}
 	frequencyInterval := 0
 	if item.FrequencyInterval != nil {
 		frequencyInterval = *item.FrequencyInterval

cfn-resources/backup-compliance-policy/docs/README.md

@@ -230,51 +230,51 @@ ISO 8601 timestamp in UTC of when the Backup Compliance Policy settings were las
 
 Email address of the user who last updated the Backup Compliance Policy settings.
 
-#### Id
+#### OnDemandPolicyItem.Id
 
-Returns the <code>Id</code> value.
+Unique identifier of the on-demand backup policy item.
 
-#### FrequencyType
+#### OnDemandPolicyItem.FrequencyType
 
-Returns the <code>FrequencyType</code> value.
+Frequency type of the on-demand backup policy item. Always returns "ondemand".
 
-#### Id
+#### PolicyItemHourly.Id
 
-Returns the <code>Id</code> value.
+Unique identifier of the hourly backup policy item.
 
-#### FrequencyType
+#### PolicyItemHourly.FrequencyType
 
-Returns the <code>FrequencyType</code> value.
+Frequency type of the hourly backup policy item. Always returns "hourly".
 
-#### Id
+#### PolicyItemDaily.Id
 
-Returns the <code>Id</code> value.
+Unique identifier of the daily backup policy item.
 
-#### FrequencyType
+#### PolicyItemDaily.FrequencyType
 
-Returns the <code>FrequencyType</code> value.
+Frequency type of the daily backup policy item. Always returns "daily".
 
-#### Id
+#### PolicyItemWeekly.Id
 
-Returns the <code>Id</code> value.
+Unique identifier of the weekly backup policy item(s). For arrays, use index notation (e.g., PolicyItemWeekly[0].Id).
 
-#### FrequencyType
+#### PolicyItemWeekly.FrequencyType
 
-Returns the <code>FrequencyType</code> value.
+Frequency type of the weekly backup policy item(s). Always returns "weekly". For arrays, use index notation (e.g., PolicyItemWeekly[0].FrequencyType).
 
-#### Id
+#### PolicyItemMonthly.Id
 
-Returns the <code>Id</code> value.
+Unique identifier of the monthly backup policy item(s). For arrays, use index notation (e.g., PolicyItemMonthly[0].Id).
 
-#### FrequencyType
+#### PolicyItemMonthly.FrequencyType
 
-Returns the <code>FrequencyType</code> value.
+Frequency type of the monthly backup policy item(s). Always returns "monthly". For arrays, use index notation (e.g., PolicyItemMonthly[0].FrequencyType).
 
-#### Id
+#### PolicyItemYearly.Id
 
-Returns the <code>Id</code> value.
+Unique identifier of the yearly backup policy item(s). For arrays, use index notation (e.g., PolicyItemYearly[0].Id).
 
-#### FrequencyType
+#### PolicyItemYearly.FrequencyType
 
-Returns the <code>FrequencyType</code> value.
+Frequency type of the yearly backup policy item(s). Always returns "yearly". For arrays, use index notation (e.g., PolicyItemYearly[0].FrequencyType).