Change flag to boolean

debricked · Mar 11, 2024 · 11fc5d0 · 11fc5d0
1 parent b50bf80
commit 11fc5d0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 34 deletions.
diff --git a/internal/cmd/scan/scan.go b/internal/cmd/scan/scan.go
@@ -23,7 +23,7 @@ var jsonFilePath string
 var exclusions = file.Exclusions()
 var verbose bool
 var regenerate int
-var versionConsolidation int
+var versionHint bool
 var noResolve bool
 var noFingerprint bool
 var passOnDowntime bool
@@ -41,7 +41,7 @@ const (
 	IntegrationFlag              = "integration"
 	ExclusionFlag                = "exclusion"
 	VerboseFlag                  = "verbose"
-	VersionConsolidationFlag     = "version-consolidation"
+	VersionHintFlag              = "version-hint"
 	RegenerateFlag               = "regenerate"
 	NoResolveFlag                = "no-resolve"
 	FingerprintFlag              = "fingerprint"
@@ -112,17 +112,12 @@ $ debricked scan . `+exampleFlags)
 			"\nExample:\n$ debricked resolve . --regenerate=1",
 		}, "\n")
 	cmd.Flags().IntVar(&regenerate, RegenerateFlag, 0, regenerateDoc)
-	versionConsolidationDoc := strings.Join(
+	versionHintDoc := strings.Join(
 		[]string{
-			"Toggles version consolidation of manifest and manifestless resolition with 3 modes:\n",
-			"Consolidation Level | Meaning",
-			"------------------- | -------",
-			"0                   | No consolidation",
-			"1 (default)         | Use manifest version hints",
-			"2 (not implemented) | Combine version and package hints",
-			"\nExample:\n$ debricked scan . --version-consolidation=1",
+			"Toggles version hinting, i.e using manifest versions to help manifestless resolution.\n",
+			"\nExample:\n$ debricked scan . --version-hint=False",
 		}, "\n")
-	cmd.Flags().IntVar(&versionConsolidation, VersionConsolidationFlag, 1, versionConsolidationDoc)
+	cmd.Flags().BoolVar(&versionHint, VersionHintFlag, true, versionHintDoc)
 	verboseDoc := strings.Join(
 		[]string{
 			"This flag allows you to reduce error output for resolution.",
@@ -169,7 +164,7 @@ func RunE(s *scan.IScanner) func(_ *cobra.Command, args []string) error {
 			Exclusions:               viper.GetStringSlice(ExclusionFlag),
 			Verbose:                  viper.GetBool(VerboseFlag),
 			Regenerate:               viper.GetInt(RegenerateFlag),
-			VersionConsolidation:     viper.GetInt(VersionConsolidationFlag),
+			VersionHint:              viper.GetBool(VersionHintFlag),
 			RepositoryName:           viper.GetString(RepositoryFlag),
 			CommitName:               viper.GetString(CommitFlag),
 			BranchName:               viper.GetString(BranchFlag),

diff --git a/internal/scan/scanner.go b/internal/scan/scanner.go
@@ -50,7 +50,7 @@ type DebrickedOptions struct {
 	Exclusions               []string
 	Verbose                  bool
 	Regenerate               int
-	VersionConsolidation     int
+	VersionHint              bool
 	RepositoryName           string
 	CommitName               string
 	BranchName               string
@@ -207,7 +207,7 @@ func (dScanner *DebrickedScanner) scan(options DebrickedOptions, gitMetaObject g
 		GitMetaObject:          gitMetaObject,
 		IntegrationsName:       options.IntegrationName,
 		CallGraphUploadTimeout: options.CallGraphUploadTimeout,
-		VersionConsolidation:   options.VersionConsolidation,
+		VersionHint:            options.VersionHint,
 	}
 	result, err := (*dScanner.uploader).Upload(uploaderOptions)
 	if err != nil {

diff --git a/internal/upload/batch.go b/internal/upload/batch.go
@@ -32,17 +32,17 @@ var (
 const callgraphName = "debricked-call-graph"
 
 type uploadBatch struct {
-	client               *client.IDebClient
-	fileGroups           file.Groups
-	gitMetaObject        *git.MetaObject
-	integrationName      string
-	ciUploadId           int
-	callGraphTimeout     int
-	versionConsolidation int
+	client           *client.IDebClient
+	fileGroups       file.Groups
+	gitMetaObject    *git.MetaObject
+	integrationName  string
+	ciUploadId       int
+	callGraphTimeout int
+	versionHint      bool
 }
 
-func newUploadBatch(client *client.IDebClient, fileGroups file.Groups, gitMetaObject *git.MetaObject, integrationName string, callGraphTimeout int, versionConsolidation int) *uploadBatch {
-	return &uploadBatch{client: client, fileGroups: fileGroups, gitMetaObject: gitMetaObject, integrationName: integrationName, ciUploadId: 0, callGraphTimeout: callGraphTimeout, versionConsolidation: versionConsolidation}
+func newUploadBatch(client *client.IDebClient, fileGroups file.Groups, gitMetaObject *git.MetaObject, integrationName string, callGraphTimeout int, versionHint bool) *uploadBatch {
+	return &uploadBatch{client: client, fileGroups: fileGroups, gitMetaObject: gitMetaObject, integrationName: integrationName, ciUploadId: 0, callGraphTimeout: callGraphTimeout, versionHint: versionHint}
 }
 
 // upload concurrently posts all file groups to Debricked
@@ -124,11 +124,10 @@ func (uploadBatch *uploadBatch) uploadFile(filePath string, timeout int) error {
 	_ = writer.WriteField("commitName", uploadBatch.gitMetaObject.CommitName)
 	_ = writer.WriteField("repositoryUrl", uploadBatch.gitMetaObject.RepositoryUrl)
 	_ = writer.WriteField("branchName", uploadBatch.gitMetaObject.BranchName)
-	_ = writer.WriteField("versionConsolidation", strconv.Itoa(uploadBatch.versionConsolidation))
+	_ = writer.WriteField("versionHint", strconv.FormatBool(uploadBatch.versionHint))
 	if uploadBatch.initialized() {
 		_ = writer.WriteField("ciUploadId", strconv.Itoa(uploadBatch.ciUploadId))
 	}
-
 	response, err := (*uploadBatch.client).Post(
 		"/api/1.0/open/uploads/dependencies/files",
 		writer.FormDataContentType(),
@@ -138,11 +137,9 @@ func (uploadBatch *uploadBatch) uploadFile(filePath string, timeout int) error {
 	if err != nil {
 		return err
 	}
-
 	if !uploadBatch.initialized() {
 		data, _ := io.ReadAll(response.Body)
 		defer response.Body.Close()
-
 		uFile := uploadedFile{}
 		_ = json.Unmarshal(data, &uFile)
 		if uFile.CiUploadId == 0 {
@@ -171,6 +168,7 @@ func (uploadBatch *uploadBatch) initAnalysis() error {
 	if err != nil {
 		return err
 	}
+	print(body) //TODO: REMOVE!
 	response, err := (*uploadBatch.client).Post(
 		"/api/1.0/open/finishes/dependencies/files/uploads",
 		"application/json",

diff --git a/internal/upload/batch_test.go b/internal/upload/batch_test.go
@@ -36,7 +36,7 @@ func TestUploadWithBadFiles(t *testing.T) {
 	clientMock.AddMockResponse(mockRes)
 	clientMock.AddMockResponse(mockRes)
 	c = clientMock
-	batch := newUploadBatch(&c, groups, metaObj, "CLI", 10*60, 1)
+	batch := newUploadBatch(&c, groups, metaObj, "CLI", 10*60, true)
 	var buf bytes.Buffer
 	log.SetOutput(&buf)
 	err = batch.upload()
@@ -48,7 +48,7 @@ func TestUploadWithBadFiles(t *testing.T) {
 }
 
 func TestInitAnalysisWithoutAnyFiles(t *testing.T) {
-	batch := newUploadBatch(nil, file.Groups{}, nil, "CLI", 10*60, 1)
+	batch := newUploadBatch(nil, file.Groups{}, nil, "CLI", 10*60, true)
 	err := batch.initAnalysis()
 
 	assert.ErrorContains(t, err, "failed to find dependency files")
@@ -71,7 +71,7 @@ func TestWaitWithPollingTerminatedError(t *testing.T) {
 	}
 	clientMock.AddMockResponse(mockRes)
 	c = clientMock
-	batch := newUploadBatch(&c, groups, metaObj, "CLI", 10*60, 1)
+	batch := newUploadBatch(&c, groups, metaObj, "CLI", 10*60, true)
 
 	uploadResult, err := batch.wait()
 
@@ -96,7 +96,7 @@ func TestInitUploadBadFile(t *testing.T) {
 	clientMock.AddMockResponse(mockRes)
 
 	var c client.IDebClient = clientMock
-	batch := newUploadBatch(&c, groups, metaObj, "CLI", 10*60, 1)
+	batch := newUploadBatch(&c, groups, metaObj, "CLI", 10*60, true)
 
 	files, err := batch.initUpload()
 
@@ -123,7 +123,7 @@ func TestInitUpload(t *testing.T) {
 	clientMock.AddMockResponse(mockRes)
 
 	var c client.IDebClient = clientMock
-	batch := newUploadBatch(&c, groups, metaObj, "CLI", 10*60, 1)
+	batch := newUploadBatch(&c, groups, metaObj, "CLI", 10*60, true)
 
 	files, err := batch.initUpload()
 

diff --git a/internal/upload/uploader.go b/internal/upload/uploader.go
@@ -15,7 +15,7 @@ type DebrickedOptions struct {
 	GitMetaObject          git.MetaObject
 	IntegrationsName       string
 	CallGraphUploadTimeout int
-	VersionConsolidation   int
+	VersionHint            bool
 }
 
 type IUploader interface {
@@ -36,7 +36,7 @@ func NewUploader(c client.IDebClient) (*Uploader, error) {
 
 func (uploader *Uploader) Upload(o IOptions) (*UploadResult, error) {
 	dOptions := o.(DebrickedOptions)
-	batch := newUploadBatch(uploader.client, dOptions.FileGroups, &dOptions.GitMetaObject, dOptions.IntegrationsName, dOptions.CallGraphUploadTimeout, dOptions.VersionConsolidation)
+	batch := newUploadBatch(uploader.client, dOptions.FileGroups, &dOptions.GitMetaObject, dOptions.IntegrationsName, dOptions.CallGraphUploadTimeout, dOptions.VersionHint)
 
 	err := batch.upload()
 	if err != nil {