From e5419dcc005f52f4f52f85cee080b43278510616 Mon Sep 17 00:00:00 2001 From: AJ Bahnken Date: Wed, 8 Apr 2020 11:37:58 -0700 Subject: [PATCH] Migrate away from multi-modules --- Makefile | 2 +- go.mod | 18 ++++-------------- go.sum | 6 ++++++ main.go | 28 ++++++++++++++-------------- modules/authorizedkeys/go.mod | 14 -------------- modules/authorizedkeys/go.sum | 35 ----------------------------------- modules/aws/go.mod | 16 ---------------- modules/aws/go.sum | 29 ----------------------------- modules/go.mod | 13 ------------- modules/go.sum | 32 -------------------------------- notifications/go.mod | 9 --------- notifications/go.sum | 26 -------------------------- test.sh | 8 -------- 13 files changed, 25 insertions(+), 211 deletions(-) delete mode 100644 modules/authorizedkeys/go.mod delete mode 100644 modules/authorizedkeys/go.sum delete mode 100644 modules/aws/go.mod delete mode 100644 modules/aws/go.sum delete mode 100644 modules/go.mod delete mode 100644 modules/go.sum delete mode 100644 notifications/go.mod delete mode 100644 notifications/go.sum delete mode 100755 test.sh diff --git a/Makefile b/Makefile index 23e2e4537..8007f6c00 100755 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ vendor: $(GO) mod vendor test: - ./test.sh + go test ./... lint: golint . diff --git a/go.mod b/go.mod index afeb0b76e..ab4145fe5 100644 --- a/go.mod +++ b/go.mod @@ -1,25 +1,15 @@ module go.mozilla.org/userplex -go 1.13 +go 1.14 require ( + github.com/aws/aws-sdk-go v1.23.13 github.com/pkg/errors v0.8.1 github.com/sirupsen/logrus v1.4.2 github.com/stretchr/testify v1.3.0 - github.com/urfave/cli v1.22.1 + github.com/urfave/cli/v2 v2.2.0 go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe go.mozilla.org/sops/v3 v3.5.0 - go.mozilla.org/userplex/modules v0.0.0 - go.mozilla.org/userplex/modules/authorizedkeys v0.0.0 - go.mozilla.org/userplex/modules/aws v0.0.0 - go.mozilla.org/userplex/notifications v0.0.0 + golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 gopkg.in/yaml.v2 v2.2.7 ) - -replace go.mozilla.org/userplex/modules/authorizedkeys => ./modules/authorizedkeys - -replace go.mozilla.org/userplex/modules/aws => ./modules/aws - -replace go.mozilla.org/userplex/modules => ./modules - -replace go.mozilla.org/userplex/notifications => ./notifications diff --git a/go.sum b/go.sum index 161878c68..7699e9a38 100644 --- a/go.sum +++ b/go.sum @@ -39,6 +39,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= 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/aws/aws-sdk-go v1.23.13 h1:l/NG+mgQFRGG3dsFzEj0jw9JIs/zYdtU6MXhY1WIDmM= github.com/aws/aws-sdk-go v1.23.13/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.25.30 h1:I9qj6zW3mMfsg91e+GMSN/INcaX9tTFvr/l/BAHKaIY= github.com/aws/aws-sdk-go v1.25.30/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -205,6 +206,10 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= +github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4= +github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a h1:N7VD+PwpJME2ZfQT8+ejxwA4Ow10IkGbU0MGf94ll8k= go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a/go.mod h1:YDKUvO0b//78PaaEro6CAPH6NqohCmL2Cwju5XI2HoE= go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe h1:SY8AtlmPXNc/tUapjxMqAHxRoMlTp7pLZvwzpdFOv3c= @@ -220,6 +225,7 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a h1:R/qVym5WAxsZWQqZCwDY/8sdVKV1m1WgU4/S5IRQAzc= golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/main.go b/main.go index 8cafc1764..86850a727 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( "go.mozilla.org/userplex/modules/aws" log "github.com/sirupsen/logrus" - "github.com/urfave/cli" + "github.com/urfave/cli/v2" ) const Version = "v1.0.1" @@ -21,19 +21,19 @@ func main() { app.Name = "userplex" app.Usage = "Propagate users from Mozilla's Person API to third party systems." app.Version = Version - app.Authors = []cli.Author{ + app.Authors = []*cli.Author{ {Name: "AJ Bahnken", Email: "ajvb@mozilla.com"}, {Name: "Julien Vehent", Email: "jvehent@mozilla.com"}, } app.EnableBashCompletion = true app.Flags = []cli.Flag{ - cli.StringFlag{ - Name: "config, c", - Usage: "Path to userplex config file", - EnvVar: "USERPLEX_CONFIG_PATH", + &cli.StringFlag{ + Name: "config", + Usage: "Path to userplex config file", + EnvVars: []string{"USERPLEX_CONFIG_PATH"}, }, } - app.Commands = []cli.Command{ + app.Commands = []*cli.Command{ { Name: "aws", Usage: "Operations within AWS", @@ -65,8 +65,8 @@ func requiresSubcommand(c *cli.Context) error { return nil } -func createModuleSubcommands(module modules.Module) []cli.Command { - return []cli.Command{ +func createModuleSubcommands(module modules.Module) []*cli.Command { + return []*cli.Command{ { Name: "create", Usage: "Create user", @@ -113,7 +113,7 @@ func createModuleSubcommands(module modules.Module) []cli.Command { if person != nil { err = m.Delete(person.GetLDAPUsername()) } else { - err = m.Delete(c.Args()[0]) + err = m.Delete(c.Args().Get(0)) } if err != nil { log.Errorf("Error from module.Delete: %s", err) @@ -159,7 +159,7 @@ func createModuleSubcommands(module modules.Module) []cli.Command { } func loadConfigForSubcommand(c *cli.Context, module modules.Module) (conf, []modules.Configuration, *person_api.Client) { - cfg, err := loadConf(c.GlobalString("c")) + cfg, err := loadConf(c.String("config")) if err != nil { log.Fatalf("Couldn't load config: %s", err) } @@ -193,7 +193,7 @@ func loadConfigForSubcommand(c *cli.Context, module modules.Module) (conf, []mod func loadAndVerifyContext(c *cli.Context, module modules.Module, exitOnError bool) (*person_api.Person, conf, []modules.Configuration, *person_api.Client) { cfg, moduleConfigs, personClient := loadConfigForSubcommand(c, module) - username := c.Args()[0] + username := c.Args().Get(0) p, err := getPerson(personClient, username) if err != nil { @@ -221,7 +221,7 @@ func loadAndVerifyContext(c *cli.Context, module modules.Module, exitOnError boo } func getPersonCmd(c *cli.Context) error { - cfg, err := loadConf(c.GlobalString("c")) + cfg, err := loadConf(c.String("config")) if err != nil { log.Fatalf("Couldn't load config: %s", err) } @@ -235,7 +235,7 @@ func getPersonCmd(c *cli.Context) error { if err != nil { log.Fatalf("Could not create person api client: %s", err) } - username := c.Args()[0] + username := c.Args().Get(0) p, err := getPerson(personClient, username) if err != nil { diff --git a/modules/authorizedkeys/go.mod b/modules/authorizedkeys/go.mod deleted file mode 100644 index 67a019e6b..000000000 --- a/modules/authorizedkeys/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module go.mozilla.org/userplex/modules/authorizedkeys - -go 1.13 - -require ( - github.com/sirupsen/logrus v1.4.2 - go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe - go.mozilla.org/userplex/modules v0.0.0 - go.mozilla.org/userplex/notifications v0.0.0 -) - -replace go.mozilla.org/userplex/modules => ../ - -replace go.mozilla.org/userplex/notifications => ../../notifications diff --git a/modules/authorizedkeys/go.sum b/modules/authorizedkeys/go.sum deleted file mode 100644 index 23ad3dd60..000000000 --- a/modules/authorizedkeys/go.sum +++ /dev/null @@ -1,35 +0,0 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/aws/aws-sdk-go v1.25.30 h1:I9qj6zW3mMfsg91e+GMSN/INcaX9tTFvr/l/BAHKaIY= -github.com/aws/aws-sdk-go v1.25.30/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -go.mozilla.org/person-api v0.0.0-20191118190218-e4c5770d1104 h1:VV/SM793UltDg3HwR6MIbgDfUiHGLsRlXqWYrKahyjc= -go.mozilla.org/person-api v0.0.0-20191118190218-e4c5770d1104/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -go.mozilla.org/person-api v0.0.0-20191120210847-5e8f6374ee7e h1:8BhgZxXe2v7TZaGmjtrVu4GzrPcmwTR1GIW+W7gvHaI= -go.mozilla.org/person-api v0.0.0-20191120210847-5e8f6374ee7e/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe h1:SY8AtlmPXNc/tUapjxMqAHxRoMlTp7pLZvwzpdFOv3c= -go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a h1:R/qVym5WAxsZWQqZCwDY/8sdVKV1m1WgU4/S5IRQAzc= -golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/modules/aws/go.mod b/modules/aws/go.mod deleted file mode 100644 index fa8d06863..000000000 --- a/modules/aws/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module go.mozilla.org/userplex/modules/aws - -go 1.13 - -require ( - github.com/aws/aws-sdk-go v1.25.30 - github.com/sirupsen/logrus v1.4.2 - github.com/stretchr/testify v1.2.2 - go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe - go.mozilla.org/userplex/modules v0.0.0 - go.mozilla.org/userplex/notifications v0.0.0 -) - -replace go.mozilla.org/userplex/modules => ../ - -replace go.mozilla.org/userplex/notifications => ../../notifications diff --git a/modules/aws/go.sum b/modules/aws/go.sum deleted file mode 100644 index 1ca360626..000000000 --- a/modules/aws/go.sum +++ /dev/null @@ -1,29 +0,0 @@ -github.com/aws/aws-sdk-go v1.25.30 h1:I9qj6zW3mMfsg91e+GMSN/INcaX9tTFvr/l/BAHKaIY= -github.com/aws/aws-sdk-go v1.25.30/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -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/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -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/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe h1:SY8AtlmPXNc/tUapjxMqAHxRoMlTp7pLZvwzpdFOv3c= -go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a h1:R/qVym5WAxsZWQqZCwDY/8sdVKV1m1WgU4/S5IRQAzc= -golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/modules/go.mod b/modules/go.mod deleted file mode 100644 index 920e6c8dd..000000000 --- a/modules/go.mod +++ /dev/null @@ -1,13 +0,0 @@ -module go.mozilla.org/userplex/modules - -go 1.13 - -require ( - github.com/aws/aws-sdk-go v1.25.30 - github.com/sirupsen/logrus v1.4.2 - github.com/stretchr/testify v1.2.2 - go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe - go.mozilla.org/userplex/notifications v0.0.0 -) - -replace go.mozilla.org/userplex/notifications => ../notifications diff --git a/modules/go.sum b/modules/go.sum deleted file mode 100644 index b7be354cd..000000000 --- a/modules/go.sum +++ /dev/null @@ -1,32 +0,0 @@ -github.com/aws/aws-sdk-go v1.25.30 h1:I9qj6zW3mMfsg91e+GMSN/INcaX9tTFvr/l/BAHKaIY= -github.com/aws/aws-sdk-go v1.25.30/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -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/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -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/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -go.mozilla.org/person-api v0.0.0-20191118190218-e4c5770d1104 h1:VV/SM793UltDg3HwR6MIbgDfUiHGLsRlXqWYrKahyjc= -go.mozilla.org/person-api v0.0.0-20191118190218-e4c5770d1104/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -go.mozilla.org/person-api v0.0.0-20191120210847-5e8f6374ee7e h1:8BhgZxXe2v7TZaGmjtrVu4GzrPcmwTR1GIW+W7gvHaI= -go.mozilla.org/person-api v0.0.0-20191120210847-5e8f6374ee7e/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe h1:SY8AtlmPXNc/tUapjxMqAHxRoMlTp7pLZvwzpdFOv3c= -go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a h1:R/qVym5WAxsZWQqZCwDY/8sdVKV1m1WgU4/S5IRQAzc= -golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/notifications/go.mod b/notifications/go.mod deleted file mode 100644 index d43ccb124..000000000 --- a/notifications/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module go.mozilla.org/userplex/notifications - -go 1.13 - -require ( - github.com/sirupsen/logrus v1.4.2 - go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe - golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a -) diff --git a/notifications/go.sum b/notifications/go.sum deleted file mode 100644 index 803dbaa3f..000000000 --- a/notifications/go.sum +++ /dev/null @@ -1,26 +0,0 @@ -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/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -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/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -go.mozilla.org/person-api v0.0.0-20191118190218-e4c5770d1104 h1:VV/SM793UltDg3HwR6MIbgDfUiHGLsRlXqWYrKahyjc= -go.mozilla.org/person-api v0.0.0-20191118190218-e4c5770d1104/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -go.mozilla.org/person-api v0.0.0-20191120210847-5e8f6374ee7e h1:8BhgZxXe2v7TZaGmjtrVu4GzrPcmwTR1GIW+W7gvHaI= -go.mozilla.org/person-api v0.0.0-20191120210847-5e8f6374ee7e/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe h1:SY8AtlmPXNc/tUapjxMqAHxRoMlTp7pLZvwzpdFOv3c= -go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a h1:R/qVym5WAxsZWQqZCwDY/8sdVKV1m1WgU4/S5IRQAzc= -golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/test.sh b/test.sh deleted file mode 100755 index 809f26f73..000000000 --- a/test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e - -go test -race -for d in $(cat go.mod | grep userplex | grep replace | awk '{print $2}'); do - go test -race $d -done