Chore: Some import order changes

.github/workflows/push.yaml

@@ -1,5 +1,6 @@
 name: Plugins - CI
-permissions: {}
+permissions:
+  contents: read
 
 on:
   push:

.github/workflows/update-make-docs.yml

@@ -1,5 +1,6 @@
 name: Update `make docs` procedure
-permissions: {}
+permissions:
+  contents: read
 
 on:
   schedule:

README.md

@@ -39,4 +39,4 @@ The first selection is used to filter the events that display on the graph. For
 
 The second selection is used to determine where on the graph the event should be displayed.
 
-Typically these will be the same, however there are some cases where you may want them to be different.
+Typically, these will be the same, however there are some cases where you may want them to be different.

pkg/main.go

@@ -3,9 +3,10 @@ package main
 import (
 	"os"
 
-	"github.com/grafana/github-datasource/pkg/plugin"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+
+	"github.com/grafana/github-datasource/pkg/plugin"
 )
 
 const dsID = "grafana-github-datasource"

pkg/models/packages.go

@@ -39,7 +39,7 @@ var validPackageTypes = []githubv4.PackageType{
 	githubv4.PackageTypePypi,
 }
 
-// notSupportedPackageTypes is a list of package types that are not supported by the GitHub graphql API 
+// notSupportedPackageTypes is a list of package types that are not supported by the GitHub graphql API
 // They were supported in the past but are not supported anymore and we want to return an error if they are used
 var notSupportedPackageTypes = []githubv4.PackageType{
 	githubv4.PackageTypeNpm,
@@ -56,4 +56,4 @@ func validatePackageType(packageType githubv4.PackageType) error {
 		return backend.DownstreamError(fmt.Errorf("package type %q is not supported. Valid types are: MAVEN, DOCKER, DEBIAN, PYPI", packageType))
 	}
 	return backend.DownstreamError(fmt.Errorf("invalid package type %q. Valid types are: MAVEN, DOCKER, DEBIAN, PYPI", packageType))
-}
+}

pkg/models/packages_test.go

@@ -80,4 +80,4 @@ func Test_validatePackageType(t *testing.T) {
 			}
 		})
 	}
-} 
+}

pkg/plugin/datasource.go

@@ -3,9 +3,10 @@ package plugin
 import (
 	"context"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
 	"github.com/grafana/github-datasource/pkg/dfutil"
 	"github.com/grafana/github-datasource/pkg/models"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
 )
 
 // The Datasource type handles the requests sent to the datasource backend

pkg/plugin/datasource_caching.go

@@ -9,10 +9,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana/github-datasource/pkg/dfutil"
-	"github.com/grafana/github-datasource/pkg/models"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/pkg/errors"
+
+	"github.com/grafana/github-datasource/pkg/dfutil"
+	"github.com/grafana/github-datasource/pkg/models"
 )
 
 // CacheDuration is a constant that defines how long to keep cached elements before they are refreshed

pkg/plugin/datasource_caching_test.go

@@ -2,11 +2,12 @@ package plugin
 
 import (
 	"encoding/json"
+	"sync"
+	"testing"
+
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/stretchr/testify/assert"
-	"sync"
-	"testing"
 )
 
 // mockFramer is a struct implementing the Framer interface that returns predefined frames for testing purposes

pkg/plugin/instance.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/grafana/github-datasource/pkg/github"
-	"github.com/grafana/github-datasource/pkg/models"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+
+	"github.com/grafana/github-datasource/pkg/github"
+	"github.com/grafana/github-datasource/pkg/models"
 )
 
 // NewGitHubInstance creates a new GitHubInstance using the settings to determine if things like the Caching Wrapper should be enabled

pkg/testutil/client.go

@@ -6,8 +6,9 @@ import (
 	"testing"
 
 	googlegithub "github.com/google/go-github/v53/github"
-	"github.com/grafana/github-datasource/pkg/models"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+
+	"github.com/grafana/github-datasource/pkg/models"
 )
 
 var (

pkg/testutil/frames.go

@@ -5,9 +5,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/grafana/github-datasource/pkg/dfutil"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/experimental"
+
+	"github.com/grafana/github-datasource/pkg/dfutil"
 )
 
 // UpdateGoldenFiles defines whether or not to update the files locally after checking the responses for validity