chore: unify web-gateway and backend

.github/workflows/push-image.yaml

@@ -85,9 +85,9 @@ jobs:
  run: make vendor
  - name: Build web and go applications
  run: |
- make build-web
+ make build-web-console
  make build-go -j ${{ env.GO_BUILD_CONCURRENCY }}
- make clean-web
+ make clean-web-console
  - name: Add executable permission to go binary files
  run: chmod +x bin/*
  - name: Set up docker

Makefile

@@ -148,21 +148,21 @@ $(GO_APP_BUILD_TARGETS): build-%:
  go build -ldflags "-s -w -X $(LDFLAGS_VERSION)=$(VERSION) -X $(LDFLAGS_HASH)=$(HASH) -X $(LDFLAGS_BUILDDATE)=$(BUILDDATE)" \
  -o bin/$* -mod=vendor cmd/$*/$*.go
 
-.PHONY: clean-web
-clean-web:
+.PHONY: clean-web-console
+clean-web-console:
  rm -rf ui/web-v2/dist/*
  touch ui/web-v2/dist/DONT-EDIT-FILES-IN-THIS-DIRECTORY
 
-.PHONY: build-web
-build-web:
+.PHONY: build-web-console
+build-web-console:
  rm -rf ui/web-v2/dist/*
  make -C ui/web-v2 install build
 
 .PHONY: build-go
 build-go: $(GO_APP_BUILD_TARGETS)
 
 .PHONY: build-go-embed
-build-go-embed: build-web $(GO_APP_BUILD_TARGETS) clean-web
+build-go-embed: build-web-console $(GO_APP_BUILD_TARGETS) clean-web-console
 
 # Make sure bucketeer-httpstan is already running. If not, run "make start-httpstan".
 .PHONY: test-go

cmd/backend/backend.go → cmd/web/web.go

@@ -17,12 +17,12 @@ package main
 import (
  "log"
 
- "github.com/bucketeer-io/bucketeer/pkg/backend/cmd/server"
  "github.com/bucketeer-io/bucketeer/pkg/cli"
+ "github.com/bucketeer-io/bucketeer/pkg/web/cmd/server"
 )
 
 var (
- name = "bucketeer-backend"
+ name = "bucketeer-web"
  version = ""
  build = ""
 )

manifests/bucketeer/charts/api-gateway/templates/envoy-configmap.yaml

@@ -98,7 +98,7 @@ data:
  private_key:
  filename: /usr/local/certs/service/tls.key
  type: strict_dns
- - name: backend
+ - name: web
  connect_timeout: 5s
  ignore_health_on_host_removal: true
  circuit_breakers:
@@ -109,13 +109,13 @@ data:
  max_pending_requests: 100000000
  max_requests: 100000000
  load_assignment:
- cluster_name: backend
+ cluster_name: web
  endpoints:
  - lb_endpoints:
  - endpoint:
  address:
  socket_address:
- address: backend.{{ .Values.namespace }}.svc.cluster.local
+ address: web.{{ .Values.namespace }}.svc.cluster.local
  port_value: 9000
  dns_lookup_family: V4_ONLY
  lb_policy: {{ .Values.envoy.lbPolicy }}
@@ -256,7 +256,7 @@ data:
  exact: application/grpc
  prefix: /bucketeer.feature.FeatureService
  route:
- cluster: backend
+ cluster: web
  timeout: 15s
  retry_policy:
  retry_on: 5xx
@@ -268,7 +268,7 @@ data:
  exact: application/grpc
  prefix: /bucketeer.account.AccountService
  route:
- cluster: backend
+ cluster: web
  timeout: 15s
  retry_policy:
  retry_on: 5xx