This repository has been archived by the owner on Jan 5, 2021. It is now read-only.
bazel detector #373
Merged
bazel detector #373
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 30 commits
December 19, 2018 14:49
# Conflicts: # hub-detect/src/main/groovy/com/blackducksoftware/integration/hub/detect/workflow/diagnostic/RelevantFileTracker.java # hub-detect/src/main/groovy/com/blackducksoftware/integration/hub/detect/workflow/profiling/BomToolAggregateTimings.java # hub-detect/src/main/groovy/com/blackducksoftware/integration/hub/detect/workflow/report/util/ReportConstants.java
…set of xpath-based rules
…or test refactoring
added 11 commits
January 13, 2019 20:53
…ore code via SimpleToolDetector and ToolRunner
taikuukaits
reviewed
Jan 15, 2019
| @AcceptableValues(value = { "DETECTOR", "DOCKER" }, caseSensitive = true, strict = true, isCommaSeparatedList = true) | ||
| DETECT_PROJECT_TOOL("detect.project.tool", "5.0.0", PropertyType.STRING, PropertyAuthority.None, "DETECTOR,DOCKER"), | ||
| @AcceptableValues(value = { "DETECTOR", "DOCKER", "BAZEL" }, caseSensitive = true, strict = true, isCommaSeparatedList = true) | ||
| DETECT_PROJECT_TOOL("detect.project.tool", "5.0.0", PropertyType.STRING, PropertyAuthority.None, "DOCKER,DETECTOR,BAZEL"), |
There was a problem hiding this comment.
Was the docker and detector order deliberately swapped?
There was a problem hiding this comment.
Yes, I was making the ordering in the help match the default ordering. Thought it might avoid some potential confusion.
taikuukaits
reviewed
Jan 15, 2019
| if (dockerToolResult.resultType == DockerToolResult.DockerToolResultType.FAILURE) { | ||
| eventSystem.publishEvent(Event.ExitCode, new ExitCodeRequest(ExitCodeType.FAILURE_GENERAL_ERROR, dockerToolResult.errorMessage)); | ||
| } | ||
| ToolRunner toolRunner = new ToolRunner(eventSystem, detectContext.getBean(DockerDetector.class, detectorEnvironment)); |
There was a problem hiding this comment.
Minor, but you should retrieve the DetectorFactory and ask it to create the detectors. But since these are technically 'not detectors' I don't know what we want.
DetectorFactory detectorFactory = detectContext.getBean(DetectorFactory.class);
detectorFactory.createDocker();
taikuukaits
reviewed
Jan 15, 2019
| } catch (ExecutableRunnerException e) { | ||
| logger.debug(String.format("Bazel version threw exception: %s", e.getMessage())); | ||
| return new ExecutableNotFoundDetectorResult("bazel"); | ||
| } |
There was a problem hiding this comment.
I'd probably move this to the executable finder if it is just a version check.
taikuukaits
reviewed
Jan 15, 2019
| if (!hasLookedForSystemBazel) { | ||
| final String userProvidedBazelPath = detectConfiguration.getProperty(DetectProperty.DETECT_BAZEL_PATH, PropertyAuthority.None); | ||
| resolvedBazel = executableFinder.getExecutablePathOrOverride(ExecutableType.BAZEL, true, environment.getDirectory(), userProvidedBazelPath); | ||
| hasLookedForSystemBazel = true; |
There was a problem hiding this comment.
Looks like it might fit the CacheableExecutableFinder model - might not need it's own class. But this is perfectly fine.
taikuukaits
approved these changes
Jan 15, 2019
added 8 commits
January 15, 2019 17:21
…- if a project order is not supplied and a decision is needed, detect will error out. (picking up Jordan's change from master).
… command) to BazelExecutableFinder
# Conflicts: # detect-configuration/src/main/java/com/blackducksoftware/integration/hub/detect/DetectTool.java # hub-detect/src/main/groovy/com/blackducksoftware/integration/hub/detect/lifecycle/run/RunManager.java
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds the new bazel tool. Here's the overview:
Behavior of the bazel tool (the ExternalId extraction part) is driven by a set of rules. Given how flexible and extensible bazel is, we assume that some customers will need to be able to tweak these rules for their environment and bazel extensions. BazelExternalIdExtractionSimpleRule is intended to represent an relatively easily-tweakable rule. Unfortunately I don't think we know nearly enough yet to be at all confident that SimpleRule exposes the right details. I assume our understanding (and SimpleRule) is likely to change, so I have not yet added the properties to allow the user to tweak it's values.
SimpleRules are converted into FullRules (BazelExternalIdExtractionFullRule), and FullRules are what actually drive the ExternalId extraction behavior. These can be overridden by the user, but they are complex, and the user must provide a json file to overwrite them. I'm pretty sure that I'll be providing those json files to customers as they run into problems with the hard-coded default rules. Early on as we're trying to get this working for early customers, I think it'll be important to have the ability swap in a new set of rules. Whether we leave that capability in detect forever is an open question.
So here's the flow (BazelExtractor): SimpleRules -> FullRules -> ExternalIds -> BDIO dependencies.