Merge pull request #1 from rarimo/refactor/rename-service

update: service name
rarimo · May 23, 2024 · 54cc66b · 54cc66b
2 parents b86d475 + f663921
commit 54cc66b
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 89 deletions.
diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
@@ -1,5 +1,9 @@
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+      - 'main'
 
 jobs:
   converge:

diff --git a/.github/workflows/actions_branch.yaml b/.github/workflows/actions_branch.yaml
diff --git a/.github/workflows/deploy-gh-pages.yaml b/.github/workflows/deploy-gh-pages.yaml
@@ -1,9 +1,3 @@
-# Builds the docs and deploys to GitHub pages
-#
-# https://github.com/actions/setup-node
-# Using https://github.com/marketplace/actions/deploy-to-github-pages
-name: Deploy to Github pages
-
 on:
   workflow_dispatch:
   push:

diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
@@ -1,8 +1,10 @@
 on:
+  workflow_dispatch:
   push:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
       - 'v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
 
 jobs:
   converge:

diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,5 @@ docker-compose.yaml
 docs/node_modules
 docs/web_deploy
 vendor/
-airdrop-svc
+evm-airdrop-svc
 .DS_Store
diff --git a/Dockerfile b/Dockerfile
@@ -2,16 +2,16 @@ FROM golang:1.22-alpine as buildbase
 
 RUN apk add git build-base
 
-WORKDIR /go/src/github.com/rarimo/airdrop-svc
+WORKDIR /go/src/github.com/rarimo/evm-airdrop-svc
 COPY vendor .
 COPY . .
 
-RUN GOOS=linux go build  -o /usr/local/bin/airdrop-svc /go/src/github.com/rarimo/airdrop-svc
+RUN GOOS=linux go build  -o /usr/local/bin/evm-airdrop-svc /go/src/github.com/rarimo/evm-airdrop-svc
 
 
 FROM alpine:3.9
 
-COPY --from=buildbase /usr/local/bin/airdrop-svc /usr/local/bin/airdrop-svc
+COPY --from=buildbase /usr/local/bin/evm-airdrop-svc /usr/local/bin/evm-airdrop-svc
 RUN apk add --no-cache ca-certificates
 
-ENTRYPOINT ["airdrop-svc"]
+ENTRYPOINT ["evm-airdrop-svc"]
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# airdrop-svc
+# evm-airdrop-svc
 
 ## Description
 
