open source fixes

leaq-ru · Jul 17, 2021 · d06d432 · d06d432
1 parent 70ab311
commit d06d432
Show file tree

Hide file tree

Showing 29 changed files with 108 additions and 95 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -17,19 +17,18 @@ jobs:
       - name: Push to GitHub Packages
         uses: docker/build-push-action@v1
         with:
-          username: nnqq
+          username: leaq-ru
           password: ${{ secrets.GH_CI_TOKEN }}
           registry: ghcr.io
           repository: ${{ github.repository }}
           tag_with_ref: true
-          build_args: GH_CI_TOKEN=${{ secrets.GH_CI_TOKEN }}
 
       - name: Extract service name
         uses: bluwy/substitute-string-action@v1
         id: substr
         with:
           _input-text: ${{ github.repository }}
-          nnqq/scr-: ''
+          leaq-ru/: ''
 
       - name: Install doctl
         uses: digitalocean/action-doctl@v2

diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,6 @@
 FROM golang:1.15-alpine AS build
-ARG GH_CI_TOKEN=$GH_CI_TOKEN
 WORKDIR /app
 COPY / /app
-ENV GOPRIVATE="github.com/nnqq/*"
-RUN apk add --no-cache git
-RUN git config --global url."https://nnqq:$GH_CI_TOKEN@github.com/".insteadOf "https://github.com/"
 RUN go build -o servicebin
 
 RUN GRPC_HEALTH_PROBE_VERSION=v0.3.2 && \

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 LEAQ
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1 +1 @@
-# scr-billing
+https://github.com/leaq-ru/about
diff --git a/balance/new_model.go b/balance/new_model.go
@@ -1,7 +1,7 @@
 package balance
 
 import (
-	"github.com/nnqq/scr-billing/mongo"
+	"github.com/leaq-ru/billing/mongo"
 	m "go.mongodb.org/mongo-driver/mongo"
 )
 

