@@ -715,10 +715,6 @@ func fix(ctx context.Context, filename string, ghsaClient *ghsa.Client) (err err
715
715
if err != nil {
716
716
return err
717
717
}
718
- // Add/fix the Go ID if needed.
719
- if goID := report .GoID (filename ); goID != r .ID {
720
- r .ID = goID
721
- }
722
718
if err := r .CheckFilename (filename ); err != nil {
723
719
return err
724
720
}
@@ -729,9 +725,6 @@ func fix(ctx context.Context, filename string, ghsaClient *ghsa.Client) (err err
729
725
warnlog .Printf ("%s still has lint errors after fix:\n \t - %s" , filename , strings .Join (lints , "\n \t - " ))
730
726
}
731
727
732
- // Adds a todo for a human. Currently outside of the scope of r.Fix()
733
- addSkipFixTodos (r )
734
-
735
728
if ! * skipSymbols {
736
729
if err := checkReportSymbols (r ); err != nil {
737
730
return err
@@ -763,23 +756,6 @@ func fix(ctx context.Context, filename string, ghsaClient *ghsa.Client) (err err
763
756
return nil
764
757
}
765
758
766
- // addSkipFixTodos adds a todo SkipFix to every package in an
767
- // unexcluded module that does not give a VulnerableAt.
768
- func addSkipFixTodos (r * report.Report ) {
769
- if r .Excluded != "" {
770
- return
771
- }
772
- for _ , m := range r .Modules {
773
- if m .VulnerableAt == "" {
774
- for _ , p := range m .Packages {
775
- if p .SkipFix == "" {
776
- p .SkipFix = todo + " [or set vulnerable_at to derive symbols]"
777
- }
778
- }
779
- }
780
- }
781
- }
782
-
783
759
func checkReportSymbols (r * report.Report ) error {
784
760
if r .IsExcluded () {
785
761
infolog .Printf ("%s is excluded, skipping symbol checks\n " , r .ID )
0 commit comments