Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add v2 suffix #113

Merged
merged 3 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azcredentials/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package azcredentials
import (
"testing"

"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion azcredentials/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package azcredentials
import (
"fmt"

"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
)

func GetAzureCloud(settings *azsettings.AzureSettings, credentials AzureCredentials) (string, error) {
Expand Down
6 changes: 3 additions & 3 deletions azhttpclient/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"net/http"

"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azhttpclient/internal/azendpoint"
"github.com/grafana/grafana-azure-sdk-go/aztokenprovider"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azhttpclient/internal/azendpoint"
"github.com/grafana/grafana-azure-sdk-go/v2/aztokenprovider"
"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
)

Expand Down
6 changes: 3 additions & 3 deletions azhttpclient/middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"net/http"
"testing"

"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/aztokenprovider"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/aztokenprovider"
"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
8 changes: 4 additions & 4 deletions azhttpclient/options.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package azhttpclient

import (
"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azhttpclient/internal/azendpoint"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/aztokenprovider"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azhttpclient/internal/azendpoint"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/aztokenprovider"
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
)

Expand Down
2 changes: 1 addition & 1 deletion azsettings/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package azsettings
import (
"fmt"

"github.com/grafana/grafana-azure-sdk-go/azsettings/internal/envutil"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings/internal/envutil"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions aztokenprovider/retriever_clientsecret.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
)

type clientSecretTokenRetriever struct {
Expand Down
4 changes: 2 additions & 2 deletions aztokenprovider/retriever_clientsecret_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package aztokenprovider
import (
"testing"

"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions aztokenprovider/retriever_msi.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
)

type managedIdentityTokenRetriever struct {
Expand Down
4 changes: 2 additions & 2 deletions aztokenprovider/retriever_workloadidentity.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
)

type workloadIdentityTokenRetriever struct {
Expand Down
2 changes: 1 addition & 1 deletion aztokenprovider/token_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func requestUrlForm(ctx context.Context, httpClient *http.Client, requestUrl str
req.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
req.Header.Set("Accept", "application/json")

req.Header.Set("X-Client-SKU", "github.com/grafana/grafana-azure-sdk-go")
req.Header.Set("X-Client-SKU", "github.com/grafana/grafana-azure-sdk-go/v2")
req.Header.Set("X-Client-Ver", "2.0")

resp, err := httpClient.Do(req)
Expand Down
6 changes: 3 additions & 3 deletions aztokenprovider/token_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"net/http"

"github.com/golang-jwt/jwt/v5"
"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/azusercontext"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/azusercontext"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)

Expand Down
6 changes: 3 additions & 3 deletions aztokenprovider/token_provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"testing"

"github.com/golang-jwt/jwt/v5"
"github.com/grafana/grafana-azure-sdk-go/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana-azure-sdk-go/azusercontext"
"github.com/grafana/grafana-azure-sdk-go/v2/azcredentials"
"github.com/grafana/grafana-azure-sdk-go/v2/azsettings"
"github.com/grafana/grafana-azure-sdk-go/v2/azusercontext"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/grafana/grafana-azure-sdk-go
module github.com/grafana/grafana-azure-sdk-go/v2

go 1.21

Expand Down