remove adobe_rules_gitops (#18)

Author: apesternikov

WORKSPACE

@@ -4,12 +4,6 @@ workspace(
 )
 # gazelle:repo bazel_gazelle
 
-# optionally override the default version of rules_gitops with a local copy
-# local_repository(
-#     name = "com_adobe_rules_gitops",
-#     path = "../rules_gitops",
-# )
-
 #Fetch deps needed for local development"
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
@@ -20,20 +14,6 @@ http_archive(
     url = "https://github.com/bazel-contrib/rules_oci/releases/download/v1.7.4/rules_oci-v1.7.4.tar.gz",
 )
 
-load("@rules_oci//oci:dependencies.bzl", "rules_oci_dependencies")
-
-rules_oci_dependencies()
-
-load("@rules_oci//oci:repositories.bzl", "LATEST_CRANE_VERSION", "oci_register_toolchains")
-
-oci_register_toolchains(
-    name = "oci",
-    crane_version = LATEST_CRANE_VERSION,
-    # Uncommenting the zot toolchain will cause it to be used instead of crane for some tasks.
-    # Note that it does not support docker-format images.
-    # zot_version = LATEST_ZOT_VERSION,
-)
-
 http_archive(
     name = "io_bazel_rules_go",
     sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
@@ -76,29 +56,50 @@ http_archive(
 
 http_archive(
     name = "aspect_bazel_lib",
-    sha256 = "44f4f6d1ea1fc5a79ed6ca83f875038fee0a0c47db4f9c9beed097e56f8fad03",
-    strip_prefix = "bazel-lib-1.34.0",
-    url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.34.0/bazel-lib-v1.34.0.tar.gz",
+    sha256 = "6d758a8f646ecee7a3e294fbe4386daafbe0e5966723009c290d493f227c390b",
+    strip_prefix = "bazel-lib-2.7.7",
+    url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.7/bazel-lib-v2.7.7.tar.gz",
 )
 
 load("//mirror:repositories.bzl", "rules_mirror_dependencies")
 
 # Fetch dependencies which users need as well
 rules_mirror_dependencies()
 
+load("@rules_oci//oci:dependencies.bzl", "rules_oci_dependencies")
+
+rules_oci_dependencies()
+
+load("@rules_oci//oci:repositories.bzl", "LATEST_CRANE_VERSION", "oci_register_toolchains")
+
+oci_register_toolchains(
+    name = "oci",
+    crane_version = LATEST_CRANE_VERSION,
+    # Uncommenting the zot toolchain will cause it to be used instead of crane for some tasks.
+    # Note that it does not support docker-format images.
+    # zot_version = LATEST_ZOT_VERSION,
+)
+
 # For running our own unit tests
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 bazel_skylib_workspace()
 
-load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
+# load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
+
+# Required bazel-lib dependencies
 
-aspect_bazel_lib_dependencies()
+# aspect_bazel_lib_dependencies()
+
+# Register bazel-lib toolchains
+
+#aspect_bazel_lib_register_toolchains()
+
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 
 ############################################
 # Gazelle, for generating bzl_library targets
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 load("//:go_repositories.bzl", "go_dependencies")
 
 # gazelle:repository_macro go_repositories.bzl%go_dependencies
@@ -111,37 +112,19 @@ go_register_toolchains(version = "1.19.3")
 gazelle_dependencies()
 
 ############################################
-# Setup for com_adobe_rules_gitops
-load("@com_adobe_rules_gitops//gitops:deps.bzl", "rules_gitops_dependencies")
+# Setup for rules_gitops
+load("@rules_gitops//gitops:deps.bzl", "rules_gitops_dependencies")
 
 rules_gitops_dependencies()
 
-load("@com_adobe_rules_gitops//gitops:repositories.bzl", "rules_gitops_repositories")
+load("@rules_gitops//gitops:repositories.bzl", "rules_gitops_repositories")
 
 rules_gitops_repositories()
 
-load("@com_adobe_rules_gitops//skylib:k8s.bzl", "kubeconfig")
+load("@rules_gitops//skylib:k8s.bzl", "kubeconfig")
 
 kubeconfig(
     name = "k8s_test",
     cluster = "dummy",
     use_host_config = True,
 )
-
-############################################
-# Setup for rules_gitops
-load("@rules_gitops//gitops:deps.bzl", rg_dependencies = "rules_gitops_dependencies")
-
-rg_dependencies()
-
-load("@rules_gitops//gitops:repositories.bzl", rg_repositories = "rules_gitops_repositories")
-
-rg_repositories()
-
-load("@rules_gitops//skylib:k8s.bzl", rg_kubeconfig = "kubeconfig")
-
-rg_kubeconfig(
-    name = "rg_remote_test",
-    cluster = "dummy",
-    use_host_config = True,
-)

mirror/BUILD.bazel

@@ -23,5 +23,4 @@ bzl_library(
     name = "defs",
     srcs = ["defs.bzl"],
     visibility = ["//visibility:public"],
-    # deps = ["@com_adobe_rules_gitops//skylib:push"],
 )

mirror/defs.bzl

@@ -1,7 +1,6 @@
 "Public API"
 
 load("@rules_gitops//gitops:provider.bzl", "GitopsPushInfo")
-load("@com_adobe_rules_gitops//skylib:push.bzl", "K8sPushInfo")
 load("@rules_gitops//skylib:runfile.bzl", "get_runfile_path")
 
 def _replace_colon_except_last_segment(input_string):
@@ -61,22 +60,13 @@ def _mirror_image_impl(ctx):
         is_executable = True,
     )
 
-    dst_registry, dst_repository = dst_without_hash.split("/", 1)
-
     runfiles = ctx.runfiles(files = pusher_input).merge(ctx.attr.mirror_tool[DefaultInfo].default_runfiles)
 
     return [
         DefaultInfo(
             runfiles = runfiles,
             executable = ctx.outputs.executable,
         ),
-        K8sPushInfo(
-            image_label = ctx.label,
-            legacy_image_name = ctx.attr.image_name,
-            registry = dst_registry,
-            repository = dst_repository,
-            digestfile = digest_file,
-        ),
         GitopsPushInfo(
             image_label = ctx.label,
             repository = dst_without_hash,
@@ -92,7 +82,7 @@ mirror_image_rule = rule(
             doc = "The image to mirror",
         ),
         "image_name": attr.string(
-            doc = "The name that could be referred in manifests. This field is deprecated and used only in legacy com_adobe_rules_gitops.",
+            doc = "The name that could be referred in manifests. This field is deprecated and unused.",
         ),
         "digest": attr.string(
             mandatory = False,

mirror/repositories.bzl

@@ -21,31 +21,16 @@ def rules_mirror_dependencies():
         ],
     )
 
-    http_archive(
-        name = "com_adobe_rules_gitops",
-        sha256 = "83124a8056b1e0f555c97adeef77ec6dff387eb3f5bc58f212b376ba06d070dd",
-        strip_prefix = "rules_gitops-0.17.2",
-        urls = ["https://github.com/adobe/rules_gitops/archive/refs/tags/v0.17.2.tar.gz"],
-    )
-
-    http_archive(
-        name = "io_bazel_rules_docker",
-        sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf",
-        urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz"],
-    )
-
     http_archive(
         name = "rules_oci",
         sha256 = "176e601d21d1151efd88b6b027a24e782493c5d623d8c6211c7767f306d655c8",
         strip_prefix = "rules_oci-1.2.0",
         url = "https://github.com/bazel-contrib/rules_oci/releases/download/v1.2.0/rules_oci-v1.2.0.tar.gz",
     )
 
-    RULES_GITOPS_COMMIT = "aa6320b36aec9beacd0af9c3ad3bb479e41f3bce"
-
     http_archive(
         name = "rules_gitops",
-        sha256 = "694cad4247a0d4919fa5d41d17770d9aab0d9858ef03ca5658787de70557889a",
-        strip_prefix = "rules_gitops-%s" % RULES_GITOPS_COMMIT,
-        urls = ["https://github.com/fasterci/rules_gitops/archive/%s.tar.gz" % RULES_GITOPS_COMMIT],
+        sha256 = "37be3b22375a91b0839385364882938a972564c5510b6c6ca92f6bfc0221fe79",
+        strip_prefix = "rules_gitops-0.31.6",
+        urls = ["https://github.com/fasterci/rules_gitops/releases/download/v0.31.6/rules_gitops-v0.31.6.tar.gz"],
     )

mirror/tests/BUILD.bazel

@@ -1,11 +1,9 @@
 load("@aspect_bazel_lib//lib:testing.bzl", "assert_contains")
-load("@com_adobe_rules_gitops//skylib/kustomize:kustomize.bzl", "kustomize")
-load("@com_adobe_rules_gitops//gitops:defs.bzl", "k8s_deploy", "k8s_test_setup")
-load("//mirror:defs.bzl", "mirror_image")
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push")
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
-load("@rules_gitops//skylib/kustomize:kustomize.bzl", kustomize_rg = "kustomize")
-load("@rules_gitops//gitops:defs.bzl", k8s_deploy_rg = "k8s_deploy", k8s_test_setup_rg = "k8s_test_setup")
+load("@rules_gitops//gitops:defs.bzl", "k8s_deploy", "k8s_test_setup")
+load("@rules_gitops//skylib/kustomize:kustomize.bzl", "kustomize")
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push")
+load("//mirror:defs.bzl", "mirror_image")
 
 # create a simple image for testing
 
@@ -41,10 +39,10 @@ mirror_image(
     name = "image_mirror",
     digest = "sha256:b812c0570a7c369b2863c64e22760dc1b1dbc025a739f02db376bac62862f4cc",
     dst_prefix = "localhost:1338/mirror",
+    push_timeout = "60s",
     src_image = "localhost:1338/image",
     tags = ["manual"],  # test should be tagged manual since it requires a running registry
     visibility = ["//visibility:public"],
-    push_timeout = "60s",
 )
 
 mirror_image(
@@ -67,40 +65,15 @@ kustomize(
     namespace = "",
 )
 
-kustomize_rg(
-    name = "kustomize2",
-    images = [
-        ":image_mirror",
-    ],
-    manifests = [
-        "deployment.yaml",
-    ],
-    namespace = "",
-)
-
 write_source_files(
     name = "write_golden_files",
     files = {
         "kustomize1.golden": ":kustomize1",
-        "kustomize2.golden": ":kustomize2",
     },
 )
 
 # use k8s_deploy with mirrored image
 k8s_deploy(
-    name = "adobe_gitops_deploy",
-    cluster = "dummy",
-    images = [
-        ":image_mirror",
-    ],
-    manifests = [
-        "deployment.yaml",
-        "service.yaml",
-    ],
-    namespace = "{BUILD_USER}",
-)
-
-k8s_deploy_rg(
     name = "fasterci_gitops_deploy",
     cluster = "dummy",
     images = [
@@ -113,12 +86,6 @@ k8s_deploy_rg(
     namespace = "{BUILD_USER}",
 )
 
-assert_contains(
-    name = "adobe_gitops_deploy_has_mirrored_image",
-    actual = ":adobe_gitops_deploy",
-    expected = "image: localhost:1338/mirror/localhost1338/image@sha256:b812c0570a7c369b2863c64e22760dc1b1dbc025a739f02db376bac62862f4cc",
-)
-
 assert_contains(
     name = "fasterci_gitops_deploy_has_mirrored_image",
     actual = ":fasterci_gitops_deploy",
@@ -130,68 +97,11 @@ exports_files([
     "kubeconfig.yaml",
 ])
 
-# Execution of this setup should push the mirrored image to the registry
-k8s_test_setup(
-    name = "adobe_gitops.setup",
-    kubeconfig = ":kubeconfig.yaml",
-    kubectl = ":kubectl",
-    objects = [
-        ":adobe_gitops_deploy",
-    ],
-)
-
-# run the setup and verify the mirrored image is pushed
-sh_test(
-    name = "adobe_gitops_setup_test",
-    srcs = ["gitops_setup_test.sh"],
-    args = [
-        "$(location :adobe_gitops.setup) localhost:1338/mirror/localhost/1338/image@sha256:b812c0570a7c369b2863c64e22760dc1b1dbc025a739f02db376bac62862f4cc",
-    ],
-    data = [
-        ":adobe_gitops.setup",
-        ":kubectl",
-        ":push_image",
-        "@com_github_google_go_containerregistry//cmd/crane",
-        "@com_github_google_go_containerregistry//cmd/registry",
-    ],
-    env = {
-        "KUBECTL": "$(location :kubectl)",
-        "PUSH_IMAGE": "$(location :push_image)",
-        "CRANE_BIN": "$(location @com_github_google_go_containerregistry//cmd/crane)",
-        "REGISTRY_BIN": "$(location @com_github_google_go_containerregistry//cmd/registry)",
-    },
-    tags = [
-        "exclusive",
-        "manual",
-    ],  # this test starts a registry on fixed port 1338
-)
-
-sh_test(
-    name = "adobe_gitops_apply_test",
-    srcs = ["gitops_setup_test.sh"],
-    args = [
-        "$(location :adobe_gitops_deploy.apply) localhost:1338/mirror/localhost1338/image@sha256:b812c0570a7c369b2863c64e22760dc1b1dbc025a739f02db376bac62862f4cc",
-    ],
-    data = [
-        ":adobe_gitops_deploy.apply",
-        ":kubectl",
-        ":push_image",
-        "@com_github_google_go_containerregistry//cmd/crane",
-        "@com_github_google_go_containerregistry//cmd/registry",
-    ],
-    env = {
-        "KUBECTL": "$(location :kubectl)",
-        "PUSH_IMAGE": "$(location :push_image)",
-        "CRANE_BIN": "$(location @com_github_google_go_containerregistry//cmd/crane)",
-        "REGISTRY_BIN": "$(location @com_github_google_go_containerregistry//cmd/registry)",
-    },
-    tags = ["exclusive"],  # this test starts a registry on fixed port 1338
-)
-
 # very it works with fasterci too
 # Execution of this setup should push the mirrored image to the registry
-k8s_test_setup_rg(
+k8s_test_setup(
     name = "fasterci_gitops.setup",
+    cluster = "@k8s_test//:cluster",
     kubeconfig = ":kubeconfig.yaml",
     kubectl = ":kubectl",
     objects = [