Skip to content

Commit

Permalink
Merge pull request #2 from rarimo/fix/naming
Browse files Browse the repository at this point in the history
fix naming
  • Loading branch information
napalmpapalam authored Dec 18, 2023
2 parents abc9600 + 5b731be commit c2becca
Show file tree
Hide file tree
Showing 23 changed files with 53 additions and 53 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.1.0] - 2023-02-16
## [0.1.0] - 2023-12-18
### Changed
- Initiated project

[Unreleased]: https://github.com/rarimo/dashboard-rarime-link-svc/compare/0.1.0...HEAD
[1.0.0]: https://github.com/rarimo/dashboard-rarime-link-svc/releases/tag/0.1.0
[Unreleased]: https://github.com/rarimo/rarime-link-svc/compare/0.1.0...HEAD
[0.1.0]: https://github.com/rarimo/rarime-link-svc/releases/tag/0.1.0
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add build-base git

ARG CI_JOB_TOKEN

WORKDIR /go/src/github.com/rarimo/dashboard-rarime-link-svc
WORKDIR /go/src/github.com/rarimo/rarime-link-svc

COPY . .

Expand All @@ -14,13 +14,13 @@ ENV GOOS="linux"

RUN go mod tidy
RUN go mod vendor
RUN go build -o /usr/local/bin/dashboard-rarime-link-svc github.com/rarimo/dashboard-rarime-link-svc
RUN go build -o /usr/local/bin/rarime-link-svc github.com/rarimo/rarime-link-svc

###

FROM alpine:3.9

COPY --from=buildbase /usr/local/bin/dashboard-rarime-link-svc /usr/local/bin/dashboard-rarime-link-svc
COPY --from=buildbase /usr/local/bin/rarime-link-svc /usr/local/bin/rarime-link-svc
RUN apk add --no-cache ca-certificates

ENTRYPOINT ["dashboard-rarime-link-svc"]
ENTRYPOINT ["rarime-link-svc"]
8 changes: 4 additions & 4 deletions Dockerfile.vendor
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM golang:1.20-alpine as buildbase

WORKDIR /go/src/github.com/rarimo/dashboard-rarime-link-svc
WORKDIR /go/src/github.com/rarimo/rarime-link-svc
COPY vendor .
COPY . .

ENV GO111MODULE="on"
ENV CGO_ENABLED=0
ENV GOOS="linux"

RUN go build -o /usr/local/bin/dashboard-rarime-link-svc github.com/rarimo/dashboard-rarime-link-svc
RUN go build -o /usr/local/bin/rarime-link-svc github.com/rarimo/rarime-link-svc

###

Expand All @@ -18,5 +18,5 @@ RUN apk add --no-cache ca-certificates

FROM calpine

COPY --from=buildbase /usr/local/bin/dashboard-rarime-link-svc /usr/local/bin/dashboard-rarime-link-svc
ENTRYPOINT ["dashboard-rarime-link-svc"]
COPY --from=buildbase /usr/local/bin/rarime-link-svc /usr/local/bin/rarime-link-svc
ENTRYPOINT ["rarime-link-svc"]
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Rarime Dashboard Link Service
# Rarime Link Service

Rarime Dashboard Link Service stores users proofs and provide simple access to it via REST API in [JSON:API] format.
Rarime Link Service stores users proofs and provide simple access to it via REST API in [JSON:API] format.

## Getting Started
### Prerequisites
Expand All @@ -19,8 +19,8 @@ To build the service binary file, follow these steps:
1. Clone the repository.

```bash
git clone github.com/rarimo/dashboard-rarime-link-svc
cd dashboard-rarime-link-svc
git clone github.com/rarimo/rarime-link-svc
cd rarime-link-svc
```

1. Install dependencies and build the service.
Expand All @@ -38,8 +38,8 @@ To build the service Docker image, follow these steps:
1. Clone the repository.

```bash
git clone github.com/rarimo/dashboard-rarime-link-svc
cd dashboard-rarime-link-svc
git clone github.com/rarimo/rarime-link-svc
cd rarime-link-svc
```

1. Build the service image.
Expand Down
2 changes: 1 addition & 1 deletion docs/.redoclyrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

