Skip to content

🐛 Fix TestParseSubscriptionConfig to work with vendor mode #2466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jan 29, 2026
Merged

🐛 Fix TestParseSubscriptionConfig to work with vendor mode #2466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions hack/tools/schema-generator/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"github.com/stretchr/testify/require"
)

// getModulePath returns the directory path of the specified Go module from go mod cache
func getModulePath(t *testing.T, modulePath string) string {
// getPackageDir returns the directory path of the specified Go package.
// It uses 'go list' which automatically handles both vendor mode and module cache.
func getPackageDir(t *testing.T, pkgPath string) string {
t.Helper()
// Use -mod=readonly to bypass vendor directory and get the module cache path
cmd := exec.Command("go", "list", "-mod=readonly", "-m", "-f", "{{.Dir}}", modulePath)
cmd := exec.Command("go", "list", "-f", "{{.Dir}}", pkgPath)
out, err := cmd.Output()
require.NoError(t, err, "failed to find module %s", modulePath)
require.NoError(t, err, "failed to find package %s", pkgPath)
return strings.TrimSpace(string(out))
}

Expand Down Expand Up @@ -70,9 +70,9 @@ func getMockOpenAPISpec() *OpenAPISpec {
}

func TestParseSubscriptionConfig(t *testing.T) {
// Get the module path from go mod cache
modulePath := getModulePath(t, "github.com/operator-framework/api")
subscriptionTypesFile := filepath.Join(modulePath, "pkg/operators/v1alpha1/subscription_types.go")
// Get the package directory containing subscription_types.go
pkgDir := getPackageDir(t, "github.com/operator-framework/api/pkg/operators/v1alpha1")
subscriptionTypesFile := filepath.Join(pkgDir, "subscription_types.go")

fields, err := parseSubscriptionConfig(subscriptionTypesFile)
require.NoError(t, err, "should successfully parse SubscriptionConfig")
Expand Down