ValidateCompatibility fix

atp/client.go

@@ -164,23 +164,27 @@ func (c *client) executeWriteLoop(
 				return
 			} else {
 				// It's not supposed to be not ok yet.
-				c.logger.Errorf("error in channel preparing to send signal over ATP")
+				c.logger.Errorf("error in channel preparing to send signal (step %s, signal %s) over ATP",
+					stepData.ID, signal.ID)
 				return
 			}
 		}
 		if isDone {
 			c.logger.Errorf("signal received after step '%s' completed. Ignoring signal '%s'", stepData.ID, signal.ID)
 			return
 		}
+		c.logger.Debugf("Sending signal with ID '%s' to step with ID '%s'", signal.ID, stepData.ID)
 		if err := c.encoder.Encode(RuntimeMessage{
 			MessageTypeSignal,
 			signalMessage{
 				StepID:   stepData.ID,
 				SignalID: signal.ID,
 				Data:     signal.InputData,
 			}}); err != nil {
-			c.logger.Errorf("Step %s failed to write signal (%s) with message: %w", stepData.ID, signal.ID, err)
+			c.logger.Errorf("Step %s failed to write signal (%s) with error: %w", stepData.ID, signal.ID, err)
+			return
 		}
+		c.logger.Debugf("Successfully sent signal with ID '%s' to step with ID '%s'", signal.ID, stepData.ID)
 	}
 }
 

schema/oneof.go

@@ -246,7 +246,9 @@ func (o OneOfSchema[KeyType]) validateMap(data map[string]any) error {
 				selectedTypeIDAsserted, o.getTypeValues()),
 		}
 	}
-	delete(data, o.DiscriminatorFieldNameValue) // The discriminator isn't part of the object.
+	if selectedSchema.Properties()[o.DiscriminatorFieldNameValue] == nil { // Check to see if the discriminator is part of the sub-object.
+		delete(data, o.DiscriminatorFieldNameValue) // The discriminator isn't part of the object.
+	}
 	err := selectedSchema.ValidateCompatibility(data)
 	if err != nil {
 		return &ConstraintError{

schema/property.go

@@ -150,7 +150,7 @@ func (p *PropertySchema) ValidateCompatibility(typeOrData any) error {
 	}
 	err := p.TypeValue.ValidateCompatibility(typeOrData)
 	if err != nil {
-		if p.DisplayValue != nil {
+		if p.DisplayValue != nil && p.Display().Name() != nil {
 			return &ConstraintError{
 				Message: fmt.Sprintf("error while validating sub-type of property %s with type %T (%s)",
 					*p.Display().Name(), p.TypeValue, err),