Minor modifications and test case work

devops-kung-fu · Aug 12, 2024 · eefcd7f · eefcd7f
1 parent 84daa6b
commit eefcd7f
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 75 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -42,6 +42,12 @@
                         "source.organizeImports": "always"
                     }
                 },
+                "[javascript]": {
+                    "editor.defaultFormatter": "esbenp.prettier-vscode"
+                },
+                "[markdown]": {
+                    "editor.defaultFormatter": "esbenp.prettier-vscode"
+                },
                 "markiscodecoverage.coverageThreshold": 95,
                 "markiscodecoverage.enableOnStartup": true,
                 "markiscodecoverage.searchCriteria": "*.lcov*"
@@ -60,9 +66,10 @@
                 "ahebrank.yaml2json",
                 "AmazonWebServices.amazon-q-vscode",
                 "markis.code-coverage",
-                "Gruntfuggly.todo-tree"
+                "Gruntfuggly.todo-tree",
+                "esbenp.prettier-vscode"
             ]
         }
     },
-    "postCreateCommand": "/usr/bin/bash ./.devcontainer/post-create.sh > ~/post-create.log"
+    "postCreateCommand": "/usr/bin/bash ./.devcontainer/post-create.sh > ~/post-create.log && starship preset nerd-font-symbols -o ~/.config/starship.toml"
 }
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -220,6 +220,20 @@
                 "./_TESTDATA_/sbom/railsgoat.cyclonedx.json"
             ]
         },
+        {
+            "name": "Debug File (ossindex - railsgoat w/epss)",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/main.go",
+            "args": [
+                "--provider=ossindex",
+                "--debug=true",
+                "--enrich=epss",
+                "scan",
+                "./_TESTDATA_/sbom/railsgoat.cyclonedx.json"
+            ]
+        },
         {
             "name": "Debug File (osv - railsgoat)",
             "type": "go",

diff --git a/README.md b/README.md
diff --git a/cmd/root.go b/cmd/root.go
@@ -65,7 +65,7 @@ func checkForNewVersion(currentVersion string) {
 
 	release, _, err := client.Repositories.GetLatestRelease(ctx, "devops-kung-fu", "bomber")
 	if err != nil {
-		fmt.Printf("Error fetching latest release: %v\n", err)
+		log.Printf("Error fetching latest release: %v\n", err)
 		return
 	}
 

diff --git a/providers/ossindex/OSSIndex_test.go b/providers/ossindex/OSSIndex_test.go
@@ -56,8 +56,8 @@ func Test_validateCredentials(t *testing.T) {
 func TestProvider_Scan(t *testing.T) {
 
 	credentials := models.Credentials{
-		Username:      os.Getenv("BOMBER_PROVIDER_USERNAME"),
-		ProviderToken: os.Getenv("BOMBER_PROVIDER_TOKEN"),
+	//	Username:      os.Getenv("BOMBER_PROVIDER_USERNAME"),
+	//	ProviderToken: os.Getenv("BOMBER_PROVIDER_TOKEN"),
 	}
 
 	httpmock.ActivateNonDefault(client.GetClient())

diff --git a/providers/osv/osv.go b/providers/osv/osv.go
@@ -96,7 +96,6 @@ var client *resty.Client
 func init() {
 	client = resty.New()
 	client.SetTransport(&http.Transport{TLSHandshakeTimeout: 60 * time.Second})
-	client.Debug = true
 }
 
 // Provider represents the OSSIndex provider