apiTitle: dashboard-rarime-link-svc
apiTitle: rarime-link-svc
splitSpec: true
codeSamples: false
swaggerUI: true
Expand Down
4 changes: 2 additions & 2 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "dashboard-rarime-link-svc",
"name": "rarime-link-svc",
"version": "1.0.0",
"dependencies": {
"@tokend/redoc-cli": "^0.9.9",
Expand Down
4 changes: 2 additions & 2 deletions docs/spec/openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
openapi: 3.0.0
info:
version: 1.0.0
title: Dashboard Rarime Link Service
title: Rarime Link Service
description: ''
servers:
- url: 'https://api.demo.tokend.io'
description: dashboard-rarime-link-svc
description: rarime-link-svc
2 changes: 1 addition & 1 deletion docs/web/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<meta charset="utf8" />
<title>Rarime Dashboard Link Service Documentation</title>
<title>Rarime Link Service Documentation</title>
<!-- needed for adaptive design -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>
Expand Down
2 changes: 1 addition & 1 deletion docs/web/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Rarime Dashboard Link Service | ReDoc</title>
<title>Rarime Link Service | 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">
Expand Down
4 changes: 2 additions & 2 deletions generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ GENERATOR_IMAGE=registry.gitlab.com/tokend/openapi-go-generator:c59241b52b0e37bb

[[ ! -x "$(command -v go 2>/dev/null)" ]] && echo "go is not installed" && exit 1

GENERATED="$(go env GOPATH)/src/github.com/rarimo/dashboard-rarime-link-svc/resources"
OPENAPI_DIR="$(go env GOPATH)/src/github.com/rarimo/dashboard-rarime-link-svc/docs/web_deploy"
GENERATED="$(go env GOPATH)/src/github.com/rarimo/rarime-link-svc/resources"
OPENAPI_DIR="$(go env GOPATH)/src/github.com/rarimo/rarime-link-svc/docs/web_deploy"
PACKAGE_NAME=resources

function printHelp {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/rarimo/dashboard-rarime-link-svc
module github.com/rarimo/rarime-link-svc

go 1.20

Expand Down
6 changes: 3 additions & 3 deletions internal/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cli
import (
"context"
"fmt"
"github.com/rarimo/dashboard-rarime-link-svc/internal/services/api"
"github.com/rarimo/rarime-link-svc/internal/services/api"
"os"
"os/signal"
"sync"
Expand All @@ -12,7 +12,7 @@ import (
"gitlab.com/distributed_lab/logan/v3/errors"

"github.com/alecthomas/kingpin"
"github.com/rarimo/dashboard-rarime-link-svc/internal/config"
"github.com/rarimo/rarime-link-svc/internal/config"
"gitlab.com/distributed_lab/kit/kv"
"gitlab.com/distributed_lab/logan/v3"
)
Expand All @@ -29,7 +29,7 @@ func Run(args []string) {
cfg := config.New(kv.MustFromEnv())
log = cfg.Log()

app := kingpin.New("rarimo-dashboard-link-svc", "")
app := kingpin.New("rarimo-link-svc", "")

runCmd := app.Command("run", "run command")
apiCmd := runCmd.Command("api", "run API")
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/migrate.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cli

import (
"github.com/rarimo/dashboard-rarime-link-svc/internal/assets"
"github.com/rarimo/dashboard-rarime-link-svc/internal/config"
"github.com/rarimo/rarime-link-svc/internal/assets"
"github.com/rarimo/rarime-link-svc/internal/config"
migrate "github.com/rubenv/sql-migrate"
"gitlab.com/distributed_lab/logan/v3/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/config/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package config

import (
"github.com/rarimo/dashboard-rarime-link-svc/internal/data"
"github.com/rarimo/dashboard-rarime-link-svc/internal/data/pg"
"github.com/rarimo/rarime-link-svc/internal/data"
"github.com/rarimo/rarime-link-svc/internal/data/pg"
"gitlab.com/distributed_lab/kit/comfig"
"gitlab.com/distributed_lab/kit/copus/types"
"gitlab.com/distributed_lab/kit/kv"
Expand Down
2 changes: 1 addition & 1 deletion internal/data/pg/schema.xo.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/data/templates/hdr.xo.go.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"regexp"
"strings"
"time"
"github.com/rarimo/dashboard-rarime-link-svc/internal/data"
"github.com/rarimo/rarime-link-svc/internal/data"
{{- if driver "postgres" }}
"github.com/lib/pq/hstore"
"github.com/rarimo/xo/types/xo"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/api/handlers/ctx.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package handlers

import (
"context"
"github.com/rarimo/dashboard-rarime-link-svc/internal/data"
"github.com/rarimo/rarime-link-svc/internal/data"
"gitlab.com/distributed_lab/logan/v3"
"net/http"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/services/api/handlers/proof.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package handlers
import (
"github.com/go-chi/chi"
validation "github.com/go-ozzo/ozzo-validation/v4"
"github.com/rarimo/dashboard-rarime-link-svc/resources"
"github.com/rarimo/rarime-link-svc/resources"
"gitlab.com/distributed_lab/ape"
"gitlab.com/distributed_lab/ape/problems"
"gitlab.com/distributed_lab/logan/v3/errors"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/api/handlers/proof_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package handlers
import (
"encoding/json"
validation "github.com/go-ozzo/ozzo-validation/v4"
"github.com/rarimo/dashboard-rarime-link-svc/internal/data"
"github.com/rarimo/dashboard-rarime-link-svc/resources"
"github.com/rarimo/rarime-link-svc/internal/data"
"github.com/rarimo/rarime-link-svc/resources"
"gitlab.com/distributed_lab/ape"
"gitlab.com/distributed_lab/ape/problems"
"gitlab.com/distributed_lab/logan/v3/errors"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/go-chi/chi"
"github.com/rarimo/dashboard-rarime-link-svc/internal/config"
"github.com/rarimo/dashboard-rarime-link-svc/internal/services/api/handlers"
"github.com/rarimo/rarime-link-svc/internal/config"
"github.com/rarimo/rarime-link-svc/internal/services/api/handlers"
"gitlab.com/distributed_lab/ape"
)

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/rarimo/dashboard-rarime-link-svc/internal/cli"
"github.com/rarimo/rarime-link-svc/internal/cli"
"os"
)

Expand Down
18 changes: 9 additions & 9 deletions werf.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
configVersion: 1
project: "dashboard-rarime-link-svc"
project: "rarime-link-svc"
---
image: builder
from: golang:1.20-alpine
docker:
WORKDIR: /go/src/github.com/rarimo/dashboard-rarime-link-svc
WORKDIR: /go/src/github.com/rarimo/rarime-link-svc
git:
- add: /
to: /go/src/github.com/rarimo/dashboard-rarime-link-svc
to: /go/src/github.com/rarimo/rarime-link-svc
stageDependencies:
install:
- go.mod
Expand All @@ -20,26 +20,26 @@ shell:
- export CGO_ENABLED=1
- export GO111MODULE=on
- export GOOS=linux
- cd /go/src/github.com/rarimo/dashboard-rarime-link-svc
- cd /go/src/github.com/rarimo/rarime-link-svc
- go mod tidy
- go mod vendor
setup:
- export CGO_ENABLED=1
- export GO111MODULE=on
- export GOOS=linux
- cd /go/src/github.com/rarimo/dashboard-rarime-link-svc
- go build -o /usr/local/bin/dashboard-rarime-link-svc /go/src/github.com/rarimo/dashboard-rarime-link-svc
- cd /go/src/github.com/rarimo/rarime-link-svc
- go build -o /usr/local/bin/rarime-link-svc /go/src/github.com/rarimo/rarime-link-svc

---
image: service
from: alpine:3.9
docker:
ENTRYPOINT: dashboard-rarime-link-svc
ENTRYPOINT: rarime-link-svc
shell:
setup:
- apk add --no-cache ca-certificates
import:
- image: builder
add: /usr/local/bin/dashboard-rarime-link-svc
to: /usr/local/bin/dashboard-rarime-link-svc
add: /usr/local/bin/rarime-link-svc
to: /usr/local/bin/rarime-link-svc
after: setup

0 comments on commit c2becca

Please sign in to comment.