@@ -7,8 +7,8 @@ Service to manage airdrops for passport ZK-proofs
 ## Install
 
 ```
-git clone github.com/rarimo/airdrop-svc
-cd airdrop-svc
+git clone github.com/rarimo/evm-airdrop-svc
+cd evm-airdrop-svc
 go build main.go
 export KV_VIPER_FILE=./config.yaml
 ./main migrate up
@@ -17,7 +17,7 @@ export KV_VIPER_FILE=./config.yaml
 
 ## API documentation
 
-[Online docs](https://rarimo.github.io/airdrop-svc/) are available.
+[Online docs](https://rarimo.github.io/evm-airdrop-svc/) are available.
 
 All endpoints from docs MUST be publicly accessible.
 

diff --git a/docs/.redoclyrc b/docs/.redoclyrc
@@ -1,5 +1,5 @@
 
-apiTitle: airdrop-svc
+apiTitle: evm-airdrop-svc
 splitSpec: true
 codeSamples: false
 swaggerUI: true

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "airdrop-svc",
+  "name": "evm-airdrop-svc",
   "version": "1.0.0",
   "dependencies": {
     "@tokend/redoc-cli": "^0.9.9",

diff --git a/docs/spec/openapi.yaml b/docs/spec/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   version: 1.0.0
-  title: airdrop-svc
+  title: evm-airdrop-svc
   description: ''
 servers:
   - url: 'https://api.stage.rarime.com'

diff --git a/docs/web/index.hbs b/docs/web/index.hbs
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf8" />
-    <title>airdrop-svc Service Documentation</title>
+    <title>evm-airdrop-svc Service Documentation</title>
     <!-- needed for adaptive design -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>

diff --git a/docs/web/index.html b/docs/web/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>airdrop-svc | ReDoc</title>
+    <title>evm-airdrop-svc | ReDoc</title>
     <!-- needed for adaptive design -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" type="image/png" href="favicon.png">

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rarimo/airdrop-svc
+module github.com/rarimo/evm-airdrop-svc
 
 go 1.22
 

diff --git a/internal/broadcaster/broadcaster.go b/internal/broadcaster/broadcaster.go
@@ -1,6 +1,6 @@
 // Package broadcaster provides the functionality to broadcast transactions to
 // the blockchain. It is similar to https://github.com/rarimo/broadcaster-svc,
-// but is integrated into airdrop-svc purposely. The mentioned broadcaster does
+// but is integrated into evm-airdrop-svc purposely. The mentioned broadcaster does
 // not allow you to track even successful transaction submission.
 //
 // The reason of broadcasting implementation is the same: account sequence
@@ -19,8 +19,8 @@ import (
 	xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/types"
-	"github.com/rarimo/airdrop-svc/internal/config"
-	"github.com/rarimo/airdrop-svc/internal/data"
+	"github.com/rarimo/evm-airdrop-svc/internal/config"
+	"github.com/rarimo/evm-airdrop-svc/internal/data"
 	ethermint "github.com/rarimo/rarimo-core/ethermint/types"
 	"gitlab.com/distributed_lab/logan/v3"
 	"gitlab.com/distributed_lab/running"

diff --git a/internal/cli/main.go b/internal/cli/main.go
@@ -8,9 +8,9 @@ import (
 	"syscall"
 
 	"github.com/alecthomas/kingpin"
-	"github.com/rarimo/airdrop-svc/internal/broadcaster"
-	"github.com/rarimo/airdrop-svc/internal/config"
-	"github.com/rarimo/airdrop-svc/internal/service"
+	"github.com/rarimo/evm-airdrop-svc/internal/broadcaster"
+	"github.com/rarimo/evm-airdrop-svc/internal/config"
+	"github.com/rarimo/evm-airdrop-svc/internal/service"
 	"gitlab.com/distributed_lab/kit/kv"
 	"gitlab.com/distributed_lab/logan/v3"
 )
@@ -25,7 +25,7 @@ func Run(args []string) bool {
 	var (
 		cfg            = config.New(kv.MustFromEnv())
 		log            = cfg.Log()
-		app            = kingpin.New("airdrop-svc", "")
+		app            = kingpin.New("evm-airdrop-svc", "")
 		runCmd         = app.Command("run", "run command")
 		serviceCmd     = runCmd.Command("service", "run service")
 		migrateCmd     = app.Command("migrate", "migrate command")

diff --git a/internal/cli/migrate.go b/internal/cli/migrate.go
@@ -1,8 +1,8 @@
 package cli
 
 import (
-	"github.com/rarimo/airdrop-svc/internal/assets"
-	"github.com/rarimo/airdrop-svc/internal/config"
+	"github.com/rarimo/evm-airdrop-svc/internal/assets"
+	"github.com/rarimo/evm-airdrop-svc/internal/config"
 	migrate "github.com/rubenv/sql-migrate"
 	"gitlab.com/distributed_lab/logan/v3/errors"
 )

diff --git a/internal/service/handlers/create_airdrop.go b/internal/service/handlers/create_airdrop.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/rarimo/airdrop-svc/internal/data"
-	"github.com/rarimo/airdrop-svc/internal/service/requests"
+	"github.com/rarimo/evm-airdrop-svc/internal/data"
+	"github.com/rarimo/evm-airdrop-svc/internal/service/requests"
 	zk "github.com/rarimo/zkverifier-kit"
 	"github.com/rarimo/zkverifier-kit/identity"
 	"gitlab.com/distributed_lab/ape"

diff --git a/internal/service/handlers/ctx.go b/internal/service/handlers/ctx.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/rarimo/airdrop-svc/internal/config"
-	"github.com/rarimo/airdrop-svc/internal/data"
+	"github.com/rarimo/evm-airdrop-svc/internal/config"
+	"github.com/rarimo/evm-airdrop-svc/internal/data"
 	zk "github.com/rarimo/zkverifier-kit"
 	"gitlab.com/distributed_lab/logan/v3"
 )

diff --git a/internal/service/handlers/get_airdrop.go b/internal/service/handlers/get_airdrop.go
@@ -3,9 +3,9 @@ package handlers
 import (
 	"net/http"
 
-	data "github.com/rarimo/airdrop-svc/internal/data"
-	"github.com/rarimo/airdrop-svc/internal/service/requests"
-	"github.com/rarimo/airdrop-svc/resources"
+	data "github.com/rarimo/evm-airdrop-svc/internal/data"
+	"github.com/rarimo/evm-airdrop-svc/internal/service/requests"
+	"github.com/rarimo/evm-airdrop-svc/resources"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 )

diff --git a/internal/service/handlers/get_airdrop_params.go b/internal/service/handlers/get_airdrop_params.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/rarimo/airdrop-svc/resources"
+	"github.com/rarimo/evm-airdrop-svc/resources"
 	"gitlab.com/distributed_lab/ape"
 )
 

diff --git a/internal/service/handlers/middleware.go b/internal/service/handlers/middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/rarimo/airdrop-svc/internal/data"
+	"github.com/rarimo/evm-airdrop-svc/internal/data"
 	"gitlab.com/distributed_lab/kit/pgdb"
 )
 

diff --git a/internal/service/requests/create_airdrop.go b/internal/service/requests/create_airdrop.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	val "github.com/go-ozzo/ozzo-validation/v4"
-	"github.com/rarimo/airdrop-svc/resources"
+	"github.com/rarimo/evm-airdrop-svc/resources"
 )
 
 func NewCreateAirdrop(r *http.Request) (req resources.CreateAirdropRequest, err error) {

diff --git a/internal/service/router.go b/internal/service/router.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/go-chi/chi"
-	"github.com/rarimo/airdrop-svc/internal/config"
-	"github.com/rarimo/airdrop-svc/internal/service/handlers"
+	"github.com/rarimo/evm-airdrop-svc/internal/config"
+	"github.com/rarimo/evm-airdrop-svc/internal/service/handlers"
 	"gitlab.com/distributed_lab/ape"
 )
 
@@ -25,7 +25,7 @@ func Run(ctx context.Context, cfg *config.Config) {
 		),
 		handlers.DBCloneMiddleware(cfg.DB()),
 	)
-	r.Route("/integrations/airdrop-svc/airdrops", func(r chi.Router) {
+	r.Route("/integrations/evm-airdrop-svc/airdrops", func(r chi.Router) {
 		r.Post("/", handlers.CreateAirdrop)
 		r.Get("/{nullifier}", handlers.GetAirdrop)
 		r.Get("/params", handlers.GetAirdropParams)

diff --git a/main.go b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/rarimo/airdrop-svc/internal/cli"
+	"github.com/rarimo/evm-airdrop-svc/internal/cli"
 )
 
 func main() {

diff --git a/werf.yaml b/werf.yaml
@@ -1,13 +1,13 @@
 configVersion: 1
-project: "airdrop-svc"
+project: "evm-airdrop-svc"
 ---
 image: builder
 from: golang:1.22-alpine
 docker:
-  WORKDIR: /go/src/github.com/rarimo/airdrop-svc
+  WORKDIR: /go/src/github.com/rarimo/evm-airdrop-svc
 git:
   - add: /
-    to: /go/src/github.com/rarimo/airdrop-svc
+    to: /go/src/github.com/rarimo/evm-airdrop-svc
     stageDependencies:
       install:
         - go.mod
@@ -20,30 +20,30 @@ shell:
     - export CGO_ENABLED=1
     - export GO111MODULE=on
     - export GOOS=linux
-    - cd /go/src/github.com/rarimo/airdrop-svc
+    - cd /go/src/github.com/rarimo/evm-airdrop-svc
     - go mod tidy
     - go mod vendor
   setup:
     - export CGO_ENABLED=1
     - export GO111MODULE=on
     - export GOOS=linux
-    - cd /go/src/github.com/rarimo/airdrop-svc
-    - go build -o /usr/local/bin/airdrop-svc /go/src/github.com/rarimo/airdrop-svc
+    - cd /go/src/github.com/rarimo/evm-airdrop-svc
+    - go build -o /usr/local/bin/evm-airdrop-svc /go/src/github.com/rarimo/evm-airdrop-svc
 
 ---
 image: service
 from: alpine:3.9
 docker:
-  ENTRYPOINT: airdrop-svc
+  ENTRYPOINT: evm-airdrop-svc
 shell:
   setup:
     - apk add --no-cache ca-certificates
 import:
   - image: builder
-    add: /usr/local/bin/airdrop-svc
-    to: /usr/local/bin/airdrop-svc
+    add: /usr/local/bin/evm-airdrop-svc
+    to: /usr/local/bin/evm-airdrop-svc
     after: setup
   - image: builder
-    add: /go/src/github.com/rarimo/airdrop-svc/verification_key.json
+    add: /go/src/github.com/rarimo/evm-airdrop-svc/verification_key.json
     to: /verification_key.json
     after: setup