Code cleanup

Author: pcj

cmd/gencopy/gencopy.bash.in

@@ -13,7 +13,6 @@ CONFIG_SHORT_PATH=@@CONFIG_SHORT_PATH@@
 # set -x
 # echo "PWD: $PWD"
 # find .
-# find ..
 
 # Get the directory of the current script (part of the runfiles tree)
 script_dir=$(dirname "$0")

cmd/gencopy/gencopy.go

@@ -18,6 +18,7 @@ import (
 const (
 	ModeUpdate = "update"
 	ModeCheck  = "check"
+	debug      = false
 )
 
 var (
@@ -83,9 +84,6 @@ func copyFile(src, dst string, mode os.FileMode) error {
 		return fmt.Errorf("copyFile: src not found: %s", src)
 	}
 
-	// NOTE: for some reason the io.Copy approach was writing an empty file...
-	// for now OK to copy in-memory
-
 	data, err := os.ReadFile(src)
 	if err != nil {
 		return err
@@ -231,7 +229,9 @@ func readConfig(workspaceRootDirectory string) (*Config, error) {
 		cfg.FileMode = "0644"
 	}
 
-	// log.Printf("%+v", cfg)
+	if debug {
+		log.Printf("%+v", cfg)
+	}
 
 	return cfg, nil
 }

example/golden/README.md

@@ -24,8 +24,8 @@ Have any `BUILD.bazel` files crept into the `vendor/` tree?  These are globbed
 in `//:all_files` and the presence of one will elide files in that package from
 the glob.  You might not see them because they are .gitignored.
 
-```
-bazel query //:all_files --output build > all_files.BUILD
+```sh
+$ bazel query //:all_files --output build > all_files.BUILD
 ```
 
 Try and build from the main test workspace.  To do that, open up rules_go in the

example/golden/builtin.MODULE.bazel

@@ -1,32 +0,0 @@
-local_repository(
-    name = "build_stack_rules_proto",
-    path = "../build_stack_rules_proto",
-)
-
-register_toolchains("@build_stack_rules_proto//toolchain:standard")
-
-# == Externals ==
-
-load("@build_stack_rules_proto//deps:core_deps.bzl", "core_deps")
-
-core_deps()
-
-# == Go ==
-
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-
-go_rules_dependencies()
-
-go_register_toolchains(version = "1.18.2")
-
-# == Gazelle ==
-
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
-
-gazelle_dependencies()
-
-# == Protobuf ==
-
-load("@build_stack_rules_proto//deps:protobuf_core_deps.bzl", "protobuf_core_deps")
-
-protobuf_core_deps()

example/golden/testdata/builtins/MODULE.bazel

@@ -1,71 +0,0 @@
-# ----------------------------------------------------
-# scala
-# ----------------------------------------------------
-
-load("@build_stack_rules_proto//deps:scala_deps.bzl", "scala_deps")
-load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
-load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
-load(
-    "@rules_jvm_external//:defs.bzl",
-    "maven_install",
-)
-load("@build_stack_rules_proto//rules/proto:proto_repository.bzl", "proto_repository")
-
-scala_deps()
-
-scala_config(scala_version = "2.12.18")
-
-scala_repositories()
-
-scala_register_toolchains()
-
-# ----------------------------------------------------
-# maven
-# ----------------------------------------------------
-
-maven_install(
-    name = "maven_scala",
-    artifacts = [
-        "com.thesamet.scalapb:lenses_2.12:0.11.10",
-        "com.thesamet.scalapb:scalapb-json4s_2.12:0.12.0",
-        "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.10",
-        "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.11.10",
-        "com.thesamet.scalapb:scalapbc_2.12:0.11.10",
-        "org.json4s:json4s-core_2.12:4.0.3",
-    ],
-    fetch_sources = True,
-    repositories = ["https://repo1.maven.org/maven2"],
-)
-
-# ----------------------------------------------------
-# akka
-# ----------------------------------------------------
-
-maven_install(
-    name = "maven_akka",
-    artifacts = [
-        "com.lightbend.akka.grpc:akka-grpc-codegen_2.12:2.1.3",
-        "com.lightbend.akka.grpc:akka-grpc-runtime_2.12:2.1.3",
-    ],
-    fetch_sources = True,
-    repositories = ["https://repo1.maven.org/maven2"],
-)
-
-# ----------------------------------------------------
-# proto_repository
-# ----------------------------------------------------
-
-proto_repository(
-    name = "scalaapis",
-    build_directives = ["gazelle:proto_language scala enabled true"],
-    build_file_generation = "on",
-    build_file_proto_mode = "file",
-    cfgs = ["//:config.yaml"],
-    sha256 = "1ac039f79b0825fe2e7e5ddf24e330632d63b70a7a42bfd39ded5bb1fb648811",
-    # the typical importpath is 'scalapb/scalapb.proto', so strip the prefix up
-    # to that directory.
-    strip_prefix = "ScalaPB-a4e0e02c0f5b160877d5f97f6902dbec4c633afe/protobuf",
-    type = "zip",
-    urls = ["https://codeload.github.com/scalapb/ScalaPB/zip/a4e0e02c0f5b160877d5f97f6902dbec4c633afe"],
-)

example/golden/testdata/scala/MODULE.bazel

@@ -1,5 +0,0 @@
-# Using scala_deps here because it provides rules_jvm_external, there is nothing
-# scala-specific about this example.
-load("@build_stack_rules_proto//deps:scala_deps.bzl", "scala_deps")
-
-scala_deps()

example/golden/testdata/starlark_java/MODULE.bazel

@@ -40,7 +40,7 @@ func (p *GogoPlugin) Configure(ctx *protoc.PluginContext) *protoc.PluginConfigur
 		return nil
 	}
 
-	grpcOptions := p.grpcOptions(ctx.Rel, ctx.PluginConfig, ctx.ProtoLibrary)
+	grpcOptions := p.grpcOptions(ctx.PluginConfig, ctx.ProtoLibrary)
 	return &protoc.PluginConfiguration{
 		Label:   label.New("build_stack_rules_proto", "plugin/gogo/protobuf", "protoc-gen-"+p.variant),
 		Outputs: p.outputs(ctx.ProtoLibrary),
@@ -73,7 +73,7 @@ func (p *GogoPlugin) outputs(lib protoc.ProtoLibrary) []string {
 	return srcs
 }
 
-func (p *GogoPlugin) grpcOptions(rel string, cfg protoc.LanguagePluginConfig, lib protoc.ProtoLibrary) []string {
+func (p *GogoPlugin) grpcOptions(cfg protoc.LanguagePluginConfig, lib protoc.ProtoLibrary) []string {
 	// if the configuration specifically states that we don't want grpc, return
 	// early
 	if want, ok := cfg.Options[gogoGrpcPluginOption]; ok && !want {

pkg/plugin/gogo/protobuf/protoc-gen-gogo.go

@@ -140,11 +140,12 @@ func (s *protoCompileRule) Rule(otherGen ...*rule.Rule) *rule.Rule {
 		switch name {
 		case "verbose":
 			val := vals[0]
-			if val == "True" || val == "true" {
+			switch val {
+			case "True", "true":
 				newRule.SetAttr("verbose", true)
-			} else if val == "False" || val == "false" {
+			case "False", "false":
 				newRule.SetAttr("verbose", false)
-			} else {
+			default:
 				log.Printf("bad attr 'verbose' value: %q", val)
 			}
 		default:

pkg/protoc/proto_compile.go

@@ -52,7 +52,7 @@ func newStringList(in []string) *starlark.List {
 	return starlark.NewList(values)
 }
 
-func newStringListDict(in map[string]map[string]bool) *starlark.Dict {
+func newStringListDict(_ map[string]map[string]bool) *starlark.Dict {
 	out := &starlark.Dict{}
 	return out
 }