feat: Add simple inconsistency on missing dependency

Signed-off-by: Víctor Cuadrado Juan <[email protected]>
rancher-sandbox · Jun 29, 2021 · 16b40e2 · 16b40e2
1 parent 2cc8cd8
commit 16b40e2
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 4 deletions.
diff --git a/internal/solver/solver.go b/internal/solver/solver.go
@@ -63,7 +63,7 @@ type PkgResultSet struct {
 	ToInstall        []*pkg.Pkg
 	ToRemove         []*pkg.Pkg
 	Status           string
-	//Incosistencies []
+	Inconsistencies  []string
 }
 
 type OutputMode int
@@ -76,10 +76,12 @@ const (
 
 // New creates a new Solver, initializing its database.
 func New() (s *Solver) {
-	return &Solver{
+	s = &Solver{
 		PkgDB:        CreatePkgDBInstance(),
 		pkgResultSet: PkgResultSet{},
 	}
+	s.pkgResultSet.Inconsistencies = []string{}
+	return s
 }
 
 // BuildWorldMock fills the database with pkgs instead of releases, charts from
@@ -269,6 +271,14 @@ func (s *Solver) buildConstraintRelations(p *pkg.Pkg) (constr []gsolver.PBConstr
 				matchingVersionIDs = append(matchingVersionIDs, depID)
 			}
 		}
+		if len(matchingVersionIDs) == 0 {
+			// there are no packages that match the version we depend on, add
+			// that to inconsistencies
+			// TODO create acyclic graph of result instead
+			incos := fmt.Sprintf("Package %s depends on %s, semver %s, but nothing satisfies it\n",
+				p.GetFingerPrint(), deprel.BaseFingerprint, deprel.SemverRange)
+			s.pkgResultSet.Inconsistencies = append(s.pkgResultSet.Inconsistencies, incos)
+		}
 
 		// A depends on all valid versions of B.
 		// Pseudo-Boolean equation:

diff --git a/internal/solver/testdata/output/format-empty-json.txt b/internal/solver/testdata/output/format-empty-json.txt
@@ -1 +1 @@
-{"PresentUnchanged":[],"ToInstall":[],"ToRemove":[],"Status":"SAT"}
+{"PresentUnchanged":[],"ToInstall":[],"ToRemove":[],"Status":"SAT","Inconsistencies":[]}
diff --git a/internal/solver/testdata/output/format-empty-yaml.txt b/internal/solver/testdata/output/format-empty-yaml.txt
@@ -2,3 +2,4 @@ presentunchanged: []
 toinstall: []
 toremove: []
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/format-unsat-json.txt b/internal/solver/testdata/output/format-unsat-json.txt
@@ -1 +1 @@
-{"PresentUnchanged":[{"Name":"bar","Version":"1.0.0","ChartHash":0,"Namespace":"targetns","DependsRel":null,"DependsOptionalRel":null,"CurrentState":1,"DesiredState":1,"Chart":null}],"ToInstall":[{"Name":"baz","Version":"1.0.0","ChartHash":0,"Namespace":"targetns","DependsRel":null,"DependsOptionalRel":null,"CurrentState":2,"DesiredState":1,"Chart":null}],"ToRemove":[{"Name":"foo","Version":"1.0.0","ChartHash":0,"Namespace":"targetns","DependsRel":null,"DependsOptionalRel":null,"CurrentState":1,"DesiredState":2,"Chart":null}],"Status":"SAT"}
+{"PresentUnchanged":[{"Name":"bar","Version":"1.0.0","ChartHash":0,"Namespace":"targetns","DependsRel":null,"DependsOptionalRel":null,"CurrentState":1,"DesiredState":1,"Chart":null}],"ToInstall":[{"Name":"baz","Version":"1.0.0","ChartHash":0,"Namespace":"targetns","DependsRel":null,"DependsOptionalRel":null,"CurrentState":2,"DesiredState":1,"Chart":null}],"ToRemove":[{"Name":"foo","Version":"1.0.0","ChartHash":0,"Namespace":"targetns","DependsRel":null,"DependsOptionalRel":null,"CurrentState":1,"DesiredState":2,"Chart":null}],"Status":"SAT","Inconsistencies":[]}
diff --git a/internal/solver/testdata/output/format-unsat-yaml.txt b/internal/solver/testdata/output/format-unsat-yaml.txt
@@ -29,3 +29,4 @@ toremove:
   desiredstate: 2
   chart: null
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/solve-empty.txt b/internal/solver/testdata/output/solve-empty.txt
@@ -2,3 +2,4 @@ presentunchanged: []
 toinstall: []
 toremove: []
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/solve-main.txt b/internal/solver/testdata/output/solve-main.txt
@@ -31,3 +31,4 @@ toinstall:
   chart: null
 toremove: []
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/solve-sat-dependecy-major.txt b/internal/solver/testdata/output/solve-sat-dependecy-major.txt
@@ -22,3 +22,4 @@ toinstall:
   chart: null
 toremove: []
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/solve-sat-dependecy-minor.txt b/internal/solver/testdata/output/solve-sat-dependecy-minor.txt
@@ -22,3 +22,4 @@ toinstall:
   chart: null
 toremove: []
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/solve-sat-dependecy-specific-ver.txt b/internal/solver/testdata/output/solve-sat-dependecy-specific-ver.txt
@@ -22,3 +22,4 @@ toinstall:
   chart: null
 toremove: []
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/solve-sat-loop-deps.txt b/internal/solver/testdata/output/solve-sat-loop-deps.txt
@@ -35,3 +35,4 @@ toinstall:
   chart: null
 toremove: []
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/solve-sat-remove-package.txt b/internal/solver/testdata/output/solve-sat-remove-package.txt
@@ -11,3 +11,4 @@ toremove:
   desiredstate: 2
   chart: null
 status: SAT
+inconsistencies: []
diff --git a/internal/solver/testdata/output/solve-unsat-dependecy-no-version.txt b/internal/solver/testdata/output/solve-unsat-dependecy-no-version.txt
@@ -2,3 +2,6 @@ presentunchanged: []
 toinstall: []
 toremove: []
 status: UNSAT
+inconsistencies:
+- |
+  Package wantedbaz-1.0.0-0-wantedbazns depends on myawesomedep-myawesomedeptargetns, semver ^1.0.0, but nothing satisfies it
diff --git a/internal/solver/testdata/output/solve-unsat-dependecy-not-known.txt b/internal/solver/testdata/output/solve-unsat-dependecy-not-known.txt
@@ -2,3 +2,6 @@ presentunchanged: []
 toinstall: []
 toremove: []
 status: UNSAT
+inconsistencies:
+- |
+  Package wantedbaz-1.0.0-0-wantedbazns depends on myawesomedep-myawesomedeptargetns, semver ^1.0.0, but nothing satisfies it
diff --git a/internal/solver/testdata/output/solve-unsat-remove-dep.txt b/internal/solver/testdata/output/solve-unsat-remove-dep.txt
@@ -2,3 +2,4 @@ presentunchanged: []
 toinstall: []
 toremove: []
 status: UNSAT
+inconsistencies: []