honor new instance and instance type on update, not the old

drewmalin · drewmalin · commit 86f21f89414f · 2025-08-31T16:48:30.000-07:00
diff --git a/v1/providers/shadeform/instance.go b/v1/providers/shadeform/instance.go
@@ -211,12 +211,12 @@ func (c *ShadeformClient) RebootInstance(_ context.Context, _ v1.CloudProviderIn
 	return v1.ErrNotImplemented
 }
 
-func (c *ShadeformClient) MergeInstanceForUpdate(currInst v1.Instance, _ v1.Instance) v1.Instance {
-	return currInst
+func (c *ShadeformClient) MergeInstanceForUpdate(_ v1.Instance, newInstance v1.Instance) v1.Instance {
+	return newInstance
 }
 
-func (c *ShadeformClient) MergeInstanceTypeForUpdate(currIt v1.InstanceType, _ v1.InstanceType) v1.InstanceType {
-	return currIt
+func (c *ShadeformClient) MergeInstanceTypeForUpdate(_ v1.InstanceType, newInstanceType v1.InstanceType) v1.InstanceType {
+	return newInstanceType
 }
 
 func (c *ShadeformClient) getLifecycleStatus(status string) v1.LifecycleStatus {

Original file line number	Diff line number	Diff line change
`@@ -211,12 +211,12 @@ func (c *ShadeformClient) RebootInstance(_ context.Context, _ v1.CloudProviderIn`
`211`	`211`	`return v1.ErrNotImplemented`
`212`	`212`	`}`
`213`	`213`
`214`		`-func (c *ShadeformClient) MergeInstanceForUpdate(currInst v1.Instance, _ v1.Instance) v1.Instance {`
`215`		`- return currInst`
	`214`	`+func (c *ShadeformClient) MergeInstanceForUpdate(_ v1.Instance, newInstance v1.Instance) v1.Instance {`
	`215`	`+ return newInstance`
`216`	`216`	`}`
`217`	`217`
`218`		`-func (c *ShadeformClient) MergeInstanceTypeForUpdate(currIt v1.InstanceType, _ v1.InstanceType) v1.InstanceType {`
`219`		`- return currIt`
	`218`	`+func (c *ShadeformClient) MergeInstanceTypeForUpdate(_ v1.InstanceType, newInstanceType v1.InstanceType) v1.InstanceType {`
	`219`	`+ return newInstanceType`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`func (c *ShadeformClient) getLifecycleStatus(status string) v1.LifecycleStatus {`