From 8720ad833682fec4a92b1501e2e456cecdf79382 Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Mon, 22 Aug 2022 16:53:34 +0545 Subject: [PATCH 01/12] Add migration for user table --- backend/server/db/migration/000001_init_schema.down.sql | 1 + backend/server/db/migration/000001_init_schema.up.sql | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 backend/server/db/migration/000001_init_schema.down.sql create mode 100644 backend/server/db/migration/000001_init_schema.up.sql diff --git a/backend/server/db/migration/000001_init_schema.down.sql b/backend/server/db/migration/000001_init_schema.down.sql new file mode 100644 index 0000000..365a210 --- /dev/null +++ b/backend/server/db/migration/000001_init_schema.down.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS users; \ No newline at end of file diff --git a/backend/server/db/migration/000001_init_schema.up.sql b/backend/server/db/migration/000001_init_schema.up.sql new file mode 100644 index 0000000..54591bf --- /dev/null +++ b/backend/server/db/migration/000001_init_schema.up.sql @@ -0,0 +1,9 @@ +CREATE TABLE "users" ( + "id" int PRIMARY KEY, + "username" varchar UNIQUE NOT NULL, + "role" int NOT NULL DEFAULT 0, + "created_at" timestamptz NOT NULL DEFAULT (now()), + "email_address" varchar, + "is_email_verified" boolean DEFAULT false, + "picture_url" varchar +); \ No newline at end of file From a2f4c53321be102096ec336095988a910a452a02 Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Mon, 22 Aug 2022 17:00:55 +0545 Subject: [PATCH 02/12] Generate CURD Golang code using sqlc --- .../db/migration/000001_init_schema.down.sql | 2 +- .../db/migration/000001_init_schema.up.sql | 2 +- backend/server/db/query/user.sql | 34 ++++ backend/server/db/sqlc/db.go | 31 ++++ backend/server/db/sqlc/models.go | 20 +++ backend/server/db/sqlc/user.sql.go | 145 ++++++++++++++++++ backend/server/sqlc.yaml | 9 ++ 7 files changed, 241 insertions(+), 2 deletions(-) create mode 100644 backend/server/db/query/user.sql create mode 100644 backend/server/db/sqlc/db.go create mode 100644 backend/server/db/sqlc/models.go create mode 100644 backend/server/db/sqlc/user.sql.go create mode 100644 backend/server/sqlc.yaml diff --git a/backend/server/db/migration/000001_init_schema.down.sql b/backend/server/db/migration/000001_init_schema.down.sql index 365a210..c99ddcd 100644 --- a/backend/server/db/migration/000001_init_schema.down.sql +++ b/backend/server/db/migration/000001_init_schema.down.sql @@ -1 +1 @@ -DROP TABLE IF EXISTS users; \ No newline at end of file +DROP TABLE IF EXISTS users; diff --git a/backend/server/db/migration/000001_init_schema.up.sql b/backend/server/db/migration/000001_init_schema.up.sql index 54591bf..7528d71 100644 --- a/backend/server/db/migration/000001_init_schema.up.sql +++ b/backend/server/db/migration/000001_init_schema.up.sql @@ -6,4 +6,4 @@ CREATE TABLE "users" ( "email_address" varchar, "is_email_verified" boolean DEFAULT false, "picture_url" varchar -); \ No newline at end of file +); diff --git a/backend/server/db/query/user.sql b/backend/server/db/query/user.sql new file mode 100644 index 0000000..0f523bb --- /dev/null +++ b/backend/server/db/query/user.sql @@ -0,0 +1,34 @@ +INSERT INTO users ( + id, username, picture_url +) VALUES ( + $1, $2, $3 +) +RETURNING *; + +-- name: GetUser :one +SELECT * FROM users +WHERE id = $1 LIMIT 1; + + +-- name: GetUserByUsername :one +SELECT * FROM users +WHERE username = $1 LIMIT 1; + +-- name: ListUsers :many +SELECT * FROM users +ORDER BY username ASC +LIMIT $1 +OFFSET $2; + +-- name: UpdateUser :one +UPDATE users SET +username = COALESCE($2, username), +role = COALESCE($3, role), +email_address = COALESCE($4, email_address), +is_email_verified = COALESCE($5, is_email_verified), +picture_url = COALESCE($6, picture_url) +WHERE id = $1 +RETURNING *; + +-- name: DeleteUser :exec +DELETE FROM users WHERE id = $1; diff --git a/backend/server/db/sqlc/db.go b/backend/server/db/sqlc/db.go new file mode 100644 index 0000000..21fc434 --- /dev/null +++ b/backend/server/db/sqlc/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.15.0 + +package db + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/backend/server/db/sqlc/models.go b/backend/server/db/sqlc/models.go new file mode 100644 index 0000000..c626a1a --- /dev/null +++ b/backend/server/db/sqlc/models.go @@ -0,0 +1,20 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.15.0 + +package db + +import ( + "database/sql" + "time" +) + +type User struct { + ID int32 `json:"id"` + Username string `json:"username"` + Role int32 `json:"role"` + CreatedAt time.Time `json:"created_at"` + EmailAddress sql.NullString `json:"email_address"` + IsEmailVerified sql.NullBool `json:"is_email_verified"` + PictureUrl sql.NullString `json:"picture_url"` +} diff --git a/backend/server/db/sqlc/user.sql.go b/backend/server/db/sqlc/user.sql.go new file mode 100644 index 0000000..38d7f1b --- /dev/null +++ b/backend/server/db/sqlc/user.sql.go @@ -0,0 +1,145 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.15.0 +// source: user.sql + +package db + +import ( + "context" + "database/sql" +) + +const deleteUser = `-- name: DeleteUser :exec +DELETE FROM users WHERE id = $1 +` + +func (q *Queries) DeleteUser(ctx context.Context, id int32) error { + _, err := q.db.ExecContext(ctx, deleteUser, id) + return err +} + +const getUser = `-- name: GetUser :one +SELECT id, username, role, created_at, email_address, is_email_verified, picture_url FROM users +WHERE id = $1 LIMIT 1 +` + +func (q *Queries) GetUser(ctx context.Context, id int32) (User, error) { + row := q.db.QueryRowContext(ctx, getUser, id) + var i User + err := row.Scan( + &i.ID, + &i.Username, + &i.Role, + &i.CreatedAt, + &i.EmailAddress, + &i.IsEmailVerified, + &i.PictureUrl, + ) + return i, err +} + +const getUserByUsername = `-- name: GetUserByUsername :one +SELECT id, username, role, created_at, email_address, is_email_verified, picture_url FROM users +WHERE username = $1 LIMIT 1 +` + +func (q *Queries) GetUserByUsername(ctx context.Context, username string) (User, error) { + row := q.db.QueryRowContext(ctx, getUserByUsername, username) + var i User + err := row.Scan( + &i.ID, + &i.Username, + &i.Role, + &i.CreatedAt, + &i.EmailAddress, + &i.IsEmailVerified, + &i.PictureUrl, + ) + return i, err +} + +const listUsers = `-- name: ListUsers :many +SELECT id, username, role, created_at, email_address, is_email_verified, picture_url FROM users +ORDER BY username ASC +LIMIT $1 +OFFSET $2 +` + +type ListUsersParams struct { + Limit int32 `json:"limit"` + Offset int32 `json:"offset"` +} + +func (q *Queries) ListUsers(ctx context.Context, arg ListUsersParams) ([]User, error) { + rows, err := q.db.QueryContext(ctx, listUsers, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + var items []User + for rows.Next() { + var i User + if err := rows.Scan( + &i.ID, + &i.Username, + &i.Role, + &i.CreatedAt, + &i.EmailAddress, + &i.IsEmailVerified, + &i.PictureUrl, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const updateUser = `-- name: UpdateUser :one +UPDATE users SET +username = COALESCE($2, username), +role = COALESCE($3, role), +email_address = COALESCE($4, email_address), +is_email_verified = COALESCE($5, is_email_verified), +picture_url = COALESCE($6, picture_url) +WHERE id = $1 +RETURNING id, username, role, created_at, email_address, is_email_verified, picture_url +` + +type UpdateUserParams struct { + ID int32 `json:"id"` + Username string `json:"username"` + Role int32 `json:"role"` + EmailAddress sql.NullString `json:"email_address"` + IsEmailVerified sql.NullBool `json:"is_email_verified"` + PictureUrl sql.NullString `json:"picture_url"` +} + +func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (User, error) { + row := q.db.QueryRowContext(ctx, updateUser, + arg.ID, + arg.Username, + arg.Role, + arg.EmailAddress, + arg.IsEmailVerified, + arg.PictureUrl, + ) + var i User + err := row.Scan( + &i.ID, + &i.Username, + &i.Role, + &i.CreatedAt, + &i.EmailAddress, + &i.IsEmailVerified, + &i.PictureUrl, + ) + return i, err +} diff --git a/backend/server/sqlc.yaml b/backend/server/sqlc.yaml new file mode 100644 index 0000000..843868b --- /dev/null +++ b/backend/server/sqlc.yaml @@ -0,0 +1,9 @@ +version: 1 +packages: + - name: "db" + path: "./db/sqlc" + engine: "postgresql" + schema: "./db/migration/" + queries: "./db/query/" + emit_json_tags: true + emit_interface: false From 365ef8ed9ca48d8967b52aa9e14454e2e34ca220 Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Tue, 23 Aug 2022 23:32:45 +0545 Subject: [PATCH 03/12] Use viper to manage env variables --- .gitignore | 3 +- backend/Dockerfile => Dockerfile.backend | 18 +- backend/server/api/server.go | 8 +- backend/server/api/workerpool.go | 18 +- backend/server/go.mod | 27 +- backend/server/go.sum | 460 ++++++++++++++++++++++- backend/server/mailer/mailer.go | 42 ++- backend/server/main.go | 9 +- backend/server/util/config.go | 35 ++ docker-compose.yml | 4 +- 10 files changed, 577 insertions(+), 47 deletions(-) rename backend/Dockerfile => Dockerfile.backend (74%) create mode 100644 backend/server/util/config.go diff --git a/.gitignore b/.gitignore index 2eea525..40ce98b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.env \ No newline at end of file +.env +before-after.env \ No newline at end of file diff --git a/backend/Dockerfile b/Dockerfile.backend similarity index 74% rename from backend/Dockerfile rename to Dockerfile.backend index 354a3b1..47be088 100644 --- a/backend/Dockerfile +++ b/Dockerfile.backend @@ -23,22 +23,22 @@ RUN apt-get install -y python3-pip python-dev build-essential RUN pip install mbutil -COPY tilemaker-configs/config.json / -COPY tilemaker-configs/process.lua / +COPY backend/tilemaker-configs/config.json / +COPY backend/tilemaker-configs/process.lua / -COPY index.html /index.html +COPY backend/index.html /index.html RUN mkdir -p /server/backend/server -COPY server/ /server/backend/server +COPY backend/server/ /server/backend/server RUN chmod +x /server/backend/server/main.go -COPY start.sh /start.sh +COPY backend/start.sh /start.sh RUN mkdir -p /provisioning-scripts -COPY provisioning-scripts/ /provisioning-scripts +COPY backend/provisioning-scripts/ /provisioning-scripts RUN mkdir -p /map-styles -COPY map-styles/ /map-styles +COPY backend/map-styles/ /map-styles RUN chmod +x /start.sh RUN chmod +x /provisioning-scripts/*.sh @@ -49,4 +49,6 @@ RUN go build WORKDIR /server -ENTRYPOINT ["/start.sh"] \ No newline at end of file +COPY before-after.env . + +ENTRYPOINT ["/start.sh"] diff --git a/backend/server/api/server.go b/backend/server/api/server.go index 909de01..578dc8c 100644 --- a/backend/server/api/server.go +++ b/backend/server/api/server.go @@ -1,6 +1,7 @@ package api import ( + "github.com/baato/before-after/util" "github.com/gin-gonic/gin" ) @@ -18,10 +19,13 @@ var dispatcher = NewDispatcher(jobQueue, maxWorkers) type Server struct { router *gin.Engine + config *util.Config } -func NewServer() *Server { - server := &Server{} +func NewServer(config *util.Config) *Server { + server := &Server{ + config: config, + } server.setupRouter() diff --git a/backend/server/api/workerpool.go b/backend/server/api/workerpool.go index 151dc7a..64cdaf6 100644 --- a/backend/server/api/workerpool.go +++ b/backend/server/api/workerpool.go @@ -3,7 +3,6 @@ package api import ( "fmt" "net/http" - "os" "os/exec" Mailer "github.com/baato/before-after/mailer" @@ -28,19 +27,22 @@ type Job struct { type JobStatus struct{ status, err string } func provision(year, bbox, style, name, uuid, country, continent, fullName, email string) JobStatus { - scripts_to_run := [5]string{"/provisioning-scripts/prepare-provision.sh", "/provisioning-scripts/download-data.sh", "/provisioning-scripts/generate-extracts.sh", "/provisioning-scripts/generate-tiles.sh", "/provisioning-scripts/provision.sh"} + scripts_to_run := [5]string{ + "/provisioning-scripts/prepare-provision.sh", + "/provisioning-scripts/download-data.sh", + "/provisioning-scripts/generate-extracts.sh", + "/provisioning-scripts/generate-tiles.sh", + "/provisioning-scripts/provision.sh", + } for i, s := range scripts_to_run { - // Websocket.NotifyClient(s, ws) cmd := exec.Command("/bin/bash", s, year, bbox, style, uuid, country, name, continent) _, err := cmd.Output() if err != nil { fmt.Println(fmt.Sprint(err)) return JobStatus{"error", s} } - // Print the output - // fmt.Print(string(stdout)) - fmt.Println(i, s) + fmt.Println(i+1, s) } return JobStatus{"done", "nil"} } @@ -73,9 +75,9 @@ func (w Worker) start() { // Dispatcher has added a job to my jobQueue. var jobstatus JobStatus = provision(job.Year, job.Bbox, job.Style, job.Name, job.Uuid, job.Country, job.Continent, job.FullName, job.Email) if jobstatus.status == "done" { - Mailer.SendMail([]string{job.Email, os.Getenv("MAIL_CC")}, job.FullName, job.Uuid, job.Name) + Mailer.SendSuccessMail(job.Email, job.FullName, job.Uuid, job.Name) } else if jobstatus.status == "error" { - Mailer.SendErrorMail([]string{job.Email, os.Getenv("MAIL_CC")}, job.FullName, job.Uuid, jobstatus.err, job.Year, job.Bbox, job.Name, job.Country, job.Continent, job.Email) + Mailer.SendErrorMail(job.Email, job.FullName, job.Uuid, jobstatus.err, job.Year, job.Bbox, job.Name, job.Country, job.Continent, job.Email) } case <-w.quitChan: diff --git a/backend/server/go.mod b/backend/server/go.mod index 65f9641..c5cb2f1 100644 --- a/backend/server/go.mod +++ b/backend/server/go.mod @@ -2,25 +2,40 @@ module github.com/baato/before-after go 1.18 -require github.com/gin-gonic/gin v1.8.1 +require ( + github.com/gin-gonic/gin v1.8.1 + github.com/spf13/viper v1.12.0 +) require ( + github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/validator/v10 v10.10.0 // indirect github.com/goccy/go-json v0.9.7 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.1 // indirect + github.com/magiconair/properties v1.8.6 // indirect github.com/mattn/go-isatty v0.0.14 // indirect - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.3.0 // indirect github.com/ugorji/go/codec v1.2.7 // indirect - golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect - golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect - golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect - golang.org/x/text v0.3.6 // indirect + golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect + golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/text v0.3.7 // indirect google.golang.org/protobuf v1.28.0 // indirect + gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0 // indirect ) diff --git a/backend/server/go.sum b/backend/server/go.sum index f99c8fe..258ba03 100644 --- a/backend/server/go.sum +++ b/backend/server/go.sum @@ -1,11 +1,71 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= @@ -16,12 +76,76 @@ github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= @@ -32,45 +156,351 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= +github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= +github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/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-20200222125558-5a598a2470a0/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-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +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-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/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-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= @@ -79,8 +509,22 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= +gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/backend/server/mailer/mailer.go b/backend/server/mailer/mailer.go index fbe800a..916da6f 100644 --- a/backend/server/mailer/mailer.go +++ b/backend/server/mailer/mailer.go @@ -7,19 +7,39 @@ import ( "net/smtp" "os" "text/template" + + "github.com/baato/before-after/util" ) -var GMAIL_USERNAME = os.Getenv("GMAIL_USERNAME") -var GMAIL_PASSWORD = os.Getenv("GMAIL_PASSWORD") -var gmailAuth = smtp.PlainAuth("", GMAIL_USERNAME, GMAIL_PASSWORD, "smtp.gmail.com") +var ( + config util.Config + configErr error +) + +func init() { + config, configErr = util.LoadConfig("../../") + if configErr != nil { + log.Fatal("cannot load config:", configErr) + } +} + +func sendMail(receiver []string, body bytes.Buffer) { + var smtpAuth = smtp.PlainAuth("", config.SMTPUsername, config.SMTPPassword, config.SMTPHost) + var smtpURL = config.SMTPHost + ":" + config.SMTPPort + + smtp.SendMail(smtpURL, smtpAuth, config.SMTPUsername, receiver, body.Bytes()) +} + +func SendSuccessMail(receiver string, FullName string, Uuid string, Name string) { -func SendMail(receiver []string, FullName string, Uuid string, Name string) { wd, err := os.Getwd() if err != nil { log.Fatal(err) } t, err := template.ParseFiles(wd + "/mailer/email-template.html") - fmt.Println(err) + if err != nil { + fmt.Println(err) + } var body bytes.Buffer headers := "MIME-version: 1.0;\nContent-Type: text/html;" @@ -32,19 +52,21 @@ func SendMail(receiver []string, FullName string, Uuid string, Name string) { }{ FullName: FullName, Name: Name, - URL: os.Getenv("HOST_PROTOCOL") + "//" + os.Getenv("HOST_IP") + "/provision/" + Uuid, + URL: config.HostProtocol + "//" + config.HostIP + "/provision/" + Uuid, }) - smtp.SendMail("smtp.gmail.com:587", gmailAuth, GMAIL_USERNAME, receiver, body.Bytes()) + sendMail([]string{receiver, config.MAILCC}, body) } -func SendErrorMail(receiver []string, FullName, Uuid, ErrorAt, Year, Bbox, Name, Country, Continent, Email string) { +func SendErrorMail(receiver string, FullName, Uuid, ErrorAt, Year, Bbox, Name, Country, Continent, Email string) { wd, err := os.Getwd() if err != nil { log.Fatal(err) } t, err := template.ParseFiles(wd + "/mailer/error-email-template.html") - fmt.Println(err) + if err != nil { + fmt.Println(err) + } var body bytes.Buffer headers := "MIME-version: 1.0;\nContent-Type: text/html;" @@ -72,5 +94,5 @@ func SendErrorMail(receiver []string, FullName, Uuid, ErrorAt, Year, Bbox, Name, Email: Email, }) - smtp.SendMail("smtp.gmail.com:587", gmailAuth, GMAIL_USERNAME, receiver, body.Bytes()) + sendMail([]string{receiver, config.MAILCC}, body) } diff --git a/backend/server/main.go b/backend/server/main.go index d378f47..2c7abd5 100644 --- a/backend/server/main.go +++ b/backend/server/main.go @@ -1,11 +1,18 @@ package main import ( + "log" + "github.com/baato/before-after/api" + "github.com/baato/before-after/util" ) func main() { - server := api.NewServer() + config, err := util.LoadConfig("../../") + if err != nil { + log.Fatal("cannot load config:", err) + } + server := api.NewServer(&config) // Start listening for incoming chat messages server.Start(":8848") diff --git a/backend/server/util/config.go b/backend/server/util/config.go new file mode 100644 index 0000000..1161199 --- /dev/null +++ b/backend/server/util/config.go @@ -0,0 +1,35 @@ +package util + +import ( + "github.com/spf13/viper" +) + +// Config stores all configuration of the application. +// The values are read by viper from a config file or environment variable. +type Config struct { + HostProtocol string `mapstructure:"HOST_PROTOCOL"` + HostIP string `mapstructure:"HOST_IP"` + SMTPHost string `mapstructure:"SMTP_HOST"` + SMTPPort string `mapstructure:"SMTP_PORT"` + SMTPUsername string `mapstructure:"SMTP_USERNAME"` + SMTPPassword string `mapstructure:"SMTP_PASSWORD"` + MAILCC string `mapstructure:"MAIL_CC"` + APIBaseURL string `mapstructure:"API_BASE_URL"` +} + +// LoadConfig reads configuration from file or environment variables. +func LoadConfig(path string) (config Config, err error) { + viper.AddConfigPath(path) + viper.SetConfigName("before-after") + viper.SetConfigType("env") + + viper.AutomaticEnv() + + err = viper.ReadInConfig() + if err != nil { + return + } + + err = viper.Unmarshal(&config) + return +} diff --git a/docker-compose.yml b/docker-compose.yml index 706fe73..a97d81c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,13 @@ version: "3" services: backend: - build: backend/ + image: before-after_backend:latest restart: always container_name: app-docker ports: - 8848:8848 environment: - HOST_IP=${HOST_IP} - env_file: - - .env volumes: - appdata:/appdata - downloads:/downloads From d2a34c15d08a92f4bacd3da8cb0f16df2c5d102a Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Wed, 24 Aug 2022 15:57:49 +0545 Subject: [PATCH 04/12] Add endpoints for oauth --- backend/server/api/oauth.go | 50 +++++++++++++++++++++++++ backend/server/api/server.go | 3 ++ backend/server/db/query/user.sql | 1 + backend/server/db/sqlc/user.sql.go | 30 +++++++++++++++ backend/server/go.mod | 3 ++ backend/server/go.sum | 9 +++++ backend/server/services/auth_service.go | 46 +++++++++++++++++++++++ backend/server/util/config.go | 33 ++++++++++++---- 8 files changed, 167 insertions(+), 8 deletions(-) create mode 100644 backend/server/api/oauth.go create mode 100644 backend/server/services/auth_service.go diff --git a/backend/server/api/oauth.go b/backend/server/api/oauth.go new file mode 100644 index 0000000..d3b3fa6 --- /dev/null +++ b/backend/server/api/oauth.go @@ -0,0 +1,50 @@ +package api + +import ( + "net/http" + + "github.com/baato/before-after/services" + "github.com/gin-gonic/gin" + "golang.org/x/oauth2" + "google.golang.org/appengine/log" +) + +func (server *Server) login(ctx *gin.Context) { + // TODO: Generate random state + state := "kdbcjbjvghvdsyt637" + url := server.config.OAUTHConfig.AuthCodeURL(state) + ctx.JSON( + http.StatusOK, + gin.H{"url": url, "state": state}, + ) +} + +func (server *Server) callback(ctx *gin.Context) { + + // Exchange the authorization code for an access token. + code := ctx.Query("code") + token, err := server.config.OAUTHConfig.Exchange(oauth2.NoContext, code) + if err != nil { + ctx.JSON( + http.StatusInternalServerError, + gin.H{"error": "error while exchanging code with access token"}, + ) + return + } + + // Fetch user details from OSM API using the access token. + user_info, err := services.GetOSMUser(token.AccessToken) + if err != nil { + ctx.JSON( + http.StatusInternalServerError, + gin.H{"error": "error getting user details"}, + ) + log.Errorf(ctx, "error getting user details: %v", err) + return + } + + ctx.JSON( + http.StatusOK, + &user_info, + ) +} diff --git a/backend/server/api/server.go b/backend/server/api/server.go index 578dc8c..990862b 100644 --- a/backend/server/api/server.go +++ b/backend/server/api/server.go @@ -34,6 +34,9 @@ func NewServer(config *util.Config) *Server { func (server *Server) setupRouter() { router := gin.Default() + + router.GET("/api/v1/login", server.login) + router.GET("/api/v1/callback", server.callback) router.POST("/api/v1/instance", server.RequestHandlerForAPI) server.router = router diff --git a/backend/server/db/query/user.sql b/backend/server/db/query/user.sql index 0f523bb..957d464 100644 --- a/backend/server/db/query/user.sql +++ b/backend/server/db/query/user.sql @@ -1,3 +1,4 @@ +-- name: CreateUser :one INSERT INTO users ( id, username, picture_url ) VALUES ( diff --git a/backend/server/db/sqlc/user.sql.go b/backend/server/db/sqlc/user.sql.go index 38d7f1b..05ffaa2 100644 --- a/backend/server/db/sqlc/user.sql.go +++ b/backend/server/db/sqlc/user.sql.go @@ -10,6 +10,36 @@ import ( "database/sql" ) +const createUser = `-- name: CreateUser :one +INSERT INTO users ( + id, username, picture_url +) VALUES ( + $1, $2, $3 +) +RETURNING id, username, role, created_at, email_address, is_email_verified, picture_url +` + +type CreateUserParams struct { + ID int32 `json:"id"` + Username string `json:"username"` + PictureUrl sql.NullString `json:"picture_url"` +} + +func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (User, error) { + row := q.db.QueryRowContext(ctx, createUser, arg.ID, arg.Username, arg.PictureUrl) + var i User + err := row.Scan( + &i.ID, + &i.Username, + &i.Role, + &i.CreatedAt, + &i.EmailAddress, + &i.IsEmailVerified, + &i.PictureUrl, + ) + return i, err +} + const deleteUser = `-- name: DeleteUser :exec DELETE FROM users WHERE id = $1 ` diff --git a/backend/server/go.mod b/backend/server/go.mod index c5cb2f1..f5942e2 100644 --- a/backend/server/go.mod +++ b/backend/server/go.mod @@ -5,6 +5,8 @@ go 1.18 require ( github.com/gin-gonic/gin v1.8.1 github.com/spf13/viper v1.12.0 + golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 + google.golang.org/appengine v1.6.7 ) require ( @@ -14,6 +16,7 @@ require ( github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/validator/v10 v10.10.0 // indirect github.com/goccy/go-json v0.9.7 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.1 // indirect diff --git a/backend/server/go.sum b/backend/server/go.sum index 258ba03..453a525 100644 --- a/backend/server/go.sum +++ b/backend/server/go.sum @@ -102,6 +102,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -289,6 +291,7 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -300,6 +303,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -346,10 +351,12 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -438,6 +445,7 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -502,6 +510,7 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/backend/server/services/auth_service.go b/backend/server/services/auth_service.go new file mode 100644 index 0000000..1e56bf9 --- /dev/null +++ b/backend/server/services/auth_service.go @@ -0,0 +1,46 @@ +package services + +import ( + "encoding/json" + "io/ioutil" + "log" + "net/http" +) + +type OSMResponse struct { + User UserInfo `json:"user"` +} + +type UserInfo struct { + ID int32 `json:"id"` + DisplayName string `json:"display_name"` + Picture Picture `json:"img"` +} +type Picture struct { + Url string `json:"href"` +} + +// Get user details from OSM API +func GetOSMUser(token string) (UserInfo, error) { + client := &http.Client{} + userDetailUrl := "https://openstreetmap.org/api/0.6/user/details.json" + req, err := http.NewRequest("GET", userDetailUrl, nil) + if err != nil { + log.Fatalf("cannot create request:%v", err) + } + req.Header.Add("Authorization", "Bearer "+token) + resp, err := client.Do(req) + if err != nil { + return UserInfo{}, err + } + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + return UserInfo{}, err + } + var userinfo OSMResponse + err = json.Unmarshal(body, &userinfo) + if err != nil { + return UserInfo{}, err + } + return userinfo.User, nil +} diff --git a/backend/server/util/config.go b/backend/server/util/config.go index 1161199..e6e0ccf 100644 --- a/backend/server/util/config.go +++ b/backend/server/util/config.go @@ -2,19 +2,26 @@ package util import ( "github.com/spf13/viper" + "golang.org/x/oauth2" ) // Config stores all configuration of the application. // The values are read by viper from a config file or environment variable. type Config struct { - HostProtocol string `mapstructure:"HOST_PROTOCOL"` - HostIP string `mapstructure:"HOST_IP"` - SMTPHost string `mapstructure:"SMTP_HOST"` - SMTPPort string `mapstructure:"SMTP_PORT"` - SMTPUsername string `mapstructure:"SMTP_USERNAME"` - SMTPPassword string `mapstructure:"SMTP_PASSWORD"` - MAILCC string `mapstructure:"MAIL_CC"` - APIBaseURL string `mapstructure:"API_BASE_URL"` + HostProtocol string `mapstructure:"HOST_PROTOCOL"` + HostIP string `mapstructure:"HOST_IP"` + SMTPHost string `mapstructure:"SMTP_HOST"` + SMTPPort string `mapstructure:"SMTP_PORT"` + SMTPUsername string `mapstructure:"SMTP_USERNAME"` + SMTPPassword string `mapstructure:"SMTP_PASSWORD"` + MAILCC string `mapstructure:"MAIL_CC"` + APIBaseURL string `mapstructure:"API_BASE_URL"` + OAUTHClientID string `mapstructure:"OAUTH_CLIENT_ID"` + OAUTHClientSecret string `mapstructure:"OAUTH_CLIENT_SECRET"` + OAUTHScopes []string `mapstructure:"OAUTH_SCOPES"` + OAUTHRedirectURL string `mapstructure:"OAUTH_REDIRECT_URL"` + OAUTHServerURL string `mapstructure:"OAUTH_SERVER_URL"` + OAUTHConfig oauth2.Config `mapstructure:"-"` } // LoadConfig reads configuration from file or environment variables. @@ -31,5 +38,15 @@ func LoadConfig(path string) (config Config, err error) { } err = viper.Unmarshal(&config) + + config.OAUTHConfig.RedirectURL = config.OAUTHRedirectURL + config.OAUTHConfig.ClientID = config.OAUTHClientID + config.OAUTHConfig.ClientSecret = config.OAUTHClientSecret + config.OAUTHConfig.Scopes = config.OAUTHScopes + config.OAUTHConfig.Endpoint = oauth2.Endpoint{ + AuthURL: config.OAUTHServerURL + "/oauth2/authorize", + TokenURL: config.OAUTHServerURL + "/oauth2/token", + } + return } From bf6475e376a72200b3426c2061c66312fde957bb Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Wed, 24 Aug 2022 23:26:34 +0545 Subject: [PATCH 05/12] Create new user on successful login --- backend/server/api/oauth.go | 12 +++- backend/server/api/server.go | 5 +- .../server/serializers/users_serializers.go | 36 ++++++++++ backend/server/services/auth_service.go | 65 +++++++++++++++++++ backend/server/services/user_service.go | 30 +++++++++ 5 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 backend/server/serializers/users_serializers.go create mode 100644 backend/server/services/user_service.go diff --git a/backend/server/api/oauth.go b/backend/server/api/oauth.go index d3b3fa6..55fddf7 100644 --- a/backend/server/api/oauth.go +++ b/backend/server/api/oauth.go @@ -43,8 +43,18 @@ func (server *Server) callback(ctx *gin.Context) { return } + // Create/update user in database and return logged in user details. + loggedInUserResponse, err := services.LoginUser(server.query, &user_info) + if err != nil { + ctx.JSON( + http.StatusInternalServerError, + gin.H{"error": "error logging in"}, + ) + log.Errorf(ctx, "error logging in: %v", err) + return + } ctx.JSON( http.StatusOK, - &user_info, + loggedInUserResponse, ) } diff --git a/backend/server/api/server.go b/backend/server/api/server.go index 990862b..1497066 100644 --- a/backend/server/api/server.go +++ b/backend/server/api/server.go @@ -1,6 +1,7 @@ package api import ( + db "github.com/baato/before-after/db/sqlc" "github.com/baato/before-after/util" "github.com/gin-gonic/gin" ) @@ -19,12 +20,14 @@ var dispatcher = NewDispatcher(jobQueue, maxWorkers) type Server struct { router *gin.Engine + query *db.Queries config *util.Config } -func NewServer(config *util.Config) *Server { +func NewServer(query *db.Queries, config *util.Config) *Server { server := &Server{ config: config, + query: query, } server.setupRouter() diff --git a/backend/server/serializers/users_serializers.go b/backend/server/serializers/users_serializers.go new file mode 100644 index 0000000..5fbab43 --- /dev/null +++ b/backend/server/serializers/users_serializers.go @@ -0,0 +1,36 @@ +package serializer + +import ( + "time" + + db "github.com/baato/before-after/db/sqlc" +) + +type UserResponse struct { + ID int32 `json:"id"` + Username string `json:"username"` + PictureURL string `json:"picture_url"` + CreatedAt time.Time `json:"created_at"` + Role int32 `json:"role"` + EmailAddress string `json:"email_address"` + IsEmailVerified bool `json:"is_email_verified"` +} + +func NewUserResponse(user db.User) UserResponse { + return UserResponse{ + ID: user.ID, + Username: user.Username, + PictureURL: user.PictureUrl.String, + CreatedAt: user.CreatedAt, + Role: user.Role, + EmailAddress: user.EmailAddress.String, + IsEmailVerified: user.IsEmailVerified.Bool, + } +} + +type UpdateUserRequest struct { + ID int32 `json:"id"` + Role int32 `json:"role"` + EmailAddress string `json:"email_address"` + IsEmailVerified bool `json:"is_email_verified"` +} diff --git a/backend/server/services/auth_service.go b/backend/server/services/auth_service.go index 1e56bf9..cf95627 100644 --- a/backend/server/services/auth_service.go +++ b/backend/server/services/auth_service.go @@ -1,10 +1,16 @@ package services import ( + "context" "encoding/json" "io/ioutil" "log" "net/http" + "time" + + db "github.com/baato/before-after/db/sqlc" + serializer "github.com/baato/before-after/serializers" + "github.com/baato/before-after/util" ) type OSMResponse struct { @@ -20,6 +26,12 @@ type Picture struct { Url string `json:"href"` } +var config util.Config + +func init() { + config, _ = util.LoadConfig(".") +} + // Get user details from OSM API func GetOSMUser(token string) (UserInfo, error) { client := &http.Client{} @@ -44,3 +56,56 @@ func GetOSMUser(token string) (UserInfo, error) { } return userinfo.User, nil } + +// Create a new user in db if user not found else updates existing user and returns user +func LoginUser(query *db.Queries, userinfo *UserInfo) (serializer.UserResponse, error) { + + // Check if user exists in db + _, getErr := query.GetUser(context.Background(), userinfo.ID) + var user db.User + var err error + if getErr == nil { + // User exists in db, so update user + user, err = updateUser(query, userinfo) + } else { + // User not found in db, so create user + user, err = createUser(query, userinfo) + } + if err != nil { + return serializer.UserResponse{}, err + } else { + userResponse := serializer.NewUserResponse(user) + return userResponse, nil + } + +} + +// Generates session token with username and secret key +func GenerateSessionToken(userid int32) string { + maker, err := NewJWTMaker(config.AppSecret) + if err != nil { + panic(err) + } + token, _, err := maker.CreateToken(userid, time.Hour) + if err != nil { + panic(err) + } + return token +} + +// Verifies token and returns username +func VerifySessionToken(token string, userid int32) (int32, bool) { + maker, err := NewJWTMaker(config.AppSecret) + if err != nil { + panic(err) + } + payload, err := maker.VerifyToken(token) + if err != nil { + panic(err) + } + if payload.UserID == userid { + return payload.UserID, true + } else { + return 0, false + } +} diff --git a/backend/server/services/user_service.go b/backend/server/services/user_service.go new file mode 100644 index 0000000..8e6a6fa --- /dev/null +++ b/backend/server/services/user_service.go @@ -0,0 +1,30 @@ +package services + +import ( + "context" + "database/sql" + + db "github.com/baato/before-after/db/sqlc" +) + +// Create a new user in db +func createUser(query *db.Queries, userinfo *UserInfo) (db.User, error) { + arg := db.CreateUserParams{ + ID: userinfo.ID, + Username: userinfo.DisplayName, + PictureUrl: sql.NullString{String: userinfo.Picture.Url, Valid: true}, + } + user, err := query.CreateUser(context.Background(), arg) + return user, err +} + +// Updates existing user in db +func updateUser(query *db.Queries, userinfo *UserInfo) (db.User, error) { + arg := db.UpdateUserParams{ + ID: userinfo.ID, + Username: userinfo.DisplayName, + PictureUrl: sql.NullString{String: userinfo.Picture.Url, Valid: true}, + } + user, err := query.UpdateUser(context.Background(), arg) + return user, err +} From ea9b108ca63e33a35477b540d838d136fec81621 Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Wed, 24 Aug 2022 23:34:58 +0545 Subject: [PATCH 06/12] Generate jwt token for user session --- backend/server/go.mod | 2 + backend/server/go.sum | 3 + .../server/serializers/users_serializers.go | 5 + backend/server/services/auth_service.go | 10 +- backend/server/services/token_service.go | 101 ++++++++++++++++++ backend/server/util/config.go | 1 + 6 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 backend/server/services/token_service.go diff --git a/backend/server/go.mod b/backend/server/go.mod index f5942e2..6e707d6 100644 --- a/backend/server/go.mod +++ b/backend/server/go.mod @@ -3,7 +3,9 @@ module github.com/baato/before-after go 1.18 require ( + github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.8.1 + github.com/google/uuid v1.1.2 github.com/spf13/viper v1.12.0 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 google.golang.org/appengine v1.6.7 diff --git a/backend/server/go.sum b/backend/server/go.sum index 453a525..2eb065a 100644 --- a/backend/server/go.sum +++ b/backend/server/go.sum @@ -50,6 +50,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -132,6 +134,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= diff --git a/backend/server/serializers/users_serializers.go b/backend/server/serializers/users_serializers.go index 5fbab43..481ed38 100644 --- a/backend/server/serializers/users_serializers.go +++ b/backend/server/serializers/users_serializers.go @@ -16,6 +16,11 @@ type UserResponse struct { IsEmailVerified bool `json:"is_email_verified"` } +type LoginUserResponse struct { + User UserResponse `json:"user"` + JwtToken string `json:"jwt_token"` +} + func NewUserResponse(user db.User) UserResponse { return UserResponse{ ID: user.ID, diff --git a/backend/server/services/auth_service.go b/backend/server/services/auth_service.go index cf95627..e5f384b 100644 --- a/backend/server/services/auth_service.go +++ b/backend/server/services/auth_service.go @@ -58,7 +58,7 @@ func GetOSMUser(token string) (UserInfo, error) { } // Create a new user in db if user not found else updates existing user and returns user -func LoginUser(query *db.Queries, userinfo *UserInfo) (serializer.UserResponse, error) { +func LoginUser(query *db.Queries, userinfo *UserInfo) (serializer.LoginUserResponse, error) { // Check if user exists in db _, getErr := query.GetUser(context.Background(), userinfo.ID) @@ -72,10 +72,14 @@ func LoginUser(query *db.Queries, userinfo *UserInfo) (serializer.UserResponse, user, err = createUser(query, userinfo) } if err != nil { - return serializer.UserResponse{}, err + return serializer.LoginUserResponse{}, err } else { userResponse := serializer.NewUserResponse(user) - return userResponse, nil + loginResponse := serializer.LoginUserResponse{ + User: userResponse, + JwtToken: GenerateSessionToken(user.ID), + } + return loginResponse, nil } } diff --git a/backend/server/services/token_service.go b/backend/server/services/token_service.go new file mode 100644 index 0000000..5fd1ef1 --- /dev/null +++ b/backend/server/services/token_service.go @@ -0,0 +1,101 @@ +package services + +import ( + "errors" + "fmt" + "time" + + "github.com/dgrijalva/jwt-go" + "github.com/google/uuid" +) + +const minSecretKeySize = 12 + +var ( + ErrInvalidToken = errors.New("token is invalid") + ErrExpiredToken = errors.New("token is expired") +) + +type JwtMaker struct { + secretKey string +} + +type Payload struct { + ID uuid.UUID `json:"id"` + UserID int32 `json:"user_id"` + IssuedAt time.Time `json:"issued_at"` + ExpiresAt time.Time `json:"expires_at"` +} + +func NewPayload(userid int32, duration time.Duration) (*Payload, error) { + tokenID, err := uuid.NewRandom() + if err != nil { + return nil, err + } + + payload := &Payload{ + ID: tokenID, + UserID: userid, + IssuedAt: time.Now(), + ExpiresAt: time.Now().Add(duration), + } + + return payload, nil +} + +func (payload *Payload) Valid() error { + if time.Now().After(payload.ExpiresAt) { + return ErrExpiredToken + } + return nil +} + +func NewJWTMaker(secretKey string) (*JwtMaker, error) { + if len(secretKey) < minSecretKeySize { + return nil, fmt.Errorf("secret key is too short") + } + return &JwtMaker{secretKey}, nil +} + +// CreateToken generates a JWT token with the given payload. +func (maker *JwtMaker) CreateToken(userid int32, duration time.Duration) (string, *Payload, error) { + payload, err := NewPayload(userid, duration) + if err != nil { + return "", &Payload{}, err + } + jwtToken := jwt.NewWithClaims(jwt.SigningMethodHS256, payload) + token, err := jwtToken.SignedString([]byte(maker.secretKey)) + return token, payload, err +} + +// VerifyToken verifies given token string and returns Payload +func (maker *JwtMaker) VerifyToken(token string) (*Payload, error) { + + // func to test signing method used to create string + keyFunc := func(token *jwt.Token) (interface{}, error) { + _, ok := token.Method.(*jwt.SigningMethodHMAC) + if !ok { + return nil, ErrInvalidToken + } + return []byte(maker.secretKey), nil + } + + // Parse token and return err if invalid or expired + jwtToken, err := jwt.ParseWithClaims(token, &Payload{}, keyFunc) + + // Check if the error returned is for invalid token or expired token + if err != nil { + verr, ok := err.(*jwt.ValidationError) + if ok && errors.Is(verr.Inner, ErrExpiredToken) { + return nil, ErrExpiredToken + } + return nil, ErrInvalidToken + } + + payload, ok := jwtToken.Claims.(*Payload) + if !ok { + return nil, ErrInvalidToken + } + + return payload, nil +} diff --git a/backend/server/util/config.go b/backend/server/util/config.go index e6e0ccf..c9cfeff 100644 --- a/backend/server/util/config.go +++ b/backend/server/util/config.go @@ -16,6 +16,7 @@ type Config struct { SMTPPassword string `mapstructure:"SMTP_PASSWORD"` MAILCC string `mapstructure:"MAIL_CC"` APIBaseURL string `mapstructure:"API_BASE_URL"` + AppSecret string `mapstructure:"APP_SECRET"` OAUTHClientID string `mapstructure:"OAUTH_CLIENT_ID"` OAUTHClientSecret string `mapstructure:"OAUTH_CLIENT_SECRET"` OAUTHScopes []string `mapstructure:"OAUTH_SCOPES"` From afbe6f3d492f1cf93a5199763a4e2269bd365257 Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Thu, 25 Aug 2022 09:47:09 +0545 Subject: [PATCH 07/12] Initialiaze db conn with api server --- backend/server/main.go | 11 ++++++++++- backend/server/util/config.go | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/server/main.go b/backend/server/main.go index 2c7abd5..88fd612 100644 --- a/backend/server/main.go +++ b/backend/server/main.go @@ -1,9 +1,11 @@ package main import ( + "database/sql" "log" "github.com/baato/before-after/api" + db "github.com/baato/before-after/db/sqlc" "github.com/baato/before-after/util" ) @@ -12,7 +14,14 @@ func main() { if err != nil { log.Fatal("cannot load config:", err) } - server := api.NewServer(&config) + + conn, err := sql.Open(config.DBDriver, config.DBSource) + if err != nil { + log.Fatalf("cannot connect to db:%v", err) + } + query := db.New(conn) + + server := api.NewServer(query, &config) // Start listening for incoming chat messages server.Start(":8848") diff --git a/backend/server/util/config.go b/backend/server/util/config.go index c9cfeff..46a829f 100644 --- a/backend/server/util/config.go +++ b/backend/server/util/config.go @@ -8,6 +8,8 @@ import ( // Config stores all configuration of the application. // The values are read by viper from a config file or environment variable. type Config struct { + DBDriver string `mapstructure:"DB_DRIVER"` + DBSource string `mapstructure:"DB_SOURCE"` HostProtocol string `mapstructure:"HOST_PROTOCOL"` HostIP string `mapstructure:"HOST_IP"` SMTPHost string `mapstructure:"SMTP_HOST"` From 3a28f5f835aa06ef6246d915e05028a1a1c4595f Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Thu, 25 Aug 2022 09:47:50 +0545 Subject: [PATCH 08/12] Move mailer into services package --- backend/server/api/workerpool.go | 6 +++--- .../email_templates}/email-template.html | 0 .../error-email-template.html | 0 .../email_templates}/index.html | 0 backend/server/{mailer => services}/mailer.go | 20 +++---------------- 5 files changed, 6 insertions(+), 20 deletions(-) rename backend/server/{mailer => services/email_templates}/email-template.html (100%) rename backend/server/{mailer => services/email_templates}/error-email-template.html (100%) rename backend/server/{mailer => services/email_templates}/index.html (100%) rename backend/server/{mailer => services}/mailer.go (82%) diff --git a/backend/server/api/workerpool.go b/backend/server/api/workerpool.go index 64cdaf6..3082973 100644 --- a/backend/server/api/workerpool.go +++ b/backend/server/api/workerpool.go @@ -5,7 +5,7 @@ import ( "net/http" "os/exec" - Mailer "github.com/baato/before-after/mailer" + "github.com/baato/before-after/services" "github.com/gin-gonic/gin" ) @@ -75,9 +75,9 @@ func (w Worker) start() { // Dispatcher has added a job to my jobQueue. var jobstatus JobStatus = provision(job.Year, job.Bbox, job.Style, job.Name, job.Uuid, job.Country, job.Continent, job.FullName, job.Email) if jobstatus.status == "done" { - Mailer.SendSuccessMail(job.Email, job.FullName, job.Uuid, job.Name) + services.SendSuccessMail(job.Email, job.FullName, job.Uuid, job.Name) } else if jobstatus.status == "error" { - Mailer.SendErrorMail(job.Email, job.FullName, job.Uuid, jobstatus.err, job.Year, job.Bbox, job.Name, job.Country, job.Continent, job.Email) + services.SendErrorMail(job.Email, job.FullName, job.Uuid, jobstatus.err, job.Year, job.Bbox, job.Name, job.Country, job.Continent, job.Email) } case <-w.quitChan: diff --git a/backend/server/mailer/email-template.html b/backend/server/services/email_templates/email-template.html similarity index 100% rename from backend/server/mailer/email-template.html rename to backend/server/services/email_templates/email-template.html diff --git a/backend/server/mailer/error-email-template.html b/backend/server/services/email_templates/error-email-template.html similarity index 100% rename from backend/server/mailer/error-email-template.html rename to backend/server/services/email_templates/error-email-template.html diff --git a/backend/server/mailer/index.html b/backend/server/services/email_templates/index.html similarity index 100% rename from backend/server/mailer/index.html rename to backend/server/services/email_templates/index.html diff --git a/backend/server/mailer/mailer.go b/backend/server/services/mailer.go similarity index 82% rename from backend/server/mailer/mailer.go rename to backend/server/services/mailer.go index 916da6f..acfc6a5 100644 --- a/backend/server/mailer/mailer.go +++ b/backend/server/services/mailer.go @@ -1,4 +1,4 @@ -package mailer +package services import ( "bytes" @@ -7,22 +7,8 @@ import ( "net/smtp" "os" "text/template" - - "github.com/baato/before-after/util" -) - -var ( - config util.Config - configErr error ) -func init() { - config, configErr = util.LoadConfig("../../") - if configErr != nil { - log.Fatal("cannot load config:", configErr) - } -} - func sendMail(receiver []string, body bytes.Buffer) { var smtpAuth = smtp.PlainAuth("", config.SMTPUsername, config.SMTPPassword, config.SMTPHost) var smtpURL = config.SMTPHost + ":" + config.SMTPPort @@ -36,7 +22,7 @@ func SendSuccessMail(receiver string, FullName string, Uuid string, Name string) if err != nil { log.Fatal(err) } - t, err := template.ParseFiles(wd + "/mailer/email-template.html") + t, err := template.ParseFiles(wd + "/services/email_templates/email-template.html") if err != nil { fmt.Println(err) } @@ -63,7 +49,7 @@ func SendErrorMail(receiver string, FullName, Uuid, ErrorAt, Year, Bbox, Name, C if err != nil { log.Fatal(err) } - t, err := template.ParseFiles(wd + "/mailer/error-email-template.html") + t, err := template.ParseFiles(wd + "/services/email_templates/error-email-template.html") if err != nil { fmt.Println(err) } From f05c6055dd95adf818167e4b6c731b06acb8eba3 Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Sun, 28 Aug 2022 09:31:54 +0545 Subject: [PATCH 09/12] Add db migration container --- Dockerfile.backend | 7 ++++--- backend/server/go.mod | 1 + backend/server/go.sum | 2 ++ backend/server/main.go | 3 ++- docker-compose.yml | 33 +++++++++++++++++++++++++++++---- 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/Dockerfile.backend b/Dockerfile.backend index 47be088..33177c9 100644 --- a/Dockerfile.backend +++ b/Dockerfile.backend @@ -22,6 +22,9 @@ RUN apt-get install -y osmosis RUN apt-get install -y python3-pip python-dev build-essential RUN pip install mbutil +RUN curl -s https://packagecloud.io/install/repositories/golang-migrate/migrate/script.deb.sh | bash +RUN apt-get update +RUN apt-get install -y migrate COPY backend/tilemaker-configs/config.json / COPY backend/tilemaker-configs/process.lua / @@ -47,8 +50,6 @@ WORKDIR /server/backend/server RUN go build -WORKDIR /server - COPY before-after.env . -ENTRYPOINT ["/start.sh"] +WORKDIR /server diff --git a/backend/server/go.mod b/backend/server/go.mod index 6e707d6..c943ac1 100644 --- a/backend/server/go.mod +++ b/backend/server/go.mod @@ -6,6 +6,7 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.8.1 github.com/google/uuid v1.1.2 + github.com/lib/pq v1.10.6 github.com/spf13/viper v1.12.0 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 google.golang.org/appengine v1.6.7 diff --git a/backend/server/go.sum b/backend/server/go.sum index 2eb065a..7d82a63 100644 --- a/backend/server/go.sum +++ b/backend/server/go.sum @@ -161,6 +161,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs= +github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= diff --git a/backend/server/main.go b/backend/server/main.go index 88fd612..faeb7ba 100644 --- a/backend/server/main.go +++ b/backend/server/main.go @@ -7,12 +7,13 @@ import ( "github.com/baato/before-after/api" db "github.com/baato/before-after/db/sqlc" "github.com/baato/before-after/util" + _ "github.com/lib/pq" ) func main() { config, err := util.LoadConfig("../../") if err != nil { - log.Fatal("cannot load config:", err) + log.Fatal("cannot load config: ", err) } conn, err := sql.Open(config.DBDriver, config.DBSource) diff --git a/docker-compose.yml b/docker-compose.yml index a97d81c..5b967ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,39 @@ version: "3" services: + postgres: + container_name: before-after-db + image: mdillon/postgis:11 + restart: always + environment: + - POSTGRES_USER=baato + - POSTGRES_PASSWORD=baato + - POSTGRES_DB=before-after + volumes: + - data/postgres:/var/lib/postgresql/data + backend: - image: before-after_backend:latest + build: + context: "." + dockerfile: "./Dockerfile.backend" + container_name: backend + entrypoint: ["/start.sh"] restart: always - container_name: app-docker ports: - 8848:8848 - environment: - - HOST_IP=${HOST_IP} volumes: - appdata:/appdata - downloads:/downloads + + migration: + image: before-after_backend:latest + container_name: migration + restart: on-failure + command: migrate -path ./backend/server/db/migration -database postgresql://baato:baato@postgres:5432/before-after?sslmode=disable -verbose up + depends_on: + - postgres + links: + - postgres + nginx: restart: always container_name: app-nginx @@ -22,6 +45,8 @@ services: - backend volumes: - appdata:/appdata + volumes: appdata: downloads: + data/postgres: From 60d3a15bc9852f33e41c43af5fce45f1b8df50be Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Mon, 29 Aug 2022 13:25:57 +0545 Subject: [PATCH 10/12] Fix issues with migration and backend connection with postgres --- .env.sample | 50 +++++++++++++++++++++--- Dockerfile.backend | 2 + backend/migrate.sh | 2 + backend/server/api/oauth.go | 5 ++- backend/server/services/token_service.go | 2 +- backend/server/util/config.go | 21 +++++++++- docker-compose.yml | 18 +++++---- 7 files changed, 83 insertions(+), 17 deletions(-) create mode 100644 backend/migrate.sh diff --git a/.env.sample b/.env.sample index 3fe62c3..f96f4d8 100644 --- a/.env.sample +++ b/.env.sample @@ -1,5 +1,45 @@ -HOST_IP=localhost OR example.com OR beforeafter.baato.io -HOST_PROTOCOL=http: OR https: -GMAIL_USERNAME=EMAIL_ADDRESS -GMAIL_PASSWORD=EMAIL_PASSWORD -MAIL_CC=EMAIL_ADDRESS_TO_ADD_IN_CC \ No newline at end of file +# Before-After configuration file + +# Copy to `before-after.env` and adjust to make it work! +# +HOST_IP=localhost +HOST_PROTOCOL=http: +API_BASE_URL=0.0.0.0:8848 + +# Secret used to create JWT token. Must be at least 32 char +APP_SECRET=rnpNmYdj7P12t8VzcNh8IxfAE2YdFiNr + +# Comment below variable to use in development environment (optional) +GIN_MODE=release +#################################################### +# +# DATABASE CONNECTION PARAMETRS +# +#################################################### +# The connection to the postgres database (required) +POSTGRES_HOST=postgres +POSTGRES_PORT=5432 +POSTGRES_DB=before-after +POSTGRES_USER=baato +POSTGRES_PASSWORD=baato +POSTGRES_SSL_MODE=disable +DB_DRIVER=postgres + +# Email sending server configuration +# This is required in order to send out messages. +# +SMTP_HOST=smtp.gmail.com +SMTP_PORT=587 +# Should be address from which mail is sent +SMTP_USERNAME=test@email.com +# Should be app password instead of password if you are using gmail smtp, +SMTP_PASSWORD=foo +MAIL_CC=test@email.com + +# OpenStreetMap OAuth2 configuration for osm login (required) +# +OAUTH_CLIENT_ID=foo +OAUTH_CLIENT_SECRET=foo +OAUTH_SCOPES=read_prefs write_api +OAUTH_REDIRECT_URL=http://127.0.0.1:8080/authorized +OAUTH_SERVER_URL=https://www.openstreetmap.org diff --git a/Dockerfile.backend b/Dockerfile.backend index 33177c9..a848bbc 100644 --- a/Dockerfile.backend +++ b/Dockerfile.backend @@ -36,6 +36,7 @@ COPY backend/server/ /server/backend/server RUN chmod +x /server/backend/server/main.go COPY backend/start.sh /start.sh +COPY backend/migrate.sh /migrate.sh RUN mkdir -p /provisioning-scripts COPY backend/provisioning-scripts/ /provisioning-scripts @@ -44,6 +45,7 @@ RUN mkdir -p /map-styles COPY backend/map-styles/ /map-styles RUN chmod +x /start.sh +RUN chmod +x /migrate.sh RUN chmod +x /provisioning-scripts/*.sh WORKDIR /server/backend/server diff --git a/backend/migrate.sh b/backend/migrate.sh new file mode 100644 index 0000000..2814b71 --- /dev/null +++ b/backend/migrate.sh @@ -0,0 +1,2 @@ +#!/bin/bash +migrate -path ./backend/server/db/migration -database ${DBSource} -verbose up \ No newline at end of file diff --git a/backend/server/api/oauth.go b/backend/server/api/oauth.go index 55fddf7..0fda218 100644 --- a/backend/server/api/oauth.go +++ b/backend/server/api/oauth.go @@ -1,6 +1,7 @@ package api import ( + "fmt" "net/http" "github.com/baato/before-after/services" @@ -37,7 +38,7 @@ func (server *Server) callback(ctx *gin.Context) { if err != nil { ctx.JSON( http.StatusInternalServerError, - gin.H{"error": "error getting user details"}, + gin.H{"error": fmt.Sprintf("error getting user details: %v", err)}, ) log.Errorf(ctx, "error getting user details: %v", err) return @@ -48,7 +49,7 @@ func (server *Server) callback(ctx *gin.Context) { if err != nil { ctx.JSON( http.StatusInternalServerError, - gin.H{"error": "error logging in"}, + gin.H{"error": fmt.Sprintf("error logging in %v", err)}, ) log.Errorf(ctx, "error logging in: %v", err) return diff --git a/backend/server/services/token_service.go b/backend/server/services/token_service.go index 5fd1ef1..0e71c24 100644 --- a/backend/server/services/token_service.go +++ b/backend/server/services/token_service.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" ) -const minSecretKeySize = 12 +const minSecretKeySize = 32 var ( ErrInvalidToken = errors.New("token is invalid") diff --git a/backend/server/util/config.go b/backend/server/util/config.go index 46a829f..3fb368a 100644 --- a/backend/server/util/config.go +++ b/backend/server/util/config.go @@ -1,6 +1,8 @@ package util import ( + "fmt" + "github.com/spf13/viper" "golang.org/x/oauth2" ) @@ -9,7 +11,13 @@ import ( // The values are read by viper from a config file or environment variable. type Config struct { DBDriver string `mapstructure:"DB_DRIVER"` - DBSource string `mapstructure:"DB_SOURCE"` + DBSource string `mapstructure:"-"` + PostgresUser string `mapstructure:"POSTGRES_USER"` + PostgresPassword string `mapstructure:"POSTGRES_PASSWORD"` + PostgresDB string `mapstructure:"POSTGRES_DB"` + PostgresHost string `mapstructure:"POSTGRES_HOST"` + PostgresPort string `mapstructure:"POSTGRES_PORT"` + PostgresSSL string `mapstructure:"POSTGRES_SSL_MODE"` HostProtocol string `mapstructure:"HOST_PROTOCOL"` HostIP string `mapstructure:"HOST_IP"` SMTPHost string `mapstructure:"SMTP_HOST"` @@ -17,7 +25,6 @@ type Config struct { SMTPUsername string `mapstructure:"SMTP_USERNAME"` SMTPPassword string `mapstructure:"SMTP_PASSWORD"` MAILCC string `mapstructure:"MAIL_CC"` - APIBaseURL string `mapstructure:"API_BASE_URL"` AppSecret string `mapstructure:"APP_SECRET"` OAUTHClientID string `mapstructure:"OAUTH_CLIENT_ID"` OAUTHClientSecret string `mapstructure:"OAUTH_CLIENT_SECRET"` @@ -42,6 +49,16 @@ func LoadConfig(path string) (config Config, err error) { err = viper.Unmarshal(&config) + // Create DBSource using env variables + // e.g. DBSource postgresql://:@:/?sslmode= + config.DBSource = fmt.Sprint( + "postgresql://", + config.PostgresUser, ":", config.PostgresPassword, "@", + config.PostgresHost, ":", config.PostgresPort, "/", config.PostgresDB, + "?sslmode=", config.PostgresSSL, + ) + + // Create OAuth config using env vatiables config.OAUTHConfig.RedirectURL = config.OAUTHRedirectURL config.OAUTHConfig.ClientID = config.OAUTHClientID config.OAUTHConfig.ClientSecret = config.OAUTHClientSecret diff --git a/docker-compose.yml b/docker-compose.yml index 5b967ca..e9c8799 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,18 +4,18 @@ services: container_name: before-after-db image: mdillon/postgis:11 restart: always - environment: - - POSTGRES_USER=baato - - POSTGRES_PASSWORD=baato - - POSTGRES_DB=before-after + env_file: + - ${ENV_FILE:-before-after.env} volumes: - - data/postgres:/var/lib/postgresql/data + - postgres_data:/var/lib/postgresql/data backend: build: context: "." dockerfile: "./Dockerfile.backend" container_name: backend + env_file: + - ${ENV_FILE:-before-after.env} entrypoint: ["/start.sh"] restart: always ports: @@ -28,7 +28,11 @@ services: image: before-after_backend:latest container_name: migration restart: on-failure - command: migrate -path ./backend/server/db/migration -database postgresql://baato:baato@postgres:5432/before-after?sslmode=disable -verbose up + environment: + # DBSource is used to establish connection with postgres db. + # It should be in the format of postgresql://:@:/?sslmode= + - DBSource=postgresql://baato:baato@postgres:5432/before-after?sslmode=disable + entrypoint: ["/migrate.sh"] depends_on: - postgres links: @@ -49,4 +53,4 @@ services: volumes: appdata: downloads: - data/postgres: + postgres_data: From a7c4cbb813a8246c3b9890eaffe7239743859838 Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Mon, 29 Aug 2022 19:28:39 +0545 Subject: [PATCH 11/12] Generate random state for oauth --- backend/server/api/oauth.go | 3 ++- backend/server/util/random.go | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 backend/server/util/random.go diff --git a/backend/server/api/oauth.go b/backend/server/api/oauth.go index 0fda218..bab2f76 100644 --- a/backend/server/api/oauth.go +++ b/backend/server/api/oauth.go @@ -5,6 +5,7 @@ import ( "net/http" "github.com/baato/before-after/services" + "github.com/baato/before-after/util" "github.com/gin-gonic/gin" "golang.org/x/oauth2" "google.golang.org/appengine/log" @@ -12,7 +13,7 @@ import ( func (server *Server) login(ctx *gin.Context) { // TODO: Generate random state - state := "kdbcjbjvghvdsyt637" + state := util.RandomState() url := server.config.OAUTHConfig.AuthCodeURL(state) ctx.JSON( http.StatusOK, diff --git a/backend/server/util/random.go b/backend/server/util/random.go new file mode 100644 index 0000000..daf38b3 --- /dev/null +++ b/backend/server/util/random.go @@ -0,0 +1,19 @@ +package util + +import ( + "math/rand" + "strings" +) + +const unicode_chars = "abcdefghijkalmnopqrstuvwxyzABCDEFGHIJKLAMNOPQRSTUVWXYZ123456789" + +func RandomState() string { + var sb strings.Builder + k := len(unicode_chars) + for i := 0; i < 48; i++ { + c := unicode_chars[rand.Intn(k)] + sb.WriteByte(c) + } + + return sb.String() +} From f5fc570c6640050ffaa47e90d2a02a735e608e0b Mon Sep 17 00:00:00 2001 From: Aadesh-Baral Date: Tue, 30 Aug 2022 00:32:02 +0545 Subject: [PATCH 12/12] Add makefile and development docs --- .gitignore | 3 +- Makefile | 30 ++++++++++++ README.md | 13 ++++-- development-setup.md | 109 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 Makefile create mode 100644 development-setup.md diff --git a/.gitignore b/.gitignore index 40ce98b..68b8fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -.env -before-after.env \ No newline at end of file +before-after.env diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9cf07c3 --- /dev/null +++ b/Makefile @@ -0,0 +1,30 @@ +backend: + docker build -t before-after_backend:latest . -f Dockerfile.backend + +frontend: + docker build -t before-after_frontend:latest ./frontend + +up: + docker-compose up -d + +down: + docker-compose down + +sqlc: + sqlc generate + +initmigrate: + migrate create -ext sql -dir backend/server/db/migration -seq init_schema + +dbupgrade: + migrate -path db/migration -database "postgresql://baato:baato@localhost:5432/beforeafter?sslmode=disable" -verbose up + +dbdowngrade: + migrate -path db/migration -database "postgresql://baato:baato@localhost:5432/beforeafter?sslmode=disable" -verbose down + +server: + cd backend/server/ + go run main.go + + +.PHONY: backend frontend up down initmigrate dbupgrade dbdowngrade sqlc server \ No newline at end of file diff --git a/README.md b/README.md index afb672e..fcd2c13 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Technical stack for generating before-after map (with vector tiles). # Installation and Setup - Clone the repository -- ` cp .env.sample .env` +- `cp .env.sample before-after.env` - Make required changes in .env file - `docker-compose build` - `docker-compose up` @@ -19,11 +19,16 @@ Technical stack for generating before-after map (with vector tiles). - Frontend: It houses the main provisioning interface. # Developing the Backend - -- `docker build` after making changes -- `docker up` to test the changes +- `make build` after making changes +- `make up` to test the changes # Developing the Frontend +#### With Docker +- `make frontend` after making changes +- `make up` +#### Without Docker - `yarn install` inside frontend/src/app - `yarn serve` + +For detailed development setup instructions have a look at our [development setup guide](development-setup.md) diff --git a/development-setup.md b/development-setup.md new file mode 100644 index 0000000..91d41be --- /dev/null +++ b/development-setup.md @@ -0,0 +1,109 @@ +# Development setup +## Understanding the code +### Architecture +Before After is composed of three parts: + +- **Frontend**: A user interface built using Vue js. +- **Database**: A postgres database with postgis extension. +- **Backend**: Backend is made of four major components. + - ***server***: Consists of golang code responsible for creating API server in order to communicate with frontend. + - ***map-styles***: Consists of 3 baato mapstyles i.e. *`retro`*, *`breeze`* and *`monochrome`* for styling of before after maps. + - ***provisioning-scripts***: Consists shell scripts that are used to download required data from geofabric, generate tiles and provision before-after maps. + - ***tilemaker-configs***: Consists of configuration files for tilemaker. + +### Frontend +This is the front-end user interface of the Before-After. It is based on the Vue js and you can find all files in the `frontend` directory. + +The following dependencies must be available _globally_ on your system: +* Download and install [NodeJS LTS v12+](https://nodejs.org/en/) and [yarn](https://classic.yarnpkg.com/en/docs/install) +* Go into the `frontend` directory and execute `yarn`. + +#### Available Scripts + +From project root cd into `frontend/src/app`, then you can run: + +##### `yarn start` + +Runs the app in the development mode.
+Open [http://localhost:8080](http://localhost:8080) to view it in the browser. + +The page will reload if you make edits.
+You will also see any lint errors in the console. + + +##### `yarn build` + +Builds the app for production to the `build` folder.
+It correctly bundles React in production mode and optimizes the build for the best performance. + +The build is minified and the filenames include the hashes.
+Your app is ready to be deployed! + +#### Using Make +Make sure [Docker CE](https://www.docker.com/community-edition#/download) is available locally: + +Then you can, +- Build frontend image using `make frontend`. +- If you plan to setup frontend only comment out all other services on `docker-compose.yml` then run command `make up`. +- Stop running docker containers using `make down`. + +### Backend + +The backend is made up of a postgres database, API server that calls various end points for user authentication and to create provisons, provisioning scripts to provision before-after maps, mapstyles for styling of maps and tilemaker configs for configuring tilemakers. + +#### Dependencies + +* [Golang 1.18+](https://go.dev/dl/) +* [PostgreSQL](https://www.postgresql.org/download/) with [PostGIS](https://postgis.net/install/) +* [tilemaker](https://github.com/systemed/tilemaker.git) +* [sqlc](https://docs.sqlc.dev/en/stable/overview/install.html) + +You can check the backend [Dockerfile](Dockerfile.backend) to have a reference of other system dependencies and how to install them in a Debian/Ubuntu system. + +#### Configuration + +There are two ways to configure Before After. You can set some environment variables on your shell or you can define the configuration in the `before-after.env` file on the repository root directory. To use that last option, follow the below instructions: + +* Copy the example configuration file to start your own configuration: `cp .env.sample before-after.env`. +* Adjust the `before-after.env` configuration file to fit your configuration. +* Make sure that the following variables are set correctly in the `before-after.env` configuration file: + - `POSTGRES_DB`=tasking-manager-database-name + - `POSTGRES_USER`=database-user-name + - `POSTGRES_PASSWORD`=database-user-password + - `POSTGRES_HOST`=database-endpoint-can-be-localhost + - `POSTGRES_PORT`=database-port + - `DB_DRIVER`=postgres (recommended) + - `OAUTH_CLIENT_ID`=oauth2-client-id-from-openstreetmapA + - `OAUTH_CLIENT_SECRET`=oauth2-client-secret-key-from-openstreetmap + - `OAUTH_SCOPES`=scope-for-oauth2-application + - `OAUTH_REDIRECT_URL`=defined-during-oauth2-application-cretion + - `OAUTH_SERVER_URL`=https://www.openstreetmap.org + - `TM_SECRET`=define-freely-any-number-and-letter-combination + - `TM_CONSUMER_KEY`=oauth-consumer-key-from-openstreetmap + - `TM_CONSUMER_SECRET`=oauth-consumer-secret-key-from-openstreetmap + +In order to send email correctly, set these variables as well: + - `SMTP_HOST` + - `SMTP_PORT` + - `SMTP_USERNAME` + - `SMTP_PASSWORD` + - `MAIL_CC`=Email will be sent to this address as well after provisioning is complete + +### Database + +#### Create a fresh database + +We use [golang migrate](https://github.com/golang-migrate/migrate) to create the database from the migrations directory. Check the instructions on how to setup a PostGIS database with [docker](#creating-a-local-postgis-database-with-docker) or on your [local system](#non-docker). +Install golang migrate: +```bash + curl -s https://packagecloud.io/install/repositories/golang-migrate/migrate/script.deb.sh | sudo bash + sudo apt-get update + sudo apt-get install -y migrate +``` +Then you can execute the following command to apply the migrations: + +Modify DBSource in format `postgresql://:@:/?sslmode=disable` and export it as your env variable. +```bash + export DBSource=postgresql://baato:baato@postgres:5432/before-after?sslmode=disable + migrate -path backend/server/db/migration -database ${DBSource} -verbose up +```