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

Remove azure resourceGroupClient from backend initialisation. #158

Merged
merged 1 commit into from
May 28, 2020
Merged
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
22 changes: 10 additions & 12 deletions azure/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,17 @@ func New(ctx context.Context) (backend.Service, error) {
return nil, err
}

auth, _ := login.NewAuthorizerFromLogin()
containerGroupsClient := containerinstance.NewContainerGroupsClient(aciContext.SubscriptionID)
containerGroupsClient.Authorizer = auth

return getAciAPIService(containerGroupsClient, aciContext)
return getAciAPIService(aciContext)
}

func getAciAPIService(cgc containerinstance.ContainerGroupsClient, aciCtx store.AciContext) (*aciAPIService, error) {
func getAciAPIService(aciCtx store.AciContext) (*aciAPIService, error) {
service, err := login.NewAzureLoginService()
if err != nil {
return nil, err
}
return &aciAPIService{
aciContainerService: aciContainerService{
containerGroupsClient: cgc,
ctx: aciCtx,
ctx: aciCtx,
},
aciComposeService: aciComposeService{
ctx: aciCtx,
Expand Down Expand Up @@ -91,13 +86,16 @@ func (a *aciAPIService) CloudService() cloud.Service {
}

type aciContainerService struct {
containerGroupsClient containerinstance.ContainerGroupsClient
ctx store.AciContext
ctx store.AciContext
}

func (cs *aciContainerService) List(ctx context.Context, _ bool) ([]containers.Container, error) {
groupsClient, err := getContainerGroupsClient(cs.ctx.SubscriptionID)
if err != nil {
return nil, err
}
var containerGroups []containerinstance.ContainerGroup
result, err := cs.containerGroupsClient.ListByResourceGroup(ctx, cs.ctx.ResourceGroup)
result, err := groupsClient.ListByResourceGroup(ctx, cs.ctx.ResourceGroup)
if err != nil {
return []containers.Container{}, err
}
Expand All @@ -111,7 +109,7 @@ func (cs *aciContainerService) List(ctx context.Context, _ bool) ([]containers.C

var res []containers.Container
for _, containerGroup := range containerGroups {
group, err := cs.containerGroupsClient.Get(ctx, cs.ctx.ResourceGroup, *containerGroup.Name)
group, err := groupsClient.Get(ctx, cs.ctx.ResourceGroup, *containerGroup.Name)
if err != nil {
return []containers.Container{}, err
}
Expand Down