refactor: use builtin maybe() from @bazel_tools instead of a custom _maybe macro

Author: Benjamin Denhartog

Diff for: buildozer/deps.bzl

@@ -1,8 +1,9 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 def buildozer_dependencies():
-    _maybe(
+    maybe(
         http_archive,
         name = "bazel_skylib",
         urls = [
@@ -12,14 +13,10 @@ def buildozer_dependencies():
         sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
     )
 
-    _maybe(
+    maybe(
         git_repository,
         name = "com_github_bazelbuild_buildtools",
         commit = "5bcc31df55ec1de770cb52887f2e989e7068301f",  #v0.29.0
         remote = "https://github.com/bazelbuild/buildtools.git",
         shallow_since = "1568030193 +0200",
     )
-
-def _maybe(repo_rule, name, **kwargs):
-    if name not in native.existing_rules():
-        repo_rule(name = name, **kwargs)

Diff for: goimports/deps.bzl

@@ -1,15 +1,16 @@
 load("@bazel_gazelle//:deps.bzl", "go_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 def goimports_dependencies():
-    _maybe(
+    maybe(
         go_repository,
         name = "org_golang_x_tools",
         importpath = "golang.org/x/tools",
         commit = "6de373a2766cf6891613ba19eb8bb06227ba7273",  # master, as of 2020-01-02
     )
 
-    _maybe(
+    maybe(
         http_archive,
         name = "bazel_skylib",
         urls = [
@@ -18,7 +19,3 @@ def goimports_dependencies():
         ],
         sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
     )
-
-def _maybe(repo_rule, name, **kwargs):
-    if name not in native.existing_rules():
-        repo_rule(name = name, **kwargs)

Diff for: golangcilint/deps.bzl

@@ -1,4 +1,5 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 _DOWNLOAD_URI = (
     "https://github.com/golangci/golangci-lint/releases/download/v{version}/" +
@@ -55,7 +56,7 @@ _golangcilint_download = repository_rule(
 )
 
 def golangcilint_dependencies():
-    _maybe(
+    maybe(
         http_archive,
         name = "bazel_skylib",
         urls = [
@@ -67,7 +68,3 @@ def golangcilint_dependencies():
     _golangcilint_download(
         name = "com_github_atlassian_bazel_tools_golangcilint",
     )
-
-def _maybe(repo_rule, name, **kwargs):
-    if name not in native.existing_rules():
-        repo_rule(name = name, **kwargs)

Diff for: gometalinter/deps.bzl

@@ -1,4 +1,5 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 _GOMETALINTER_TARBALLS = {
     "darwin_amd64": (
@@ -42,7 +43,7 @@ _gometalinter_download = repository_rule(
 )
 
 def gometalinter_dependencies():
-    _maybe(
+    maybe(
         http_archive,
         name = "bazel_skylib",
         urls = [
@@ -54,7 +55,3 @@ def gometalinter_dependencies():
     _gometalinter_download(
         name = "com_github_atlassian_bazel_tools_gometalinter",
     )
-
-def _maybe(repo_rule, name, **kwargs):
-    if name not in native.existing_rules():
-        repo_rule(name = name, **kwargs)

Diff for: gorevive/deps.bzl

@@ -1,86 +1,87 @@
 load("@bazel_gazelle//:deps.bzl", "go_repository")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 def go_revive_dependencies():
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_burntsushi_toml",
         importpath = "github.com/BurntSushi/toml",
         tag = "v0.3.0",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_fatih_color",
         importpath = "github.com/fatih/color",
         tag = "v1.7.0",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_fatih_structtag",
         importpath = "github.com/fatih/structtag",
         tag = "v1.0.0",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_mattn_go_colorable",
         importpath = "github.com/mattn/go-colorable",
         tag = "v0.0.9",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_mattn_go_isatty",
         importpath = "github.com/mattn/go-isatty",
         tag = "v0.0.4",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_mattn_go_runewidth",
         importpath = "github.com/mattn/go-runewidth",
         tag = "v0.0.3",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_mgechev_dots",
         commit = "8e09d8ea2757",
         importpath = "github.com/mgechev/dots",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_olekukonko_tablewriter",
         commit = "be2c049b30cc",
         importpath = "github.com/olekukonko/tablewriter",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_pkg_errors",
         importpath = "github.com/pkg/errors",
         tag = "v0.8.0",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "org_golang_x_sys",
         commit = "d0be0721c37e",
         importpath = "golang.org/x/sys",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "org_golang_x_tools",
         commit = "bf090417da8b6150dcfe96795325f5aa78fff718",
         importpath = "golang.org/x/tools",
     )
 
-    _maybe(
+    maybe(
         http_archive,
         name = "bazel_skylib",
         urls = [
@@ -90,14 +91,10 @@ def go_revive_dependencies():
         sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
     )
 
-    _maybe(
+    maybe(
         new_git_repository,
         name = "com_github_mgechev_revive",
         commit = "b4cc152955fbbcd2afafd5df3d46393d621a7fdf",
         remote = "https://github.com/mgechev/revive.git",
         build_file = "@com_github_atlassian_bazel_tools//gorevive:revive.BUILD.bazel",
     )
-
-def _maybe(repo_rule, name, **kwargs):
-    if name not in native.existing_rules():
-        repo_rule(name = name, **kwargs)

Diff for: gotemplate/deps.bzl

@@ -1,20 +1,17 @@
 load("@bazel_gazelle//:deps.bzl", "go_repository")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 def gotemplate_dependencies():
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_ghodss_yaml",
         commit = "c7ce16629ff4cd059ed96ed06419dd3856fd3577",
         importpath = "github.com/ghodss/yaml",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "in_gopkg_yaml_v2",
         commit = "5420a8b6744d3b0345ab293f6fcba19c978f1183",
         importpath = "gopkg.in/yaml.v2",
     )
-
-def _maybe(repo_rule, name, **kwargs):
-    if name not in native.existing_rules():
-        repo_rule(name = name, **kwargs)

Diff for: multirun/deps.bzl

@@ -1,7 +1,8 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 def multirun_dependencies():
-    _maybe(
+    maybe(
         http_archive,
         name = "bazel_skylib",
         urls = [
@@ -10,7 +11,3 @@ def multirun_dependencies():
         ],
         sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
     )
-
-def _maybe(repo_rule, name, **kwargs):
-    if name not in native.existing_rules():
-        repo_rule(name = name, **kwargs)

Diff for: rjsone/deps.bzl

@@ -1,41 +1,38 @@
 load("@bazel_gazelle//:deps.bzl", "go_repository")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 def rjsone_dependencies():
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_wryun_rjsone",
         commit = "a871600de5f3b73007fd8c92e084768b92668877",
         importpath = "github.com/wryun/rjsone",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_taskcluster_json_e",
         commit = "5f1fefda8b07ed0016c98f77cd4640ec8a920201",
         importpath = "github.com/taskcluster/json-e",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_wryun_yaml_1",
         commit = "e5213689ab3ec721209263e51f9edf8615d93085",
         importpath = "github.com/wryun/yaml-1",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "com_github_imdario_mergo",
         commit = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58",
         importpath = "github.com/imdario/mergo",
     )
 
-    _maybe(
+    maybe(
         go_repository,
         name = "in_gopkg_yaml_v2",
         commit = "5420a8b6744d3b0345ab293f6fcba19c978f1183",
         importpath = "gopkg.in/yaml.v2",
     )
-
-def _maybe(repo_rule, name, **kwargs):
-    if name not in native.existing_rules():
-        repo_rule(name = name, **kwargs)