Skip to content

Commit

Permalink
Remove extra newlines in imports and document Cortex formatting (graf…
Browse files Browse the repository at this point in the history
…ana#2111)

* Removed extra empty lines in imports.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Added section on Go files formatting

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
  • Loading branch information
pstibrany authored Feb 11, 2020
1 parent 187ad97 commit d0e5ecb
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 11 deletions.
1 change: 0 additions & 1 deletion aws/aws_autoscaling.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/aws/aws-sdk-go/service/applicationautoscaling/applicationautoscalingiface"
"github.com/go-kit/kit/log/level"
"github.com/prometheus/client_golang/prometheus"

"github.com/weaveworks/common/instrument"

"github.com/cortexproject/cortex/pkg/chunk"
Expand Down
1 change: 0 additions & 1 deletion aws/dynamodb_storage_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"github.com/aws/aws-sdk-go/service/dynamodb"
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface"
"github.com/prometheus/client_golang/prometheus"

awscommon "github.com/weaveworks/common/aws"
"github.com/weaveworks/common/instrument"

Expand Down
3 changes: 1 addition & 2 deletions aws/dynamodb_table_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import (
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface"
"github.com/go-kit/kit/log/level"
"github.com/pkg/errors"
"golang.org/x/time/rate"

"github.com/weaveworks/common/instrument"
"golang.org/x/time/rate"

"github.com/cortexproject/cortex/pkg/chunk"
"github.com/cortexproject/cortex/pkg/util"
Expand Down
1 change: 0 additions & 1 deletion aws/s3_storage_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3iface"
"github.com/prometheus/client_golang/prometheus"

awscommon "github.com/weaveworks/common/aws"
"github.com/weaveworks/common/instrument"

Expand Down
3 changes: 1 addition & 2 deletions chunk.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ import (
"github.com/pkg/errors"
"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels"
errs "github.com/weaveworks/common/errors"

prom_chunk "github.com/cortexproject/cortex/pkg/chunk/encoding"
"github.com/cortexproject/cortex/pkg/prom1/storage/metric"

errs "github.com/weaveworks/common/errors"
)

// Errors that decode can return
Expand Down
1 change: 0 additions & 1 deletion chunk_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels"
"github.com/prometheus/prometheus/promql"

"github.com/weaveworks/common/httpgrpc"

"github.com/cortexproject/cortex/pkg/chunk/cache"
Expand Down
1 change: 0 additions & 1 deletion chunk_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/prometheus/prometheus/promql"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/weaveworks/common/test"
"github.com/weaveworks/common/user"

Expand Down
1 change: 0 additions & 1 deletion table_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/go-kit/kit/log/level"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/model"

"github.com/weaveworks/common/instrument"
"github.com/weaveworks/common/mtime"

Expand Down
1 change: 0 additions & 1 deletion table_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"time"

"github.com/prometheus/common/model"

"github.com/stretchr/testify/require"
"github.com/weaveworks/common/mtime"
)
Expand Down

0 comments on commit d0e5ecb

Please sign in to comment.