Fix sweeper clean up CoreImage

abhilash-av · codycushing · commit 05959398f897 · 2019-05-06T16:42:54.000-07:00
diff --git a/oci/core_image_test.go b/oci/core_image_test.go
@@ -279,9 +279,11 @@ func getImageIds(compartment string) ([]string, error) {
 		return resourceIds, fmt.Errorf("Error getting Image list for compartment id : %s , %s \n", compartmentId, err)
 	}
 	for _, image := range listImagesResponse.Items {
-		id := *image.Id
-		resourceIds = append(resourceIds, id)
-		addResourceIdToSweeperResourceIdMap(compartmentId, "ImageId", id)
+		if image.CompartmentId != nil && *image.CompartmentId == compartment && image.BaseImageId != nil {
+			id := *image.Id
+			resourceIds = append(resourceIds, id)
+			addResourceIdToSweeperResourceIdMap(compartmentId, "ImageId", id)
+		}
 	}
 	return resourceIds, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -279,9 +279,11 @@ func getImageIds(compartment string) ([]string, error) {`
`279`	`279`	`return resourceIds, fmt.Errorf("Error getting Image list for compartment id : %s , %s \n", compartmentId, err)`
`280`	`280`	`}`
`281`	`281`	`for _, image := range listImagesResponse.Items {`
`282`		`- id := *image.Id`
`283`		`- resourceIds = append(resourceIds, id)`
`284`		`- addResourceIdToSweeperResourceIdMap(compartmentId, "ImageId", id)`
	`282`	`+ if image.CompartmentId != nil && *image.CompartmentId == compartment && image.BaseImageId != nil {`
	`283`	`+ id := *image.Id`
	`284`	`+ resourceIds = append(resourceIds, id)`
	`285`	`+ addResourceIdToSweeperResourceIdMap(compartmentId, "ImageId", id)`
	`286`	`+ }`
`285`	`287`	`}`
`286`	`288`	`return resourceIds, nil`
`287`	`289`	`}`