Skip to content

Commit 28e312f

Browse files
EdSchoutenEdSchouten
committed
Remove compatibility_level and max_compatibility_level from the schema
We already lacked any logic for enforcing this. Because Bazel is turning it into no-ops as well, we might as well just remove it from the Protobuf message schema. bazelbuild/bazel#28564
1 parent d617383 commit 28e312f

13 files changed

Lines changed: 32 additions & 51 deletions

‎pkg/bazelclient/commands/build/local_path_extracting_module_dot_bazel_handler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (h *LocalPathExtractingModuleDotBazelHandler) GetRootModuleName() (label.Mo
4646

4747
// BazelDep can normally be used to capture calls in MODULE.bazel to
4848
// bazel_dep(). This implementation does not need to do that.
49-
func (LocalPathExtractingModuleDotBazelHandler) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
49+
func (LocalPathExtractingModuleDotBazelHandler) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
5050
return nil
5151
}
5252

@@ -63,7 +63,7 @@ func (h *LocalPathExtractingModuleDotBazelHandler) LocalPathOverride(moduleName
6363

6464
// Module is used to capture calls in MODULE.bazel to module(). This
6565
// allows extracting the name of the root module.
66-
func (h *LocalPathExtractingModuleDotBazelHandler) Module(name label.Module, version *label.ModuleVersion, compatibilityLevel int, repoName label.ApparentRepo, bazelCompatibility []string) error {
66+
func (h *LocalPathExtractingModuleDotBazelHandler) Module(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, bazelCompatibility []string) error {
6767
if h.rootModuleName != nil {
6868
return errors.New("multiple module() declarations")
6969
}

‎pkg/model/analysis/module_dot_bazel_contents.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ func (baseComputer[TReference, TMetadata]) parseModuleDotBazel(ctx context.Conte
109109
if err := handler.BazelDep(
110110
bazelToolsModule,
111111
/* version = */ nil,
112-
/* maxCompatibilityLevel = */ 0,
113112
bazelToolsModule.ToApparentRepo(),
114113
/* devDependency = */ false,
115114
); err != nil {
@@ -137,7 +136,7 @@ type dependencQueueingModuleDotBazelHandler struct {
137136
ignoreDevDependencies bool
138137
}
139138

140-
func (h *dependencQueueingModuleDotBazelHandler) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
139+
func (h *dependencQueueingModuleDotBazelHandler) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
141140
if devDependency && h.ignoreDevDependencies {
142141
return nil
143142
}
@@ -159,7 +158,7 @@ func (h *dependencQueueingModuleDotBazelHandler) BazelDep(name label.Module, ver
159158
h.moduleInstancesSeen[moduleInstance] = struct{}{}
160159
}
161160

162-
return h.ChildModuleDotBazelHandler.BazelDep(name, version, maxCompatibilityLevel, repoName, devDependency)
161+
return h.ChildModuleDotBazelHandler.BazelDep(name, version, repoName, devDependency)
163162
}
164163

165164
func (c *baseComputer[TReference, TMetadata]) visitModuleDotBazelFilesBreadthFirst(

‎pkg/model/analysis/module_extension_repos.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ type useRepoRuleCapturingModuleDotBazelHandler[TReference object.BasicReference,
8989
repos map[string]model_core.PatchedMessage[*model_starlark_pb.Repo, TMetadata]
9090
}
9191

92-
func (useRepoRuleCapturingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
92+
func (useRepoRuleCapturingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
9393
return nil
9494
}
9595

96-
func (useRepoRuleCapturingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, compatibilityLevel int, repoName label.ApparentRepo, bazelCompatibility []string) error {
96+
func (useRepoRuleCapturingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, bazelCompatibility []string) error {
9797
return nil
9898
}
9999

‎pkg/model/analysis/module_repo_mapping.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (h *repoMappingCapturingModuleDotBazelHandler) setRepo(from label.ApparentR
8181
return nil
8282
}
8383

84-
func (h *repoMappingCapturingModuleDotBazelHandler) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
84+
func (h *repoMappingCapturingModuleDotBazelHandler) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
8585
if devDependency && h.ignoreDevDependencies {
8686
return nil
8787
}
@@ -99,7 +99,7 @@ func (h *repoMappingCapturingModuleDotBazelHandler) BazelDep(name label.Module,
9999
})
100100
}
101101

102-
func (h *repoMappingCapturingModuleDotBazelHandler) Module(name label.Module, version *label.ModuleVersion, compatibilityLevel int, repoName label.ApparentRepo, bazelCompatibility []string) error {
102+
func (h *repoMappingCapturingModuleDotBazelHandler) Module(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, bazelCompatibility []string) error {
103103
return h.setRepo(repoName, canonicalRepoMapping{
104104
canonicalRepo: h.moduleInstance.GetBareCanonicalRepo(),
105105
})

‎pkg/model/analysis/module_rough_build_list.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ var moduleDotBazelTargetName = util.Must(label.NewTargetName(moduleDotBazelFilen
2929
type bazelDepCapturingModuleDotBazelHandler struct {
3030
ignoreDevDependencies bool
3131

32-
compatibilityLevel int
33-
dependencies map[label.Module]*label.ModuleVersion
32+
dependencies map[label.Module]*label.ModuleVersion
3433
}
3534

36-
func (h *bazelDepCapturingModuleDotBazelHandler) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
35+
func (h *bazelDepCapturingModuleDotBazelHandler) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
3736
if !devDependency || !h.ignoreDevDependencies {
3837
if _, ok := h.dependencies[name]; ok {
3938
return fmt.Errorf("module depends on module %#v multiple times", name.String())
@@ -43,8 +42,7 @@ func (h *bazelDepCapturingModuleDotBazelHandler) BazelDep(name label.Module, ver
4342
return nil
4443
}
4544

46-
func (h *bazelDepCapturingModuleDotBazelHandler) Module(name label.Module, version *label.ModuleVersion, compatibilityLevel int, repoName label.ApparentRepo, bazelCompatibility []string) error {
47-
h.compatibilityLevel = compatibilityLevel
45+
func (bazelDepCapturingModuleDotBazelHandler) Module(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, bazelCompatibility []string) error {
4846
return nil
4947
}
5048

@@ -269,7 +267,6 @@ ProcessModule:
269267
}
270268

271269
if buildListEntry != nil {
272-
buildListEntry.CompatibilityLevel = int32(handler.compatibilityLevel)
273270
buildList.Slice = append(buildList.Slice, buildListEntry)
274271
}
275272

‎pkg/model/analysis/modules_with_remote_overrides.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ func (overrideExtractingModuleDotBazelHandler[TReference, TMetadata]) GetRootMod
9898
return label.Module{}, nil
9999
}
100100

101-
func (overrideExtractingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
101+
func (overrideExtractingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
102102
return nil
103103
}
104104

105105
func (overrideExtractingModuleDotBazelHandler[TReference, TMetadata]) LocalPathOverride(moduleName label.Module, path path.Parser) error {
106106
return nil
107107
}
108108

109-
func (overrideExtractingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, compatibilityLevel int, repoName label.ApparentRepo, bazelCompatibility []string) error {
109+
func (overrideExtractingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, bazelCompatibility []string) error {
110110
return nil
111111
}
112112

‎pkg/model/analysis/registered_execution_platforms.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ type registeredExecutionPlatformExtractingModuleDotBazelHandler[TReference objec
3434
executionPlatforms *[]*model_analysis_pb.ExecutionPlatform
3535
}
3636

37-
func (registeredExecutionPlatformExtractingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
37+
func (registeredExecutionPlatformExtractingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
3838
return nil
3939
}
4040

41-
func (registeredExecutionPlatformExtractingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, compatibilityLevel int, repoName label.ApparentRepo, bazelCompatibility []string) error {
41+
func (registeredExecutionPlatformExtractingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, bazelCompatibility []string) error {
4242
return nil
4343
}
4444

‎pkg/model/analysis/registered_toolchains.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ type registeredToolchainExtractingModuleDotBazelHandler[TReference object.BasicR
3737
registeredToolchainsByType map[string][]*model_analysis_pb.RegisteredToolchain
3838
}
3939

40-
func (registeredToolchainExtractingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
40+
func (registeredToolchainExtractingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
4141
return nil
4242
}
4343

44-
func (registeredToolchainExtractingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, compatibilityLevel int, repoName label.ApparentRepo, bazelCompatibility []string) error {
44+
func (registeredToolchainExtractingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, bazelCompatibility []string) error {
4545
return nil
4646
}
4747

‎pkg/model/analysis/used_module_extensions.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ type usedModuleExtensionExtractingModuleDotBazelHandler[TReference object.BasicR
7979
valueEncodingOptions *model_starlark.ValueEncodingOptions[TReference, TMetadata]
8080
}
8181

82-
func (usedModuleExtensionExtractingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, maxCompatibilityLevel int, repoName label.ApparentRepo, devDependency bool) error {
82+
func (usedModuleExtensionExtractingModuleDotBazelHandler[TReference, TMetadata]) BazelDep(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, devDependency bool) error {
8383
return nil
8484
}
8585

86-
func (usedModuleExtensionExtractingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, compatibilityLevel int, repoName label.ApparentRepo, bazelCompatibility []string) error {
86+
func (usedModuleExtensionExtractingModuleDotBazelHandler[TReference, TMetadata]) Module(name label.Module, version *label.ModuleVersion, repoName label.ApparentRepo, bazelCompatibility []string) error {
8787
return nil
8888
}
8989

‎pkg/proto/model/analysis/analysis.pb.go‎

Lines changed: 9 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)