Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit 4ee5aa6

Browse files
gtardifgtardif
committedAug 14, 2020
More renaming
·
v2.0.0-rc.2v0.1.12
1 parent 274dc82 commit 4ee5aa6

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed
 

‎aci/aci.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
)
4343

4444
func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error {
45-
containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID)
45+
containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID)
4646
if err != nil {
4747
return errors.Wrapf(err, "cannot get container group client")
4848
}
@@ -66,7 +66,7 @@ func createACIContainers(ctx context.Context, aciContext store.AciContext, group
6666

6767
func createOrUpdateACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error {
6868
w := progress.ContextWriter(ctx)
69-
containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID)
69+
containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID)
7070
if err != nil {
7171
return errors.Wrapf(err, "cannot get container group client")
7272
}
@@ -121,7 +121,7 @@ func createOrUpdateACIContainers(ctx context.Context, aciContext store.AciContex
121121
}
122122

123123
func getACIContainerGroup(ctx context.Context, aciContext store.AciContext, containerGroupName string) (containerinstance.ContainerGroup, error) {
124-
containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID)
124+
containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID)
125125
if err != nil {
126126
return containerinstance.ContainerGroup{}, fmt.Errorf("cannot get container group client: %v", err)
127127
}
@@ -130,7 +130,7 @@ func getACIContainerGroup(ctx context.Context, aciContext store.AciContext, cont
130130
}
131131

132132
func deleteACIContainerGroup(ctx context.Context, aciContext store.AciContext, containerGroupName string) (containerinstance.ContainerGroup, error) {
133-
containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID)
133+
containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID)
134134
if err != nil {
135135
return containerinstance.ContainerGroup{}, fmt.Errorf("cannot get container group client: %v", err)
136136
}
@@ -139,7 +139,7 @@ func deleteACIContainerGroup(ctx context.Context, aciContext store.AciContext, c
139139
}
140140

141141
func stopACIContainerGroup(ctx context.Context, aciContext store.AciContext, containerGroupName string) error {
142-
containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID)
142+
containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID)
143143
if err != nil {
144144
return fmt.Errorf("cannot get container group client: %v", err)
145145
}
@@ -152,7 +152,7 @@ func stopACIContainerGroup(ctx context.Context, aciContext store.AciContext, con
152152
}
153153

154154
func execACIContainer(ctx context.Context, aciContext store.AciContext, command, containerGroup string, containerName string) (c containerinstance.ContainerExecResponse, err error) {
155-
containerClient, err := login.GetContainerClient(aciContext.SubscriptionID)
155+
containerClient, err := login.NewContainerClient(aciContext.SubscriptionID)
156156
if err != nil {
157157
return c, errors.Wrapf(err, "cannot get container client")
158158
}
@@ -245,7 +245,7 @@ func exec(ctx context.Context, address string, password string, request containe
245245
}
246246

247247
func getACIContainerLogs(ctx context.Context, aciContext store.AciContext, containerGroupName, containerName string, tail *int32) (string, error) {
248-
containerClient, err := login.GetContainerClient(aciContext.SubscriptionID)
248+
containerClient, err := login.NewContainerClient(aciContext.SubscriptionID)
249249
if err != nil {
250250
return "", errors.Wrapf(err, "cannot get container client")
251251
}

‎aci/backend.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ type aciContainerService struct {
133133
}
134134

135135
func (cs *aciContainerService) List(ctx context.Context, all bool) ([]containers.Container, error) {
136-
groupsClient, err := login.GetContainerGroupsClient(cs.ctx.SubscriptionID)
136+
groupsClient, err := login.NewContainerGroupsClient(cs.ctx.SubscriptionID)
137137
if err != nil {
138138
return nil, err
139139
}
@@ -232,7 +232,7 @@ func (cs *aciContainerService) Start(ctx context.Context, containerID string) er
232232
return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName))
233233
}
234234

235-
containerGroupsClient, err := login.GetContainerGroupsClient(cs.ctx.SubscriptionID)
235+
containerGroupsClient, err := login.NewContainerGroupsClient(cs.ctx.SubscriptionID)
236236
if err != nil {
237237
return err
238238
}
@@ -336,7 +336,7 @@ func (cs *aciContainerService) Delete(ctx context.Context, containerID string, r
336336
}
337337