diff --git a/billingimpl/new_server.go b/billingimpl/new_server.go
@@ -1,13 +1,13 @@
 package billingimpl
 
 import (
-	"github.com/nnqq/scr-billing/balance"
-	"github.com/nnqq/scr-billing/counter"
-	"github.com/nnqq/scr-billing/data_premium_plan"
-	"github.com/nnqq/scr-billing/invoice"
-	"github.com/nnqq/scr-billing/robokassa"
-	"github.com/nnqq/scr-proto/codegen/go/parser"
-	"github.com/nnqq/scr-proto/codegen/go/user"
+	"github.com/leaq-ru/billing/balance"
+	"github.com/leaq-ru/billing/counter"
+	"github.com/leaq-ru/billing/data_premium_plan"
+	"github.com/leaq-ru/billing/invoice"
+	"github.com/leaq-ru/billing/robokassa"
+	"github.com/leaq-ru/proto/codegen/go/parser"
+	"github.com/leaq-ru/proto/codegen/go/user"
 	"github.com/rs/zerolog"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"

diff --git a/billingimpl/server.go b/billingimpl/server.go
@@ -1,14 +1,14 @@
 package billingimpl
 
 import (
-	"github.com/nnqq/scr-billing/balance"
-	"github.com/nnqq/scr-billing/counter"
-	"github.com/nnqq/scr-billing/data_premium_plan"
-	"github.com/nnqq/scr-billing/invoice"
-	"github.com/nnqq/scr-billing/robokassa"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
-	"github.com/nnqq/scr-proto/codegen/go/parser"
-	"github.com/nnqq/scr-proto/codegen/go/user"
+	"github.com/leaq-ru/billing/balance"
+	"github.com/leaq-ru/billing/counter"
+	"github.com/leaq-ru/billing/data_premium_plan"
+	"github.com/leaq-ru/billing/invoice"
+	"github.com/leaq-ru/billing/robokassa"
+	"github.com/leaq-ru/proto/codegen/go/billing"
+	"github.com/leaq-ru/proto/codegen/go/parser"
+	"github.com/leaq-ru/proto/codegen/go/user"
 	"github.com/rs/zerolog"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"

diff --git a/billingimpl/server_create_invoice.go b/billingimpl/server_create_invoice.go
@@ -3,11 +3,11 @@ package billingimpl
 import (
 	"context"
 	"errors"
-	"github.com/nnqq/scr-billing/md"
-	"github.com/nnqq/scr-billing/price"
-	"github.com/nnqq/scr-billing/robokassa"
-	"github.com/nnqq/scr-billing/safeerr"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
+	"github.com/leaq-ru/billing/md"
+	"github.com/leaq-ru/billing/price"
+	"github.com/leaq-ru/billing/robokassa"
+	"github.com/leaq-ru/billing/safeerr"
+	"github.com/leaq-ru/proto/codegen/go/billing"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"net/http"
 	"time"

diff --git a/billingimpl/server_get_data_plan.go b/billingimpl/server_get_data_plan.go
@@ -2,7 +2,7 @@ package billingimpl
 
 import (
 	"context"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
+	"github.com/leaq-ru/proto/codegen/go/billing"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"time"
 )

diff --git a/billingimpl/server_get_my_balance.go b/billingimpl/server_get_my_balance.go
@@ -3,9 +3,9 @@ package billingimpl
 import (
 	"context"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/nnqq/scr-billing/md"
-	"github.com/nnqq/scr-billing/safeerr"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
+	"github.com/leaq-ru/billing/md"
+	"github.com/leaq-ru/billing/safeerr"
+	"github.com/leaq-ru/proto/codegen/go/billing"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"time"
 )

diff --git a/billingimpl/server_get_my_data_plan.go b/billingimpl/server_get_my_data_plan.go
@@ -3,9 +3,9 @@ package billingimpl
 import (
 	"context"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/nnqq/scr-billing/md"
-	"github.com/nnqq/scr-billing/safeerr"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
+	"github.com/leaq-ru/billing/md"
+	"github.com/leaq-ru/billing/safeerr"
+	"github.com/leaq-ru/proto/codegen/go/billing"
 	"time"
 )
 

diff --git a/billingimpl/server_get_my_invoices.go b/billingimpl/server_get_my_invoices.go
@@ -2,11 +2,11 @@ package billingimpl
 
 import (
 	"context"
-	"github.com/nnqq/scr-billing/md"
-	"github.com/nnqq/scr-billing/pagination"
-	"github.com/nnqq/scr-billing/safeerr"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
-	"github.com/nnqq/scr-proto/codegen/go/parser"
+	"github.com/leaq-ru/billing/md"
+	"github.com/leaq-ru/billing/pagination"
+	"github.com/leaq-ru/billing/safeerr"
+	"github.com/leaq-ru/proto/codegen/go/billing"
+	"github.com/leaq-ru/proto/codegen/go/parser"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"time"
 )

diff --git a/billingimpl/server_manual_debit.go b/billingimpl/server_manual_debit.go
@@ -3,9 +3,9 @@ package billingimpl
 import (
 	"context"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/nnqq/scr-billing/safeerr"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
-	"github.com/nnqq/scr-proto/codegen/go/user"
+	"github.com/leaq-ru/billing/safeerr"
+	"github.com/leaq-ru/proto/codegen/go/billing"
+	"github.com/leaq-ru/proto/codegen/go/user"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"time"

diff --git a/billingimpl/server_renew_company_premium.go b/billingimpl/server_renew_company_premium.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"errors"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/nnqq/scr-billing/balance"
-	"github.com/nnqq/scr-billing/md"
-	"github.com/nnqq/scr-billing/price"
-	"github.com/nnqq/scr-billing/safeerr"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
-	"github.com/nnqq/scr-proto/codegen/go/parser"
+	"github.com/leaq-ru/billing/balance"
+	"github.com/leaq-ru/billing/md"
+	"github.com/leaq-ru/billing/price"
+	"github.com/leaq-ru/billing/safeerr"
+	"github.com/leaq-ru/proto/codegen/go/billing"
+	"github.com/leaq-ru/proto/codegen/go/parser"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"time"

diff --git a/billingimpl/server_renew_data_premium.go b/billingimpl/server_renew_data_premium.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"errors"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/nnqq/scr-billing/balance"
-	"github.com/nnqq/scr-billing/md"
-	"github.com/nnqq/scr-billing/price"
-	"github.com/nnqq/scr-billing/safeerr"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
+	"github.com/leaq-ru/billing/balance"
+	"github.com/leaq-ru/billing/md"
+	"github.com/leaq-ru/billing/price"
+	"github.com/leaq-ru/billing/safeerr"
+	"github.com/leaq-ru/proto/codegen/go/billing"
 	"go.mongodb.org/mongo-driver/mongo"
 	"time"
 )

diff --git a/billingimpl/server_robokassa_webhook.go b/billingimpl/server_robokassa_webhook.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"github.com/golang/protobuf/ptypes/wrappers"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
+	"github.com/leaq-ru/proto/codegen/go/billing"
 	"net/http"
 	"strconv"
 )

diff --git a/call/new_clients.go b/call/new_clients.go
@@ -1,8 +1,8 @@
 package call
 
 import (
-	"github.com/nnqq/scr-proto/codegen/go/parser"
-	"github.com/nnqq/scr-proto/codegen/go/user"
+	"github.com/leaq-ru/proto/codegen/go/parser"
+	"github.com/leaq-ru/proto/codegen/go/user"
 	"google.golang.org/grpc"
 )
 

diff --git a/counter/new_model.go b/counter/new_model.go
@@ -1,7 +1,7 @@
 package counter
 
 import (
-	"github.com/nnqq/scr-billing/mongo"
+	"github.com/leaq-ru/billing/mongo"
 	m "go.mongodb.org/mongo-driver/mongo"
 )
 

diff --git a/data_premium_plan/new_model.go b/data_premium_plan/new_model.go
@@ -1,7 +1,7 @@
 package data_premium_plan
 
 import (
-	"github.com/nnqq/scr-billing/mongo"
+	"github.com/leaq-ru/billing/mongo"
 	m "go.mongodb.org/mongo-driver/mongo"
 )
 

diff --git a/event_log/new_model.go b/event_log/new_model.go
@@ -1,7 +1,7 @@
 package event_log
 
 import (
-	"github.com/nnqq/scr-billing/mongo"
+	"github.com/leaq-ru/billing/mongo"
 	m "go.mongodb.org/mongo-driver/mongo"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,15 +1,15 @@
-module github.com/nnqq/scr-billing
+module github.com/leaq-ru/billing
 
 go 1.15
 
 require (
 	github.com/golang/protobuf v1.4.2
 	github.com/google/uuid v1.1.2
 	github.com/kelseyhightower/envconfig v1.4.0
+	github.com/leaq-ru/lib-graceful v1.0.1
+	github.com/leaq-ru/proto v1.23.6
 	github.com/nats-io/nats-streaming-server v0.22.0 // indirect
 	github.com/nats-io/stan.go v0.9.0
-	github.com/nnqq/scr-lib-graceful v1.0.0
-	github.com/nnqq/scr-proto v1.21.2
 	github.com/rs/zerolog v1.20.0
 	go.mongodb.org/mongo-driver v1.4.3
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a

diff --git a/go.sum b/go.sum
@@ -120,6 +120,10 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/leaq-ru/lib-graceful v1.0.1 h1:8N6Gnz4wCkpLW4nDOTQ39EZU5DRrH/JmtpNdqI9XAyk=
+github.com/leaq-ru/lib-graceful v1.0.1/go.mod h1:F0n189lXn6CKNAM3B6lnuDdTDe5jzXNfoeqDa2ZRC9s=
+github.com/leaq-ru/proto v1.23.6 h1:ZFR9YVtJ39ql+GQR3T0tRRLIPVrZPXetzykWSzfQY2Y=
+github.com/leaq-ru/proto v1.23.6/go.mod h1:mLawSu374CD1aVyF3tSaQ5uRvYeOkSoE+n1p1RBMkpE=
 github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
@@ -150,10 +154,6 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nats-io/stan.go v0.9.0 h1:TB73Y31au++0sU0VmnBy2pYkSrwH0zUFNRB9YePHqC4=
 github.com/nats-io/stan.go v0.9.0/go.mod h1:0jEuBXKauB1HHJswHM/lx05K48TJ1Yxj6VIfM4k+aB4=
-github.com/nnqq/scr-lib-graceful v1.0.0 h1:Rwj3HYGq4u9LHto6Sl9oNxVwTasGJWfk5Ut4k0lxV+M=
-github.com/nnqq/scr-lib-graceful v1.0.0/go.mod h1:/2o2N5m9iXXKMxZXF108U3vqy0o0FLoqJcAYIG3n+Ec=
-github.com/nnqq/scr-proto v1.21.2 h1:xPIINnMJnHWYeu5prHfC6Br2KjpIgOHQr5FEs9YtWSk=
-github.com/nnqq/scr-proto v1.21.2/go.mod h1:gN6hMpPZeeiwvv/3w9NwvXR1xOQaXEqREbKvE+HXOk0=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
@@ -228,7 +228,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -256,8 +255,6 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

diff --git a/invoice/new_model.go b/invoice/new_model.go
@@ -1,7 +1,7 @@
 package invoice
 
 import (
-	"github.com/nnqq/scr-billing/mongo"
+	"github.com/leaq-ru/billing/mongo"
 	m "go.mongodb.org/mongo-driver/mongo"
 )
 

diff --git a/main.go b/main.go
@@ -1,20 +1,20 @@
 package main
 
 import (
-	"github.com/nnqq/scr-billing/balance"
-	"github.com/nnqq/scr-billing/billingimpl"
-	"github.com/nnqq/scr-billing/call"
-	"github.com/nnqq/scr-billing/config"
-	"github.com/nnqq/scr-billing/counter"
-	"github.com/nnqq/scr-billing/data_premium_plan"
-	"github.com/nnqq/scr-billing/event_log"
-	"github.com/nnqq/scr-billing/invoice"
-	"github.com/nnqq/scr-billing/logger"
-	"github.com/nnqq/scr-billing/mongo"
-	"github.com/nnqq/scr-billing/robokassa"
-	"github.com/nnqq/scr-billing/stan"
-	graceful "github.com/nnqq/scr-lib-graceful"
-	"github.com/nnqq/scr-proto/codegen/go/billing"
+	"github.com/leaq-ru/billing/balance"
+	"github.com/leaq-ru/billing/billingimpl"
+	"github.com/leaq-ru/billing/call"
+	"github.com/leaq-ru/billing/config"
+	"github.com/leaq-ru/billing/counter"
+	"github.com/leaq-ru/billing/data_premium_plan"
+	"github.com/leaq-ru/billing/event_log"
+	"github.com/leaq-ru/billing/invoice"
+	"github.com/leaq-ru/billing/logger"
+	"github.com/leaq-ru/billing/mongo"
+	"github.com/leaq-ru/billing/robokassa"
+	"github.com/leaq-ru/billing/stan"
+	graceful "github.com/leaq-ru/lib-graceful"
+	"github.com/leaq-ru/proto/codegen/go/billing"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health"
 	"google.golang.org/grpc/health/grpc_health_v1"

diff --git a/md/get_user_id.go b/md/get_user_id.go
@@ -2,7 +2,7 @@ package md
 
 import (
 	"context"
-	"github.com/nnqq/scr-billing/safeerr"
+	"github.com/leaq-ru/billing/safeerr"
 	"google.golang.org/grpc/metadata"
 )
 

diff --git a/md/get_user_oid.go b/md/get_user_oid.go
@@ -2,7 +2,7 @@ package md
 
 import (
 	"context"
-	"github.com/nnqq/scr-billing/safeerr"
+	"github.com/leaq-ru/billing/safeerr"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )