tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use location specifed by user if provided, and do not override with group location. ACI allow deploying in any location regardless of resource group 

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2021-05-05 16:16:08 +02:00
parent 04c78c24e4
commit adcadf0af2
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aci/context.go
View File

@ -99,7 +99,10 @@ func (helper contextCreateACIHelper) createContextData(ctx context.Context, opts
}
}
location := *group.Location
location := opts.Location
if opts.Location == "" {
location = *group.Location
}
description := fmt.Sprintf("%s@%s", *group.Name, location)
if opts.Description != "" {

23
aci/context_test.go
View File

@ -107,6 +107,28 @@ func TestCreateNewResourceGroup(t *testing.T) {
assert.DeepEqual(t, data, aciContext("1234", "newResourceGroup", "eastus"))
}
func TestCreateNewResourceGroupWithSpecificLocation(t *testing.T) {
ctx := context.TODO()
opts := options("1234", "")
opts.Location = "eastus2"
m := testContextMocks()
m.resourceGroupHelper.On("GetSubscriptionIDs", ctx).Return([]subscription.Model{subModel("1234", "Subscription1")}, nil)
m.resourceGroupHelper.On("GetGroup", ctx, "1234", "myResourceGroup").Return(group("myResourceGroup", "eastus"), nil)
selectOptions := []string{"create a new resource group", "group1 (eastus)", "group2 (westeurope)"}
m.userPrompt.On("Select", "Select a resource group", selectOptions).Return(0, nil)
m.resourceGroupHelper.On("CreateOrUpdate", ctx, "1234", mock.AnythingOfType("string"), mock.AnythingOfType("resources.Group")).Return(group("newResourceGroup", "eastus"), nil)
m.resourceGroupHelper.On("ListGroups", ctx, "1234").Return([]resources.Group{
group("group1", "eastus"),
group("group2", "westeurope"),
}, nil)
data, description, err := m.contextCreateHelper.createContextData(ctx, opts)
assert.NilError(t, err)
assert.Equal(t, description, "newResourceGroup@eastus2")
assert.DeepEqual(t, data, aciContext("1234", "newResourceGroup", "eastus2"))
}
func TestSelectExistingResourceGroup(t *testing.T) {
ctx := context.TODO()
opts := options("1234", "")
@ -194,7 +216,6 @@ func options(subscriptionID string, resourceGroupName string) ContextParams {
return ContextParams{
SubscriptionID: subscriptionID,
ResourceGroup: resourceGroupName,
Location: "eastus",
}
}

4
cli/cmd/context/create_aci.go
View File

@ -49,8 +49,8 @@ func createAciCommand() *cobra.Command {
}
addDescriptionFlag(cmd, &opts.Description)
cmd.Flags().StringVar(&opts.Location, "location", "eastus", "Location")
cmd.Flags().StringVar(&opts.SubscriptionID, "subscription-id", "", "Location")
cmd.Flags().StringVar(&opts.Location, "location", "", "Location")
cmd.Flags().StringVar(&opts.SubscriptionID, "subscription-id", "", "Subscription id")
cmd.Flags().StringVar(&opts.ResourceGroup, "resource-group", "", "Resource group")
return cmd