Merge pull request #21 from grafana/cedwards/update-imports

Update imports to use grafana/carbonapi

Author: carrieedwards

.deepsource.toml

@@ -12,5 +12,5 @@ name = "go"
 enabled = true
 
   [analyzers.meta]
-  import_path = "github.com/go-graphite/carbonapi"
+  import_path = "github.com/grafana/carbonapi"
   dependencies_vendored = true

Dockerfile

@@ -1,8 +1,8 @@
 FROM golang:alpine as builder
 
-LABEL org.opencontainers.image.source https://github.com/go-graphite/carbonapi
+LABEL org.opencontainers.image.source https://github.com/grafana/carbonapi
 
-WORKDIR /go/src/github.com/go-graphite/carbonapi
+WORKDIR /go/src/github.com/grafana/carbonapi
 
 COPY . .
 
@@ -11,12 +11,12 @@ RUN make && make test
 
 # If you have "Operation not permitted" errors, please refer to https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
 # TLDR; Either update docker/moby and libseccomp or switch to alpine:3.13 (builder needs to be switched to 1.16-alpine3.13 as well).
-# See https://github.com/go-graphite/carbonapi/issues/639#issuecomment-896570456 for detailed information
+# See https://github.com/grafana/carbonapi/issues/639#issuecomment-896570456 for detailed information
 FROM alpine:latest
 
 RUN apk --no-cache add ca-certificates cairo
 WORKDIR /
 
-COPY --from=builder /go/src/github.com/go-graphite/carbonapi/carbonapi ./usr/bin/carbonapi
+COPY --from=builder /go/src/github.com/grafana/carbonapi/carbonapi ./usr/bin/carbonapi
 
 CMD ["carbonapi", "-config", "/etc/carbonapi.yml"]

Makefile

@@ -7,9 +7,9 @@ VERSION ?= $(shell git describe --abbrev=4 --dirty --always --tags)
 
 GO ?= go
 
-PKG_CARBONAPI=github.com/go-graphite/carbonapi/cmd/carbonapi
-PKG_MOCKBACKEND=github.com/go-graphite/carbonapi/cmd/mockbackend
-PKG_CARBONZIPPER=github.com/go-graphite/carbonapi/cmd/carbonzipper
+PKG_CARBONAPI=github.com/grafana/carbonapi/cmd/carbonapi
+PKG_MOCKBACKEND=github.com/grafana/carbonapi/cmd/mockbackend
+PKG_CARBONZIPPER=github.com/grafana/carbonapi/cmd/carbonzipper
 
 carbonapi: $(shell find . -name '*.go' | grep -v 'vendor')
 	PKG_CONFIG_PATH="$(EXTRA_PKG_CONFIG_PATH)" GO111MODULE=on $(GO) build -mod=vendor -v -tags cairo -ldflags '-X main.BuildVersion=$(VERSION)' $(PKG_CARBONAPI)

cmd/carbonapi/config/config.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/go-graphite/carbonapi/cache"
-	"github.com/go-graphite/carbonapi/cmd/carbonapi/interfaces"
-	"github.com/go-graphite/carbonapi/limiter"
-	zipperCfg "github.com/go-graphite/carbonapi/zipper/config"
-	zipperTypes "github.com/go-graphite/carbonapi/zipper/types"
+	"github.com/grafana/carbonapi/cache"
+	"github.com/grafana/carbonapi/cmd/carbonapi/interfaces"
+	"github.com/grafana/carbonapi/limiter"
+	zipperCfg "github.com/grafana/carbonapi/zipper/config"
+	zipperTypes "github.com/grafana/carbonapi/zipper/types"
 
 	"github.com/lomik/zapwriter"
 )

cmd/carbonapi/config/init.go

