mantle/azure: Prepare to upload to Fedora Community Gallery

go.mod

@@ -5,7 +5,7 @@ go 1.25.0
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
-	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v1.0.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.1.0
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1

go.sum

@@ -13,10 +13,10 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+
 github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v1.0.0 h1:/Di3vB4sNeQ+7A8efjUVENvyB945Wruvstucqp7ZArg=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v1.0.0/go.mod h1:gM3K25LQlsET3QR+4V74zxCsFAy0r6xMNN9n80SZn+4=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.0.0 h1:lMW1lD/17LUA5z1XTURo7LcVG2ICBPlyMHjIUrcFZNQ=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.0.0/go.mod h1:ceIuwmxDWptoW3eCqSXlnPsZFKh4X+R38dWPv7GS9Vs=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 h1:UPeCRD+XY7QlaGQte2EVI2iOcWvUYA2XY8w5T/8v0NQ=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1/go.mod h1:oGV6NlB0cvi1ZbYRR2UN44QHxWFyGk+iylgD0qaMXjA=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 h1:mLY+pNLjCUeKhgnAJWAKhEUQM+RJQo2H1fuGSw1Ky1E=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2/go.mod h1:FbdwsQ2EzwvXxOPcMFYO8ogEc9uMMIj3YkmCdXdAFmk=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0 h1:PTFGRSlMKCQelWwxUyYVEUqseBJVemLyqWJjvMyt0do=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0/go.mod h1:LRr2FzBTQlONPPa5HREE5+RjSCTXl7BwOvYOaWTqCaI=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v3 v3.1.0 h1:2qsIIvxVT+uE6yrNldntJKlLRgxGbZ85kgtz5SNBhMw=

mantle/cmd/ore/azure/azure.go

