Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cloud API: make location optional for Azure Upload Options #3093

Merged
merged 5 commits into from
Oct 27, 2022
Merged

Cloud API: make location optional for Azure Upload Options #3093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7798190
internal/upload/azure: add method for getting resource group location
thozza Oct 24, 2022
833d7e0
internal/upload/azure: make `location` optional in various methods
thozza Oct 24, 2022
773bbce
cloudapi: make `location` optional in Azure Upload Options
thozza Oct 24, 2022
a6b34ec
internal/target/azure_image: mark `Location` as optional
thozza Oct 24, 2022
1c4ee4d
test/api: don't provide Resource Group Location when testing Azure
thozza Oct 24, 2022
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
6 changes: 5 additions & 1 deletion internal/cloudapi/v2/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,13 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
if err != nil {
return HTTPError(ErrorJSONUnMarshallingError)
}
rgLocation := ""
if azureUploadOptions.Location != nil {
rgLocation = *azureUploadOptions.Location
}
t := target.NewAzureImageTarget(&target.AzureImageTargetOptions{
TenantID: azureUploadOptions.TenantId,
Location: azureUploadOptions.Location,
Location: rgLocation,
SubscriptionID: azureUploadOptions.SubscriptionId,
ResourceGroup: azureUploadOptions.ResourceGroup,
})
Expand Down
Loading