Merge pull request #36 from wandera/maintenance

Regular project maintenance
wandera · Jun 18, 2020 · 52fa798 · 52fa798
2 parents e931838 + 6a1e1c8
commit 52fa798
Show file tree

Hide file tree

Showing 20 changed files with 283 additions and 140 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-- 1.12.1
+- 1.14.3
 - master
 
 notifications:
@@ -64,7 +64,7 @@ before_deploy:
 deploy:
   provider: releases
   api_key:
-    secure: q+w7Sw9tDrqcVtkTXHSN/dVQlYmN9hceQ+YbPVEc4mKKAUkrIEsdeyvYEyJCwimyCpeMsY4DoIoBG6vBQR7NEVUBaX0xq8KoMB9H93vVKaBxFhHo1KfnzBXqbPCpqfzySX096MMZQWJjbv7pljkYSzREFJhFKln3Ij1DDpt0SeWsjbFdthc05LbRMQpv0K2GWSMY68603sLtBL2s1Xfc5K3XXdIl7Fe94G5NbnqsqWuSShqHYpS4/lZYzzbHvpavXnn2jyNFlhJeyMpojdvrytQu15DEds3FTxmD8tJ9cKcPYPlfQ4cvFIahdHw4t3FEgkpT1cgLpwJgNMSDiGy5pQi5IS/v0CXgXAHKv9UnKLN/pc19PwGCiXH7HkOcYFPWQfOLgm4KQ8Ufx8TISx3GXBi7bWEkmINO9/Zt2ZzCg+KFZmpDD5iQypAue6rs1CTT+59gsJAitNoT+h6YR8PCMbymlwUJ8K40/Fi56vPPJUXVrEei7u0nD2tuZLqR1j0brL5YpRAi/FQvx3DJXrBqwXQDYGI+ksU/qSMSgnyveqiTvobPd3vS5a3hGlFVTzNPcVVv85Ro0SjuwjR2mdUXk/qwwz1BmTfQDsOucs7IBUG6yJfP6vuYQWyXfikC+NJ4MRZ4RpXQWt7JRVpSV/F4aI0zjas5ClMPqYHVj5YYpXU=
+    secure: oTGw6aQhRfQOYs4k75uQPR2f0FPbDsrwJXll1JiCtDx1CyoTCAoVRSuBbntuifrhBGqp9kPdxwllHX5c4I0ApAQ+JnxnUUHCyUOJl9bM467Se5EB5sk78lWDZZTzedzoAr0lM0xHHk8FWZFveVgsy0BDXxFkdXZR+Dl1WJ45dJXHKXkHMtsKoWRebLYpXvBctt0MdMtX3f0Z2mUEZy3Ck9pD9zbOq9VGQoT38RUgjF71cDiUbOTd8oqdAw9CfJGfW1S/LZpZeZMWTt6bNNkXXElSyy9b/ACcBu3KpvSqvnZeL6pkTDxKhqZv7XjiCIW6c54fkwMJ80N51Ql9kl/PAsO3ISe8E7iRLNc4x7HZuaBJFfn+xxsJmlPacAV0gXL9OvBZHj2sA6jR6SrAnhIMZjvKV0dg+dzrhkc9Ab7r5V5ffkrGXoWtG8E8ewo+NzknQN7yDtu4i2B2Xzq1hzXv/UnONBMhOc7MWKA7LbCKLytnk864BQ+yu3KnakIf3ZEwzTIt3+evVpoRfrFRUyKa/9YxPeZ1IoNDMbjwu/wT1kvW/x9ZczPuy2EV8N5ceFD8jAo4CcWMu0IJVQCXPrHQ1BwSndxANs+XmgZigxBMEAGBh+WFLaYCP4Jt39SLNi/Sqh/pBUstcCNrwAzJUp0GMsZsNEi7BOYsbs0IL31oOuQ=
   file:
     - "scccmd-darwin-amd64.tgz"
     - "scccmd-freebsd-amd64.tgz"

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Builder image
-FROM golang:1.12.1 AS builder
+FROM golang:1.14.3 AS builder
 
 WORKDIR /build
 COPY go.mod go.sum ./
@@ -13,7 +13,7 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -v -ldflags '-w -s -X 'github.com/wandera/scccmd/cmd.Version=${CACHE_TAG}
 
 # Runtime image
-FROM alpine:3.8
+FROM alpine:3.12
 RUN apk --no-cache add ca-certificates
 
 COPY --from=builder /build/scccmd /app/scccmd

diff --git a/docs/scccmd.md b/docs/scccmd.md
@@ -11,7 +11,7 @@ Tool currently provides functionality to get (download) config file from server.
 
 ```
   -h, --help               help for scccmd
-      --log-level string   command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string   command log level (options: [panic fatal error warning info debug trace]) (default "info")
 ```
 
 ### SEE ALSO

diff --git a/docs/scccmd_decrypt.md b/docs/scccmd_decrypt.md
@@ -21,7 +21,7 @@ scccmd decrypt [flags]
 ### Options inherited from parent commands
 
 ```
-      --log-level string   command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string   command log level (options: [panic fatal error warning info debug trace]) (default "info")
 ```
 
 ### SEE ALSO

diff --git a/docs/scccmd_diff.md b/docs/scccmd_diff.md
@@ -21,7 +21,7 @@ Diff the config from the given config server
 ### Options inherited from parent commands
 
 ```
-      --log-level string   command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string   command log level (options: [panic fatal error warning info debug trace]) (default "info")
 ```
 
 ### SEE ALSO

