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

Jump to bottom

Refactor in favor to use primitiveOrStruct. #159

Merged
merged 21 commits into from
May 3, 2023
Merged

Refactor in favor to use primitiveOrStruct. #159

merged 21 commits into from
May 3, 2023

Conversation

ribeiromiranda
Copy link
Collaborator

Refactor in favor to use primitiveOrStruct.

sonatype-lift[bot]
sonatype-lift bot reviewed Mar 10, 2023
View reviewed changes
model/util.go Outdated Show resolved Hide resolved
sonatype-lift[bot]
sonatype-lift bot reviewed Mar 10, 2023
View reviewed changes
model/util.go Outdated Show resolved Hide resolved
sonatype-lift[bot]
sonatype-lift bot reviewed Mar 10, 2023
View reviewed changes
model/util.go Outdated Show resolved Hide resolved
@ribeiromiranda
Copy link
Collaborator Author

Not found in the specification, what is the motivation for function unmarshalFile?

When a parameter can be a string or object, must always check if a string is a file path and try loading?

@ricardozanini
Copy link
Member

ricardozanini commented Mar 10, 2023 •
edited

@ribeiromiranda sometimes a reference can be an external file instead of a plain JSON object. In these cases, we need to load the file, process it and unmarshal it into a struct. So it's a string which is a URI.

@spolti
Copy link
Member

spolti commented Mar 13, 2023

@ribeiromiranda hi, can you please sign your commit and rebase the PR?
Thanks.

sonatype-lift[bot]
sonatype-lift bot reviewed Mar 15, 2023
View reviewed changes
model/util_test.go Outdated Show resolved Hide resolved
spolti
spolti reviewed Mar 15, 2023
View reviewed changes
model/util.go Outdated Show resolved Hide resolved
@ribeiromiranda ribeiromiranda mentioned this pull request Mar 16, 2023
Merged
@spolti
Copy link
Member

spolti commented Mar 20, 2023

Hi @ribeiromiranda, can you please rebase?

@spolti
Copy link
Member

spolti commented Mar 27, 2023

@lsytj0413 hi, if you have time, do you mind reviewing this PR?
Thanks.

lsytj0413
lsytj0413 reviewed Mar 28, 2023
View reviewed changes
model/action.go Show resolved Hide resolved
model/action_data_filter_test.go Outdated Show resolved Hide resolved
model/util.go Outdated Show resolved Hide resolved
model/util.go Outdated Show resolved Hide resolved
model/util.go Outdated Show resolved Hide resolved
model/util.go Outdated Show resolved Hide resolved
model/util.go Outdated Show resolved Hide resolved
spolti
spolti reviewed Mar 28, 2023
View reviewed changes
model/event_test.go Outdated Show resolved Hide resolved
spolti
spolti reviewed Mar 28, 2023
View reviewed changes
model/event_test.go Outdated Show resolved Hide resolved
spolti
spolti reviewed Mar 28, 2023
View reviewed changes
model/foreach_state_test.go Outdated Show resolved Hide resolved
spolti
spolti requested changes Mar 28, 2023
View reviewed changes
Copy link
Member

@spolti spolti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactoring :D
Few comments

sonatype-lift[bot]
sonatype-lift bot reviewed May 3, 2023
View reviewed changes
model/util.go Show resolved Hide resolved
sonatype-lift[bot]
sonatype-lift bot reviewed May 3, 2023
View reviewed changes
model/util.go Show resolved Hide resolved
sonatype-lift[bot]
sonatype-lift bot reviewed May 3, 2023
View reviewed changes
model/util.go Show resolved Hide resolved
sonatype-lift[bot]
sonatype-lift bot reviewed May 3, 2023
View reviewed changes
model/util.go Show resolved Hide resolved
@ribeiromiranda
Copy link
Collaborator Author

@ricardozanini Changed the getBytesFromFile to loadExternalResource adding more validation.

@ribeiromiranda
change unmarshalString to primitiveOrStruct
cedde1d 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Add unit test for DefaultCondition UnmarshalJSON
9e95171 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Improve switch case
31f9fc2 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
ribeiromiranda and others added 18 commits May 3, 2023 17:01
@ribeiromiranda
Change unmarshall array/object/file and change error messages
506e15d 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Check response.Write error
3f91f01 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Move default values to the function ApplyDefault()
70ead09 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Change the go version to 1.20 on workflows
df3876e 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
uri scheme empty the default is file://
efdadc5 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Change the golang version to 1.20.2. Fix lint
977a176 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Rebase from main branch
803c6fb 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Revision suggestions. Add a new interface for the types used in const…
7387405 
…, that aux the validation and error handling.

Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Refactor unmarshalObjectOrFile and unmarshalArrayOrFile
1d71c9d 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Revision suggestions. Rename interface Kinds to Kind
59135ac 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Accept external resource as object or array
33d4906 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Revision suggestions. Support golang 1.19 and external resource
c79f40d 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Revision suggestions
96b67bc 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Revision suggestions
4c5ed60 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Revision suggestions. Add more tests
ab70605 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda @spolti
Remove tag #nosec in model/util.go
72a3d07 
Co-authored-by: Filippe Spolti <filippespolti@gmail.com>
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Rename AuthArray to Auths, and ErrorArray to Errors. Improve loadExte…
ce58327 
…rnalResource. Clean state json. Add state type validation oneofkind

Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ribeiromiranda
Return json tags in state
0fdaceb 
Signed-off-by: André R. de Miranda <andre@galgo.tech>
@ricardozanini ricardozanini merged commit 2ee5933 into serverlessworkflow:main May 3, 2023
7 checks passed
@ribeiromiranda ribeiromiranda deleted the refactor branch May 4, 2023 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lsytj0413 lsytj0413 lsytj0413 left review comments

@sonatype-lift sonatype-lift[bot] sonatype-lift left review comments

@ricardozanini ricardozanini ricardozanini approved these changes

@spolti spolti spolti approved these changes

Assignees
No one assigned
Labels
lgtm source
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ribeiromiranda @ricardozanini @spolti @lsytj0413