Fix git conflict artifacts (#192)

wayfair-incubator · Jun 19, 2024 · bb49889 · bb49889
1 parent 99db0c0
commit bb49889
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/internal/pkg/configuration/config.go b/internal/pkg/configuration/config.go
@@ -45,7 +45,6 @@ type Config struct {
 	CommentArgocdDiffonPR        bool                   `yaml:"commentArgocdDiffonPR"`
 	AutoMergeNoDiffPRs           bool                   `yaml:"autoMergeNoDiffPRs"`
 	UseSHALabelForArgoDicovery   bool                   `yaml:"useSHALabelForArgoDicovery"`
-
 }
 
 func ParseConfigFromYaml(y string) (*Config, error) {

diff --git a/internal/pkg/githubapi/promotion.go b/internal/pkg/githubapi/promotion.go
@@ -110,7 +110,6 @@ func getComponentConfig(ghPrClientDetails GhPrClientDetails, componentPath strin
 	return componentConfig, nil
 }
 
-
 // This function generates a list of "components" that where changed in the PR and are relevant for promotion)
 func generateListOfRelevantComponents(ghPrClientDetails GhPrClientDetails, config *cfg.Config) (relevantComponents map[relevantComponent]struct{}, err error) {
 	relevantComponents = make(map[relevantComponent]struct{})
@@ -124,16 +123,6 @@ func generateListOfRelevantComponents(ghPrClientDetails GhPrClientDetails, confi
 		prom.InstrumentGhCall(resp)
 		if err != nil {
 			ghPrClientDetails.PrLogger.Errorf("could not get file list from GH API: err=%s\nstatus code=%v", err, resp.Response.Status)
-			return promotions, err
-		}
-		prFiles = append(prFiles, perPagePrFiles...)
-		if resp.NextPage == 0 {
-			break
-		}
-		opts.Page = resp.NextPage
-	}
-
-
 			return nil, err
 		}
 		prFiles = append(prFiles, perPagePrFiles...)