Internal

PiperOrigin-RevId: 745816284

Author: cuixq

guidedremediation/guidedremediation.go

@@ -117,7 +117,7 @@ func Update(opts options.UpdateOptions) (result.Result, error) {
 		return result.Result{}, err
 	}
 
-	suggester, err := suggest.GetSuggester(manifestRW.System())
+	suggester, err := suggest.NewSuggester(manifestRW.System())
 	if err != nil {
 		return result.Result{}, err
 	}

guidedremediation/internal/suggest/maven.go

@@ -53,7 +53,7 @@ func (ms *MavenSuggester) Suggest(ctx context.Context, mf manifest.Manifest, opt
 			// and updates on development dependencies are not desired
 			continue
 		}
-		if strings.Contains(req.Name, "${") && strings.Contains(req.Version, "${") {
+		if strings.Contains(req.Name, "${") || strings.Contains(req.Version, "${") {
 			// If there are unresolved properties, we should skip this version.
 			continue
 		}

guidedremediation/internal/suggest/maven_test.go

@@ -151,7 +151,7 @@ func TestMavenSuggester_Suggest(t *testing.T) {
 	addVersions(resolve.Maven, "org.import:xyz", []string{"6.6.6", "6.7.0", "7.0.0"})
 	addVersions(resolve.Maven, "org.dep:plugin-dep", []string{"2.3.1", "2.3.2", "2.3.3", "2.3.4"})
 
-	suggester, err := GetSuggester(resolve.Maven)
+	suggester, err := NewSuggester(resolve.Maven)
 	if err != nil {
 		t.Fatalf("failed to get Maven suggester: %v", err)
 	}

guidedremediation/internal/suggest/suggest.go

@@ -34,8 +34,8 @@ type PatchSuggester interface {
 	Suggest(ctx context.Context, mf manifest.Manifest, opts options.UpdateOptions) (result.Patch, error)
 }
 
-// GetSuggester returns the PatchSuggester based on the specified ecosystem.
-func GetSuggester(system resolve.System) (PatchSuggester, error) {
+// NewSuggester returns the PatchSuggester based on the specified ecosystem.
+func NewSuggester(system resolve.System) (PatchSuggester, error) {
 	switch system {
 	case resolve.Maven:
 		return &MavenSuggester{}, nil