Deleted skip auto install parameter, changed allow partial results default value (#961)

* deleted skip auto install, changed allow partial results default

* removed NewSecretsEmailDetails

Author: orto17

scanpullrequest/scanpullrequest.go

@@ -104,15 +104,6 @@ func scanPullRequest(repo *utils.Repository, client vcsclient.VcsClient) (err er
 		return
 	}
 
-	// Output results
-	shouldSendExposedSecretsEmail := issues.SecretsIssuesExists() && repo.SmtpServer != ""
-	if shouldSendExposedSecretsEmail {
-		secretsEmailDetails := utils.NewSecretsEmailDetails(client, repo, append(issues.SecretsVulnerabilities, issues.SecretsViolations...))
-		if err = utils.AlertSecretsExposed(secretsEmailDetails); err != nil {
-			return
-		}
-	}
-
 	// Handle PR comments for scan output
 	if err = utils.HandlePullRequestCommentsAfterScan(issues, resultContext, repo, client, int(pullRequestDetails.ID)); err != nil {
 		return
@@ -184,7 +175,6 @@ func createBaseScanDetails(repoConfig *utils.Repository, client vcsclient.VcsCli
 		SetResultsContext(repositoryCloneUrl, repoConfig.Watches, repoConfig.JFrogProjectKey, repoConfig.IncludeVulnerabilities, len(repoConfig.AllowedLicenses) > 0).
 		SetFixableOnly(repoConfig.FixableOnly).
 		SetConfigProfile(repoConfig.ConfigProfile).
-		SetSkipAutoInstall(repoConfig.SkipAutoInstall).
 		SetDisableJas(repoConfig.DisableJas).
 		SetXscPRGitInfoContext(repoConfig.Project, client, repoConfig.PullRequestDetails).
 		SetDiffScan(!repoConfig.IncludeAllVulnerabilities).

scanrepository/scanrepository.go

@@ -135,7 +135,6 @@ func (cfp *ScanRepositoryCmd) setCommandPrerequisites(repository *utils.Reposito
 		SetResultsContext(repositoryCloneUrl, repository.Watches, repository.JFrogProjectKey, repository.IncludeVulnerabilities, len(repository.AllowedLicenses) > 0).
 		SetFixableOnly(repository.FixableOnly).
 		SetConfigProfile(repository.ConfigProfile).
-		SetSkipAutoInstall(repository.SkipAutoInstall).
 		SetAllowPartialResults(repository.AllowPartialResults).
 		SetDisableJas(repository.DisableJas)
 

utils/consts.go

@@ -77,17 +77,9 @@ const (
 	DisableJasEnv                      = "JF_DISABLE_ADVANCED_SECURITY"
 	DetectionOnlyEnv                   = "JF_SKIP_AUTOFIX"
 	AllowedLicensesEnv                 = "JF_ALLOWED_LICENSES"
-	SkipAutoInstallEnv                 = "JF_SKIP_AUTO_INSTALL"
 	AllowPartialResultsEnv             = "JF_ALLOW_PARTIAL_RESULTS"
 	WatchesDelimiter                   = ","
 
-	// Email related environment variables
-	//#nosec G101 -- False positive - no hardcoded credentials.
-	SmtpPasswordEnv   = "JF_SMTP_PASSWORD"
-	SmtpUserEnv       = "JF_SMTP_USER"
-	SmtpServerEnv     = "JF_SMTP_SERVER"
-	EmailReceiversEnv = "JF_EMAIL_RECEIVERS"
-
 	//#nosec G101 -- False positive - no hardcoded credentials.
 	GitTokenEnv          = "JF_GIT_TOKEN"
 	GitBaseBranchEnv     = "JF_GIT_BASE_BRANCH"

utils/params.go

@@ -170,7 +170,6 @@ type Scan struct {
 	Projects                        []Project `yaml:"projects,omitempty"`
 	EmailDetails                    `yaml:",inline"`
 	ConfigProfile                   *services.ConfigProfile
-	SkipAutoInstall                 bool
 	AllowPartialResults             bool
 }
 
@@ -182,33 +181,6 @@ type EmailDetails struct {
 	EmailReceivers []string `yaml:"emailReceivers,omitempty"`
 }
 
-func (s *Scan) SetEmailDetails() error {
-	smtpServerAndPort := getTrimmedEnv(SmtpServerEnv)
-	if smtpServerAndPort == "" {
-		return nil
-	}
-	splittedServerAndPort := strings.Split(smtpServerAndPort, ":")
-	if len(splittedServerAndPort) < 2 {
-		return fmt.Errorf("failed while setting your email details. Could not extract the smtp server and its port from the %s environment variable. Expected format: `smtp.server.com:port`, received: %s", SmtpServerEnv, smtpServerAndPort)
-	}
-	s.SmtpServer = splittedServerAndPort[0]
-	s.SmtpPort = splittedServerAndPort[1]
-	s.SmtpUser = getTrimmedEnv(SmtpUserEnv)
-	s.SmtpPassword = getTrimmedEnv(SmtpPasswordEnv)
-	if s.SmtpUser == "" {
-		return fmt.Errorf("failed while setting your email details. SMTP username is expected, but the %s environment variable is empty", SmtpUserEnv)
-	}
-	if s.SmtpPassword == "" {
-		return fmt.Errorf("failed while setting your email details. SMTP password is expected, but the %s environment variable is empty", SmtpPasswordEnv)
-	}
-	if len(s.EmailReceivers) == 0 {
-		if emailReceiversEnv := getTrimmedEnv(EmailReceiversEnv); emailReceiversEnv != "" {
-			s.EmailReceivers = strings.Split(emailReceiversEnv, ",")
-		}
-	}
-	return nil
-}
-
 func (s *Scan) setDefaultsIfNeeded() (err error) {
 	e := &ErrMissingEnv{}
 	if !s.IncludeAllVulnerabilities {
@@ -260,11 +232,6 @@ func (s *Scan) setDefaultsIfNeeded() (err error) {
 		}
 		s.MinSeverity = severity.String()
 	}
-	if !s.SkipAutoInstall {
-		if s.SkipAutoInstall, err = getBoolEnv(SkipAutoInstallEnv, false); err != nil {
-			return
-		}
-	}
 	if len(s.Projects) == 0 {
 		s.Projects = append(s.Projects, Project{})
 	}
@@ -274,7 +241,7 @@ func (s *Scan) setDefaultsIfNeeded() (err error) {
 		}
 	}
 	if !s.AllowPartialResults {
-		if s.AllowPartialResults, err = getBoolEnv(AllowPartialResultsEnv, false); err != nil {
+		if s.AllowPartialResults, err = getBoolEnv(AllowPartialResultsEnv, true); err != nil {
 			return
 		}
 	}
@@ -283,7 +250,6 @@ func (s *Scan) setDefaultsIfNeeded() (err error) {
 			return
 		}
 	}
-	err = s.SetEmailDetails()
 	return
 }
 

utils/scandetails.go

@@ -29,7 +29,6 @@ type ScanDetails struct {
 	client              vcsclient.VcsClient
 	fixableOnly         bool
 	disableJas          bool
-	skipAutoInstall     bool
 	minSeverityFilter   severityutils.Severity
 	baseBranch          string
 	configProfile       *clientservices.ConfigProfile
@@ -91,11 +90,6 @@ func (sc *ScanDetails) SetFixableOnly(fixable bool) *ScanDetails {
 	return sc
 }
 
-func (sc *ScanDetails) SetSkipAutoInstall(skipAutoInstall bool) *ScanDetails {
-	sc.skipAutoInstall = skipAutoInstall
-	return sc
-}
-
 func (sc *ScanDetails) SetMinSeverity(minSeverity string) (*ScanDetails, error) {
 	if minSeverity == "" {
 		return sc, nil
@@ -170,7 +164,7 @@ func (sc *ScanDetails) RunInstallAndAudit(workDirs ...string) (auditResults *res
 		SetInstallCommandName(sc.InstallCommandName).
 		SetInstallCommandArgs(sc.InstallCommandArgs).
 		SetTechnologies(sc.GetTechFromInstallCmdIfExists()).
-		SetSkipAutoInstall(sc.skipAutoInstall).
+		SetSkipAutoInstall(true).
 		SetAllowPartialResults(sc.allowPartialResults).
 		SetExclusions(sc.PathExclusions).
 		SetUseJas(!sc.DisableJas()).