From ae1a3df39a10ecd40ae0a0646ef66de2fc844690 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <kevinzhang940420@gmail.com>
Date: Thu, 26 Sep 2024 12:48:26 -0700
Subject: [PATCH] update business pay again

---
 queue_services/business-pay/Makefile | 30 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/queue_services/business-pay/Makefile b/queue_services/business-pay/Makefile
index 868b8c2008..6804a7cf54 100644
--- a/queue_services/business-pay/Makefile
+++ b/queue_services/business-pay/Makefile
@@ -87,15 +87,18 @@ mac-cov: test ## Run the coverage report and display in a browser window (mac)
 #################################################################################
 cd: ## CD flow
 ifeq ($(TAG_NAME), test)
-cd: update-env
+# cd: update-env
+cd:
 	oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):dev $(DOCKER_NAME):$(TAG_NAME)
 else ifeq ($(TAG_NAME), prod)
-cd: update-env
+# cd: update-env
+cd:
 	oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):$(TAG_NAME) $(DOCKER_NAME):$(TAG_NAME)-$(shell date +%F)
 	oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):test $(DOCKER_NAME):$(TAG_NAME)
 else
 TAG_NAME=dev
-cd: build update-env tag
+# cd: build update-env tag
+cd: build tag
 endif
 
 build: ## Build the docker container
@@ -114,16 +117,17 @@ push: #build ## Push the docker container to the registry & tag latest
     docker tag $(DOCKER_NAME) $(REGISTRY_IMAGE):latest ;\
     docker push $(REGISTRY_IMAGE):latest
 
-VAULTS=`cat devops/vaults.json`
-update-env: ## Update env from 1pass
-	oc -n "$(OPS_REPOSITORY)-$(TAG_NAME)" exec "dc/vault-service-$(TAG_NAME)" -- ./scripts/1pass.sh \
-		-m "secret" \
-		-e "$(TAG_NAME)" \
-		-a "$(DOCKER_NAME)-$(TAG_NAME)" \
-		-n "$(OPENSHIFT_REPOSITORY)-$(TAG_NAME)" \
-		-v "$(VAULTS)" \
-		-r "true" \
-		-f "false"
+# 1Password CLI1 will be deprecated on Oct 1, 2024
+# VAULTS=`cat devops/vaults.json`
+# update-env: ## Update env from 1pass
+# 	oc -n "$(OPS_REPOSITORY)-$(TAG_NAME)" exec "dc/vault-service-$(TAG_NAME)" -- ./scripts/1pass.sh \
+# 		-m "secret" \
+# 		-e "$(TAG_NAME)" \
+# 		-a "$(DOCKER_NAME)-$(TAG_NAME)" \
+# 		-n "$(OPENSHIFT_REPOSITORY)-$(TAG_NAME)" \
+# 		-v "$(VAULTS)" \
+# 		-r "true" \
+# 		-f "false"
 
 tag: push ## tag image
 	oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):latest $(DOCKER_NAME):$(TAG_NAME)