Skip to content

Set subpackage mutations to always be non-deployment #1131

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
efiacor merged 6 commits into from
Jul 23, 2026
+1 −29
Merged

Set subpackage mutations to always be non-deployment #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25f4646
Set subpackage mutations to always be non-deployment
liamfallon Jul 23, 2026
02bc047
Address copilot comments
liamfallon Jul 23, 2026
a5ee730
Address copilot comments
liamfallon Jul 23, 2026
2f420a0
Address copilot comments
liamfallon Jul 23, 2026
7a66248
Remove defunct test
liamfallon Jul 23, 2026
5b99b91
Rever changes to vscode config
liamfallon Jul 23, 2026
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
7 changes: 1 addition & 6 deletions pkg/task/generictaskhandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,7 @@ func (th *genericTaskHandler) applySubpackageTask(
return pkgerrors.New("for subpackage tasks, the task list must contain exactly 2 tasks, the source task followed by the subpackage task")
}

var repo configapi.Repository
if err := th.referenceResolver.ResolveReference(ctx, draft.Key().RKey().K8SNS(), draft.Key().RKey().K8SName(), &repo); err != nil {
return pkgerrors.Wrapf(err, "cannot find repository for draft PR %+v", draft.Key())
}

mut, err := th.mapTaskToMutation(obj, &obj.Spec.Tasks[1], repo.Spec.Deployment, nil)
mut, err := th.mapTaskToMutation(obj, &obj.Spec.Tasks[1], false, nil)
Comment thread
liamfallon marked this conversation as resolved.
if err != nil {
return err
}
Expand Down
23 changes: 0 additions & 23 deletions pkg/task/generictaskhandler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,29 +864,6 @@ func TestApplySubpackageTask(t *testing.T) {
resources: repository.PackageResources{Contents: map[string]string{}},
expectedError: "task list must contain exactly 2 tasks",
},
{
name: "Error when reference resolver fails",
obj: &porchapi.PackageRevision{
Spec: porchapi.PackageRevisionSpec{
Tasks: []porchapi.Task{
{Type: porchapi.TaskTypeClone, Clone: &porchapi.PackageCloneTaskSpec{}},
{Type: porchapi.TaskTypeClone, Clone: &porchapi.PackageCloneTaskSpec{
SubpackageDir: "subpkg",
Upstream: porchapi.UpstreamPackage{
Type: porchapi.RepositoryTypeGit,
Git: &porchapi.GitPackage{
Repo: "https://github.com/example/repo.git",
Ref: "main",
},
},
}},
},
},
},
resources: repository.PackageResources{Contents: map[string]string{}},
resolveErr: fmt.Errorf("repository not found"),
expectedError: "cannot find repository",
},
{
name: "Error when second task has unsupported type",
obj: &porchapi.PackageRevision{
Expand Down
Loading