particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upload/azure: user newer resourcemanager packages

Browse source 
The older azure sdk and autorest packages are deprecated.

Signed-off-by: Sanne Raymaekers <sanne.raymaekers@gmail.com>
This commit is contained in:
Sanne Raymaekers 2023-12-15 13:37:04 +01:00
parent d5e1bc28e9
commit 828d82e871
301 changed files with 108023 additions and 32863 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cmd/osbuild-worker/jobimpl-osbuild.go
View file

@ -763,21 +763,29 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
break
}
c, err := azure.NewClient(*impl.AzureConfig.Creds, targetOptions.TenantID)
c, err := azure.NewClient(*impl.AzureConfig.Creds, targetOptions.TenantID, targetOptions.SubscriptionID)
if err != nil {
targetResult.TargetError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidTargetConfig, err.Error(), nil)
break
}
logWithId.Info("[Azure] 🔑 Logged in Azure")
location := targetOptions.Location
if location == "" {
location, err = c.GetResourceGroupLocation(ctx, targetOptions.ResourceGroup)
if err != nil {
targetResult.TargetError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidTargetConfig, fmt.Sprintf("retrieving resource group location failed: %v", err), nil)
break
}
}
storageAccountTag := azure.Tag{
Name: "imageBuilderStorageAccount",
Value: fmt.Sprintf("location=%s", targetOptions.Location),
Value: fmt.Sprintf("location=%s", location),
}
storageAccount, err := c.GetResourceNameByTag(
ctx,
targetOptions.SubscriptionID,
targetOptions.ResourceGroup,
storageAccountTag,
)
@ -793,10 +801,9 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
err := c.CreateStorageAccount(
ctx,
targetOptions.SubscriptionID,
targetOptions.ResourceGroup,
storageAccount,
targetOptions.Location,
location,
storageAccountTag,
)
if err != nil {
@ -808,7 +815,6 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
logWithId.Info("[Azure] 🔑📦 Retrieving a storage account key")
storageAccessKey, err := c.GetStorageAccountKey(
ctx,
targetOptions.SubscriptionID,
targetOptions.ResourceGroup,
storageAccount,
)
@ -873,7 +879,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
storageContainer,
blobName,
jobTarget.ImageName,
targetOptions.Location,
location,
)
if err != nil {
targetResult.TargetError = clienterrors.WorkerClientError(clienterrors.ErrorImportingImage, fmt.Sprintf("registering the image failed: %v", err), nil)