build(tags): remove redundant build tag ui_base (#857)

It was not used for UI, it had become a CLI dependency
with the same functionality as search

Signed-off-by: Andrei Aaron <andaaron@cisco.com>

.github/workflows/branch-cov.yml

@@ -38,7 +38,7 @@ jobs:
           cd $GITHUB_WORKSPACE
           for i in $(find . -type f \( -name "*.go" -not -name "*_test.go" -not -name "generated.go" \)); do
             echo $i;
-            gobco -test '-tags=sync,search,scrub,metrics,ui_base,containers_image_openpgp' $i;
+            gobco -test '-tags=sync,search,scrub,metrics,containers_image_openpgp' $i;
             gobco -test '-tags=minimal,containers_image_openpgp' $i;
           done
         env:

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
     env:
       CGO_ENABLED: 0
-      GOFLAGS: "-tags=sync,search,scrub,metrics,ui_base,containers_image_openpgp"
+      GOFLAGS: "-tags=sync,search,scrub,metrics,containers_image_openpgp"
 
     steps:
     - name: Checkout repository

.github/workflows/golangci-lint.yaml

@@ -31,7 +31,7 @@ jobs:
 
           # Optional: golangci-lint command line arguments.
           # args: --issues-exit-code=0
-          args: --config ./golangcilint.yaml --enable-all --build-tags debug,needprivileges,sync,scrub,search,metrics,ui_base,containers_image_openpgp,lint ./cmd/... ./pkg/...
+          args: --config ./golangcilint.yaml --enable-all --build-tags debug,needprivileges,sync,scrub,search,metrics,containers_image_openpgp,lint ./cmd/... ./pkg/...
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true

CONTRIBUTING.md

@@ -45,7 +45,7 @@ make binary-minimal
 ```
 
 For a zot that includes only the extensions that you specify,
-the available extensions that can be used at the moment are: sync, scrub, metrics, search, ui_base .
+the available extensions that can be used at the moment are: sync, scrub, metrics, search.
 
 NOTES: When multiple extensions are used, they should be enlisted in the above presented order.
 

Makefile

@@ -19,7 +19,7 @@ TESTDATA := $(TOP_LEVEL)/test/data
 OS ?= linux
 ARCH ?= amd64
 BENCH_OUTPUT ?= stdout
-EXTENSIONS ?= sync,search,scrub,metrics,ui_base,lint
+EXTENSIONS ?= sync,search,scrub,metrics,lint
 comma:= ,
 hyphen:= -
 extended-name:=
@@ -59,7 +59,7 @@ binary-debug: modcheck swagger create-name build-metadata
 
 .PHONY: cli
 cli: modcheck create-name build-metadata
-	env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zli-$(OS)-$(ARCH) -buildmode=pie -tags $(EXTENSIONS),ui_base,containers_image_openpgp -v -trimpath -ldflags "-X zotregistry.io/zot/pkg/api/config.Commit=${COMMIT} -X zotregistry.io/zot/pkg/api/config.BinaryType=$(extended-name) -X zotregistry.io/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zli
+	env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zli-$(OS)-$(ARCH) -buildmode=pie -tags $(EXTENSIONS),search,containers_image_openpgp -v -trimpath -ldflags "-X zotregistry.io/zot/pkg/api/config.Commit=${COMMIT} -X zotregistry.io/zot/pkg/api/config.BinaryType=$(extended-name) -X zotregistry.io/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zli
 
 .PHONY: bench
 bench: modcheck create-name build-metadata
@@ -280,12 +280,12 @@ bats-sync-verbose: binary binary-minimal check-skopeo $(BATS)
 	$(BATS) --trace -t -x -p --verbose-run --print-output-on-failure --show-output-of-passing-tests test/blackbox/sync.bats
 
 .PHONY: bats-cve
-bats-cve: EXTENSIONS=ui_base
+bats-cve: EXTENSIONS=search
 bats-cve: binary cli check-skopeo $(BATS)
 	$(BATS) --trace --print-output-on-failure test/blackbox/cve.bats
 
 .PHONY: bats-cve-verbose
-bats-cve-verbose: EXTENSIONS=ui_base
+bats-cve-verbose: EXTENSIONS=search
 bats-cve-verbose: binary cli check-skopeo $(BATS)
 	$(BATS) --trace -t -x -p --verbose-run --print-output-on-failure --show-output-of-passing-tests test/blackbox/cve.bats
 

pkg/api/controller_test.go

@@ -1,5 +1,5 @@
-//go:build sync && scrub && metrics && search && ui_base
+//go:build sync && scrub && metrics && search
-// +build sync,scrub,metrics,search,ui_base
+// +build sync,scrub,metrics,search
 
 package api_test
 

pkg/api/routes_test.go

@@ -1,5 +1,5 @@
-//go:build sync && scrub && metrics && search && ui_base && lint
+//go:build sync && scrub && metrics && search && lint
-// +build sync,scrub,metrics,search,ui_base,lint
+// +build sync,scrub,metrics,search,lint
 
 package api_test
 

pkg/cli/cli.go

@@ -1,5 +1,5 @@
-//go:build ui_base || search
+//go:build search
-// +build ui_base search
+// +build search
 
 package cli
 

pkg/cli/client.go

@@ -1,5 +1,5 @@
-//go:build search || ui_base
+//go:build search
-// +build search ui_base
+// +build search
 
 package cli
 

pkg/cli/client_elevated_test.go

@@ -1,5 +1,5 @@
-//go:build ui_base && needprivileges
+//go:build search && needprivileges
-// +build ui_base,needprivileges
+// +build search,needprivileges
 
 package cli //nolint:testpackage
 

pkg/cli/client_test.go

@@ -1,5 +1,5 @@
-//go:build ui_base
+//go:build search
-// +build ui_base
+// +build search
 
 package cli //nolint:testpackage
 

pkg/cli/config_cmd.go

@@ -1,5 +1,5 @@
-//go:build search || ui_base
+//go:build search
-// +build search ui_base
+// +build search
 
 package cli
 

pkg/cli/config_cmd_test.go

@@ -1,5 +1,5 @@
-//go:build ui_base
+//go:build search
-// +build ui_base
+// +build search
 
 package cli //nolint:testpackage
 

pkg/cli/cve_cmd.go

@@ -1,5 +1,5 @@
-//go:build search || ui_base
+//go:build search
-// +build search ui_base
+// +build search
 
 package cli
 

pkg/cli/cve_cmd_test.go

@@ -1,5 +1,5 @@
-//go:build ui_base
+//go:build search
-// +build ui_base
+// +build search
 
 package cli //nolint:testpackage
 

pkg/cli/extensions_test.go

@@ -1,5 +1,5 @@
-//go:build sync && scrub && metrics && search && ui_base
+//go:build sync && scrub && metrics && search
-// +build sync,scrub,metrics,search,ui_base
+// +build sync,scrub,metrics,search
 
 package cli_test
 

pkg/cli/image_cmd.go

@@ -1,5 +1,5 @@
-//go:build search || ui_base
+//go:build search
-// +build search ui_base
+// +build search
 
 package cli
 

pkg/cli/image_cmd_test.go

@@ -1,5 +1,5 @@
-//go:build ui_base
+//go:build search
-// +build ui_base
+// +build search
 
 package cli //nolint:testpackage
 

pkg/cli/minimal.go

@@ -1,5 +1,5 @@
-//go:build !search && !ui_base
+//go:build !search
-// +build !search,!ui_base
+// +build !search
 
 package cli
 

pkg/cli/repo_cmd.go

@@ -1,5 +1,5 @@
-//go:build search || ui_base
+//go:build search
-// +build search ui_base
+// +build search
 
 package cli
 

pkg/cli/searcher.go

@@ -1,5 +1,5 @@
-//go:build search || ui_base
+//go:build search
-// +build search ui_base
+// +build search
 
 package cli
 

pkg/cli/service.go

@@ -1,5 +1,5 @@
-//go:build ui_base || search
+//go:build search
-// +build ui_base search
+// +build search
 
 package cli
 

pkg/extensions/README.md

@@ -27,5 +27,5 @@ package extensions
 
 - with every new extension, you should modify the EXTENSIONS variable in Makefile by adding the new extension. The EXTENSIONS variable represents all extensions and is used in Make targets that require them all (e.g make test).
 
-- the available extensions that can be used at the moment are: <b>sync, scrub, metrics, search, ui_base </b>.
+- the available extensions that can be used at the moment are: <b>sync, scrub, metrics, search </b>.
 NOTE: When multiple extensions are used, they should be enlisted in the above presented order.

pkg/extensions/extension_search.go

@@ -1,5 +1,5 @@
-//go:build search || ui_base
+//go:build search
-// +build search ui_base
+// +build search
 
 package extensions
 

pkg/extensions/extension_search_disabled.go

@@ -1,5 +1,5 @@
-//go:build !search && !ui_base
+//go:build !search
-// +build !search,!ui_base
+// +build !search
 
 package extensions
 

pkg/log/log_test.go

@@ -1,5 +1,5 @@
-//go:build sync && scrub && metrics && search && ui_base
+//go:build sync && scrub && metrics && search
-// +build sync,scrub,metrics,search,ui_base
+// +build sync,scrub,metrics,search
 
 package log_test
 

pkg/test/common_test.go

@@ -1,5 +1,5 @@
-//go:build sync && scrub && metrics && search && ui_base
+//go:build sync && scrub && metrics && search
-// +build sync,scrub,metrics,search,ui_base
+// +build sync,scrub,metrics,search
 
 package test_test
 

test/scripts/fuzzAll.sh

@@ -13,6 +13,6 @@ do
     do
         echo "Fuzzing $func in $file"
         parentDir=$(dirname $file)
-        go test $parentDir -run=$func -fuzz=$func$ -fuzztime=${fuzzTime}s -tags sync,metrics,search,scrub,ui_base,containers_image_openpgp | grep -oP -x '^(?:(?!\blevel\b).)*$'
+        go test $parentDir -run=$func -fuzz=$func$ -fuzztime=${fuzzTime}s -tags sync,metrics,search,scrub,containers_image_openpgp | grep -oP -x '^(?:(?!\blevel\b).)*$'
     done
 done