Fixing refresh breaking drift and ttl schedule

CHANGELOG_PENDING.md

@@ -2,4 +2,6 @@
 
 ### Bug Fixes
 
+- Fixed refresh breaking schedules bug [#257](https://github.com/pulumi/pulumi-pulumiservice/issues/257)
+
 ### Miscellaneous

provider/cmd/pulumi-resource-pulumiservice/schema.json

@@ -1109,7 +1109,8 @@
         },
         "autoRemediate": {
           "description": "Whether any drift detected should be remediated after a drift run.",
-          "type": "boolean"
+          "type": "boolean",
+          "default": false
         },
         "scheduleId": {
           "description": "Schedule ID of the created schedule, assigned by Pulumi Cloud.",
@@ -1142,7 +1143,8 @@
         },
         "autoRemediate": {
           "description": "Whether any drift detected should be remediated after a drift run.",
-          "type": "boolean"
+          "type": "boolean",
+          "default": false
         }
       },
       "requiredInputs": [
@@ -1173,7 +1175,8 @@
         },
         "deleteAfterDestroy": {
           "description": "True if the stack and all associated history and settings should be deleted.",
-          "type": "boolean"
+          "type": "boolean",
+          "default": false
         },
         "scheduleId": {
           "description": "Schedule ID of the created schedule, assigned by Pulumi Cloud.",
@@ -1206,7 +1209,8 @@
         },
         "deleteAfterDestroy": {
           "description": "True if the stack and all associated history and settings should be deleted.",
-          "type": "boolean"
+          "type": "boolean",
+          "default": false
         }
       },
       "requiredInputs": [

provider/pkg/provider/deployment_schedules.go

@@ -142,16 +142,20 @@ func ScheduleSharedDiff(req *pulumirpc.DiffRequest) (*pulumirpc.DiffResponse, er
 		return nil, err
 	}
 
-	// preprocess olds to remove the `scheduleId` property since it's only an output and shouldn't cause a diff
-	if olds["scheduleId"].HasValue() {
-		delete(olds, "scheduleId")
-	}
-
 	news, err := plugin.UnmarshalProperties(req.GetNews(), plugin.MarshalOptions{KeepUnknowns: true, SkipNulls: true})
 	if err != nil {
 		return nil, err
 	}
 
+	return ScheduleSharedDiffMaps(olds, news)
+}
+
+func ScheduleSharedDiffMaps(olds resource.PropertyMap, news resource.PropertyMap) (*pulumirpc.DiffResponse, error) {
+	// preprocess olds to remove the `scheduleId` property since it's only an output and shouldn't cause a diff
+	if olds["scheduleId"].HasValue() {
+		delete(olds, "scheduleId")
+	}
+
 	diffs := olds.Diff(news)
 	if diffs == nil {
 		return &pulumirpc.DiffResponse{
@@ -342,7 +346,7 @@ func (st *PulumiServiceDeploymentScheduleResource) Read(req *pulumirpc.ReadReque
 	}
 
 	outputProperties, err := plugin.MarshalProperties(
-		input.ToPropertyMap(),
+		AddScheduleIdToPropertyMap(*scheduleID, input.ToPropertyMap()),
 		plugin.MarshalOptions{
 			KeepUnknowns: true,
 			SkipNulls:    true,

provider/pkg/provider/drift_schedules.go

@@ -63,7 +63,21 @@ func ToPulumiServiceDriftScheduleInput(properties *structpb.Struct) (*PulumiServ
 }
 
 func (st *PulumiServiceDriftScheduleResource) Diff(req *pulumirpc.DiffRequest) (*pulumirpc.DiffResponse, error) {
-	return ScheduleSharedDiff(req)
+	olds, err := plugin.UnmarshalProperties(req.GetOlds(), plugin.MarshalOptions{KeepUnknowns: false, SkipNulls: true})
+	if err != nil {
+		return nil, err
+	}
+
+	news, err := plugin.UnmarshalProperties(req.GetNews(), plugin.MarshalOptions{KeepUnknowns: true, SkipNulls: true})
+	if err != nil {
+		return nil, err
+	}
+
+	if !news["autoRemediate"].HasValue() {
+		news["autoRemediate"] = resource.NewBoolProperty(false)
+	}
+
+	return ScheduleSharedDiffMaps(olds, news)
 }
 
 func (st *PulumiServiceDriftScheduleResource) Delete(req *pulumirpc.DeleteRequest) (*pbempty.Empty, error) {
@@ -182,7 +196,7 @@ func (st *PulumiServiceDriftScheduleResource) Read(req *pulumirpc.ReadRequest) (
 	}
 
 	outputProperties, err := plugin.MarshalProperties(
-		input.ToPropertyMap(),
+		AddScheduleIdToPropertyMap(*scheduleID, input.ToPropertyMap()),
 		plugin.MarshalOptions{
 			KeepUnknowns: true,
 			SkipNulls:    true,

provider/pkg/provider/ttl_schedules.go

@@ -67,7 +67,21 @@ func ToPulumiServiceTtlScheduleInput(properties *structpb.Struct) (*PulumiServic
 }
 
 func (st *PulumiServiceTtlScheduleResource) Diff(req *pulumirpc.DiffRequest) (*pulumirpc.DiffResponse, error) {
-	return ScheduleSharedDiff(req)
+	olds, err := plugin.UnmarshalProperties(req.GetOlds(), plugin.MarshalOptions{KeepUnknowns: false, SkipNulls: true})
+	if err != nil {
+		return nil, err
+	}
+
+	news, err := plugin.UnmarshalProperties(req.GetNews(), plugin.MarshalOptions{KeepUnknowns: true, SkipNulls: true})
+	if err != nil {
+		return nil, err
+	}
+
+	if !news["deleteAfterDestroy"].HasValue() {
+		news["deleteAfterDestroy"] = resource.NewBoolProperty(false)
+	}
+
+	return ScheduleSharedDiffMaps(olds, news)
 }
 
 func (st *PulumiServiceTtlScheduleResource) Delete(req *pulumirpc.DeleteRequest) (*pbempty.Empty, error) {
@@ -186,7 +200,7 @@ func (st *PulumiServiceTtlScheduleResource) Read(req *pulumirpc.ReadRequest) (*p
 	}
 
 	outputProperties, err := plugin.MarshalProperties(
-		input.ToPropertyMap(),
+		AddScheduleIdToPropertyMap(*scheduleID, input.ToPropertyMap()),
 		plugin.MarshalOptions{
 			KeepUnknowns: true,
 			SkipNulls:    true,