From 4ee5aa6267aee1c96ab8a5a51898c54e346d52b8 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Fri, 14 Aug 2020 17:07:33 +0200 Subject: [PATCH] More renaming --- aci/aci.go | 14 ++++++------- aci/backend.go | 6 +++--- aci/login/client.go | 20 +++++++++---------- ...rageAccountHelper.go => storage_helper.go} | 2 +- aci/resource_group.go | 10 +++++----- 5 files changed, 26 insertions(+), 26 deletions(-) rename aci/login/{StorageAccountHelper.go => storage_helper.go} (93%) diff --git a/aci/aci.go b/aci/aci.go index 2b5dfbb91..c22994d75 100644 --- a/aci/aci.go +++ b/aci/aci.go @@ -42,7 +42,7 @@ import ( ) func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error { - containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID) + containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID) if err != nil { return errors.Wrapf(err, "cannot get container group client") } @@ -66,7 +66,7 @@ func createACIContainers(ctx context.Context, aciContext store.AciContext, group func createOrUpdateACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error { w := progress.ContextWriter(ctx) - containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID) + containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID) if err != nil { return errors.Wrapf(err, "cannot get container group client") } @@ -121,7 +121,7 @@ func createOrUpdateACIContainers(ctx context.Context, aciContext store.AciContex } func getACIContainerGroup(ctx context.Context, aciContext store.AciContext, containerGroupName string) (containerinstance.ContainerGroup, error) { - containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID) + containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID) if err != nil { return containerinstance.ContainerGroup{}, fmt.Errorf("cannot get container group client: %v", err) } @@ -130,7 +130,7 @@ func getACIContainerGroup(ctx context.Context, aciContext store.AciContext, cont } func deleteACIContainerGroup(ctx context.Context, aciContext store.AciContext, containerGroupName string) (containerinstance.ContainerGroup, error) { - containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID) + containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID) if err != nil { return containerinstance.ContainerGroup{}, fmt.Errorf("cannot get container group client: %v", err) } @@ -139,7 +139,7 @@ func deleteACIContainerGroup(ctx context.Context, aciContext store.AciContext, c } func stopACIContainerGroup(ctx context.Context, aciContext store.AciContext, containerGroupName string) error { - containerGroupsClient, err := login.GetContainerGroupsClient(aciContext.SubscriptionID) + containerGroupsClient, err := login.NewContainerGroupsClient(aciContext.SubscriptionID) if err != nil { return fmt.Errorf("cannot get container group client: %v", err) } @@ -152,7 +152,7 @@ func stopACIContainerGroup(ctx context.Context, aciContext store.AciContext, con } func execACIContainer(ctx context.Context, aciContext store.AciContext, command, containerGroup string, containerName string) (c containerinstance.ContainerExecResponse, err error) { - containerClient, err := login.GetContainerClient(aciContext.SubscriptionID) + containerClient, err := login.NewContainerClient(aciContext.SubscriptionID) if err != nil { return c, errors.Wrapf(err, "cannot get container client") } @@ -245,7 +245,7 @@ func exec(ctx context.Context, address string, password string, request containe } func getACIContainerLogs(ctx context.Context, aciContext store.AciContext, containerGroupName, containerName string, tail *int32) (string, error) { - containerClient, err := login.GetContainerClient(aciContext.SubscriptionID) + containerClient, err := login.NewContainerClient(aciContext.SubscriptionID) if err != nil { return "", errors.Wrapf(err, "cannot get container client") } diff --git a/aci/backend.go b/aci/backend.go index 005bc763d..71679a070 100644 --- a/aci/backend.go +++ b/aci/backend.go @@ -133,7 +133,7 @@ type aciContainerService struct { } func (cs *aciContainerService) List(ctx context.Context, all bool) ([]containers.Container, error) { - groupsClient, err := login.GetContainerGroupsClient(cs.ctx.SubscriptionID) + groupsClient, err := login.NewContainerGroupsClient(cs.ctx.SubscriptionID) if err != nil { return nil, err } @@ -232,7 +232,7 @@ func (cs *aciContainerService) Start(ctx context.Context, containerID string) er return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName)) } - containerGroupsClient, err := login.GetContainerGroupsClient(cs.ctx.SubscriptionID) + containerGroupsClient, err := login.NewContainerGroupsClient(cs.ctx.SubscriptionID) if err != nil { return err } @@ -336,7 +336,7 @@ func (cs *aciContainerService) Delete(ctx context.Context, containerID string, r } if !request.Force { - containerGroupsClient, err := login.GetContainerGroupsClient(cs.ctx.SubscriptionID) + containerGroupsClient, err := login.NewContainerGroupsClient(cs.ctx.SubscriptionID) if err != nil { return err } diff --git a/aci/login/client.go b/aci/login/client.go index afaad6c30..ad92441bb 100644 --- a/aci/login/client.go +++ b/aci/login/client.go @@ -15,8 +15,8 @@ import ( const userAgent = "docker-cli" -// GetContainerGroupsClient get client toi manipulate containerGrouos -func GetContainerGroupsClient(subscriptionID string) (containerinstance.ContainerGroupsClient, error) { +// NewContainerGroupsClient get client toi manipulate containerGrouos +func NewContainerGroupsClient(subscriptionID string) (containerinstance.ContainerGroupsClient, error) { containerGroupsClient := containerinstance.NewContainerGroupsClient(subscriptionID) err := setupClient(&containerGroupsClient.Client) if err != nil { @@ -38,8 +38,8 @@ func setupClient(aciClient *autorest.Client) error { return nil } -// GetStorageAccountsClient get client to manipulate storage accounts -func GetStorageAccountsClient(subscriptionID string) (storage.AccountsClient, error) { +// NewStorageAccountsClient get client to manipulate storage accounts +func NewStorageAccountsClient(subscriptionID string) (storage.AccountsClient, error) { containerGroupsClient := storage.NewAccountsClient(subscriptionID) err := setupClient(&containerGroupsClient.Client) if err != nil { @@ -51,8 +51,8 @@ func GetStorageAccountsClient(subscriptionID string) (storage.AccountsClient, er return containerGroupsClient, nil } -// GetSubscriptionsClient get subscription client -func GetSubscriptionsClient() (subscription.SubscriptionsClient, error) { +// NewSubscriptionsClient get subscription client +func NewSubscriptionsClient() (subscription.SubscriptionsClient, error) { subc := subscription.NewSubscriptionsClient() err := setupClient(&subc.Client) if err != nil { @@ -61,8 +61,8 @@ func GetSubscriptionsClient() (subscription.SubscriptionsClient, error) { return subc, nil } -// GetGroupsClient get client to manipulate groups -func GetGroupsClient(subscriptionID string) (resources.GroupsClient, error) { +// NewGroupsClient get client to manipulate groups +func NewGroupsClient(subscriptionID string) (resources.GroupsClient, error) { groupsClient := resources.NewGroupsClient(subscriptionID) err := setupClient(&groupsClient.Client) if err != nil { @@ -71,8 +71,8 @@ func GetGroupsClient(subscriptionID string) (resources.GroupsClient, error) { return groupsClient, nil } -// GetContainerClient get client to manipulate containers -func GetContainerClient(subscriptionID string) (containerinstance.ContainerClient, error) { +// NewContainerClient get client to manipulate containers +func NewContainerClient(subscriptionID string) (containerinstance.ContainerClient, error) { containerClient := containerinstance.NewContainerClient(subscriptionID) err := setupClient(&containerClient.Client) if err != nil { diff --git a/aci/login/StorageAccountHelper.go b/aci/login/storage_helper.go similarity index 93% rename from aci/login/StorageAccountHelper.go rename to aci/login/storage_helper.go index 42f7a23f0..51d047462 100644 --- a/aci/login/StorageAccountHelper.go +++ b/aci/login/storage_helper.go @@ -17,7 +17,7 @@ type StorageAccountHelper struct { // GetAzureStorageAccountKey retrieves the storage account ket from the current azure login func (helper StorageAccountHelper) GetAzureStorageAccountKey(ctx context.Context, accountName string) (string, error) { - client, err := GetStorageAccountsClient(helper.AciContext.SubscriptionID) + client, err := NewStorageAccountsClient(helper.AciContext.SubscriptionID) if err != nil { return "", err } diff --git a/aci/resource_group.go b/aci/resource_group.go index 3776e348d..e5f623f5c 100644 --- a/aci/resource_group.go +++ b/aci/resource_group.go @@ -45,7 +45,7 @@ func NewACIResourceGroupHelper() ResourceGroupHelper { // GetGroup get a resource group from its name func (mgt aciResourceGroupHelperImpl) GetGroup(ctx context.Context, subscriptionID string, groupName string) (resources.Group, error) { - gc, err := login.GetGroupsClient(subscriptionID) + gc, err := login.NewGroupsClient(subscriptionID) if err != nil { return resources.Group{}, err } @@ -54,7 +54,7 @@ func (mgt aciResourceGroupHelperImpl) GetGroup(ctx context.Context, subscription // ListGroups list resource groups func (mgt aciResourceGroupHelperImpl) ListGroups(ctx context.Context, subscriptionID string) ([]resources.Group, error) { - gc, err := login.GetGroupsClient(subscriptionID) + gc, err := login.NewGroupsClient(subscriptionID) if err != nil { return nil, err } @@ -80,7 +80,7 @@ func (mgt aciResourceGroupHelperImpl) ListGroups(ctx context.Context, subscripti // CreateOrUpdate create or update a resource group func (mgt aciResourceGroupHelperImpl) CreateOrUpdate(ctx context.Context, subscriptionID string, resourceGroupName string, parameters resources.Group) (result resources.Group, err error) { - gc, err := login.GetGroupsClient(subscriptionID) + gc, err := login.NewGroupsClient(subscriptionID) if err != nil { return resources.Group{}, err } @@ -89,7 +89,7 @@ func (mgt aciResourceGroupHelperImpl) CreateOrUpdate(ctx context.Context, subscr // DeleteAsync deletes a resource group. Does not wait for full deletion to return (long operation) func (mgt aciResourceGroupHelperImpl) DeleteAsync(ctx context.Context, subscriptionID string, resourceGroupName string) (err error) { - gc, err := login.GetGroupsClient(subscriptionID) + gc, err := login.NewGroupsClient(subscriptionID) if err != nil { return err } @@ -100,7 +100,7 @@ func (mgt aciResourceGroupHelperImpl) DeleteAsync(ctx context.Context, subscript // GetSubscriptionIDs Return available subscription IDs based on azure login func (mgt aciResourceGroupHelperImpl) GetSubscriptionIDs(ctx context.Context) ([]subscription.Model, error) { - c, err := login.GetSubscriptionsClient() + c, err := login.NewSubscriptionsClient() if err != nil { return nil, err }