Thanks to visit codestin.com
Credit goes to github.com

Skip to content

tiltfile: v1alpha1 compare existing objects w/o managed annotation #5811

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
merged 1 commit into from
May 12, 2022
Merged

tiltfile: v1alpha1 compare existing objects w/o managed annotation #5811

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v1.2.3
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.8
github.com/google/uuid v1.3.0
github.com/google/wire v0.5.0
Expand Down Expand Up @@ -143,7 +144,6 @@ require (
github.com/gogo/googleapis v1.4.0 // indirect
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
Expand Down
28 changes: 28 additions & 0 deletions internal/tiltfile/tiltextension/plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,34 @@ printFoo()
f.assertLoadRecorded(res, "my-extension")
}

func TestLoadedExtensionTwiceDifferentFiles(t *testing.T) {
if runtime.GOOS == "windows" {
// We don't want to have to bother with file:// escaping on windows.
// The repo reconciler already tests this.
t.Skip()
}

f := newExtensionFixture(t)

f.tmp.WriteFile(filepath.Join("my-custom-repo", "my-custom-path", "Tiltfile"), libText)

subfileContent := fmt.Sprintf(`
v1alpha1.extension_repo(name='my-extension-repo', url='file://%s/my-custom-repo')
v1alpha1.extension(name='my-extension', repo_name='my-extension-repo', repo_path='my-custom-path')
load('ext://my-extension', 'printFoo')
printFoo()
`, f.tmp.Path())

f.skf.File("Tiltfile.a", subfileContent)
f.skf.File("Tiltfile.b", subfileContent)
f.tiltfile(`
include('Tiltfile.a')
include('Tiltfile.b')
`)
res := f.assertExecOutput("foo\nfoo")
f.assertLoadRecorded(res, "my-extension")
}

type extensionFixture struct {
t *testing.T
skf *starkit.Fixture
Expand Down
10 changes: 8 additions & 2 deletions internal/tiltfile/v1alpha1/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/tilt-dev/tilt/internal/controllers/apicmp"
"github.com/tilt-dev/tilt/internal/controllers/apiset"
"github.com/tilt-dev/tilt/internal/tiltfile/starkit"
"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"
)

// Defines starlark functions that register API objects
Expand Down Expand Up @@ -47,8 +48,13 @@ func (p Plugin) register(t *starlark.Thread, obj apiset.Object) (starlark.Value,
typedSet := set.GetOrCreateTypedSet(obj)
name := obj.GetName()
existing, exists := typedSet[name]
if exists && !apicmp.DeepEqual(obj, existing) {
return set, fmt.Errorf("%s %q already registered", obj.GetGroupVersionResource().Resource, name)
if exists {
// tiltextension adds this for extensions, but new objects will not
// have this annotation yet, so delete for comparison
delete(existing.GetAnnotations(), v1alpha1.AnnotationManagedBy)
if !apicmp.DeepEqual(obj, existing) {
return set, fmt.Errorf("%s %q already registered", obj.GetGroupVersionResource().Resource, name)
}
}

typedSet[name] = obj
Expand Down