From bea478266ea1fb1b795a2ea0ba1864b9d44b3d43 Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <siarkowicz@google.com>
Date: Tue, 20 Sep 2022 13:53:16 +0200
Subject: [PATCH] makefile: Raname targets update* to fix* to distinquish from
 update_dep

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
---
 .github/workflows/static-analysis.yaml |  2 +-
 CONTRIBUTING.md                        |  4 ++--
 Makefile                               | 11 ++++-------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
index 5db798f45..abb11161f 100644
--- a/.github/workflows/static-analysis.yaml
+++ b/.github/workflows/static-analysis.yaml
@@ -13,4 +13,4 @@ jobs:
         with:
           version: v1.49.0
       - run: make verify
-      - run: make update
+      - run: make fix
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8a22d5266..effb03b65 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -67,8 +67,8 @@ See the [style doc](https://github.com/golang/go/wiki/CodeReviewComments) for de
 Please ensure that your change passes static analysis (requires [golangci-lint](https://golangci-lint.run/usage/install/)):
 - `make verify` to verify if all checks pass.
 - `make verify-*` to verify a single check, for example `make verify-bom` to verify if bill-of-materials.json file is up-to-date.
-- `make update` to fix all checks.
-- `make update-*` to fix a single checks, for example `make update-bom` to update bill-of-materials.json.
+- `make fix` to fix all checks.
+- `make fix-*` to fix a single checks, for example `make fix-bom` to update bill-of-materials.json.
 
 Please ensure that your change passes tests.
 - `make test-unit` to run unit tests.
diff --git a/Makefile b/Makefile
index 65e75d825..fb05e5ca5 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ test-e2e-release: build
 # Static analysis
 
 verify: verify-gofmt verify-bom verify-lint verify-dep verify-shellcheck verify-goword verify-govet verify-license-header verify-receiver-name verify-mod-tidy verify-shellcheck verify-shellws verify-proto-annotations
-update: update-bom update-lint update-fix
+fix: fix-bom fix-lint
+	./scripts/fix.sh
 
 .PHONY: verify-gofmt
 verify-gofmt:
@@ -41,7 +42,7 @@ verify-bom:
 	PASSES="bom" ./scripts/test.sh
 
 .PHONY: update-bom
-update-bom:
+fix-bom:
 	./scripts/updatebom.sh
 
 .PHONY: verify-dep
@@ -53,13 +54,9 @@ verify-lint:
 	golangci-lint run
 
 .PHONY: update-lint
-update-lint:
+fix-lint:
 	golangci-lint run --fix
 
-.PHONY: update-fix
-update-fix:
-	./scripts/fix.sh
-
 .PHONY: verify-shellcheck
 verify-shellcheck:
 	PASSES="shellcheck" ./scripts/test.sh