@@ -12,18 +12,18 @@ import (
 	"time"
 	"unicode"
 
-	zipperConfig "github.com/go-graphite/carbonapi/zipper/config"
+	zipperConfig "github.com/grafana/carbonapi/zipper/config"
 
 	"github.com/ansel1/merry"
 	"github.com/facebookgo/pidfile"
-	"github.com/go-graphite/carbonapi/cache"
-	"github.com/go-graphite/carbonapi/expr/functions"
-	"github.com/go-graphite/carbonapi/expr/functions/cairo/png"
-	"github.com/go-graphite/carbonapi/expr/helper"
-	"github.com/go-graphite/carbonapi/expr/rewrite"
-	"github.com/go-graphite/carbonapi/limiter"
-	"github.com/go-graphite/carbonapi/pkg/parser"
-	zipperTypes "github.com/go-graphite/carbonapi/zipper/types"
+	"github.com/grafana/carbonapi/cache"
+	"github.com/grafana/carbonapi/expr/functions"
+	"github.com/grafana/carbonapi/expr/functions/cairo/png"
+	"github.com/grafana/carbonapi/expr/helper"
+	"github.com/grafana/carbonapi/expr/rewrite"
+	"github.com/grafana/carbonapi/limiter"
+	"github.com/grafana/carbonapi/pkg/parser"
+	zipperTypes "github.com/grafana/carbonapi/zipper/types"
 	"github.com/lomik/zapwriter"
 	"github.com/spf13/viper"
 	"go.uber.org/zap"

cmd/carbonapi/graphite_metrics.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-graphite/carbonapi/cmd/carbonapi/config"
-	"github.com/go-graphite/carbonapi/cmd/carbonapi/http"
-	"github.com/go-graphite/carbonapi/mstats"
+	"github.com/grafana/carbonapi/cmd/carbonapi/config"
+	"github.com/grafana/carbonapi/cmd/carbonapi/http"
+	"github.com/grafana/carbonapi/mstats"
 	"github.com/peterbourgon/g2g"
 	"go.uber.org/zap"
 )

cmd/carbonapi/http/capability.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/go-graphite/carbonapi/zipper/httpHeaders"
 	pb "github.com/go-graphite/protocol/carbonapi_v3_pb"
+	"github.com/grafana/carbonapi/zipper/httpHeaders"
 	"github.com/lomik/zapwriter"
 	"go.uber.org/zap"
 )

cmd/carbonapi/http/enrichcontext.go

@@ -3,7 +3,7 @@ package http
 import (
 	"net/http"
 
-	utilctx "github.com/go-graphite/carbonapi/util/ctx"
+	utilctx "github.com/grafana/carbonapi/util/ctx"
 )
 
 // TrackConnections exports via expvar a list of all currently executing requests

cmd/carbonapi/http/find_handlers.go

@@ -11,13 +11,13 @@ import (
 	"time"
 
 	"github.com/ansel1/merry"
-	"github.com/go-graphite/carbonapi/carbonapipb"
-	"github.com/go-graphite/carbonapi/cmd/carbonapi/config"
-	"github.com/go-graphite/carbonapi/date"
-	"github.com/go-graphite/carbonapi/intervalset"
-	utilctx "github.com/go-graphite/carbonapi/util/ctx"
 	pbv2 "github.com/go-graphite/protocol/carbonapi_v2_pb"
 	pbv3 "github.com/go-graphite/protocol/carbonapi_v3_pb"
+	"github.com/grafana/carbonapi/carbonapipb"
+	"github.com/grafana/carbonapi/cmd/carbonapi/config"
+	"github.com/grafana/carbonapi/date"
+	"github.com/grafana/carbonapi/intervalset"
+	utilctx "github.com/grafana/carbonapi/util/ctx"
 	pickle "github.com/lomik/og-rek"
 	"github.com/lomik/zapwriter"
 	"github.com/maruel/natural"

cmd/carbonapi/http/functions_handler.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-graphite/carbonapi/carbonapipb"
-	"github.com/go-graphite/carbonapi/expr/metadata"
-	"github.com/go-graphite/carbonapi/expr/types"
-	utilctx "github.com/go-graphite/carbonapi/util/ctx"
+	"github.com/grafana/carbonapi/carbonapipb"
+	"github.com/grafana/carbonapi/expr/metadata"
+	"github.com/grafana/carbonapi/expr/types"
+	utilctx "github.com/grafana/carbonapi/util/ctx"
 	"github.com/lomik/zapwriter"
 	"go.uber.org/zap"
 )