Skip to content

feat: Allow entrypoints other than main.jsonnet when searching for environments #1250

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Allow entrypoints other than main.jsonnet when searching for environments #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f7bfb3
Allow entrypoints other than main.jsonnet
sabeechen Nov 28, 2024
8588fdf
Merge remote-tracking branch 'upstream/main'
sabeechen Nov 30, 2024
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
2 changes: 1 addition & 1 deletion pkg/tanka/find.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func findJsonnetFilesFromPaths(paths []string, opts FindOpts) ([]string, error)
jsonnetFiles, err := jsonnet.FindFiles(path, nil)
var mainFiles []string
for _, file := range jsonnetFiles {
if filepath.Base(file) == jpath.DefaultEntrypoint {
if filepath.Base(file) == jpath.DefaultEntrypoint || file == path {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it perhaps make sense here to restrict that to only files with the suffix .jsonnet? For me, *.libsonnet files would not look like entrypoints to me. WDYT?

mainFiles = append(mainFiles, file)
}
}
Expand Down
26 changes: 26 additions & 0 deletions pkg/tanka/find_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,29 @@ func buildLargeEnvironmentDirForFindTest(t testing.TB) (string, []string) {

return tempDir, envPaths
}

func TestFindInlineEnvWithNonStandardEntrypoint(t *testing.T) {
tempDir := t.TempDir()

// Create an inline environment with an entrypoint named something other than main.jsonnet
entrypoint := filepath.Join(tempDir, "entrypoint.libsonnet")
require.NoError(t, os.WriteFile(filepath.Join(tempDir, "jsonnetfile.json"), []byte(`{}`), 0644))
require.NoError(t, os.WriteFile(entrypoint, []byte(`{
"apiVersion": "tanka.dev/v1alpha1",
"kind": "Environment",
"metadata": {
"name": "test-name",
"labels": {}
},
"spec": {
"apiServer": "https://192.168.0.1",
"namespace": "test-namespace",
"cluster": "test-cluster"
}
}`), 0644))

// Verify the environment is found if the entrypoint's file name is explicitly specified
envs, err := findJsonnetFilesFromPaths([]string{entrypoint}, FindOpts{Parallelism: 1})
require.NoError(t, err)
require.Len(t, envs, 1)
}
Loading