@@ -34,6 +34,7 @@ var (
 
 	azureCredentials string
 	azureLocation    string
+	azureOffer       string
 	azurePublisher   string
 
 	api *azure.API
@@ -45,7 +46,8 @@ func init() {
 	sv := Azure.PersistentFlags().StringVar
 	sv(&azureCredentials, "azure-credentials", "", "Azure credentials file location (default \"~/"+auth.AzureCredentialsPath+"\")")
 	sv(&azureLocation, "azure-location", "westus", "Azure location (default \"westus\")")
-	sv(&azurePublisher, "azure-publisher", "CoreOS", "Azure image publisher")
+	sv(&azureOffer, "azure-offer", "CoreOS", "Azure image offer")
+	sv(&azurePublisher, "azure-publisher", "Fedora", "Azure image publisher")
 }
 
 func preauth(cmd *cobra.Command, args []string) error {
@@ -54,6 +56,7 @@ func preauth(cmd *cobra.Command, args []string) error {
 	a, err := azure.New(&azure.Options{
 		AzureCredentials: azureCredentials,
 		Location:         azureLocation,
+		Offer:            azureOffer,
 		Publisher:        azurePublisher,
 	})
 	if err != nil {

mantle/cmd/ore/azure/create-gallery-image.go

@@ -37,6 +37,8 @@ var (
 	galleryImageName string
 	galleryName      string
 	architecture     string
+	galleryProfile   string
+	version          string
 )
 
 func init() {
@@ -47,6 +49,8 @@ func init() {
 	sv(&blobUrl, "image-blob", "", "source blob url")
 	sv(&resourceGroup, "resource-group", "kola", "resource group name")
 	sv(&architecture, "arch", "", "The target architecture for the image")
+	sv(&galleryProfile, "coreos-gallery-profile", "", "The CoreOS specific gallery profile to apply to the image on upload")
+	sv(&version, "version", "", "The azure gallery image version")
 
 	Azure.AddCommand(cmdCreateGalleryImage)
 }
@@ -57,23 +61,17 @@ func runCreateGalleryImage(cmd *cobra.Command, args []string) error {
 		os.Exit(1)
 	}
 
-	if err := api.SetupClients(); err != nil {
-		fmt.Fprintf(os.Stderr, "setting up clients: %v\n", err)
+	if version == "" {
+		fmt.Fprintf(os.Stderr, "must supply --version\n")
 		os.Exit(1)
 	}
 
-	img, err := api.CreateImage(galleryImageName, resourceGroup, blobUrl)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Couldn't create Azure image: %v\n", err)
-		os.Exit(1)
-	}
-	if img.ID == nil {
-		fmt.Fprintf(os.Stderr, "received nil image\n")
+	if err := api.SetupClients(); err != nil {
+		fmt.Fprintf(os.Stderr, "setting up clients: %v\n", err)
 		os.Exit(1)
 	}
-	sourceImageId := *img.ID
 
-	galleryImage, err := api.CreateGalleryImage(galleryImageName, galleryName, resourceGroup, sourceImageId, architecture)
+	galleryImage, err := api.CreateGalleryImage(galleryImageName, galleryName, resourceGroup, blobUrl, architecture, version, galleryProfile)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Couldn't create Azure Shared Image Gallery image: %v\n", err)
 		os.Exit(1)

mantle/cmd/ore/azure/delete-gallery-image.go

@@ -31,7 +31,7 @@ var (
 		SilenceUsage: true,
 	}
 
-	deleteGallery bool
+	deleteDefinition bool
 )
 
 func init() {
@@ -41,37 +41,30 @@ func init() {
 	sv(&imageName, "gallery-image-name", "", "gallery image name")
 	sv(&resourceGroup, "resource-group", "kola", "resource group name")
 	sv(&galleryName, "gallery-name", "kola", "gallery name")
-	bv(&deleteGallery, "delete-entire-gallery", false, "delete entire gallery")
+	sv(&version, "version", "", "The azure gallery image version")
+	sv(&galleryProfile, "coreos-gallery-profile", "", "The CoreOS specific gallery profile to apply to the image on upload")
+	bv(&deleteDefinition, "delete-definition", false, "delete the gallery image definition after deleting the specified version")
 
 	Azure.AddCommand(cmdDeleteGalleryImage)
 }
 
 func runDeleteGalleryImage(cmd *cobra.Command, args []string) error {
-	if err := api.SetupClients(); err != nil {
-		return fmt.Errorf("setting up clients: %v\n", err)
+	if imageName == "" {
+		return fmt.Errorf("must supply --gallery-image-name")
 	}
 
-	if deleteGallery {
-		err := api.DeleteGallery(galleryName, resourceGroup)
-		if err != nil {
-			return fmt.Errorf("Couldn't delete gallery: %v\n", err)
-		}
-		plog.Printf("Gallery %q in resource group %q removed", galleryName, resourceGroup)
-		return nil
+	if version == "" {
+		return fmt.Errorf("must supply --version")
 	}
 
-	err := api.DeleteGalleryImage(imageName, resourceGroup, galleryName)
-	if err != nil {
-		return fmt.Errorf("Couldn't delete gallery image: %v\n", err)
+	if err := api.SetupClients(); err != nil {
+		return fmt.Errorf("setting up clients: %v\n", err)
 	}
 
-	// Gallery image versions are backed by managed images with the same name,
-	// so we can easily identify and delete them together.
-	err = api.DeleteImage(imageName, resourceGroup)
+	err := api.DeleteGalleryImageVersion(imageName, version, resourceGroup, galleryName, galleryProfile, deleteDefinition)
 	if err != nil {
-		return fmt.Errorf("Couldn't delete image: %v\n", err)
+		return fmt.Errorf("Couldn't delete gallery image version: %v\n", err)
 	}
 
-	plog.Printf("Image %q in gallery %q in resource group %q removed", imageName, galleryName, resourceGroup)
 	return nil
 }

mantle/platform/api/azure/api.go

@@ -22,14 +22,17 @@ import (
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
-	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
+	"github.com/coreos/pkg/capnslog"
 
 	"github.com/coreos/coreos-assembler/mantle/auth"
 )
 
+var plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "platform/api/azure")
+
 type API struct {
 	azIdCred        *azidentity.DefaultAzureCredential
 	rgClient        *armresources.ResourceGroupsClient

mantle/platform/api/azure/disk.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
-	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4"
 
 	"github.com/coreos/coreos-assembler/mantle/util"
 )