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.

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

Jump to bottom

Remove --incompatible_blacklisted_protos_requires_proto_info #12431

Closed
wants to merge 1 commit into from
Closed

Remove --incompatible_blacklisted_protos_requires_proto_info #12431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 0 additions & 18 deletions src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,19 +169,6 @@ public static class Options extends FragmentOptions {
help = "If true, add --allowed_public_imports to the java compile actions.")
public boolean experimentalJavaProtoAddAllowedPublicImports;

@Option(
name = "incompatible_blacklisted_protos_requires_proto_info",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
help =
"If enabled, 'proto_lang_toolchain.blacklisted_protos' requires provider 'ProtoInfo'")
public boolean blacklistedProtosRequiresProtoInfo;

@Override
public FragmentOptions getHost() {
Options host = (Options) super.getHost();
Expand All @@ -201,7 +188,6 @@ public FragmentOptions getHost() {
host.experimentalJavaProtoAddAllowedPublicImports =
experimentalJavaProtoAddAllowedPublicImports;
host.generatedProtosInVirtualImports = generatedProtosInVirtualImports;
host.blacklistedProtosRequiresProtoInfo = blacklistedProtosRequiresProtoInfo;
return host;
}
}
Expand Down Expand Up @@ -295,8 +281,4 @@ public boolean strictPublicImports() {
public boolean generatedProtosInVirtualImports() {
return options.generatedProtosInVirtualImports;
}

public boolean blacklistedProtosRequiresProtoInfo() {
return options.blacklistedProtosRequiresProtoInfo;
}
}
18 changes: 2 additions & 16 deletions src/main/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,8 @@ public class ProtoLangToolchain implements RuleConfiguredTargetFactory {
public ConfiguredTarget create(RuleContext ruleContext)
throws InterruptedException, RuleErrorException, ActionConflictException {
NestedSetBuilder<Artifact> blacklistedProtos = NestedSetBuilder.stableOrder();
for (TransitiveInfoCollection protos : ruleContext.getPrerequisites("blacklisted_protos")) {
ProtoInfo protoInfo = protos.get(ProtoInfo.PROVIDER);
if (protoInfo == null
&& ruleContext
.getFragment(ProtoConfiguration.class)
.blacklistedProtosRequiresProtoInfo()) {
ruleContext.ruleError(
"'" + ruleContext.getLabel() + "' does not have mandatory provider 'ProtoInfo'.");
}
if (protoInfo != null) {
blacklistedProtos.addTransitive(protoInfo.getOriginalTransitiveProtoSources());
} else {
// Only add files from FileProvider if |protos| is not a proto_library to avoid adding
// the descriptor_set of proto_library to the list of blacklisted files.
blacklistedProtos.addTransitive(protos.getProvider(FileProvider.class).getFilesToBuild());
}
for (ProtoInfo protoInfo : ruleContext.getPrerequisites("blacklisted_protos", ProtoInfo.PROVIDER)) {
blacklistedProtos.addTransitive(protoInfo.getOriginalTransitiveProtoSources());
}

return new RuleConfiguredTargetBuilder(ruleContext)
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@
import static com.google.devtools.build.lib.packages.BuildType.LABEL;
import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;

import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.analysis.BaseRuleClasses;
import com.google.devtools.build.lib.analysis.FileProvider;
import com.google.devtools.build.lib.analysis.RuleDefinition;
import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
import com.google.devtools.build.lib.analysis.config.HostTransition;
import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier;
import com.google.devtools.build.lib.packages.Type;

/** Implements {code proto_lang_toolchain}. */
Expand Down Expand Up @@ -70,8 +68,7 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment envi
.add(
attr("blacklisted_protos", LABEL_LIST)
.allowedFileTypes()
.mandatoryBuiltinProviders(
ImmutableList.<Class<? extends TransitiveInfoProvider>>of(FileProvider.class)))
.mandatoryProviders(StarlarkProviderIdentifier.forKey(ProtoInfo.PROVIDER.getKey())))
.requiresConfigurationFragments(ProtoConfiguration.class)
.advertiseProvider(ProtoLangToolchainProvider.class)
.removeAttribute("data")
Expand Down
38 changes: 0 additions & 38 deletions src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,44 +140,6 @@ public void protoToolchainBlacklistTransitiveProtos() throws Exception {
getConfiguredTarget("//foo:toolchain").getProvider(ProtoLangToolchainProvider.class));
}

@Test
public void protoToolchainMixedBlacklist() throws Exception {
// Tests legacy behaviour.
useConfiguration("--incompatible_blacklisted_protos_requires_proto_info=false");

scratch.file(
"third_party/x/BUILD",
TestConstants.LOAD_PROTO_LIBRARY,
"licenses(['unencumbered'])",
"cc_binary(name = 'plugin', srcs = ['plugin.cc'])",
"cc_library(name = 'runtime', srcs = ['runtime.cc'])",
"proto_library(name = 'metadata', srcs = ['metadata.proto'])",
"proto_library(",
" name = 'descriptor',",
" srcs = ['descriptor.proto'],",
" strip_import_prefix = '/third_party')",
"filegroup(name = 'any', srcs = ['any.proto'])");

scratch.file(
"foo/BUILD",
TestConstants.LOAD_PROTO_LANG_TOOLCHAIN,
"proto_lang_toolchain(",
" name = 'toolchain',",
" command_line = 'cmd-line',",
" plugin = '//third_party/x:plugin',",
" runtime = '//third_party/x:runtime',",
" blacklisted_protos = [",
" '//third_party/x:metadata',",
" '//third_party/x:descriptor',",
" '//third_party/x:any']",
")");

update(ImmutableList.of("//foo:toolchain"), false, 1, true, new EventBus());

validateProtoLangToolchain(
getConfiguredTarget("//foo:toolchain").getProvider(ProtoLangToolchainProvider.class));
}

@Test
public void optionalFieldsAreEmpty() throws Exception {
scratch.file(
Expand Down