From 0d63b5d74516f924d8f98f7374569282f3215184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@hedenstroem.com>
Date: Mon, 30 Mar 2020 18:03:59 +0200
Subject: [PATCH] Improved app structure
---
.gitignore | 1 +
.gitlab-ci.yml | 51 +++++++++++++++
cmd/attachment.go | 37 +++++++++++
cmd/root.go | 37 +++++++++++
cmd/send.go | 41 ++++++++++++
cmd/version.go | 21 ++++++
constant/version.go | 6 ++
go.mod | 9 +++
go.sum | 152 ++++++++++++++++++++++++++++++++++++++++++++
main.go | 74 +++++++--------------
slack/slack.go | 92 +++++++++++++++++++++++++++
11 files changed, 469 insertions(+), 52 deletions(-)
create mode 100644 .gitlab-ci.yml
create mode 100644 cmd/attachment.go
create mode 100644 cmd/root.go
create mode 100644 cmd/send.go
create mode 100644 cmd/version.go
create mode 100644 constant/version.go
create mode 100644 go.mod
create mode 100644 go.sum
create mode 100644 slack/slack.go
diff --git a/.gitignore b/.gitignore
index 3fffa41..3708fbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@ _testmain.go
*.test
*.prof
+.env
slackcli
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..02670c6
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,51 @@
+image: gcr.io/hedenstroem-docker/gitlab-builder-base
+
+before_script:
+ - export GOPATH=${CI_PROJECT_DIR}/.cache
+
+stages:
+ - build
+ - upload
+ - deps
+
+.build: &build
+ image: gcr.io/hedenstroem-docker/gitlab-builder-go:1.14
+ stage: build
+ only:
+ - master
+ - /^\d+[.]\d+[.]\d+$/
+ cache:
+ key: build
+ paths:
+ - .cache
+ script:
+ - go generate constant/version.go
+ - GOOS=${CI_JOB_NAME%%-*} GOARCH=${CI_JOB_NAME#*-} CGO_ENABLED=0 go build -tags netgo --ldflags '-extldflags "-static"' -o $CI_PROJECT_NAME-$CI_JOB_NAME
+ artifacts:
+ name: "$CI_PROJECT_NAME-$CI_JOB_NAME"
+ paths:
+ - $CI_PROJECT_NAME-$CI_JOB_NAME
+
+upload to s3:
+ stage: upload
+ only:
+ - /^\d+[.]\d+[.]\d+$/
+ script:
+ - git describe --tags --long > $CI_PROJECT_NAME-version.txt
+ - eval $(vaultenv read -s secret/gitlab-ci/s3)
+ - aws s3 cp . s3://s3.hedenstroem.com/utils/$CI_PROJECT_NAME/ --recursive --exclude="*" --include="$CI_PROJECT_NAME-*"
+ - aws configure set preview.cloudfront true
+ - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/utils/$CI_PROJECT_NAME/*"
+
+gitlab-builder-base:
+ stage: deps
+ only:
+ - /^\d+[.]\d+[.]\d+$/
+ trigger: google-cloud/cloud-build/gitlab-builder-base
+
+"darwin-amd64": *build
+"linux-arm": *build
+"linux-386": *build
+"linux-amd64": *build
+"windows-386": *build
+"windows-amd64": *build
diff --git a/cmd/attachment.go b/cmd/attachment.go
new file mode 100644
index 0000000..da9599a
--- /dev/null
+++ b/cmd/attachment.go
@@ -0,0 +1,37 @@
+package cmd
+
+import (
+ "strings"
+
+ "github.com/spf13/cobra"
+ "gitlab.hedenstroem.com/go/slackcli/slack"
+)
+
+var (
+ attachment1 slack.Attachment
+ attachments []string
+ fallback string
+)
+
+var attachmentCmd = &cobra.Command{
+ Use: "attachment",
+ Short: "attachment Short",
+ Long: `attachment Long`,
+ PersistentPreRun: func(cmd *cobra.Command, args []string) {
+ cmd.Parent().PersistentPreRun(cmd, args)
+ attachment1 := slack.Attachment{}
+ for _, attach := range attachments {
+ parts := strings.Split(attach, "=")
+ attachment1.AddField(slack.Field{Title: parts[0], Value: parts[1]})
+ }
+ payload.Attachments = []slack.Attachment{attachment1}
+ },
+ RunE: func(cmd *cobra.Command, args []string) error {
+ return slack.Send(payload)
+ },
+}
+
+func init() {
+ sendCmd.AddCommand(attachmentCmd)
+ attachmentCmd.PersistentFlags().StringArrayVarP(&attachments, "field", "f", []string{}, "Attachment field (name=value)")
+}
diff --git a/cmd/root.go b/cmd/root.go
new file mode 100644
index 0000000..bc4fddb
--- /dev/null
+++ b/cmd/root.go
@@ -0,0 +1,37 @@
+package cmd
+
+import (
+ "fmt"
+ "os"
+
+ "github.com/joho/godotenv"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
+)
+
+var RootCmd = &cobra.Command{
+ Use: "slackcli",
+ Short: "Util to send messages to Slack",
+ Long: ``,
+}
+
+func Execute() {
+ if err := RootCmd.Execute(); err != nil {
+ fmt.Println(err)
+ os.Exit(-1)
+ }
+}
+
+func init() {
+ cobra.OnInitialize(initEnv)
+ RootCmd.PersistentFlags().StringP("url", "u", "", "Slack Webhook URL")
+ RootCmd.PersistentFlags().Bool("dryrun", false, "Do not send request to url")
+ viper.SetEnvPrefix("SLACK")
+ viper.BindPFlag("DEBUG", RootCmd.PersistentFlags().Lookup("dryrun"))
+ viper.BindPFlag("WEBHOOK_URL", RootCmd.PersistentFlags().Lookup("url"))
+}
+
+func initEnv() {
+ _ = godotenv.Load(".env")
+ viper.AutomaticEnv()
+}
diff --git a/cmd/send.go b/cmd/send.go
new file mode 100644
index 0000000..efd0198
--- /dev/null
+++ b/cmd/send.go
@@ -0,0 +1,41 @@
+package cmd
+
+import (
+ "github.com/spf13/cobra"
+ "gitlab.hedenstroem.com/go/slackcli/slack"
+)
+
+var (
+ username string
+ channel string
+ text string
+ iconemoji string
+
+ payload slack.Payload
+)
+
+var sendCmd = &cobra.Command{
+ Use: "send [flags]",
+ Short: "send Short",
+ Long: `send Long`,
+ PersistentPreRun: func(cmd *cobra.Command, args []string) {
+ payload = slack.Payload{
+ Username: username,
+ Channel: channel,
+ Text: text,
+ IconEmoji: iconemoji,
+ }
+ },
+ RunE: func(cmd *cobra.Command, args []string) error {
+ return slack.Send(payload)
+ },
+}
+
+func init() {
+ RootCmd.AddCommand(sendCmd)
+ sendCmd.PersistentFlags().StringVarP(&username, "name", "n", "slackcli", "Displayed name")
+ sendCmd.PersistentFlags().StringVarP(&channel, "channel", "c", "#general", "Channel to post to")
+ sendCmd.PersistentFlags().StringVarP(&text, "message", "m", "", "Message contents")
+ sendCmd.PersistentFlags().StringVarP(&iconemoji, "icon", "i", ":monkey_face:", "Emoji for icon")
+ sendCmd.MarkPersistentFlagRequired("message")
+}
diff --git a/cmd/version.go b/cmd/version.go
new file mode 100644
index 0000000..d2558f5
--- /dev/null
+++ b/cmd/version.go
@@ -0,0 +1,21 @@
+package cmd
+
+import (
+ "fmt"
+
+ "github.com/spf13/cobra"
+ "gitlab.hedenstroem.com/go/slackcli/constant"
+)
+
+var versionCmd = &cobra.Command{
+ Use: "version",
+ Short: "version Short",
+ Long: `version Long`,
+ Run: func(cmd *cobra.Command, args []string) {
+ fmt.Printf("Version: %s\n", constant.Version)
+ },
+}
+
+func init() {
+ RootCmd.AddCommand(versionCmd)
+}
diff --git a/constant/version.go b/constant/version.go
new file mode 100644
index 0000000..8befc95
--- /dev/null
+++ b/constant/version.go
@@ -0,0 +1,6 @@
+//go:generate sh -c "sed -i \"s/const Version = \\\".*\\\"/const Version = \\\"`git describe --tags --long`\\\"/\" version.go"
+
+package constant
+
+// Version git version number
+const Version = ""
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..41e054b
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,9 @@
+module gitlab.hedenstroem.com/go/slackcli
+
+go 1.14
+
+require (
+ github.com/joho/godotenv v1.3.0
+ github.com/spf13/cobra v0.0.7
+ github.com/spf13/viper v1.6.2
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..f191e11
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,152 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+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/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+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/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+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/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+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.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU=
+github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
+github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
+github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E=
+github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
+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/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/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-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+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/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/main.go b/main.go
index dc1566c..786963c 100644
--- a/main.go
+++ b/main.go
@@ -1,57 +1,27 @@
-package main
-
-import (
- "fmt"
- "github.com/ashwanthkumar/slack-go-webhook"
- "github.com/spf13/cobra"
- "os"
- "strings"
-)
+// Copyright © 2016 Erik Hedenström <erik@hedenstroem.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
-var (
- username string
- channel string
- iconemoji string
- attachments []string
- args []string
-)
+package main
-var RootCmd = &cobra.Command{
- Use: "slackcli",
- Short: "Small CLI util to send messages to slack",
- Long: ``,
- Run: func(cmd *cobra.Command, _args []string) {
- args = _args
- },
-}
+import "gitlab.hedenstroem.com/go/slackcli/cmd"
func main() {
- webhookUrl := os.Getenv("SLACK_WEBHOOK")
-
- RootCmd.Flags().StringVar(&username, "username", "slackcli", "Name of bot")
- RootCmd.Flags().StringVar(&channel, "channel", "#general", "Channel to post to")
- RootCmd.Flags().StringVar(&iconemoji, "iconemoji", ":monkey_face:", "Emoji for icon")
- RootCmd.Flags().StringArrayVar(&attachments, "attachment", []string{}, "title=value")
- RootCmd.Execute()
-
- if len(args) > 0 {
- attachment1 := slack.Attachment{}
- for _, attach := range attachments {
- parts := strings.Split(attach, "=")
- attachment1.AddField(slack.Field{Title: parts[0], Value: parts[1] })
- }
- payload := slack.Payload{
- Text: strings.Join(args, " "),
- Username: username,
- Channel: channel,
- IconEmoji: iconemoji,
- Attachments: []slack.Attachment{attachment1},
- }
- err := slack.Send(webhookUrl, "", payload)
- if len(err) > 0 {
- fmt.Printf("error: %s\n", err)
- }
- }
-
-
+ cmd.Execute()
}
diff --git a/slack/slack.go b/slack/slack.go
new file mode 100644
index 0000000..5e0a762
--- /dev/null
+++ b/slack/slack.go
@@ -0,0 +1,92 @@
+package slack
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "net/http"
+
+ "github.com/spf13/viper"
+)
+
+type Field struct {
+ Title string `json:"title,omitempty"`
+ Value string `json:"value,omitempty"`
+ Short bool `json:"short,omitempty"`
+}
+
+type Action struct {
+ Type string `json:"type,omitempty"`
+ Text string `json:"text,omitempty"`
+ URL string `json:"url,omitempty"`
+ Style string `json:"style,omitempty"`
+}
+
+type Attachment struct {
+ Fallback *string `json:"fallback,omitempty"`
+ Color *string `json:"color,omitempty"`
+ PreText *string `json:"pretext,omitempty"`
+ AuthorName *string `json:"author_name,omitempty"`
+ AuthorLink *string `json:"author_link,omitempty"`
+ AuthorIcon *string `json:"author_icon,omitempty"`
+ Title *string `json:"title,omitempty"`
+ TitleLink *string `json:"title_link,omitempty"`
+ Text *string `json:"text,omitempty"`
+ ImageURL *string `json:"image_url,omitempty"`
+ Fields []*Field `json:"fields,omitempty"`
+ Footer *string `json:"footer,omitempty"`
+ FooterIcon *string `json:"footer_icon,omitempty"`
+ Timestamp *int64 `json:"ts,omitempty"`
+ MarkdownIn *[]string `json:"mrkdwn_in,omitempty"`
+ Actions []*Action `json:"actions,omitempty"`
+ CallbackID *string `json:"callback_id,omitempty"`
+ ThumbnailURL *string `json:"thumb_urld,omitempty"`
+}
+
+type Payload struct {
+ Parse string `json:"parse,omitempty"`
+ Username string `json:"username,omitempty"`
+ IconURL string `json:"icon_url,omitempty"`
+ IconEmoji string `json:"icon_emoji,omitempty"`
+ Channel string `json:"channel,omitempty"`
+ Text string `json:"text,omitempty"`
+ LinkNames string `json:"link_names,omitempty"`
+ Attachments []Attachment `json:"attachments,omitempty"`
+ UnfurlLinks bool `json:"unfurl_links,omitempty"`
+ UnfurlMedia bool `json:"unfurl_media,omitempty"`
+ Markdown bool `json:"mrkdwn,omitempty"`
+}
+
+func (attachment *Attachment) AddField(field Field) *Attachment {
+ attachment.Fields = append(attachment.Fields, &field)
+ return attachment
+}
+
+func (attachment *Attachment) AddAction(action Action) *Attachment {
+ attachment.Actions = append(attachment.Actions, &action)
+ return attachment
+}
+
+func Send(payload Payload) error {
+ debug := viper.GetBool("DEBUG")
+ url := viper.GetString("WEBHOOK_URL")
+
+ json, err := json.MarshalIndent(payload, "", " ")
+ if err != nil {
+ return err
+ }
+
+ if debug {
+ fmt.Printf("%s\n%s\n", url, string(json))
+ } else {
+ resp, err := http.Post(url, "application/json", bytes.NewBuffer(json))
+ if err != nil {
+ return err
+ }
+ if resp.StatusCode >= 400 {
+ return fmt.Errorf("Error sending msg. Status: %v", resp.Status)
+ }
+ }
+
+ return nil
+}
--
GitLab