Skip to content

Commit

Permalink
chore: move github.com/kotakanbe to github.com/vulsio (#38)
Browse files Browse the repository at this point in the history
* chore: move github.com/kotakanbe to github.com/vulsio

* fix: readme

Co-authored-by: Kota Kanbe <[email protected]>
  • Loading branch information
MaineK00n and kotakanbe authored Sep 16, 2021
1 parent a707cd1 commit f194808
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 32 deletions.
4 changes: 2 additions & 2 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ SRCS = $(shell git ls-files '*.go')
PKGS = ./config ./db ./models
VERSION := $(shell git describe --tags --abbrev=0)
REVISION := $(shell git rev-parse --short HEAD)
LDFLAGS := -X 'github.com/kotakanbe/go-cpe-dictionary/config.Version=$(VERSION)' \
-X 'github.com/kotakanbe/go-cpe-dictionary/config.Revision=$(REVISION)'
LDFLAGS := -X 'github.com/vulsio/go-cpe-dictionary/config.Version=$(VERSION)' \
-X 'github.com/vulsio/go-cpe-dictionary/config.Revision=$(REVISION)'
GO := GO111MODULE=on go
GO_OFF := GO111MODULE=off go

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ $ source /etc/profile.d/goenv.sh
To install:

```bash
$ mkdir -p $GOPATH/src/github.com/kotakanbe
$ cd $GOPATH/src/github.com/kotakanbe
$ git clone https://github.com/kotakanbe/go-cpe-dictionary.git
$ mkdir -p $GOPATH/src/github.com/vulsio
$ cd $GOPATH/src/github.com/vulsio
$ git clone https://github.com/vulsio/go-cpe-dictionary.git
$ cd go-cpe-dictionary
$ make install
```
Expand Down Expand Up @@ -169,14 +169,14 @@ Run with --debug, --debug-sql option.

# Authors

kotakanbe ([@kotakanbe](https://twitter.com/kotakanbe)) created go-cpe-dictionary and [these fine people](https://github.com/kotakanbe/go-cpe-dictionary/graphs/contributors) have contributed.
kotakanbe ([@kotakanbe](https://twitter.com/kotakanbe)) created go-cpe-dictionary and [these fine people](https://github.com/vulsio/go-cpe-dictionary/graphs/contributors) have contributed.

----

# Contribute

1. fork a repository: github.com/kotakanbe/go-cpe-dictionary to github.com/you/repo
2. get original code: go get github.com/kotakanbe/go-cpe-dictionary
1. fork a repository: github.com/vulsio/go-cpe-dictionary to github.com/you/repo
2. get original code: go get github.com/vulsio/go-cpe-dictionary
3. work on original code
4. add remote to your repo: git remote add myfork https://github.com/you/repo.git
5. push your changes: git push myfork
Expand All @@ -188,7 +188,7 @@ kotakanbe ([@kotakanbe](https://twitter.com/kotakanbe)) created go-cpe-dictionar

# Licence

Please see [LICENSE](https://github.com/kotakanbe/go-cpe-dictionary/blob/master/LICENSE).
Please see [LICENSE](https://github.com/vulsio/go-cpe-dictionary/blob/master/LICENSE).

----

Expand Down
4 changes: 2 additions & 2 deletions commands/fetchjvn.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"

"github.com/inconshreveable/log15"
"github.com/kotakanbe/go-cpe-dictionary/db"
"github.com/kotakanbe/go-cpe-dictionary/fetcher"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/vulsio/go-cpe-dictionary/db"
"github.com/vulsio/go-cpe-dictionary/fetcher"
)

var fetchJvnCmd = &cobra.Command{
Expand Down
4 changes: 2 additions & 2 deletions commands/fetchnvd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"

"github.com/inconshreveable/log15"
"github.com/kotakanbe/go-cpe-dictionary/db"
"github.com/kotakanbe/go-cpe-dictionary/fetcher"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/vulsio/go-cpe-dictionary/db"
"github.com/vulsio/go-cpe-dictionary/fetcher"
)

var fetchNvdCmd = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion commands/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"path/filepath"

"github.com/inconshreveable/log15"
"github.com/kotakanbe/go-cpe-dictionary/util"
homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/vulsio/go-cpe-dictionary/util"
)

var cfgFile string
Expand Down
4 changes: 2 additions & 2 deletions commands/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package commands

import (
"github.com/inconshreveable/log15"
"github.com/kotakanbe/go-cpe-dictionary/db"
"github.com/kotakanbe/go-cpe-dictionary/server"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/vulsio/go-cpe-dictionary/db"
"github.com/vulsio/go-cpe-dictionary/server"
)

var serverCmd = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion db/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/knqyf263/go-cpe/common"
"github.com/knqyf263/go-cpe/naming"
"github.com/kotakanbe/go-cpe-dictionary/models"
"github.com/vulsio/go-cpe-dictionary/models"
)

func prepareTestData(driver DB) error {
Expand Down
2 changes: 1 addition & 1 deletion db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/inconshreveable/log15"
"github.com/kotakanbe/go-cpe-dictionary/models"
"github.com/vulsio/go-cpe-dictionary/models"
)

// DB is interface for a database driver
Expand Down
2 changes: 1 addition & 1 deletion db/rdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cheggaaa/pb/v3"
"github.com/jinzhu/gorm"
"github.com/k0kubun/pp"
"github.com/kotakanbe/go-cpe-dictionary/models"
sqlite3 "github.com/mattn/go-sqlite3"
"github.com/vulsio/go-cpe-dictionary/models"
"golang.org/x/xerrors"

// Required MySQL. See http://jinzhu.me/gorm/database.html#connecting-to-a-database
Expand Down
2 changes: 1 addition & 1 deletion db/redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/cheggaaa/pb/v3"
"github.com/go-redis/redis/v8"
"github.com/inconshreveable/log15"
"github.com/kotakanbe/go-cpe-dictionary/models"
"github.com/spf13/viper"
"github.com/vulsio/go-cpe-dictionary/models"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions fetcher/jvn.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/inconshreveable/log15"
"github.com/knqyf263/go-cpe/common"
"github.com/knqyf263/go-cpe/naming"
"github.com/kotakanbe/go-cpe-dictionary/models"
"github.com/kotakanbe/go-cpe-dictionary/util"
"github.com/vulsio/go-cpe-dictionary/models"
"github.com/vulsio/go-cpe-dictionary/util"
)

type rdf struct {
Expand Down
4 changes: 2 additions & 2 deletions fetcher/nvd.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"github.com/inconshreveable/log15"
"github.com/knqyf263/go-cpe/common"
"github.com/knqyf263/go-cpe/naming"
"github.com/kotakanbe/go-cpe-dictionary/models"
"github.com/kotakanbe/go-cpe-dictionary/util"
"github.com/parnurzeal/gorequest"
"github.com/spf13/viper"
"github.com/vulsio/go-cpe-dictionary/models"
"github.com/vulsio/go-cpe-dictionary/util"
)

// CpeDictionary has cpe-item list
Expand Down
33 changes: 30 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
module github.com/kotakanbe/go-cpe-dictionary
module github.com/vulsio/go-cpe-dictionary

go 1.16
go 1.17

require (
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/alicebob/miniredis/v2 v2.14.1
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cheggaaa/pb/v3 v3.0.8
github.com/elazarl/goproxy v0.0.0-20200426045556-49ad98f6dac1 // indirect
Expand Down Expand Up @@ -37,3 +36,31 @@ require (
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
moul.io/http2curl v1.0.0 // indirect
)

require (
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/pelletier/go-toml v1.9.3 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
go.opentelemetry.io/otel v1.0.0-RC1 // indirect
go.opentelemetry.io/otel/metric v0.21.0 // indirect
golang.org/x/text v0.3.6 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"strings"

"github.com/kotakanbe/go-cpe-dictionary/commands"
"github.com/kotakanbe/go-cpe-dictionary/config"
"github.com/vulsio/go-cpe-dictionary/commands"
"github.com/vulsio/go-cpe-dictionary/config"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"path/filepath"

"github.com/inconshreveable/log15"
"github.com/kotakanbe/go-cpe-dictionary/db"
"github.com/labstack/echo"
"github.com/labstack/echo/middleware"
"github.com/spf13/viper"
"github.com/vulsio/go-cpe-dictionary/db"
)

// Start starts CVE dictionary HTTP Server.
Expand Down

0 comments on commit f194808

Please sign in to comment.