revert the change for entity pay, business pay

bcgov · Sep 26, 2024 · cc4eda4 · cc4eda4
1 parent ba38e3a
commit cc4eda4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 34 deletions.
diff --git a/queue_services/business-pay/Makefile b/queue_services/business-pay/Makefile
@@ -87,18 +87,15 @@ 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:
+cd: update-env
 	oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):dev $(DOCKER_NAME):$(TAG_NAME)
 else ifeq ($(TAG_NAME), prod)
-# cd: update-env
-cd:
+cd: update-env
 	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 tag
+cd: build update-env tag
 endif
 
 build: ## Build the docker container
@@ -117,17 +114,16 @@ push: #build ## Push the docker container to the registry & tag latest
     docker tag $(DOCKER_NAME) $(REGISTRY_IMAGE):latest ;\
     docker push $(REGISTRY_IMAGE):latest
 
-# 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"
+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)

diff --git a/queue_services/entity-pay/Makefile b/queue_services/entity-pay/Makefile
@@ -87,18 +87,15 @@ 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:
+cd: update-env
 	oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):dev $(DOCKER_NAME):$(TAG_NAME)
 else ifeq ($(TAG_NAME), prod)
-# cd: update-env
-cd:
+cd: update-env
 	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 tag
+cd: build update-env tag
 endif
 
 build: ## Build the docker container
@@ -115,17 +112,16 @@ push: #build ## Push the docker container to the registry & tag latest
     docker tag $(DOCKER_NAME) $(REGISTRY_IMAGE):latest ;\
     docker push $(REGISTRY_IMAGE):latest
 
-# 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"
+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)