diff --git a/docs/scccmd_diff_files.md b/docs/scccmd_diff_files.md
@@ -22,7 +22,7 @@ scccmd diff files [flags]
 ```
   -a, --application string      name of the application to get the config for
       --label string            configuration label (default "master")
-      --log-level string        command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string        command log level (options: [panic fatal error warning info debug trace]) (default "info")
       --profile string          configuration profile (default "default")
   -s, --source string           address of the config server
       --target-label string     second label to diff with

diff --git a/docs/scccmd_diff_values.md b/docs/scccmd_diff_values.md
@@ -22,7 +22,7 @@ scccmd diff values [flags]
 ```
   -a, --application string      name of the application to get the config for
       --label string            configuration label (default "master")
-      --log-level string        command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string        command log level (options: [panic fatal error warning info debug trace]) (default "info")
       --profile string          configuration profile (default "default")
   -s, --source string           address of the config server
       --target-label string     second label to diff with

diff --git a/docs/scccmd_encrypt.md b/docs/scccmd_encrypt.md
@@ -21,7 +21,7 @@ scccmd encrypt [flags]
 ### Options inherited from parent commands
 
 ```
-      --log-level string   command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string   command log level (options: [panic fatal error warning info debug trace]) (default "info")
 ```
 
 ### SEE ALSO

diff --git a/docs/scccmd_gendoc.md b/docs/scccmd_gendoc.md
@@ -20,7 +20,7 @@ scccmd gendoc [flags]
 ### Options inherited from parent commands
 
 ```
-      --log-level string   command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string   command log level (options: [panic fatal error warning info debug trace]) (default "info")
 ```
 
 ### SEE ALSO

diff --git a/docs/scccmd_get.md b/docs/scccmd_get.md
@@ -19,7 +19,7 @@ Get the config from the given config server
 ### Options inherited from parent commands
 
 ```
-      --log-level string   command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string   command log level (options: [panic fatal error warning info debug trace]) (default "info")
 ```
 
 ### SEE ALSO

diff --git a/docs/scccmd_get_files.md b/docs/scccmd_get_files.md
@@ -22,7 +22,7 @@ scccmd get files [flags]
 ```
   -a, --application string   name of the application to get the config for
   -l, --label string         configuration label (default "master")
-      --log-level string     command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string     command log level (options: [panic fatal error warning info debug trace]) (default "info")
   -p, --profile string       configuration profile (default "default")
   -s, --source string        address of the config server
 ```

diff --git a/docs/scccmd_get_values.md b/docs/scccmd_get_values.md
@@ -23,7 +23,7 @@ scccmd get values [flags]
 ```
   -a, --application string   name of the application to get the config for
   -l, --label string         configuration label (default "master")
-      --log-level string     command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string     command log level (options: [panic fatal error warning info debug trace]) (default "info")
   -p, --profile string       configuration profile (default "default")
   -s, --source string        address of the config server
 ```

diff --git a/docs/scccmd_version.md b/docs/scccmd_version.md
@@ -19,7 +19,7 @@ scccmd version [flags]
 ### Options inherited from parent commands
 
 ```
-      --log-level string   command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string   command log level (options: [panic fatal error warning info debug trace]) (default "info")
 ```
 
 ### SEE ALSO

diff --git a/docs/scccmd_webhook.md b/docs/scccmd_webhook.md
@@ -23,7 +23,7 @@ scccmd webhook [flags]
 ### Options inherited from parent commands
 
 ```
-      --log-level string   command log level (options: [panic fatal error warning info debug]) (default "info")
+      --log-level string   command log level (options: [panic fatal error warning info debug trace]) (default "info")
 ```
 
 ### SEE ALSO

diff --git a/go.mod b/go.mod
@@ -1,26 +1,19 @@
 module github.com/wandera/scccmd
 
+go 1.14
+
 require (
-	github.com/cpuguy83/go-md2man v1.0.8 // indirect
-	github.com/dimiro1/health v0.0.0-20170102175817-22672c488556
-	github.com/ghodss/yaml v1.0.0
-	github.com/golang/protobuf v1.3.2 // indirect
-	github.com/google/go-cmp v0.3.1 // indirect
-	github.com/howeyc/fsnotify v0.9.0
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/onsi/gomega v1.5.0
+	github.com/dimiro1/health v0.0.0-20191019130555-c5cbb4d46ffc
+	github.com/fsnotify/fsnotify v1.4.9
+	github.com/go-resty/resty/v2 v2.3.0
+	github.com/onsi/gomega v1.10.1
 	github.com/pmezard/go-difflib v1.0.0
-	github.com/russross/blackfriday v1.5.1 // indirect
-	github.com/sirupsen/logrus v1.0.6
-	github.com/spf13/cobra v0.0.2
-	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
-	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 // indirect
-	golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
-	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
-	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/resty.v1 v1.11.0
-	gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api v0.0.0-20190813220812-4c9d9526570f
-	k8s.io/apimachinery v0.0.0-20190813235223-d2c4b5819cd0
+	github.com/sirupsen/logrus v1.6.0
+	github.com/spf13/cobra v1.0.0
+	golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
+	golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 // indirect
+	golang.org/x/text v0.3.3 // indirect
+	gopkg.in/yaml.v2 v2.3.0
+	k8s.io/api v0.17.3
+	k8s.io/apimachinery v0.17.3
 )