From 3a3e6e525b80fe88dcf53cd13ca745cf1ce74403 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Wed, 15 Apr 2020 21:46:46 +0000 Subject: [PATCH] Shift names to diskset Instead of one disk, we'll be working with a set of disks. --- builder/azure/chroot/builder.go | 46 ++++++------- builder/azure/chroot/builder_test.go | 20 +++--- ...new_disk.go => step_create_new_diskset.go} | 64 ++++++++++--------- ...est.go => step_create_new_diskset_test.go} | 16 ++--- 4 files changed, 75 insertions(+), 71 deletions(-) rename builder/azure/chroot/{step_create_new_disk.go => step_create_new_diskset.go} (66%) rename builder/azure/chroot/{step_create_new_disk_test.go => step_create_new_diskset_test.go} (89%) diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go index ee0152291..5a8c8c136 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -464,12 +464,12 @@ func buildsteps(config Config, info *client.ComputeInfo) []multistep.Step { } if config.FromScratch { - addSteps(&StepCreateNewDisk{ - ResourceID: config.TemporaryOSDiskID, - DiskSizeGB: config.OSDiskSizeGB, - DiskStorageAccountType: config.OSDiskStorageAccountType, - HyperVGeneration: config.ImageHyperVGeneration, - Location: info.Location}) + addSteps(&StepCreateNewDiskset{ + OSDiskID: config.TemporaryOSDiskID, + OSDiskSizeGB: config.OSDiskSizeGB, + OSDiskStorageAccountType: config.OSDiskStorageAccountType, + HyperVGeneration: config.ImageHyperVGeneration, + Location: info.Location}) } else { switch config.sourceType { case sourcePlatformImage: @@ -482,13 +482,13 @@ func buildsteps(config Config, info *client.ComputeInfo) []multistep.Step { }) } addSteps( - &StepCreateNewDisk{ - ResourceID: config.TemporaryOSDiskID, - DiskSizeGB: config.OSDiskSizeGB, - DiskStorageAccountType: config.OSDiskStorageAccountType, - HyperVGeneration: config.ImageHyperVGeneration, - Location: info.Location, - PlatformImage: pi, + &StepCreateNewDiskset{ + OSDiskID: config.TemporaryOSDiskID, + OSDiskSizeGB: config.OSDiskSizeGB, + OSDiskStorageAccountType: config.OSDiskStorageAccountType, + HyperVGeneration: config.ImageHyperVGeneration, + Location: info.Location, + SourcePlatformImage: pi, SkipCleanup: config.SkipCleanup, }) @@ -502,13 +502,13 @@ func buildsteps(config Config, info *client.ComputeInfo) []multistep.Step { SourceDiskResourceID: config.Source, Location: info.Location, }, - &StepCreateNewDisk{ - ResourceID: config.TemporaryOSDiskID, - DiskSizeGB: config.OSDiskSizeGB, - DiskStorageAccountType: config.OSDiskStorageAccountType, - HyperVGeneration: config.ImageHyperVGeneration, - SourceDiskResourceID: config.Source, - Location: info.Location, + &StepCreateNewDiskset{ + OSDiskID: config.TemporaryOSDiskID, + OSDiskSizeGB: config.OSDiskSizeGB, + OSDiskStorageAccountType: config.OSDiskStorageAccountType, + HyperVGeneration: config.ImageHyperVGeneration, + SourceOSDiskResourceID: config.Source, + Location: info.Location, SkipCleanup: config.SkipCleanup, }) @@ -520,9 +520,9 @@ func buildsteps(config Config, info *client.ComputeInfo) []multistep.Step { SubscriptionID: info.SubscriptionID, Location: info.Location, }, - &StepCreateNewDisk{ - ResourceID: config.TemporaryOSDiskID, - DiskSizeGB: config.OSDiskSizeGB, + &StepCreateNewDiskset{ + OSDiskID: config.TemporaryOSDiskID, + OSDiskSizeGB: config.OSDiskSizeGB, SourceImageResourceID: config.Source, Location: info.Location, diff --git a/builder/azure/chroot/builder_test.go b/builder/azure/chroot/builder_test.go index 8f01b9969..dee9436a9 100644 --- a/builder/azure/chroot/builder_test.go +++ b/builder/azure/chroot/builder_test.go @@ -151,9 +151,9 @@ func Test_buildsteps(t *testing.T) { config: Config{FromScratch: true}, verify: func(steps []multistep.Step, _ *testing.T) { for _, s := range steps { - if s, ok := s.(*StepCreateNewDisk); ok { - if s.SourceDiskResourceID == "" && - s.PlatformImage == nil { + if s, ok := s.(*StepCreateNewDiskset); ok { + if s.SourceOSDiskResourceID == "" && + s.SourcePlatformImage == nil { return } t.Errorf("found misconfigured StepCreateNewDisk: %+v", s) @@ -166,10 +166,10 @@ func Test_buildsteps(t *testing.T) { config: Config{Source: "publisher:offer:sku:version", sourceType: sourcePlatformImage}, verify: func(steps []multistep.Step, _ *testing.T) { for _, s := range steps { - if s, ok := s.(*StepCreateNewDisk); ok { - if s.SourceDiskResourceID == "" && - s.PlatformImage != nil && - s.PlatformImage.Publisher == "publisher" { + if s, ok := s.(*StepCreateNewDiskset); ok { + if s.SourceOSDiskResourceID == "" && + s.SourcePlatformImage != nil && + s.SourcePlatformImage.Publisher == "publisher" { return } t.Errorf("found misconfigured StepCreateNewDisk: %+v", s) @@ -197,9 +197,9 @@ func Test_buildsteps(t *testing.T) { config: Config{Source: "diskresourceid", sourceType: sourceDisk}, verify: func(steps []multistep.Step, _ *testing.T) { for _, s := range steps { - if s, ok := s.(*StepCreateNewDisk); ok { - if s.SourceDiskResourceID == "diskresourceid" && - s.PlatformImage == nil { + if s, ok := s.(*StepCreateNewDiskset); ok { + if s.SourceOSDiskResourceID == "diskresourceid" && + s.SourcePlatformImage == nil { return } t.Errorf("found misconfigured StepCreateNewDisk: %+v", s) diff --git a/builder/azure/chroot/step_create_new_disk.go b/builder/azure/chroot/step_create_new_diskset.go similarity index 66% rename from builder/azure/chroot/step_create_new_disk.go rename to builder/azure/chroot/step_create_new_diskset.go index 0a0a2615d..ae65a06ce 100644 --- a/builder/azure/chroot/step_create_new_disk.go +++ b/builder/azure/chroot/step_create_new_diskset.go @@ -15,22 +15,26 @@ import ( "github.com/hashicorp/packer/packer" ) -var _ multistep.Step = &StepCreateNewDisk{} +var _ multistep.Step = &StepCreateNewDiskset{} + +type StepCreateNewDiskset struct { + OSDiskID string // Disk ID + OSDiskSizeGB int32 // optional, ignored if 0 + OSDiskStorageAccountType string // from compute.DiskStorageAccountTypes -type StepCreateNewDisk struct { - ResourceID string // Disk ID subscriptionID, resourceGroup, diskName string // split out resource id - DiskSizeGB int32 // optional, ignored if 0 - DiskStorageAccountType string // from compute.DiskStorageAccountTypes - HyperVGeneration string + HyperVGeneration string // For OS disk - Location string - PlatformImage *client.PlatformImage - - SourceDiskResourceID string + // Copy another disk + SourceOSDiskResourceID string + // Extract from platform image + SourcePlatformImage *client.PlatformImage + // Extract from shared image SourceImageResourceID string + // Location is needed for platform and shared images + Location string SkipCleanup bool } @@ -49,19 +53,19 @@ func parseDiskResourceID(resourceID string) (subscriptionID, resourceGroup, disk return r.SubscriptionID, r.ResourceGroup, r.ResourceName, nil } -func (s *StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { +func (s *StepCreateNewDiskset) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { azcli := state.Get("azureclient").(client.AzureClientSet) ui := state.Get("ui").(packer.Ui) - state.Put(stateBagKey_OSDiskResourceID, s.ResourceID) - ui.Say(fmt.Sprintf("Creating disk '%s'", s.ResourceID)) + state.Put(stateBagKey_OSDiskResourceID, s.OSDiskID) + ui.Say(fmt.Sprintf("Creating disk '%s'", s.OSDiskID)) var err error - s.subscriptionID, s.resourceGroup, s.diskName, err = parseDiskResourceID(s.ResourceID) + s.subscriptionID, s.resourceGroup, s.diskName, err = parseDiskResourceID(s.OSDiskID) if err != nil { log.Printf("StepCreateNewDisk.Run: error: %+v", err) err := fmt.Errorf( - "error parsing resource id '%s': %v", s.ResourceID, err) + "error parsing resource id '%s': %v", s.OSDiskID, err) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt @@ -75,9 +79,9 @@ func (s *StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) m }, } - if s.DiskStorageAccountType != "" { + if s.OSDiskStorageAccountType != "" { disk.Sku = &compute.DiskSku{ - Name: compute.DiskStorageAccountTypes(s.DiskStorageAccountType), + Name: compute.DiskStorageAccountTypes(s.OSDiskStorageAccountType), } } @@ -85,21 +89,21 @@ func (s *StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) m disk.DiskProperties.HyperVGeneration = compute.HyperVGeneration(s.HyperVGeneration) } - if s.DiskSizeGB > 0 { - disk.DiskProperties.DiskSizeGB = to.Int32Ptr(s.DiskSizeGB) + if s.OSDiskSizeGB > 0 { + disk.DiskProperties.DiskSizeGB = to.Int32Ptr(s.OSDiskSizeGB) } switch { - case s.PlatformImage != nil: + case s.SourcePlatformImage != nil: disk.CreationData.CreateOption = compute.FromImage disk.CreationData.ImageReference = &compute.ImageDiskReference{ ID: to.StringPtr(fmt.Sprintf( "/subscriptions/%s/providers/Microsoft.Compute/locations/%s/publishers/%s/artifacttypes/vmimage/offers/%s/skus/%s/versions/%s", - s.subscriptionID, s.Location, s.PlatformImage.Publisher, s.PlatformImage.Offer, s.PlatformImage.Sku, s.PlatformImage.Version)), + s.subscriptionID, s.Location, s.SourcePlatformImage.Publisher, s.SourcePlatformImage.Offer, s.SourcePlatformImage.Sku, s.SourcePlatformImage.Version)), } - case s.SourceDiskResourceID != "": + case s.SourceOSDiskResourceID != "": disk.CreationData.CreateOption = compute.Copy - disk.CreationData.SourceResourceID = to.StringPtr(s.SourceDiskResourceID) + disk.CreationData.SourceResourceID = to.StringPtr(s.SourceOSDiskResourceID) case s.SourceImageResourceID != "": disk.CreationData.CreateOption = compute.FromImage disk.CreationData.GalleryImageReference = &compute.ImageDiskReference{ @@ -118,7 +122,7 @@ func (s *StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) m if err != nil { log.Printf("StepCreateNewDisk.Run: error: %+v", err) err := fmt.Errorf( - "error creating new disk '%s': %v", s.ResourceID, err) + "error creating new disk '%s': %v", s.OSDiskID, err) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt @@ -127,18 +131,18 @@ func (s *StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) m return multistep.ActionContinue } -func (s *StepCreateNewDisk) Cleanup(state multistep.StateBag) { +func (s *StepCreateNewDiskset) Cleanup(state multistep.StateBag) { if !s.SkipCleanup { azcli := state.Get("azureclient").(client.AzureClientSet) ui := state.Get("ui").(packer.Ui) - ui.Say(fmt.Sprintf("Waiting for disk %q detach to complete", s.ResourceID)) - err := NewDiskAttacher(azcli).WaitForDetach(context.Background(), s.ResourceID) + ui.Say(fmt.Sprintf("Waiting for disk %q detach to complete", s.OSDiskID)) + err := NewDiskAttacher(azcli).WaitForDetach(context.Background(), s.OSDiskID) if err != nil { - ui.Error(fmt.Sprintf("error detaching disk %q: %s", s.ResourceID, err)) + ui.Error(fmt.Sprintf("error detaching disk %q: %s", s.OSDiskID, err)) } - ui.Say(fmt.Sprintf("Deleting disk %q", s.ResourceID)) + ui.Say(fmt.Sprintf("Deleting disk %q", s.OSDiskID)) f, err := azcli.DisksClient().Delete(context.TODO(), s.resourceGroup, s.diskName) if err == nil { @@ -146,7 +150,7 @@ func (s *StepCreateNewDisk) Cleanup(state multistep.StateBag) { } if err != nil { log.Printf("StepCreateNewDisk.Cleanup: error: %+v", err) - ui.Error(fmt.Sprintf("error deleting disk '%s': %v.", s.ResourceID, err)) + ui.Error(fmt.Sprintf("error deleting disk '%s': %v.", s.OSDiskID, err)) } } } diff --git a/builder/azure/chroot/step_create_new_disk_test.go b/builder/azure/chroot/step_create_new_diskset_test.go similarity index 89% rename from builder/azure/chroot/step_create_new_disk_test.go rename to builder/azure/chroot/step_create_new_diskset_test.go index 64739150a..272a1ec3c 100644 --- a/builder/azure/chroot/step_create_new_disk_test.go +++ b/builder/azure/chroot/step_create_new_diskset_test.go @@ -99,14 +99,14 @@ func TestStepCreateNewDisk_Run(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - s := StepCreateNewDisk{ - ResourceID: tt.fields.ResourceID, - DiskSizeGB: tt.fields.DiskSizeGB, - DiskStorageAccountType: tt.fields.DiskStorageAccountType, - HyperVGeneration: tt.fields.HyperVGeneration, - Location: tt.fields.Location, - PlatformImage: tt.fields.PlatformImage, - SourceDiskResourceID: tt.fields.SourceDiskResourceID, + s := StepCreateNewDiskset{ + OSDiskID: tt.fields.ResourceID, + OSDiskSizeGB: tt.fields.DiskSizeGB, + OSDiskStorageAccountType: tt.fields.DiskStorageAccountType, + HyperVGeneration: tt.fields.HyperVGeneration, + Location: tt.fields.Location, + SourcePlatformImage: tt.fields.PlatformImage, + SourceOSDiskResourceID: tt.fields.SourceDiskResourceID, } expectedPutDiskBody := regexp.MustCompile(`[\s\n]`).ReplaceAllString(tt.fields.expectedPutDiskBody, "")