-
Notifications
You must be signed in to change notification settings - Fork 312
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* [#6664] Add `blaze mod ...` runner implementation - 2/n * Revert unnecessary change * javadocs * More comments * Skip using asMap * Update copyright and use project local output file * better name + copyright years
- Loading branch information
Showing
9 changed files
with
269 additions
and
21 deletions.
There are no files selected for viewing
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
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
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
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
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
31 changes: 31 additions & 0 deletions
31
base/src/com/google/idea/blaze/base/command/mod/BlazeModException.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Copyright 2024 The Bazel Authors. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.idea.blaze.base.command.mod; | ||
|
|
||
| import com.google.idea.blaze.exception.BuildException; | ||
|
|
||
| import javax.annotation.concurrent.Immutable; | ||
|
|
||
| @Immutable | ||
| public final class BlazeModException extends BuildException { | ||
| public BlazeModException(String message) { | ||
| super(message); | ||
| } | ||
|
|
||
| public BlazeModException(String message, Throwable cause) { | ||
| super(message, cause); | ||
| } | ||
| } |
61 changes: 61 additions & 0 deletions
61
base/src/com/google/idea/blaze/base/command/mod/BlazeModRunner.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright 2024 The Bazel Authors. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.idea.blaze.base.command.mod; | ||
|
|
||
| import com.google.common.util.concurrent.ListenableFuture; | ||
| import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker; | ||
| import com.google.idea.blaze.base.model.ExternalWorkspaceData; | ||
| import com.google.idea.blaze.base.scope.BlazeContext; | ||
| import com.google.idea.blaze.base.settings.BuildSystemName; | ||
| import com.intellij.openapi.application.ApplicationManager; | ||
| import com.intellij.openapi.project.Project; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** Runs the {@code blaze mod ...} command. The results may be cached in the workspace. */ | ||
| public abstract class BlazeModRunner { | ||
|
|
||
| public static BlazeModRunner getInstance() { | ||
| return ApplicationManager.getApplication().getService(BlazeModRunner.class); | ||
| } | ||
|
|
||
| /** | ||
| * This calls {@code blaze mod dump_repo_mapping workspace} so blaze mod will return all mapped | ||
| * repos visible to the current workspace. | ||
| * | ||
| * @param flags The blaze flags that will be passed to Blaze. | ||
| * @return a ListenableFuture<ExternalWorkspaceData> | ||
| */ | ||
| @SuppressWarnings({"unused"}) // will be used shortly | ||
| public abstract ListenableFuture<ExternalWorkspaceData> dumpRepoMapping( | ||
| Project project, | ||
| BuildInvoker invoker, | ||
| BlazeContext context, | ||
| BuildSystemName buildSystemName, | ||
| List<String> flags); | ||
|
|
||
| /** | ||
| * @param args The arguments passed into `blaze mod ...` | ||
| * @param flags The blaze flags that will be passed to {@code blaze ...} | ||
| * @return the stdout bytes of the command | ||
| */ | ||
| protected abstract ListenableFuture<byte[]> runBlazeModGetBytes( | ||
| Project project, | ||
| BuildInvoker invoker, | ||
| BlazeContext context, | ||
| List<String> args, | ||
| List<String> flags); | ||
| } |
90 changes: 90 additions & 0 deletions
90
base/src/com/google/idea/blaze/base/command/mod/BlazeModRunnerImpl.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Copyright 2024 The Bazel Authors. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.idea.blaze.base.command.mod; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.util.concurrent.Futures; | ||
| import com.google.common.util.concurrent.ListenableFuture; | ||
| import com.google.gson.JsonObject; | ||
| import com.google.gson.JsonParser; | ||
| import com.google.idea.blaze.base.async.executor.BlazeExecutor; | ||
| import com.google.idea.blaze.base.bazel.BuildSystem; | ||
| import com.google.idea.blaze.base.command.BlazeCommand; | ||
| import com.google.idea.blaze.base.command.BlazeCommandName; | ||
| import com.google.idea.blaze.base.command.BlazeCommandRunner; | ||
| import com.google.idea.blaze.base.command.buildresult.BuildResultHelper; | ||
| import com.google.idea.blaze.base.model.ExternalWorkspaceData; | ||
| import com.google.idea.blaze.base.model.primitives.ExternalWorkspace; | ||
| import com.google.idea.blaze.base.scope.BlazeContext; | ||
| import com.google.idea.blaze.base.settings.BuildSystemName; | ||
| import com.intellij.openapi.project.Project; | ||
|
|
||
| import java.io.InputStream; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.List; | ||
|
|
||
| public class BlazeModRunnerImpl extends BlazeModRunner { | ||
|
|
||
| @Override | ||
| public ListenableFuture<ExternalWorkspaceData> dumpRepoMapping( | ||
| Project project, | ||
| BuildSystem.BuildInvoker invoker, | ||
| BlazeContext context, | ||
| BuildSystemName buildSystemName, | ||
| List<String> flags) { | ||
| return Futures.transform( | ||
| runBlazeModGetBytes(project, invoker, context, ImmutableList.of( "dump_repo_mapping", "workspace"), flags), | ||
| bytes -> { | ||
| JsonObject json = JsonParser.parseString(new String(bytes, StandardCharsets.UTF_8).trim()).getAsJsonObject(); | ||
|
|
||
| ImmutableList<ExternalWorkspace> externalWorkspaces = | ||
| json.entrySet().stream() | ||
| .filter(e -> e.getValue().isJsonPrimitive()) | ||
| .filter(e -> !e.getValue().getAsString().trim().isEmpty()) | ||
| .map(e -> ExternalWorkspace.create(e.getValue().getAsString(), e.getKey())) | ||
| .collect(ImmutableList.toImmutableList()); | ||
|
|
||
| return ExternalWorkspaceData.create(externalWorkspaces); | ||
| }, | ||
| BlazeExecutor.getInstance().getExecutor()); | ||
| } | ||
|
|
||
| @Override | ||
| public ListenableFuture<byte[]> runBlazeModGetBytes( | ||
| Project project, | ||
| BuildSystem.BuildInvoker invoker, | ||
| BlazeContext context, | ||
| List<String> args, | ||
| List<String> flags) { | ||
| return BlazeExecutor.getInstance() | ||
| .submit(() -> { | ||
| BlazeCommand.Builder builder = | ||
| BlazeCommand.builder(invoker, BlazeCommandName.MOD) | ||
| .addBlazeFlags(flags); | ||
|
|
||
| if (args != null) { | ||
| builder.addBlazeFlags(args); | ||
| } | ||
|
|
||
| try (BuildResultHelper buildResultHelper = invoker.createBuildResultHelper()) { | ||
| BlazeCommandRunner runner = invoker.getCommandRunner(); | ||
| try (InputStream stream = runner.runBlazeMod(project, builder, buildResultHelper, context)) { | ||
| return stream.readAllBytes(); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| } |
Oops, something went wrong.