Skip to content
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

Move model.DeploymentSource to deployment.DeploymentSource #5290

Merged
merged 1 commit into from
Oct 23, 2024
Merged

Move model.DeploymentSource to deployment.DeploymentSource #5290

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
4 changes: 2 additions & 2 deletions pkg/app/pipedv1/controller/planner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
}()

// TODO: Prepare running deploy source and target deploy source.
var runningDS, targetDS *model.DeploymentSource
var runningDS, targetDS *deployment.DeploymentSource

Check warning on line 193 in pkg/app/pipedv1/controller/planner.go

View check run for this annotation

Codecov / codecov/patch

pkg/app/pipedv1/controller/planner.go#L193 

Added line #L193 was not covered by tests

// repoCfg := config.PipedRepository{
// RepoID: p.deployment.GitPath.Repo.Id,
Expand Down Expand Up @@ -243,7 +243,7 @@
// - CommitMatcher ensure pipeline/quick sync based on the commit message
// - Force quick sync if there is no previous deployment (aka. this is the first deploy)
// - Based on PlannerService.DetermineStrategy returned by plugins
func (p *planner) buildPlan(ctx context.Context, runningDS, targetDS *model.DeploymentSource) (*plannerOutput, error) {
func (p *planner) buildPlan(ctx context.Context, runningDS, targetDS *deployment.DeploymentSource) (*plannerOutput, error) {
out := &plannerOutput{}

input := &deployment.PlanPluginInput{
Expand Down
4 changes: 2 additions & 2 deletions pkg/app/pipedv1/controller/planner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ func TestPlanner_BuildPlan(t *testing.T) {
planner.lastSuccessfulCommitHash = "123"
}

runningDS := &model.DeploymentSource{}
runningDS := &deployment.DeploymentSource{}

type genericConfig struct {
Kind config.Kind `json:"kind"`
Expand All @@ -931,7 +931,7 @@ func TestPlanner_BuildPlan(t *testing.T) {
})

require.NoError(t, err)
targetDS := &model.DeploymentSource{
targetDS := &deployment.DeploymentSource{
ApplicationConfig: jsonBytes,
}
out, err := planner.buildPlan(context.TODO(), runningDS, targetDS)
Expand Down
198 changes: 0 additions & 198 deletions pkg/model/deployment_source.pb.go
View file
Open in desktop

This file was deleted.

144 changes: 0 additions & 144 deletions pkg/model/deployment_source.pb.validate.go
View file
Open in desktop

This file was deleted.

Loading
Loading