trt-2163: move ExtractImageFromReleasePayload to payload package

Author: neisw

pkg/monitortests/kubeapiserver/disruptioninclusterapiserver/monitortest.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/openshift/origin/pkg/monitortestlibrary/disruptionlibrary"
 	"github.com/openshift/origin/pkg/test/extensions"
+	"github.com/openshift/origin/test/extended/util/payload"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
 
@@ -319,7 +320,7 @@ func (i *InvariantInClusterDisruption) StartCollection(ctx context.Context, admi
 
 	// Extract the openshift-tests image from the release payload
 	oc := exutil.NewCLIForMonitorTest("default")
-	i.openshiftTestsImagePullSpec, err = extensions.ExtractImageFromReleasePayload(i.payloadImagePullSpec, "tests", oc)
+	i.openshiftTestsImagePullSpec, err = payload.ExtractImageFromReleasePayload(i.payloadImagePullSpec, "tests", oc)
 	if err != nil {
 		return fmt.Errorf("unable to determine openshift-tests image: %s: %v", i.payloadImagePullSpec, err)
 	}

pkg/monitortests/network/disruptionpodnetwork/monitortest.go

@@ -91,7 +91,6 @@ func NewPodNetworkAvalibilityInvariant(info monitortestframework.MonitorTestInit
 func (pna *podNetworkAvalibility) PrepareCollection(ctx context.Context, adminRESTConfig *rest.Config, recorder monitorapi.RecorderWriter) error {
 	deploymentID := uuid.New().String()
 
-	// Skip on ROSA TRT-1869
 	oc := util.NewCLIWithoutNamespace("openshift-tests")
 	openshiftTestsImagePullSpec, err := GetOpenshiftTestsImagePullSpec(ctx, adminRESTConfig, pna.payloadImagePullSpec, oc)
 	if err != nil {

pkg/monitortests/network/disruptionpodnetwork/utils.go

@@ -4,15 +4,17 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/openshift/origin/pkg/test/extensions"
+
 	"io/ioutil"
 	"os"
 	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
 
+	"github.com/openshift/origin/pkg/test/extensions"
 	exutil "github.com/openshift/origin/test/extended/util"
+	"github.com/openshift/origin/test/extended/util/payload"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
@@ -33,7 +35,7 @@ func GetOpenshiftTestsImagePullSpec(ctx context.Context, adminRESTConfig *rest.C
 	// runImageExtract extracts src from specified image to dst
 
 	// Extract the openshift-tests image from the release payload
-	openshiftTestsImagePullSpec, err := extensions.ExtractImageFromReleasePayload(suggestedPayloadImage, "tests", oc)
+	openshiftTestsImagePullSpec, err := payload.ExtractImageFromReleasePayload(suggestedPayloadImage, "tests", oc)
 	if err != nil {
 		logrus.WithError(err).Errorf("unable to determine openshift-tests image through ExtractImageFromReleasePayload: %v", err)
 		// Now try the wrapper to see if it makes a difference

pkg/test/extensions/provider.go

@@ -59,7 +59,7 @@ func NewExternalBinaryProvider(releaseImage, registryAuthfilePath string) (*Exte
 		return nil, errors.WithMessagef(err, "error creating cache path %s", binDir)
 	}
 
-	releasePayloadImageStream, releaseImage, err := extractReleaseImageStream(binDir, releaseImage, registryAuthfilePath)
+	releasePayloadImageStream, releaseImage, err := ExtractReleaseImageStream(binDir, releaseImage, registryAuthfilePath)
 	if err != nil {
 		return nil, errors.WithMessage(err, "couldn't extract release payload image stream")
 	}

pkg/test/extensions/util.go

@@ -231,9 +231,9 @@ func createBinPath(path string) error {
 	return nil
 }
 
-// extractReleaseImageStream extracts image references from the given releaseImage and returns
+// ExtractReleaseImageStream extracts image references from the given releaseImage and returns
 // an ImageStream object with tags associated with image-references from that payload.
-func extractReleaseImageStream(extractPath, releaseImage string,
+func ExtractReleaseImageStream(extractPath, releaseImage string,
 	registryAuthFilePath string) (*imagev1.ImageStream, string, error) {
 
 	if _, err := os.Stat(path.Join(extractPath, "image-references")); err != nil {
@@ -271,37 +271,6 @@ func extractReleaseImageStream(extractPath, releaseImage string,
 	return is, releaseImage, nil
 }
 
-// ExtractImageFromReleasePayload extracts the image pull spec for a specific tag from a release payload.
-// It returns the image pull spec for the specified tag or an error if the tag is not found.
-func ExtractImageFromReleasePayload(releaseImage, imageTag string, oc *util.CLI) (string, error) {
-	// Create a temporary directory for extraction
-	tmpDir, err := os.MkdirTemp("", "release-extract")
-	if err != nil {
-		return "", fmt.Errorf("failed to create temporary directory: %w", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	registryAuthFilePath, err := DetermineRegistryAuthFilePath(tmpDir, oc)
-	if err != nil {
-		return "", fmt.Errorf("failed to determine registry auth file path: %w", err)
-	}
-
-	// Extract the ImageStream from the release payload
-	imageStream, _, err := extractReleaseImageStream(tmpDir, releaseImage, registryAuthFilePath)
-	if err != nil {
-		return "", fmt.Errorf("failed to extract image references from release payload: %w", err)
-	}
-
-	// Find the specified tag in the ImageStream
-	for _, tag := range imageStream.Spec.Tags {
-		if tag.Name == imageTag {
-			return tag.From.Name, nil
-		}
-	}
-
-	return "", fmt.Errorf("image tag %q not found in release payload %q", imageTag, releaseImage)
-}
-
 func DetermineRegistryAuthFilePath(tmpDir string, oc *util.CLI) (string, error) {
 	// To extract binaries bearing external tests, we must inspect the release
 	// payload under tests as well as extract content from component images

test/extended/util/payload/payload.go

@@ -0,0 +1,39 @@
+package payload
+
+import (
+	"fmt"
+	"github.com/openshift/origin/pkg/test/extensions"
+	"github.com/openshift/origin/test/extended/util"
+	"os"
+)
+
+// ExtractImageFromReleasePayload extracts the image pull spec for a specific tag from a release payload.
+// It returns the image pull spec for the specified tag or an error if the tag is not found.
+func ExtractImageFromReleasePayload(releaseImage, imageTag string, oc *util.CLI) (string, error) {
+	// Create a temporary directory for extraction
+	tmpDir, err := os.MkdirTemp("", "release-extract")
+	if err != nil {
+		return "", fmt.Errorf("failed to create temporary directory: %w", err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	registryAuthFilePath, err := extensions.DetermineRegistryAuthFilePath(tmpDir, oc)
+	if err != nil {
+		return "", fmt.Errorf("failed to determine registry auth file path: %w", err)
+	}
+
+	// Extract the ImageStream from the release payload
+	imageStream, _, err := extensions.ExtractReleaseImageStream(tmpDir, releaseImage, registryAuthFilePath)
+	if err != nil {
+		return "", fmt.Errorf("failed to extract image references from release payload: %w", err)
+	}
+
+	// Find the specified tag in the ImageStream
+	for _, tag := range imageStream.Spec.Tags {
+		if tag.Name == imageTag {
+			return tag.From.Name, nil
+		}
+	}
+
+	return "", fmt.Errorf("image tag %q not found in release payload %q", imageTag, releaseImage)
+}