Skip to content

Extractor - Remove JSON #20

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

Merged
merged 4 commits into from
Sep 4, 2023
Merged

Extractor - Remove JSON #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70c34de
Remove JSON from extractor
GeekMasher Sep 4, 2023
acd578b
Update tests and lib to remove JSON
GeekMasher Sep 4, 2023
1e37da3
Update Cargo lock
GeekMasher Sep 4, 2023
9837599
Update Rust toolchain
GeekMasher Sep 4, 2023
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
141 changes: 36 additions & 105 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion extractor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ flate2 = "1.0"

tree-sitter = ">= 0.20, < 0.21"
tree-sitter-hcl = { git = "https://github.com/GeekMasher/tree-sitter-hcl", rev = "5e045dd1ff7852511c249c4c5d919d9556751d98" }
tree-sitter-json = { git = "https://github.com/tausbn/tree-sitter-json.git", rev = "745663ee997f1576fe1e7187e6347e0db36ec7a9" }
tree-sitter-dockerfile = { git = "https://github.com/GeekMasher/tree-sitter-dockerfile", rev = "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321" }
clap = { version = "4.2", features = ["derive"] }
tracing = "0.1"
Expand Down
5 changes: 1 addition & 4 deletions extractor/src/autobuilder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ pub fn run(_: Options) -> std::io::Result<()> {
.include_extensions(&[
".hcl",
".tf",
".ftvars", // Terraform / HCL files
".json",
".jsonc",
".jsonl", // JSON files
".ftvars", // Terraform / HCL files
".Dockerfile", // Docker files
])
.include_globs(&[
Expand Down
6 changes: 0 additions & 6 deletions extractor/src/extractor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ pub fn run(options: Options) -> std::io::Result<()> {
node_types: tree_sitter_hcl::NODE_TYPES,
file_globs: vec!["*.hcl".into(), "*.tf".into(), "*.tfvar".into()],
},
simple::LanguageSpec {
prefix: "json",
ts_language: tree_sitter_json::language(),
node_types: tree_sitter_json::NODE_TYPES,
file_globs: vec!["*.json".into(), "*.jsonl".into(), "*.jsonc".into()],
},
simple::LanguageSpec {
prefix: "dockerfile",
ts_language: tree_sitter_dockerfile::language(),
Expand Down
4 changes: 0 additions & 4 deletions extractor/src/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ pub fn run(options: Options) -> std::io::Result<()> {
name: "HCL".to_owned(),
node_types: tree_sitter_hcl::NODE_TYPES,
},
Language {
name: "JSON".to_owned(),
node_types: tree_sitter_json::NODE_TYPES,
},
Language {
name: "DOCKERFILE".to_owned(),
node_types: tree_sitter_dockerfile::NODE_TYPES,
Expand Down
Empty file removed ql/lib/codeql/iac/ast/Json.qll
View file
Open in desktop
Empty file.
4 changes: 1 addition & 3 deletions ql/lib/codeql/iac/ast/internal/AstNodes.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
private import TreeSitter
import Hcl
import Container
import Json

/**
* AST Common Type
*/
cached
newtype TAstNode =
THclAstNode(HCL::AstNode node) or
TContainerAstNode(DOCKERFILE::AstNode node) or
TJsonAstNode(JSON::AstNode node)
TContainerAstNode(DOCKERFILE::AstNode node)
Loading