storage account

lionello · lionello · commit e3479c11209e · 2025-08-04T16:37:21.000-07:00
diff --git a/src/go.mod b/src/go.mod
@@ -21,6 +21,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerinstance/armcontainerinstance/v2 v2.4.0
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2 v2.1.0
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2
 	github.com/DefangLabs/secret-detector v0.0.0-20250108223530-c2b44d4c1f8f
 	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
 	github.com/aws/aws-sdk-go-v2 v1.32.6
diff --git a/src/go.sum b/src/go.sum
@@ -52,6 +52,8 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2 v2.1.0/go.mod h1:M3QD7IyKZBaC4uAKjitTOSOXdcPC6JS1A9oOW3hYjbQ=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2 h1:FwladfywkNirM+FZYLBR2kBz5C8Tg0fw5w5Y7meRXWI=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2/go.mod h1:vv5Ad0RrIoT1lJFdWBZwt4mB1+j+V8DUroixmKDTCdk=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
diff --git a/src/pkg/cli/client/byoc/azure/byoc.go b/src/pkg/cli/client/byoc/azure/byoc.go
@@ -2,7 +2,9 @@ package azure
 
 import (
 	"context"
+	"net/url"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas"
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/cli/client/byoc"
 	"github.com/DefangLabs/defang/src/pkg/clouds/azure/aci"
@@ -28,7 +30,11 @@ func NewByocAzure(ctx context.Context, tenantName types.TenantName) *ByocAzure {
 
 // AccountInfo implements client.Provider.
 func (b *ByocAzure) AccountInfo(context.Context) (*client.AccountInfo, error) {
-	panic("unimplemented")
+	return &client.AccountInfo{
+		AccountID: b.driver.SubscriptionID,
+		Provider:  client.ProviderAzure,
+		Region:    b.driver.Location.String(),
+	}, nil
 }
 
 // BootstrapCommand implements client.Provider.
@@ -43,7 +49,10 @@ func (b *ByocAzure) BootstrapList(context.Context) ([]string, error) {
 
 // CreateUploadURL implements client.Provider.
 func (b *ByocAzure) CreateUploadURL(context.Context, *defangv1.UploadURLRequest) (*defangv1.UploadURLResponse, error) {
-	panic("unimplemented")
+	sasQueryParameters := sas.NewQueryParameters(url.Values{}, true)
+	return &defangv1.UploadURLResponse{
+		Url: sasQueryParameters.Encode(),
+	}, nil
 }
 
 // Delete implements client.Provider.
diff --git a/src/pkg/clouds/azure/aci/common.go b/src/pkg/clouds/azure/aci/common.go
@@ -21,44 +21,48 @@ func NewContainerInstance(resourceGroupName string, location azure.Location) *Co
 		location = azure.Location(os.Getenv("AZURE_LOCATION"))
 	}
 	return &ContainerInstance{
-		Azure:             azure.Azure{Location: location},
+		Azure: azure.Azure{
+			Location:       location,
+			SubscriptionID: os.Getenv("AZURE_SUBSCRIPTION_ID"),
+		},
 		resourceGroupName: resourceGroupName, // TODO: append location?
 		storageAccount:    os.Getenv("DEFANG_CD_BUCKET"),
 	}
 }
-func newContainerGroupClient() (*armcontainerinstance.ContainerGroupsClient, error) {
-	subscriptionID, cred, err := azure.NewCreds()
+
+func (c ContainerInstance) newContainerGroupClient() (*armcontainerinstance.ContainerGroupsClient, error) {
+	cred, err := c.NewCreds()
 	if err != nil {
 		return nil, err
 	}
 
-	clientFactory, err := armcontainerinstance.NewClientFactory(subscriptionID, cred, nil)
+	clientFactory, err := armcontainerinstance.NewClientFactory(c.SubscriptionID, cred, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create container group client: %w", err)
 	}
 	return clientFactory.NewContainerGroupsClient(), nil
 }
 
-func newContainerClient() (*armcontainerinstance.ContainersClient, error) {
-	subscriptionID, cred, err := azure.NewCreds()
+func (c ContainerInstance) newContainerClient() (*armcontainerinstance.ContainersClient, error) {
+	cred, err := c.NewCreds()
 	if err != nil {
 		return nil, err
 	}
 
-	clientFactory, err := armcontainerinstance.NewClientFactory(subscriptionID, cred, nil)
+	clientFactory, err := armcontainerinstance.NewClientFactory(c.SubscriptionID, cred, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create container client: %w", err)
 	}
 	return clientFactory.NewContainersClient(), nil
 }
 
-func newResourceGroupClient() (*armresources.ResourceGroupsClient, error) {
-	subscriptionID, cred, err := azure.NewCreds()
+func (c ContainerInstance) newResourceGroupClient() (*armresources.ResourceGroupsClient, error) {
+	cred, err := c.NewCreds()
 	if err != nil {
 		return nil, err
 	}
 
-	resourcesClientFactory, err := armresources.NewClientFactory(subscriptionID, cred, nil)
+	resourcesClientFactory, err := armresources.NewClientFactory(c.SubscriptionID, cred, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create resource group client: %w", err)
 	}
diff --git a/src/pkg/clouds/azure/aci/common_test.go b/src/pkg/clouds/azure/aci/common_test.go
@@ -9,7 +9,9 @@ import (
 func TestNewClient(t *testing.T) {
 	t.Setenv("AZURE_SUBSCRIPTION_ID", uuid.NewString())
 
-	client, err := newContainerGroupClient()
+	c := NewContainerInstance(testResourceGroupName, "")
+
+	client, err := c.newContainerGroupClient()
 	if err != nil {
 		t.Fatalf("Failed to create client: %v", err)
 	}
diff --git a/src/pkg/clouds/azure/aci/run.go b/src/pkg/clouds/azure/aci/run.go
@@ -18,7 +18,7 @@ func safeAppend[T any](slice []T, elems ...T) []T {
 }
 
 func (c *ContainerInstance) Run(ctx context.Context, env map[string]string, args ...string) (ContainerGroupName, error) {
-	containerGroupClient, err := newContainerGroupClient()
+	containerGroupClient, err := c.newContainerGroupClient()
 	if err != nil {
 		return nil, err
 	}
diff --git a/src/pkg/clouds/azure/aci/setup.go b/src/pkg/clouds/azure/aci/setup.go
@@ -12,15 +12,14 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
 	"github.com/DefangLabs/defang/src/pkg"
-	"github.com/DefangLabs/defang/src/pkg/clouds/azure"
 	"github.com/DefangLabs/defang/src/pkg/types"
 )
 
 const containerGroupPrefix = "defang-cd-"
 const storageAccountPrefix = "defangcd"
 
 func (c *ContainerInstance) SetUp(ctx context.Context, containers []types.Container) error {
-	resourceGroupClient, err := newResourceGroupClient()
+	resourceGroupClient, err := c.newResourceGroupClient()
 	if err != nil {
 		return err
 	}
@@ -74,20 +73,20 @@ func (c *ContainerInstance) SetUp(ctx context.Context, containers []types.Contai
 		}
 	}
 
-	bucketName, err := c.getStorageAccount(ctx)
+	storageAccount, err := c.setUpStorageAccount(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to get bucket name: %w", err)
 	}
 
-	if bucketName == "" {
+	if storageAccount == "" {
 
 	}
 
 	return nil
 }
 
 func (c *ContainerInstance) TearDown(ctx context.Context) error {
-	resourceGroupClient, err := newResourceGroupClient()
+	resourceGroupClient, err := c.newResourceGroupClient()
 	if err != nil {
 		return err
 	}
@@ -104,16 +103,11 @@ func (c *ContainerInstance) TearDown(ctx context.Context) error {
 	return nil
 }
 
-func (c *ContainerInstance) getStorageAccount(ctx context.Context) (string, error) {
+func (c *ContainerInstance) getStorageAccount(ctx context.Context, accountsClient *armstorage.AccountsClient) (string, error) {
 	if c.storageAccount != "" {
 		return c.storageAccount, nil
 	}
 
-	accountsClient, err := azure.NewStorageAccountsClient()
-	if err != nil {
-		return "", err
-	}
-
 	for pager := accountsClient.NewListByResourceGroupPager(c.resourceGroupName, nil); pager.More(); {
 		page, err := pager.NextPage(ctx)
 		if err != nil {
@@ -129,11 +123,15 @@ func (c *ContainerInstance) getStorageAccount(ctx context.Context) (string, erro
 }
 
 func (c *ContainerInstance) setUpStorageAccount(ctx context.Context) (string, error) {
-	accountsClient, err := azure.NewStorageAccountsClient()
+	accountsClient, err := c.NewStorageAccountsClient()
 	if err != nil {
 		return "", err
 	}
 
+	if x, err := c.getStorageAccount(ctx, accountsClient); err == nil {
+		return x, nil
+	}
+
 	storageAccount := storageAccountPrefix + pkg.RandomID() // unique storage account name
 	createResponse, err := accountsClient.BeginCreate(ctx, c.resourceGroupName, storageAccount, armstorage.AccountCreateParameters{
 		Kind:     to.Ptr(armstorage.KindStorageV2),
diff --git a/src/pkg/clouds/azure/aci/setup_test.go b/src/pkg/clouds/azure/aci/setup_test.go
@@ -40,20 +40,3 @@ func TestSetup(t *testing.T) {
 		}
 	})
 }
-
-func TestStorage(t *testing.T) {
-	c := NewContainerInstance(testResourceGroupName, "westeurope")
-
-	storageAccountName, err := c.setUpStorageAccount(context.Background())
-	if err != nil {
-		t.Fatalf("Failed to set up storage account: %v", err)
-	}
-
-	foundAccountName, err := c.getStorageAccount(context.Background())
-	if err != nil {
-		t.Fatalf("Failed to get storage account name: %v", err)
-	}
-	if foundAccountName != storageAccountName {
-		t.Fatalf("Expected storage account name %s, got %s", storageAccountName, foundAccountName)
-	}
-}
diff --git a/src/pkg/clouds/azure/aci/stop.go b/src/pkg/clouds/azure/aci/stop.go
@@ -5,7 +5,7 @@ import (
 )
 
 func (c *ContainerInstance) Stop(ctx context.Context, groupName ContainerGroupName) error {
-	containerGroupClient, err := newContainerGroupClient()
+	containerGroupClient, err := c.newContainerGroupClient()
 	if err != nil {
 		return err
 	}
diff --git a/src/pkg/clouds/azure/aci/tail.go b/src/pkg/clouds/azure/aci/tail.go
@@ -42,7 +42,7 @@ func (c *ContainerInstance) Tail(ctx context.Context, groupName ContainerGroupNa
 }
 
 func (c *ContainerInstance) QueryLogs(ctx context.Context, groupName ContainerGroupName, containerName string) (string, error) {
-	client, err := newContainerClient()
+	client, err := c.newContainerClient()
 	if err != nil {
 		return "", err
 	}
@@ -65,7 +65,7 @@ func (c *ContainerInstance) QueryLogs(ctx context.Context, groupName ContainerGr
 }
 
 func (c *ContainerInstance) StreamLogs(ctx context.Context, groupName ContainerGroupName, containerName string) (<-chan logEntry, error) {
-	client, err := newContainerClient()
+	client, err := c.newContainerClient()
 	if err != nil {
 		return nil, err
 	}
diff --git a/src/pkg/clouds/azure/common.go b/src/pkg/clouds/azure/common.go
@@ -3,40 +3,53 @@ package azure
 import (
 	"errors"
 	"fmt"
-	"os"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
 )
 
 type Azure struct {
-	Location Location
+	Location       Location
+	SubscriptionID string
 }
 
-func NewCreds() (string, *azidentity.DefaultAzureCredential, error) {
-	subscriptionID := os.Getenv("AZURE_SUBSCRIPTION_ID")
-	if len(subscriptionID) == 0 {
-		return "", nil, errors.New("environment variable AZURE_SUBSCRIPTION_ID is not set")
+func (a Azure) NewCreds() (*azidentity.DefaultAzureCredential, error) {
+	if len(a.SubscriptionID) == 0 {
+		return nil, errors.New("environment variable AZURE_SUBSCRIPTION_ID is not set")
 	}
 
 	cred, err := azidentity.NewDefaultAzureCredential(nil)
 	if err != nil {
-		return "", nil, fmt.Errorf("failed to create default Azure credentials: %w", err)
+		return nil, fmt.Errorf("failed to create default Azure credentials: %w", err)
 	}
 
-	return subscriptionID, cred, nil
+	return cred, nil
 }
 
-func NewStorageAccountsClient() (*armstorage.AccountsClient, error) {
-	subscriptionID, cred, err := NewCreds()
+func (a Azure) NewStorageAccountsClient() (*armstorage.AccountsClient, error) {
+	cred, err := a.NewCreds()
 	if err != nil {
 		return nil, err
 	}
 
-	storageClient, err := armstorage.NewClientFactory(subscriptionID, cred, nil)
+	clientFactory, err := armstorage.NewClientFactory(a.SubscriptionID, cred, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create storage client: %w", err)
 	}
 
-	return storageClient.NewAccountsClient(), nil
+	return clientFactory.NewAccountsClient(), nil
+}
+
+func (a Azure) NewStorageClient() (*armstorage.BlobContainersClient, error) {
+	cred, err := a.NewCreds()
+	if err != nil {
+		return nil, err
+	}
+
+	clientFactory, err := armstorage.NewClientFactory(a.SubscriptionID, cred, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create storage client: %w", err)
+	}
+
+	return clientFactory.NewBlobContainersClient(), nil
 }
diff --git a/src/pkg/clouds/azure/job.go b/src/pkg/clouds/azure/job.go

Original file line number	Diff line number	Diff line change
`@@ -21,44 +21,48 @@ func NewContainerInstance(resourceGroupName string, location azure.Location) *Co`
`21`	`21`	`location = azure.Location(os.Getenv("AZURE_LOCATION"))`
`22`	`22`	`}`
`23`	`23`	`return &ContainerInstance{`
`24`		`- Azure: azure.Azure{Location: location},`
	`24`	`+ Azure: azure.Azure{`
	`25`	`+ Location: location,`
	`26`	`+ SubscriptionID: os.Getenv("AZURE_SUBSCRIPTION_ID"),`
	`27`	`+ },`
`25`	`28`	`resourceGroupName: resourceGroupName, // TODO: append location?`
`26`	`29`	`storageAccount: os.Getenv("DEFANG_CD_BUCKET"),`
`27`	`30`	`}`
`28`	`31`	`}`
`29`		`-func newContainerGroupClient() (*armcontainerinstance.ContainerGroupsClient, error) {`
`30`		`- subscriptionID, cred, err := azure.NewCreds()`
	`32`	`+`
	`33`	`+func (c ContainerInstance) newContainerGroupClient() (*armcontainerinstance.ContainerGroupsClient, error) {`
	`34`	`+ cred, err := c.NewCreds()`
`31`	`35`	`if err != nil {`
`32`	`36`	`return nil, err`
`33`	`37`	`}`
`34`	`38`
`35`		`- clientFactory, err := armcontainerinstance.NewClientFactory(subscriptionID, cred, nil)`
	`39`	`+ clientFactory, err := armcontainerinstance.NewClientFactory(c.SubscriptionID, cred, nil)`
`36`	`40`	`if err != nil {`
`37`	`41`	`return nil, fmt.Errorf("failed to create container group client: %w", err)`
`38`	`42`	`}`
`39`	`43`	`return clientFactory.NewContainerGroupsClient(), nil`
`40`	`44`	`}`
`41`	`45`
`42`		`-func newContainerClient() (*armcontainerinstance.ContainersClient, error) {`
`43`		`- subscriptionID, cred, err := azure.NewCreds()`
	`46`	`+func (c ContainerInstance) newContainerClient() (*armcontainerinstance.ContainersClient, error) {`
	`47`	`+ cred, err := c.NewCreds()`
`44`	`48`	`if err != nil {`
`45`	`49`	`return nil, err`
`46`	`50`	`}`
`47`	`51`
`48`		`- clientFactory, err := armcontainerinstance.NewClientFactory(subscriptionID, cred, nil)`
	`52`	`+ clientFactory, err := armcontainerinstance.NewClientFactory(c.SubscriptionID, cred, nil)`
`49`	`53`	`if err != nil {`
`50`	`54`	`return nil, fmt.Errorf("failed to create container client: %w", err)`
`51`	`55`	`}`
`52`	`56`	`return clientFactory.NewContainersClient(), nil`
`53`	`57`	`}`
`54`	`58`
`55`		`-func newResourceGroupClient() (*armresources.ResourceGroupsClient, error) {`
`56`		`- subscriptionID, cred, err := azure.NewCreds()`
	`59`	`+func (c ContainerInstance) newResourceGroupClient() (*armresources.ResourceGroupsClient, error) {`
	`60`	`+ cred, err := c.NewCreds()`
`57`	`61`	`if err != nil {`
`58`	`62`	`return nil, err`
`59`	`63`	`}`
`60`	`64`
`61`		`- resourcesClientFactory, err := armresources.NewClientFactory(subscriptionID, cred, nil)`
	`65`	`+ resourcesClientFactory, err := armresources.NewClientFactory(c.SubscriptionID, cred, nil)`
`62`	`66`	`if err != nil {`
`63`	`67`	`return nil, fmt.Errorf("failed to create resource group client: %w", err)`
`64`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func safeAppend[T any](slice []T, elems ...T) []T {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func (c *ContainerInstance) Run(ctx context.Context, env map[string]string, args ...string) (ContainerGroupName, error) {`
`21`		`- containerGroupClient, err := newContainerGroupClient()`
	`21`	`+ containerGroupClient, err := c.newContainerGroupClient()`
`22`	`22`	`if err != nil {`
`23`	`23`	`return nil, err`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,14 @@ import (`
`12`	`12`	`"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v2"`
`13`	`13`	`"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"`
`14`	`14`	`"github.com/DefangLabs/defang/src/pkg"`
`15`		`- "github.com/DefangLabs/defang/src/pkg/clouds/azure"`
`16`	`15`	`"github.com/DefangLabs/defang/src/pkg/types"`
`17`	`16`	`)`
`18`	`17`
`19`	`18`	`const containerGroupPrefix = "defang-cd-"`
`20`	`19`	`const storageAccountPrefix = "defangcd"`
`21`	`20`
`22`	`21`	`func (c *ContainerInstance) SetUp(ctx context.Context, containers []types.Container) error {`
`23`		`- resourceGroupClient, err := newResourceGroupClient()`
	`22`	`+ resourceGroupClient, err := c.newResourceGroupClient()`
`24`	`23`	`if err != nil {`
`25`	`24`	`return err`
`26`	`25`	`}`
`@@ -74,20 +73,20 @@ func (c *ContainerInstance) SetUp(ctx context.Context, containers []types.Contai`
`74`	`73`	`}`
`75`	`74`	`}`
`76`	`75`
`77`		`- bucketName, err := c.getStorageAccount(ctx)`
	`76`	`+ storageAccount, err := c.setUpStorageAccount(ctx)`
`78`	`77`	`if err != nil {`
`79`	`78`	`return fmt.Errorf("failed to get bucket name: %w", err)`
`80`	`79`	`}`
`81`	`80`
`82`		`- if bucketName == "" {`
	`81`	`+ if storageAccount == "" {`
`83`	`82`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`return nil`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`func (c *ContainerInstance) TearDown(ctx context.Context) error {`
`90`		`- resourceGroupClient, err := newResourceGroupClient()`
	`89`	`+ resourceGroupClient, err := c.newResourceGroupClient()`
`91`	`90`	`if err != nil {`
`92`	`91`	`return err`
`93`	`92`	`}`
`@@ -104,16 +103,11 @@ func (c *ContainerInstance) TearDown(ctx context.Context) error {`
`104`	`103`	`return nil`
`105`	`104`	`}`
`106`	`105`
`107`		`-func (c *ContainerInstance) getStorageAccount(ctx context.Context) (string, error) {`
	`106`	`+func (c ContainerInstance) getStorageAccount(ctx context.Context, accountsClient armstorage.AccountsClient) (string, error) {`
`108`	`107`	`if c.storageAccount != "" {`
`109`	`108`	`return c.storageAccount, nil`
`110`	`109`	`}`
`111`	`110`
`112`		`- accountsClient, err := azure.NewStorageAccountsClient()`
`113`		`- if err != nil {`
`114`		`- return "", err`
`115`		`- }`
`116`		`-`
`117`	`111`	`for pager := accountsClient.NewListByResourceGroupPager(c.resourceGroupName, nil); pager.More(); {`
`118`	`112`	`page, err := pager.NextPage(ctx)`
`119`	`113`	`if err != nil {`
`@@ -129,11 +123,15 @@ func (c *ContainerInstance) getStorageAccount(ctx context.Context) (string, erro`
`129`	`123`	`}`
`130`	`124`
`131`	`125`	`func (c *ContainerInstance) setUpStorageAccount(ctx context.Context) (string, error) {`
`132`		`- accountsClient, err := azure.NewStorageAccountsClient()`
	`126`	`+ accountsClient, err := c.NewStorageAccountsClient()`
`133`	`127`	`if err != nil {`
`134`	`128`	`return "", err`
`135`	`129`	`}`
`136`	`130`
	`131`	`+ if x, err := c.getStorageAccount(ctx, accountsClient); err == nil {`
	`132`	`+ return x, nil`
	`133`	`+ }`
	`134`	`+`
`137`	`135`	`storageAccount := storageAccountPrefix + pkg.RandomID() // unique storage account name`
`138`	`136`	`createResponse, err := accountsClient.BeginCreate(ctx, c.resourceGroupName, storageAccount, armstorage.AccountCreateParameters{`
`139`	`137`	`Kind: to.Ptr(armstorage.KindStorageV2),`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func (c *ContainerInstance) Stop(ctx context.Context, groupName ContainerGroupName) error {`
`8`		`- containerGroupClient, err := newContainerGroupClient()`
	`8`	`+ containerGroupClient, err := c.newContainerGroupClient()`
`9`	`9`	`if err != nil {`
`10`	`10`	`return err`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (c *ContainerInstance) Tail(ctx context.Context, groupName ContainerGroupNa`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`func (c *ContainerInstance) QueryLogs(ctx context.Context, groupName ContainerGroupName, containerName string) (string, error) {`
`45`		`- client, err := newContainerClient()`
	`45`	`+ client, err := c.newContainerClient()`
`46`	`46`	`if err != nil {`
`47`	`47`	`return "", err`
`48`	`48`	`}`
`@@ -65,7 +65,7 @@ func (c *ContainerInstance) QueryLogs(ctx context.Context, groupName ContainerGr`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func (c *ContainerInstance) StreamLogs(ctx context.Context, groupName ContainerGroupName, containerName string) (<-chan logEntry, error) {`
`68`		`- client, err := newContainerClient()`
	`68`	`+ client, err := c.newContainerClient()`
`69`	`69`	`if err != nil {`
`70`	`70`	`return nil, err`
`71`	`71`	`}`