Skip to content

Commit d765680

Browse files
authored
azcontainerregistry tests use internal credential factory (Azure#23077)
* azcontainerregistry tests use internal credential factory * upgrade
1 parent 7f4c741 commit d765680

File tree

2 files changed

+13
-22
lines changed

2 files changed

+13
-22
lines changed

sdk/containers/azcontainerregistry/authentication_policy_test.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ import (
1010
"bytes"
1111
"context"
1212
"fmt"
13+
"net/http"
14+
"reflect"
15+
"strings"
16+
"sync/atomic"
17+
"testing"
18+
"time"
19+
1320
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
1421
"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
1522
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
@@ -18,13 +25,8 @@ import (
1825
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
1926
"github.com/Azure/azure-sdk-for-go/sdk/internal/mock"
2027
"github.com/Azure/azure-sdk-for-go/sdk/internal/temporal"
28+
"github.com/Azure/azure-sdk-for-go/sdk/internal/test/credential"
2129
"github.com/stretchr/testify/require"
22-
"net/http"
23-
"reflect"
24-
"strings"
25-
"sync/atomic"
26-
"testing"
27-
"time"
2830
)
2931

3032
func Test_getJWTExpireTime(t *testing.T) {
@@ -161,7 +163,7 @@ func Test_authenticationPolicy_getAccessToken_error(t *testing.T) {
161163
p := &authenticationPolicy{
162164
temporal.NewResource(acquireRefreshToken),
163165
atomic.Value{},
164-
&FakeCredential{},
166+
&credential.Fake{},
165167
[]string{"test"},
166168
authClient,
167169
}
@@ -245,7 +247,7 @@ func Test_authenticationPolicy(t *testing.T) {
245247
authPolicy := &authenticationPolicy{
246248
temporal.NewResource(acquireRefreshToken),
247249
atomic.Value{},
248-
&FakeCredential{},
250+
&credential.Fake{},
249251
[]string{"test"},
250252
authClient,
251253
}

sdk/containers/azcontainerregistry/utils_test.go

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ import (
1212
"os"
1313
"strings"
1414
"testing"
15-
"time"
1615

1716
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
1817
"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
1918
azcloud "github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
20-
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
2119
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
22-
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
2320
"github.com/Azure/azure-sdk-for-go/sdk/internal/recording"
21+
"github.com/Azure/azure-sdk-for-go/sdk/internal/test/credential"
2422
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry"
2523
"github.com/stretchr/testify/require"
2624
)
@@ -37,19 +35,10 @@ var testConfig = struct {
3735
loginServer string
3836
}{
3937
cloud: azcloud.AzurePublic,
40-
credential: &FakeCredential{},
38+
credential: &credential.Fake{},
4139
loginServer: fakeLoginServer,
4240
}
4341

44-
// FakeCredential is an empty credential for testing.
45-
type FakeCredential struct {
46-
}
47-
48-
// GetToken provide a fake access token.
49-
func (c *FakeCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
50-
return azcore.AccessToken{Token: recording.SanitizedValue, ExpiresOn: time.Now().Add(time.Hour * 24).UTC()}, nil
51-
}
52-
5342
// getEndpointCredAndClientOptions will create a credential and a client options for test application.
5443
// The client options will initialize the transport for recording client add recording policy to the pipeline.
5544
// In the record mode, the credential will be a DefaultAzureCredential which combines several common credentials.
@@ -81,7 +70,7 @@ func TestMain(m *testing.M) {
8170
func run(m *testing.M) int {
8271
if recording.GetRecordMode() != recording.PlaybackMode {
8372
var err error
84-
testConfig.credential, err = azidentity.NewDefaultAzureCredential(nil)
73+
testConfig.credential, err = credential.New(nil)
8574
if err != nil {
8675
panic(err)
8776
}

0 commit comments

Comments
 (0)