338338
if !request.Force {
339-
containerGroupsClient, err := login.GetContainerGroupsClient(cs.ctx.SubscriptionID)
339+
containerGroupsClient, err := login.NewContainerGroupsClient(cs.ctx.SubscriptionID)
340340
if err != nil {
341341
return err
342342
}

‎aci/login/client.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515

1616
const userAgent = "docker-cli"
1717

18-
// GetContainerGroupsClient get client toi manipulate containerGrouos
19-
func GetContainerGroupsClient(subscriptionID string) (containerinstance.ContainerGroupsClient, error) {
18+
// NewContainerGroupsClient get client toi manipulate containerGrouos
19+
func NewContainerGroupsClient(subscriptionID string) (containerinstance.ContainerGroupsClient, error) {
2020
containerGroupsClient := containerinstance.NewContainerGroupsClient(subscriptionID)
2121
err := setupClient(&containerGroupsClient.Client)
2222
if err != nil {
@@ -38,8 +38,8 @@ func setupClient(aciClient *autorest.Client) error {
3838
return nil
3939
}
4040

41-
// GetStorageAccountsClient get client to manipulate storage accounts
42-
func GetStorageAccountsClient(subscriptionID string) (storage.AccountsClient, error) {
41+
// NewStorageAccountsClient get client to manipulate storage accounts
42+
func NewStorageAccountsClient(subscriptionID string) (storage.AccountsClient, error) {
4343
containerGroupsClient := storage.NewAccountsClient(subscriptionID)
4444
err := setupClient(&containerGroupsClient.Client)
4545
if err != nil {
@@ -51,8 +51,8 @@ func GetStorageAccountsClient(subscriptionID string) (storage.AccountsClient, er
5151
return containerGroupsClient, nil
5252
}
5353

54-
// GetSubscriptionsClient get subscription client
55-
func GetSubscriptionsClient() (subscription.SubscriptionsClient, error) {
54+
// NewSubscriptionsClient get subscription client
55+
func NewSubscriptionsClient() (subscription.SubscriptionsClient, error) {
5656
subc := subscription.NewSubscriptionsClient()
5757
err := setupClient(&subc.Client)
5858
if err != nil {
@@ -61,8 +61,8 @@ func GetSubscriptionsClient() (subscription.SubscriptionsClient, error) {
6161
return subc, nil
6262
}
6363

64-
// GetGroupsClient get client to manipulate groups
65-
func GetGroupsClient(subscriptionID string) (resources.GroupsClient, error) {
64+
// NewGroupsClient get client to manipulate groups
65+
func NewGroupsClient(subscriptionID string) (resources.GroupsClient, error) {
6666
groupsClient := resources.NewGroupsClient(subscriptionID)
6767
err := setupClient(&groupsClient.Client)
6868
if err != nil {
@@ -71,8 +71,8 @@ func GetGroupsClient(subscriptionID string) (resources.GroupsClient, error) {
7171
return groupsClient, nil
7272
}
7373

74-
// GetContainerClient get client to manipulate containers
75-
func GetContainerClient(subscriptionID string) (containerinstance.ContainerClient, error) {
74+
// NewContainerClient get client to manipulate containers
75+
func NewContainerClient(subscriptionID string) (containerinstance.ContainerClient, error) {
7676
containerClient := containerinstance.NewContainerClient(subscriptionID)
7777
err := setupClient(&containerClient.Client)
7878
if err != nil {

‎aci/login/StorageAccountHelper.go ‎aci/login/storage_helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type StorageAccountHelper struct {
1717

1818
// GetAzureStorageAccountKey retrieves the storage account ket from the current azure login
1919
func (helper StorageAccountHelper) GetAzureStorageAccountKey(ctx context.Context, accountName string) (string, error) {
20-
client, err := GetStorageAccountsClient(helper.AciContext.SubscriptionID)
20+
client, err := NewStorageAccountsClient(helper.AciContext.SubscriptionID)
2121
if err != nil {
2222
return "", err
2323
}

‎aci/resource_group.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func NewACIResourceGroupHelper() ResourceGroupHelper {
4545

4646
// GetGroup get a resource group from its name
4747
func (mgt aciResourceGroupHelperImpl) GetGroup(ctx context.Context, subscriptionID string, groupName string) (resources.Group, error) {
48-
gc, err := login.GetGroupsClient(subscriptionID)
48+
gc, err := login.NewGroupsClient(subscriptionID)
4949
if err != nil {
5050
return resources.Group{}, err
5151
}
@@ -54,7 +54,7 @@ func (mgt aciResourceGroupHelperImpl) GetGroup(ctx context.Context, subscription
5454

5555
// ListGroups list resource groups
5656
func (mgt aciResourceGroupHelperImpl) ListGroups(ctx context.Context, subscriptionID string) ([]resources.Group, error) {
57-
gc, err := login.GetGroupsClient(subscriptionID)
57+
gc, err := login.NewGroupsClient(subscriptionID)
5858
if err != nil {
5959
return nil, err
6060
}
@@ -80,7 +80,7 @@ func (mgt aciResourceGroupHelperImpl) ListGroups(ctx context.Context, subscripti
8080

8181
// CreateOrUpdate create or update a resource group
8282
func (mgt aciResourceGroupHelperImpl) CreateOrUpdate(ctx context.Context, subscriptionID string, resourceGroupName string, parameters resources.Group) (result resources.Group, err error) {
83-
gc, err := login.GetGroupsClient(subscriptionID)
83+
gc, err := login.NewGroupsClient(subscriptionID)
8484
if err != nil {
8585
return resources.Group{}, err
8686
}
@@ -89,7 +89,7 @@ func (mgt aciResourceGroupHelperImpl) CreateOrUpdate(ctx context.Context, subscr
8989

9090
// DeleteAsync deletes a resource group. Does not wait for full deletion to return (long operation)
9191
func (mgt aciResourceGroupHelperImpl) DeleteAsync(ctx context.Context, subscriptionID string, resourceGroupName string) (err error) {
92-
gc, err := login.GetGroupsClient(subscriptionID)
92+
gc, err := login.NewGroupsClient(subscriptionID)
9393
if err != nil {
9494
return err
9595
}
@@ -100,7 +100,7 @@ func (mgt aciResourceGroupHelperImpl) DeleteAsync(ctx context.Context, subscript
100100

101101
// GetSubscriptionIDs Return available subscription IDs based on azure login
102102
func (mgt aciResourceGroupHelperImpl) GetSubscriptionIDs(ctx context.Context) ([]subscription.Model, error) {
103-
c, err := login.GetSubscriptionsClient()
103+
c, err := login.NewSubscriptionsClient()
104104
if err != nil {
105105
return nil, err
106106
}

0 commit comments

Comments
 (0)
This repository has been archived.