test

Author: uibm

ibm/flex/structures.go

@@ -2853,13 +2853,21 @@ func fetchTagsForBatch(gsClient globalsearchv2.GlobalSearchV2, crns []string, re
 	options.SetFields([]string{"access_tags", "tags", "service_tags", "crn"})
 	options.SetLimit(500)
 
+	log.Printf("[DEBUG] Fetching tags for %d CRNs", len(crns))
+
 	// Handle pagination
+	pageCount := 0
 	for {
+		pageCount++
+		log.Printf("[DEBUG] Fetching page %d", pageCount)
+
 		result, resp, err := gsClient.Search(options)
 		if err != nil {
-			return nil, fmt.Errorf("[ERROR] Error querying tags (batch size: %d): %s %s", len(crns), err, resp)
+			return nil, fmt.Errorf("[ERROR] Error querying tags (batch size: %d, page: %d): %s %s", len(crns), pageCount, err, resp)
 		}
 
+		log.Printf("[DEBUG] Page %d returned %d items", pageCount, len(result.Items))
+
 		// Process items
 		for _, item := range result.Items {
 			crnProp := item.GetProperty("crn")
@@ -2892,13 +2900,24 @@ func fetchTagsForBatch(gsClient globalsearchv2.GlobalSearchV2, crns []string, re
 			tagsMap[crn] = NewStringSet(ResourceIBMVPCHash, taglist)
 		}
 
-		// Check for pagination
+		// Check for pagination - break if no cursor or empty cursor
 		if result.SearchCursor == nil || *result.SearchCursor == "" {
+			log.Printf("[DEBUG] No more pages, breaking pagination loop")
+			break
+		}
+
+		// Also break if we got no items (empty page)
+		if len(result.Items) == 0 {
+			log.Printf("[DEBUG] Empty page returned, breaking pagination loop")
 			break
 		}
+
+		log.Printf("[DEBUG] Setting search cursor for next page: %s", *result.SearchCursor)
 		options.SetSearchCursor(*result.SearchCursor)
 	}
 
+	log.Printf("[DEBUG] Total tags fetched for %d CRNs across %d pages", len(tagsMap), pageCount)
+
 	return tagsMap, nil
 }
 

ibm/service/vpc/data_source_ibm_is_images.go

@@ -485,19 +485,30 @@ func processImagesConcurrently(ctx context.Context, images []vpcv1.Image, meta i
 		isStockImage := strings.HasPrefix(strings.ToLower(*image.Name), "ibm")
 		isRemoteImage := image.Remote != nil
 
-		if !isStockImage && !isRemoteImage {
+		if !isStockImage {
 			crnsForBulkFetch = append(crnsForBulkFetch, *image.CRN)
+			log.Printf("[DEBUG] UJJK Image %s (%s) needs tag fetch", *image.Name, *image.CRN)
+		} else {
+			log.Printf("[DEBUG] UJJK Image %s skipped - stock: %v, remote: %v", *image.Name, isStockImage, isRemoteImage)
 		}
 	}
 
+	log.Printf("[DEBUG] UJJK Total images needing tags: %d", len(crnsForBulkFetch))
+
 	// Bulk fetch all tags in one API call
 	var bulkTags map[string]*schema.Set
 	if len(crnsForBulkFetch) > 0 {
 		var err error
 		bulkTags, err = flex.GetGlobalTagsUsingCRNBulk(meta, crnsForBulkFetch, "", isImageAccessTagType)
 		if err != nil {
-			log.Printf("[ERROR] Bulk tag fetch failed: %s", err)
-			bulkTags = make(map[string]*schema.Set) // Initialize empty map to avoid nil checks
+			log.Printf("[ERROR] UJJK Bulk tag fetch failed: %s", err)
+			bulkTags = make(map[string]*schema.Set)
+		} else {
+			log.Printf("[DEBUG] UJJK Bulk tags fetched successfully. Got tags for %d images", len(bulkTags))
+			// Log what we got
+			for crn, tags := range bulkTags {
+				log.Printf("[DEBUG] UJJK CRN: %s has %d tags", crn, tags.Len())
+			}
 		}
 	} else {
 		bulkTags = make(map[string]*schema.Set)
@@ -511,15 +522,15 @@ func processImagesConcurrently(ctx context.Context, images []vpcv1.Image, meta i
 	}
 
 	results := make(chan result, len(images))
-	sem := make(chan struct{}, 10) // Limit to 10 concurrent goroutines
+	sem := make(chan struct{}, 10)
 	var wg sync.WaitGroup
 
 	for idx, image := range images {
 		wg.Add(1)
 		go func(i int, img vpcv1.Image) {
 			defer wg.Done()
-			sem <- struct{}{}        // Acquire
-			defer func() { <-sem }() // Release
+			sem <- struct{}{}
+			defer func() { <-sem }()
 
 			data, err := processImageWithBulkTags(ctx, img, bulkTags)
 			results <- result{index: i, data: data, err: err}
@@ -535,7 +546,7 @@ func processImagesConcurrently(ctx context.Context, images []vpcv1.Image, meta i
 	orderedResults := make([]map[string]interface{}, len(images))
 	for res := range results {
 		if res.err != nil {
-			log.Printf("[WARN] Error processing image at index %d: %s", res.index, res.err)
+			log.Printf("[WARN] UJJK Error processing image at index %d: %s", res.index, res.err)
 			continue
 		}
 		orderedResults[res.index] = res.data
@@ -549,6 +560,8 @@ func processImagesConcurrently(ctx context.Context, images []vpcv1.Image, meta i
 		}
 	}
 
+	log.Printf("[DEBUG] UJJK Final processed images: %d", len(imagesInfo))
+
 	return imagesInfo, nil
 }
 
@@ -623,13 +636,20 @@ func processImageWithBulkTags(ctx context.Context, image vpcv1.Image, bulkTags m
 		l["allowed_use"] = []map[string]interface{}{modelMap}
 	}
 
-	// Add access tags from bulk fetch (only for non-stock)
+	// Add access tags from bulk fetch (only for non-stock, non-remote images)
 	isStockImage := strings.HasPrefix(strings.ToLower(*image.Name), "ibm")
+	isRemoteImage := image.Remote != nil
 
 	if !isStockImage {
 		if tags, exists := bulkTags[*image.CRN]; exists {
+			log.Printf("[DEBUG] UJJK Setting tags for image %s: %d tags found", *image.Name, tags.Len())
 			l[isImageAccessTags] = tags
+		} else {
+			log.Printf("[DEBUG] UJJK No tags found for image %s (CRN: %s) in bulkTags map", *image.Name, *image.CRN)
+			l[isImageAccessTags] = flex.NewStringSet(flex.ResourceIBMVPCHash, []string{})
 		}
+	} else {
+		log.Printf("[DEBUG] UJJK Image %s - stock: %v, remote: %v - not setting tags", *image.Name, isStockImage, isRemoteImage)
 	}
 
 	return l, nil