Skip to content

Commit 508f185

Browse files
ShreeM01Yannicckolli5
authored
Move newCredentialHelperProvider into GoogleAuthUtils (#15973)
Follow-up on #15930 due to #15906 Progress on #15856 Closes #15941. PiperOrigin-RevId: 462580799 Change-Id: Ibac79ed68a0c87a4f34eb9d0729abb1552b44519 Co-authored-by: Yannic Bonenberger <[email protected]> Co-authored-by: Chenchu K <[email protected]>
1 parent c5bc34e commit 508f185

File tree

9 files changed

+324
-304
lines changed

9 files changed

+324
-304
lines changed

‎src/main/java/com/google/devtools/build/lib/BUILD

+26
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,30 @@ java_library(
205205
],
206206
)
207207

208+
java_library(
209+
name = "runtime/memory_pressure_event",
210+
srcs = [
211+
"runtime/MemoryPressureEvent.java",
212+
],
213+
deps = [
214+
"//third_party:auto_value",
215+
"//third_party:guava",
216+
],
217+
)
218+
219+
java_library(
220+
name = "runtime/command_line_path_factory",
221+
srcs = [
222+
"runtime/CommandLinePathFactory.java",
223+
],
224+
deps = [
225+
"//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
226+
"//src/main/java/com/google/devtools/build/lib/vfs",
227+
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
228+
"//third_party:guava",
229+
],
230+
)
231+
208232
java_library(
209233
name = "runtime",
210234
srcs = glob(
@@ -217,6 +241,7 @@ java_library(
217241
"buildtool/BuildRequestOptions.java",
218242
"runtime/BlazeCommandResult.java",
219243
"runtime/CommandDispatcher.java",
244+
"runtime/CommandLinePathFactory.java",
220245
"runtime/KeepGoingOption.java",
221246
"runtime/LoadingPhaseThreadsOption.java",
222247
],
@@ -227,6 +252,7 @@ java_library(
227252
":loading-phase-threads-option",
228253
":runtime/blaze_command_result",
229254
":runtime/command_dispatcher",
255+
":runtime/command_line_path_factory",
230256
"//src/main/java/com/google/devtools/build/lib/actions",
231257
"//src/main/java/com/google/devtools/build/lib/actions:action_lookup_data",
232258
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",

‎src/main/java/com/google/devtools/build/lib/authandtls/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ java_library(
1414
name = "authandtls",
1515
srcs = glob(["*.java"]),
1616
deps = [
17+
"//src/main/java/com/google/devtools/build/lib:runtime/command_line_path_factory",
18+
"//src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper",
1719
"//src/main/java/com/google/devtools/build/lib/concurrent",
1820
"//src/main/java/com/google/devtools/build/lib/events",
1921
"//src/main/java/com/google/devtools/build/lib/vfs",

‎src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java

+26
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
import com.google.common.annotations.VisibleForTesting;
2020
import com.google.common.base.Preconditions;
2121
import com.google.common.base.Strings;
22+
import com.google.devtools.build.lib.authandtls.credentialhelper.CredentialHelperEnvironment;
23+
import com.google.devtools.build.lib.authandtls.credentialhelper.CredentialHelperProvider;
2224
import com.google.devtools.build.lib.events.Event;
2325
import com.google.devtools.build.lib.events.Reporter;
26+
import com.google.devtools.build.lib.runtime.CommandLinePathFactory;
2427
import com.google.devtools.build.lib.vfs.FileSystem;
2528
import com.google.devtools.build.lib.vfs.Path;
2629
import io.grpc.CallCredentials;
@@ -338,4 +341,27 @@ static Optional<Credentials> newCredentialsFromNetrc(
338341
"Failed to parse " + netrcFile.getPathString() + ": " + e.getMessage(), e);
339342
}
340343
}
344+
345+
@VisibleForTesting
346+
public static CredentialHelperProvider newCredentialHelperProvider(
347+
CredentialHelperEnvironment environment,
348+
CommandLinePathFactory pathFactory,
349+
List<AuthAndTLSOptions.UnresolvedScopedCredentialHelper> helpers)
350+
throws IOException {
351+
Preconditions.checkNotNull(environment);
352+
Preconditions.checkNotNull(pathFactory);
353+
Preconditions.checkNotNull(helpers);
354+
355+
CredentialHelperProvider.Builder builder = CredentialHelperProvider.builder();
356+
for (AuthAndTLSOptions.UnresolvedScopedCredentialHelper helper : helpers) {
357+
Optional<String> scope = helper.getScope();
358+
Path path = pathFactory.create(environment.getClientEnvironment(), helper.getPath());
359+
if (scope.isPresent()) {
360+
builder.add(scope.get(), path);
361+
} else {
362+
builder.add(path);
363+
}
364+
}
365+
return builder.build();
366+
}
341367
}

‎src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java

-38
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import build.bazel.remote.execution.v2.DigestFunction;
2020
import build.bazel.remote.execution.v2.ServerCapabilities;
2121
import com.google.auth.Credentials;
22-
import com.google.auto.value.AutoValue;
2322
import com.google.common.annotations.VisibleForTesting;
2423
import com.google.common.base.Ascii;
2524
import com.google.common.base.Preconditions;
@@ -46,11 +45,8 @@
4645
import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
4746
import com.google.devtools.build.lib.analysis.test.TestProvider;
4847
import com.google.devtools.build.lib.authandtls.AuthAndTLSOptions;
49-
import com.google.devtools.build.lib.authandtls.AuthAndTLSOptions.UnresolvedScopedCredentialHelper;
5048
import com.google.devtools.build.lib.authandtls.CallCredentialsProvider;
5149
import com.google.devtools.build.lib.authandtls.GoogleAuthUtils;
52-
import com.google.devtools.build.lib.authandtls.credentialhelper.CredentialHelperEnvironment;
53-
import com.google.devtools.build.lib.authandtls.credentialhelper.CredentialHelperProvider;
5450
import com.google.devtools.build.lib.bazel.repository.downloader.Downloader;
5551
import com.google.devtools.build.lib.buildeventstream.BuildEventArtifactUploader;
5652
import com.google.devtools.build.lib.buildeventstream.LocalFilesArtifactUploader;
@@ -78,7 +74,6 @@
7874
import com.google.devtools.build.lib.runtime.BuildEventArtifactUploaderFactory;
7975
import com.google.devtools.build.lib.runtime.Command;
8076
import com.google.devtools.build.lib.runtime.CommandEnvironment;
81-
import com.google.devtools.build.lib.runtime.CommandLinePathFactory;
8277
import com.google.devtools.build.lib.runtime.RepositoryRemoteExecutor;
8378
import com.google.devtools.build.lib.runtime.RepositoryRemoteExecutorFactory;
8479
import com.google.devtools.build.lib.runtime.ServerBuilder;
@@ -1049,29 +1044,6 @@ RemoteActionContextProvider getActionContextProvider() {
10491044
return actionContextProvider;
10501045
}
10511046

1052-
@VisibleForTesting
1053-
static CredentialHelperProvider newCredentialHelperProvider(
1054-
CredentialHelperEnvironment environment,
1055-
CommandLinePathFactory pathFactory,
1056-
List<UnresolvedScopedCredentialHelper> helpers)
1057-
throws IOException {
1058-
Preconditions.checkNotNull(environment);
1059-
Preconditions.checkNotNull(pathFactory);
1060-
Preconditions.checkNotNull(helpers);
1061-
1062-
CredentialHelperProvider.Builder builder = CredentialHelperProvider.builder();
1063-
for (UnresolvedScopedCredentialHelper helper : helpers) {
1064-
Optional<String> scope = helper.getScope();
1065-
Path path = pathFactory.create(environment.getClientEnvironment(), helper.getPath());
1066-
if (scope.isPresent()) {
1067-
builder.add(scope.get(), path);
1068-
} else {
1069-
builder.add(path);
1070-
}
1071-
}
1072-
return builder.build();
1073-
}
1074-
10751047
static Credentials newCredentials(
10761048
Map<String, String> clientEnv,
10771049
FileSystem fileSystem,
@@ -1100,14 +1072,4 @@ static Credentials newCredentials(
11001072

11011073
return credentials;
11021074
}
1103-
1104-
@VisibleForTesting
1105-
@AutoValue
1106-
abstract static class ScopedCredentialHelper {
1107-
/** Returns the scope of the credential helper (if any). */
1108-
public abstract Optional<String> getScope();
1109-
1110-
/** Returns the path of the credential helper. */
1111-
public abstract Path getPath();
1112-
}
11131075
}

‎src/test/java/com/google/devtools/build/lib/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ java_test(
118118
"//src/main/java/com/google/devtools/build/lib:runtime",
119119
"//src/main/java/com/google/devtools/build/lib:runtime/blaze_command_result",
120120
"//src/main/java/com/google/devtools/build/lib:runtime/command_dispatcher",
121+
"//src/main/java/com/google/devtools/build/lib:runtime/command_line_path_factory",
121122
"//src/main/java/com/google/devtools/build/lib:runtime/safe_request_logging",
122123
"//src/main/java/com/google/devtools/build/lib/actions",
123124
"//src/main/java/com/google/devtools/build/lib/actions:action_lookup_data",

‎src/test/java/com/google/devtools/build/lib/authandtls/BUILD

+3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ java_library(
2424
],
2525
),
2626
deps = [
27+
"//src/main/java/com/google/devtools/build/lib:runtime/command_line_path_factory",
2728
"//src/main/java/com/google/devtools/build/lib/authandtls",
29+
"//src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper",
30+
"//src/main/java/com/google/devtools/build/lib/events",
2831
"//src/main/java/com/google/devtools/build/lib/vfs",
2932
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
3033
"//src/main/java/com/google/devtools/common/options",

0 commit comments

Comments
 (0)