Feature/import sarif file

internal/commands/import.go

@@ -0,0 +1,59 @@
+package commands
+
+import (
+	"github.com/MakeNowJust/heredoc"
+	clierrors "github.com/checkmarx/ast-cli/internal/errors"
+	commonParams "github.com/checkmarx/ast-cli/internal/params"
+	"github.com/checkmarx/ast-cli/internal/wrappers"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+func NewImportCommand(uploadsWrapper wrappers.UploadsWrapper) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "import",
+		Short: "Import scan results",
+		Long:  "Import a SARIF file or a ZIP file containing SARIF file/s.",
+		Annotations: map[string]string{
+			"command:doc": heredoc.Doc(
+				`
+				https://checkmarx.com/resource/documents/en/34965-68625-checkmarx-one-cli-commands.html
+			`,
+			),
+		},
+		RunE: runImportCommand(uploadsWrapper),
+	}
+
+	cmd.PersistentFlags().String(commonParams.ImportFileType, "", "The type of the imported file (SARIF or ZIP containing SARIF files)")
+	cmd.PersistentFlags().String(commonParams.ImportFilePath, "", "The local path of the imported file")
+
+	return cmd
+}
+
+func runImportCommand(wrapper wrappers.UploadsWrapper) func(cmd *cobra.Command, args []string) error {
+	return func(cmd *cobra.Command, args []string) error {
+		importFileType, err := cmd.Flags().GetString(commonParams.ImportFileType)
+		if err != nil {
+			return err
+		}
+		importFilePath, err := cmd.Flags().GetString(commonParams.ImportFilePath)
+		if err != nil {
+			return err
+		}
+
+		if importFileType == "" || importFilePath == "" {
+			return errors.Errorf(clierrors.MissingImportFlags)
+		}
+		_, err = importFile(importFileType, importFilePath)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}
+}
+
+func importFile(fileType string, path string) (string, error) {
+	// returns importId as string
+	return "", nil
+}

internal/commands/import_test.go

@@ -0,0 +1,24 @@
+//go:build !integration
+
+package commands
+
+import (
+	"testing"
+
+	cliErrors "github.com/checkmarx/ast-cli/internal/errors"
+	"gotest.tools/assert"
+)
+
+func TestImport_ImportSarifFileWithCorrectFlags_CreateImportSuccessfully(t *testing.T) {
+	execCmdNilAssertion(t, "import", "--import-file-type", "my-type", "--import-file-path", "my-path")
+}
+
+func TestImport_ImportSarifFileMissingImportFileType_CreateImportReturnsErrorWithCorrectMessage(t *testing.T) {
+	err := execCmdNotNilAssertion(t, "import", "--import-file-type", "", "--import-file-path", "my-path")
+	assert.Assert(t, err.Error() == cliErrors.MissingImportFlags)
+}
+
+func TestImport_ImportSarifFileMissingImportFilePath_CreateImportReturnsErrorWithCorrectMessage(t *testing.T) {
+	err := execCmdNotNilAssertion(t, "import", "--import-file-type", "my-type", "--import-file-path", "")
+	assert.Assert(t, err.Error() == cliErrors.MissingImportFlags)
+}

internal/commands/root.go

@@ -162,6 +162,9 @@ func NewAstCLI(
 		accessManagementWrapper,
 	)
 	projectCmd := NewProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper, accessManagementWrapper)
+
+	importCmd := NewImportCommand(uploadsWrapper)
+
 	resultsCmd := NewResultsCommand(
 		resultsWrapper,
 		scansWrapper,
@@ -203,6 +206,7 @@ func NewAstCLI(
 		utilsCmd,
 		configCmd,
 		chatCmd,
+		importCmd,
 	)
 
 	rootCmd.SilenceErrors = true

internal/errors/cli-errors.go

@@ -0,0 +1,7 @@
+package clierrors
+
+const (
+	ApplicationDoesntExistOrNoPermission = "Provided application does not exist or user has no permission to the application"
+	MissingImportFlags                   = "importFileType and importFilePath are required"
+	FailedToGetApplication               = "Failed to get application"
+)

internal/params/flags.go

@@ -26,6 +26,8 @@ const (
 	IgnorePolicyFlag              = "ignore-policy"
 	SourceDirFilterFlag           = "file-filter"
 	SourceDirFilterFlagSh         = "f"
+	ImportFileType                = "import-file-type"
+	ImportFilePath                = "import-file-path"
 	IncludeFilterFlag             = "file-include"
 	IncludeFilterFlagSh           = "i"
 	ProjectIDFlag                 = "project-id"

test/integration/util_command.go

@@ -203,7 +203,7 @@ func executeCmdWithTimeOutNilAssertion(
 func executeWithTimeout(cmd *cobra.Command, timeout time.Duration, args ...string) error {
 
 	args = append(args, flag(params.RetryFlag), "3", flag(params.RetryDelayFlag), "5")
-	args = appendProxyArgs(args)
+	//args = appendProxyArgs(args)
 	cmd.SetArgs(args)
 
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)