fixes and logs

Author: timmy-wright

e2e/config/azure.go

@@ -365,7 +365,7 @@ func (a *AzureClient) assignRolesToVMIdentity(ctx context.Context, principalID *
 	return nil
 }
 
-func (a *AzureClient) LatestSIGImageVersionByTag(ctx context.Context, image *Image, tagName, tagValue string) (VHDResourceID, error) {
+func (a *AzureClient) LatestSIGImageVersionByTag(ctx context.Context, t *testing.T, image *Image, tagName, tagValue string) (VHDResourceID, error) {
 	galleryImageVersion, err := armcompute.NewGalleryImageVersionsClient(image.Gallery.SubscriptionID, a.Credential, a.ArmOptions)
 	if err != nil {
 		return "", fmt.Errorf("create a new images client: %v", err)
@@ -379,6 +379,7 @@ func (a *AzureClient) LatestSIGImageVersionByTag(ctx context.Context, image *Ima
 		}
 		versions := page.Value
 		for _, version := range versions {
+			t.Logf("Found image version: %s", version.Tags)
 			// skip images tagged with the no-selection tag, indicating they
 			// shouldn't be selected dynmically for running abe2e scenarios
 			if _, ok := version.Tags[noSelectionTagName]; ok {

e2e/config/vhd.go

@@ -223,12 +223,16 @@ func (i *Image) VHDResourceID(ctx context.Context, t *testing.T) (VHDResourceID,
 			i.vhd, i.vhdErr = Azure.EnsureSIGImageVersion(ctx, i)
 			t.Logf("got version vid %s: %s", i.Version, i.vhd)
 		default:
-			i.vhd, i.vhdErr = Azure.LatestSIGImageVersionByTag(ctx, i, Config.SIGVersionTagName, Config.SIGVersionTagValue)
+			t.Logf("version: %s", i.Version)
+			i.vhd, i.vhdErr = Azure.LatestSIGImageVersionByTag(ctx, t, i, Config.SIGVersionTagName, Config.SIGVersionTagValue)
 			t.Logf("got version by tag %s=%s: %s", Config.SIGVersionTagName, Config.SIGVersionTagValue, i.vhd)
 		}
 		if i.vhdErr != nil {
 			i.vhdErr = fmt.Errorf("img: %s, tag %s=%s, err %w", i.Name, Config.SIGVersionTagName, Config.SIGVersionTagValue, i.vhdErr)
-			t.Logf("failed to find the image sub=%s rg=%s gallary=%s version for with id %s", i.Gallery.SubscriptionID, i.Gallery.ResourceGroupName, i.Gallery.Name, i.vhdErr)
+			t.Logf("Failed to find the image. Sub=%s rg=%s gallary=%s version for with err %s", i.Gallery.SubscriptionID, i.Gallery.ResourceGroupName, i.Gallery.Name, i.vhdErr)
+		} else {
+			t.Logf("Found the image. Sub=%s rg=%s gallary=%s version for with id %s", i.Gallery.SubscriptionID, i.Gallery.ResourceGroupName, i.Gallery.Name, i.vhd.Short())
+
 		}
 	})
 	return i.vhd, i.vhdErr

e2e/vmss.go

@@ -53,9 +53,9 @@ func createVMSS(ctx context.Context, s *Scenario) *armcompute.VirtualMachineScal
 	}
 
 	if nodeBootstrapping != nil && nodeBootstrapping.SigImageConfig != nil {
-		s.T.Logf("vhd sub id %s", nodeBootstrapping.SigImageConfig.SubscriptionID)
-		s.T.Logf("vhd rgr id %s", nodeBootstrapping.SigImageConfig.ResourceGroup)
-		s.T.Logf("vhd galler %s", nodeBootstrapping.SigImageConfig.Gallery)
+		s.T.Logf("vhd sub id %s", config.Config.SubscriptionID)
+		s.T.Logf("vhd rgr id %s", config.ResourceGroupName)
+		s.T.Logf("vhd galler %s", config.Config.GalleryNameWindows)
 		s.T.Logf("vhd versio %s", nodeBootstrapping.SigImageConfig.Version)
 		s.T.Logf("vhd defini %s", nodeBootstrapping.SigImageConfig.Definition)
 	} else {