From 0599ba0985812c8dda9360ea68bc264fa0b7d06e Mon Sep 17 00:00:00 2001 From: takamoto Date: Wed, 25 Mar 2020 12:40:56 +0900 Subject: [PATCH 1/2] Modify dimensions value parser, and Use urfave/cli version 1. --- lib/utils.go | 2 +- main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utils.go b/lib/utils.go index 78ffe59..5650f1e 100644 --- a/lib/utils.go +++ b/lib/utils.go @@ -77,7 +77,7 @@ func BuildParams(input BuildParamsInput) *cloudwatch.GetMetricStatisticsInput { s[i] = &cloudwatch.Dimension{ Name: aws.String(splitted[0]), - Value: aws.String(splitted[1]), + Value: aws.String(strings.Join(splitted[1:], ":")), } } diff --git a/main.go b/main.go index 9c2c553..4403393 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/y13i/metrin/lib" - "github.com/urfave/cli" + "gopkg.in/urfave/cli.v1" ) const ( From 6e6a6a7e541919c9c73c19a6d66228ca8096d227 Mon Sep 17 00:00:00 2001 From: takamoto Date: Fri, 27 Mar 2020 17:53:24 +0900 Subject: [PATCH 2/2] Modify dimensions value parser, and Use Go Modules. --- .travis.yml | 7 ++----- Gomfile | 2 -- go.mod | 9 +++++++++ go.sum | 34 ++++++++++++++++++++++++++++++++++ main.go | 2 +- 5 files changed, 46 insertions(+), 8 deletions(-) delete mode 100644 Gomfile create mode 100644 go.mod create mode 100644 go.sum diff --git a/.travis.yml b/.travis.yml index ed8a7d0..5c31096 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,8 @@ language: go go: -- '1.7' +- '1.12' env: -- PATH=/home/travis/gopath/bin:$PATH -install: -- go get github.com/mattn/gom -- gom install +- PATH=/home/travis/gopath/bin:$PATH GO111MODULE=on script: go test before_deploy: - go get -v github.com/mitchellh/gox diff --git a/Gomfile b/Gomfile deleted file mode 100644 index 83abbd5..0000000 --- a/Gomfile +++ /dev/null @@ -1,2 +0,0 @@ -gom 'github.com/urfave/cli', :tag => 'v1.19.1' -gom 'github.com/aws/aws-sdk-go', :tag => 'v1.5.13' diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..744164c --- /dev/null +++ b/go.mod @@ -0,0 +1,9 @@ +module github.com/dtakamoto/metrin + +go 1.12 + +require ( + github.com/aws/aws-sdk-go v1.29.33 + github.com/urfave/cli v1.22.3 + github.com/y13i/metrin v0.0.6 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..f5c1aff --- /dev/null +++ b/go.sum @@ -0,0 +1,34 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/aws/aws-sdk-go v1.29.33 h1:WP85+WHalTFQR2wYp5xR2sjiVAZXew2bBQXGU1QJBXI= +github.com/aws/aws-sdk-go v1.29.33/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +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.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +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/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +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/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/urfave/cli v1.22.3 h1:FpNT6zq26xNpHZy08emi755QwzLPs6Pukqjlc7RfOMU= +github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/y13i/metrin v0.0.6 h1:X3IU582dduUODY0CGnH2bypfM8Eg3PE3fXMfChhJrV4= +github.com/y13i/metrin v0.0.6/go.mod h1:MOKQErd2mVQq1ErOuQDoEOSs1hTa98osBlwTwJka5hQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +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= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index 4403393..9c2c553 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/y13i/metrin/lib" - "gopkg.in/urfave/cli.v1" + "github.com/urfave/cli" ) const (