Changing all reference to netsage fork of the SDK

esnet · Apr 15, 2021 · a1b38c1 · a1b38c1
1 parent ea195dc
commit a1b38c1
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -9,7 +9,7 @@ before:
 builds:
   - env:
       - CGO_ENABLED=0
-    ldflags: -X github.com/esnet/grafana-dashboard-manager/version.GitCommit={{ .Commit }} -X github.com/esnet/grafana-dashboard-manager/version.BuildDate={{ .Date }}
+    ldflags: -X github.com/netsage-project/grafana-dashboard-manager/version.GitCommit={{ .Commit }} -X github.com/netsage-project/grafana-dashboard-manager/version.BuildDate={{ .Date }}  -X github.com/netsage-project/grafana-dashboard-manager/version.Version={{ .Tag }} 
     goos:
       - linux
       - windows

diff --git a/api/dashboards.go b/api/dashboards.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/grafana-tools/sdk"
 	"github.com/netsage-project/grafana-dashboard-manager/config"
 	"github.com/netsage-project/grafana-dashboard-manager/log"
+	"github.com/netsage-project/sdk"
 	"github.com/thoas/go-funk"
 )
 

diff --git a/api/datasources.go b/api/datasources.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/gosimple/slug"
-	"github.com/grafana-tools/sdk"
 	"github.com/netsage-project/grafana-dashboard-manager/config"
+	"github.com/netsage-project/sdk"
 )
 
 //ListDataSources: list all the currently configured datasources

diff --git a/api/login.go b/api/login.go
@@ -3,8 +3,8 @@ package api
 import (
 	"fmt"
 
-	"github.com/grafana-tools/sdk"
 	"github.com/netsage-project/grafana-dashboard-manager/config"
+	"github.com/netsage-project/sdk"
 )
 
 //Login: Logs into grafana returning a client instance using Token or Basic Auth

diff --git a/cmd/root.go b/cmd/root.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jedib0t/go-pretty/table"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/grafana-tools/sdk"
 	"github.com/netsage-project/grafana-dashboard-manager/api"
 	"github.com/netsage-project/grafana-dashboard-manager/config"
+	"github.com/netsage-project/sdk"
 	"github.com/spf13/cobra"
 )
 

diff --git a/go.mod b/go.mod
@@ -7,10 +7,10 @@ require (
 	github.com/go-openapi/errors v0.20.0 // indirect
 	github.com/go-openapi/strfmt v0.20.1 // indirect
 	github.com/gosimple/slug v1.1.1
-	github.com/grafana-tools/sdk v0.0.0-20210402150123-f7c763c3738c
 	github.com/jedib0t/go-pretty v4.3.0+incompatible
 	github.com/mattn/go-runewidth v0.0.12 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/netsage-project/sdk v0.1.1
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.0.0
@@ -21,5 +21,3 @@ require (
 	gopkg.in/yaml.v2 v2.2.8
 
 )
-
-replace github.com/grafana-tools/sdk v0.0.0-20210402150123-f7c763c3738c => github.com/safaci2000/sdk v0.1.0
diff --git a/go.sum b/go.sum
@@ -210,6 +210,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/netsage-project/sdk v0.1.1 h1:sAcU9vbPFIuIxCPitbaxWUcOHtZwrsyqpRg35sLaiyo=
+github.com/netsage-project/sdk v0.1.1/go.mod h1:iy77EUF+8OUeMvVPrBzotknVWjwZ+gNURyeMEQNq8KA=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
@@ -245,8 +247,6 @@ github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/safaci2000/sdk v0.1.0 h1:g8VQbRUlc3Tcd7Wev1QXfRTTqMFhXIXcBTlACecBopQ=
-github.com/safaci2000/sdk v0.1.0/go.mod h1:uby+6hPUCRVNG/iAZKCOlaq5YhyK0oKMRke+FDesZdw=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 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=
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ before: @@
     builds:
       - env:
           - CGO_ENABLED=0
-        ldflags: -X github.com/esnet/grafana-dashboard-manager/version.GitCommit={{ .Commit }} -X github.com/esnet/grafana-dashboard-manager/version.BuildDate={{ .Date }}
+        ldflags: -X github.com/netsage-project/grafana-dashboard-manager/version.GitCommit={{ .Commit }} -X github.com/netsage-project/grafana-dashboard-manager/version.BuildDate={{ .Date }}  -X github.com/netsage-project/grafana-dashboard-manager/version.Version={{ .Tag }}
         goos:
           - linux
           - windows
@@ Expand Down @@