From e69b5f89ce9b3d94d05c70504390fc0fb784ab70 Mon Sep 17 00:00:00 2001 From: Hassansin Date: Fri, 30 Jul 2021 15:52:15 +0600 Subject: [PATCH] Update v2 Readme [ch32651] (#46) * Update readme & other references * Run GH actions on v2 branch * Fix CC report generation * Added go 1.6 in build matrix --- .github/workflows/test.yml | 8 +++---- README.md | 8 +++---- genmocks.sh | 2 +- mock_chartmogul/chartmogul.go | 39 ++++++++++++++++++++++++++++++----- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8007b54..a437292 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,15 +1,15 @@ name: Run specs and generate Code Climate report on: push: - branches: [ main ] + branches: [ main, v2 ] pull_request: - branches: [ main ] + branches: [ main, v2 ] jobs: test: runs-on: ubuntu-latest strategy: matrix: - go-versions: ['1.11', '1.12', '1.13', '1.14'] + go-versions: ['1.11', '1.12', '1.13', '1.14', '1.16' ] steps: - uses: actions/checkout@v2 @@ -58,7 +58,7 @@ jobs: echo "mode: set" > c.out grep -h -v "^mode:" ./*.cover >> c.out rm -f *.cover - sed -i 's#^github.com/chartmogul/chartmogul-go/##g' c.out + sed -i 's#^github.com/chartmogul/chartmogul-go/v2/##g' c.out - name: Send Report to Code Climate env: diff --git a/README.md b/README.md index 544692b..fb1b174 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

chartmogul-go provides convenient Golang bindings for ChartMogul's API.

- Build Status + Build Status

@@ -26,7 +26,7 @@

-[![GoDoc](https://godoc.org/github.com/golang/gddo?status.svg)](http://godoc.org/github.com/chartmogul/chartmogul-go) +[![Go Reference](https://pkg.go.dev/badge/github.com/chartmogul/chartmogul-go/v2.svg)](https://pkg.go.dev/github.com/chartmogul/chartmogul-go/v2) [![Go Report Card](https://goreportcard.com/badge/github.com/chartmogul/chartmogul-go)](https://goreportcard.com/report/github.com/chartmogul/chartmogul-go) ## Installation @@ -34,7 +34,7 @@ This library requires Go 1.11 or above. ```sh -go get github.com/chartmogul/chartmogul-go +go get github.com/chartmogul/chartmogul-go/v2 ``` ## Configuration @@ -42,7 +42,7 @@ go get github.com/chartmogul/chartmogul-go First create the `API` struct by passing your account token and secret key, available from the administration section of your ChartMogul account. ```go -import cm "github.com/chartmogul/chartmogul-go" +import cm "github.com/chartmogul/chartmogul-go/v2" api := cm.API{ AccountToken: os.Getenv("CHARTMOGUL_ACCOUNT_TOKEN"), diff --git a/genmocks.sh b/genmocks.sh index de252b1..ef78f23 100755 --- a/genmocks.sh +++ b/genmocks.sh @@ -1,2 +1,2 @@ #!/bin/bash -mkdir -p mock_chartmogul ; mockgen github.com/chartmogul/chartmogul-go IApi > mock_chartmogul/chartmogul.go +mkdir -p mock_chartmogul ; mockgen github.com/chartmogul/chartmogul-go/v2 IApi > mock_chartmogul/chartmogul.go diff --git a/mock_chartmogul/chartmogul.go b/mock_chartmogul/chartmogul.go index 2754892..d959853 100644 --- a/mock_chartmogul/chartmogul.go +++ b/mock_chartmogul/chartmogul.go @@ -1,14 +1,13 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/chartmogul/chartmogul-go (interfaces: IApi) +// Source: github.com/chartmogul/chartmogul-go/v2 (interfaces: IApi) -// Package mock_chartmogul_go is a generated GoMock package. -package mock_chartmogul_go +// Package mock_v2 is a generated GoMock package. +package mock_v2 import ( - reflect "reflect" - chartmogul "github.com/chartmogul/chartmogul-go/v2" gomock "github.com/golang/mock/gomock" + reflect "reflect" ) // MockIApi is a mock of IApi interface @@ -475,6 +474,21 @@ func (mr *MockIApiMockRecorder) MergeCustomers(arg0 interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MergeCustomers", reflect.TypeOf((*MockIApi)(nil).MergeCustomers), arg0) } +// MetricsCreateActivitiesExport mocks base method +func (m *MockIApi) MetricsCreateActivitiesExport(arg0 *chartmogul.CreateMetricsActivitiesExportParam) (*chartmogul.MetricsActivitiesExport, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "MetricsCreateActivitiesExport", arg0) + ret0, _ := ret[0].(*chartmogul.MetricsActivitiesExport) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// MetricsCreateActivitiesExport indicates an expected call of MetricsCreateActivitiesExport +func (mr *MockIApiMockRecorder) MetricsCreateActivitiesExport(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MetricsCreateActivitiesExport", reflect.TypeOf((*MockIApi)(nil).MetricsCreateActivitiesExport), arg0) +} + // MetricsListActivities mocks base method func (m *MockIApi) MetricsListActivities(arg0 *chartmogul.MetricsListActivitiesParams) (*chartmogul.MetricsActivities, error) { m.ctrl.T.Helper() @@ -565,6 +579,21 @@ func (mr *MockIApiMockRecorder) MetricsRetrieveASP(arg0 interface{}) *gomock.Cal return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MetricsRetrieveASP", reflect.TypeOf((*MockIApi)(nil).MetricsRetrieveASP), arg0) } +// MetricsRetrieveActivitiesExport mocks base method +func (m *MockIApi) MetricsRetrieveActivitiesExport(arg0 string) (*chartmogul.MetricsActivitiesExport, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "MetricsRetrieveActivitiesExport", arg0) + ret0, _ := ret[0].(*chartmogul.MetricsActivitiesExport) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// MetricsRetrieveActivitiesExport indicates an expected call of MetricsRetrieveActivitiesExport +func (mr *MockIApiMockRecorder) MetricsRetrieveActivitiesExport(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MetricsRetrieveActivitiesExport", reflect.TypeOf((*MockIApi)(nil).MetricsRetrieveActivitiesExport), arg0) +} + // MetricsRetrieveAll mocks base method func (m *MockIApi) MetricsRetrieveAll(arg0 *chartmogul.MetricsFilter) (*chartmogul.MetricsResult, error) { m.ctrl.T.Helper()