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.

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

Consolidate all InlineFlowTest libraries in the dataflow qlpack #14050

Merged
merged 2 commits into from Aug 29, 2023
Merged

Consolidate all InlineFlowTest libraries in the dataflow qlpack #14050

merged 2 commits into from Aug 29, 2023

Conversation

jketema
Copy link
Contributor

@jketema jketema commented Aug 24, 2023

No description provided.

@github-actions github-actions bot added the C# label Aug 24, 2023
@jketema jketema force-pushed the inline-6 branch 3 times, most recently from d37a4d0 to ff12882 Compare August 24, 2023 13:40
@jketema jketema changed the title Share InlineFlowTest Consolidate all InlineFlowTest libraries in the dataflow qlpack Aug 24, 2023
@jketema jketema marked this pull request as ready for review August 25, 2023 06:16
@jketema jketema requested review from a team as code owners August 25, 2023 06:16
@jketema jketema requested a review from hvitved August 25, 2023 06:16
atorralba
atorralba approved these changes Aug 25, 2023
View reviewed changes
Copy link
Contributor

@atorralba atorralba left a comment

Choose a reason for hiding this comment

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

Java changes LGTM. Thanks for doing this, it feels good to witness tests and test libraries getting increasingly cleaner :)

hvitved
hvitved approved these changes Aug 29, 2023
View reviewed changes
Copy link
Contributor

@hvitved hvitved left a comment

Choose a reason for hiding this comment

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

Looks great, thanks for doing this. A few minor questions.

shared/dataflow/codeql/dataflow/test/InlineFlowTest.qll
predicate isSink(DataFlowLang::Node sink) { none() }
}

module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFlowConfig> {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can this be private?

Copy link
Contributor Author

@jketema jketema Aug 29, 2023 •
edited

Choose a reason for hiding this comment

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

No, there are tests that override both configurations. For example:

codeql/ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql

Line 19 in 3343b78

import FlowTest<DefaultFlowConfig, SinatraConfig>

and:

codeql/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql

Line 163 in 3343b78

import FlowTest<CustomConfig, CustomConfig>

go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.ql
@@ -1,4 +1,5 @@
import go
import TestUtilities.InlineExpectationsTest
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this import needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was originally exposed through InlineFlowTest, which it is no longer. It's needed later in this file, because it also defines an inline expectation test next to an inline flow test.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'd happily expose this again through InlineFlowTest (and the same below), but this seems somewhat cleaner.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, this is certainly better.

java/ql/test/library-tests/dataflow/synth-global/test.ql
@@ -1,4 +1,5 @@
import java
import semmle.code.java.dataflow.ExternalFlow
Copy link
Contributor

Choose a reason for hiding this comment

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

same

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was originally exposed through InlineFlowTest, which it is no longer. It's needed later in this file for ModelValidation.

@jketema jketema merged commit 0d1fd88 into github:main Aug 29, 2023
34 checks passed
@jketema jketema deleted the inline-6 branch August 29, 2023 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hvitved hvitved hvitved approved these changes

@atorralba atorralba atorralba approved these changes

Assignees
No one assigned
Labels
C# documentation Go Java Kotlin Ruby
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jketema @hvitved @atorralba