Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(trigger): resolve issue where default value for number cannot be an integer #933

Merged
merged 1 commit into from
Dec 11, 2024
Merged

fix(trigger): resolve issue where default value for number cannot be an integer #933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions pkg/service/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,8 +1058,21 @@ func (s *service) preTriggerPipeline(ctx context.Context, ns resource.Namespace,
}
case "number":
if v == nil {
variable[k] = data.NewNumberFromFloat(defaultValueMap[k].(float64))
uploadingPipelineData[idx][k] = defaultValueMap[k].(float64)

// TODO: this is a temporary solution to handle the default
// value of integer type, we will implement a better
// solution for conversion JSON betweeen instill format
switch num := defaultValueMap[k].(type) {
case int:
variable[k] = data.NewNumberFromFloat(float64(num))
uploadingPipelineData[idx][k] = float64(num)
case float64:
variable[k] = data.NewNumberFromFloat(num)
uploadingPipelineData[idx][k] = num
default:
return fmt.Errorf("invalid number value: %v", defaultValueMap[k])
}

} else {
if _, ok := v.Kind.(*structpb.Value_NumberValue); !ok {
return fmt.Errorf("%w: invalid number value: %v", errdomain.ErrInvalidArgument, v)
Expand All @@ -1071,9 +1084,21 @@ func (s *service) preTriggerPipeline(ctx context.Context, ns resource.Namespace,
if v == nil {
array := make(data.Array, len(defaultValueMap[k].([]any)))
uploadingDataArray := make([]any, len(defaultValueMap[k].([]any)))

// TODO: this is a temporary solution to handle the default
// value of integer type, we will implement a better
// solution for conversion JSON betweeen instill format
for i, val := range defaultValueMap[k].([]any) {
array[i] = data.NewNumberFromFloat(val.(float64))
uploadingDataArray[i] = val.(float64)
switch num := val.(type) {
case int:
array[i] = data.NewNumberFromFloat(float64(num))
uploadingDataArray[i] = float64(num)
case float64:
array[i] = data.NewNumberFromFloat(num)
uploadingDataArray[i] = num
default:
return fmt.Errorf("invalid number value: %v", val)
}
}
variable[k] = array
uploadingPipelineData[idx][k] = uploadingDataArray
Expand Down
Loading