From 3e629bdea5e7868575c52c356102c1daf60bfb58 Mon Sep 17 00:00:00 2001
From: Odysseus Chiu <odysseus@highwaythreesolutions.com>
Date: Thu, 3 Oct 2024 10:34:15 -0700
Subject: [PATCH] disable vault due to deprecation

---
 jobs/payment-jobs/Makefile | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/jobs/payment-jobs/Makefile b/jobs/payment-jobs/Makefile
index 2c10cf1c8..d1fe5c439 100644
--- a/jobs/payment-jobs/Makefile
+++ b/jobs/payment-jobs/Makefile
@@ -72,15 +72,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
@@ -97,16 +100,16 @@ 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"
+#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)