mrva/gh-mrva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: hardcode a local url

Browse Source 
Avoids
   2024/02/27 14:42:55 Post
   "https://localhost/api/v3/repos/hohn/mirva-controller/code-scanning/codeql/variant-analyses":
   dial tcp [::1]:443: connect: connection refused
This commit is contained in:
Michael Hohn
2024-02-27 15:18:08 -08:00
committed by =Michael Hohn
parent 22fba84261
commit f3de11e72d
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.org
View File

@@ -200,7 +200,7 @@
./gh-mrva -h ./gh-mrva -h
# In log-submit-the-mrva-job.log after edit # In log-submit-the-mrva-job.log after edit
SN=60 SN=93
./gh-mrva submit --language cpp --session mirva-session-$SN \ ./gh-mrva submit --language cpp --session mirva-session-$SN \
--list mirva-list \ --list mirva-list \
--query /Users/hohn/local/gh-mrva/FlatBuffersFunc.ql >& log-submit-$SN.log & --query /Users/hohn/local/gh-mrva/FlatBuffersFunc.ql >& log-submit-$SN.log &

34
utils/utils.go
View File

@@ -7,8 +7,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/google/uuid"
"gopkg.in/yaml.v3"
"io" "io"
"log" "log"
"os" "os"
@@ -19,6 +17,9 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/google/uuid"
"gopkg.in/yaml.v3"
"github.com/GitHubSecurityLab/gh-mrva/models" "github.com/GitHubSecurityLab/gh-mrva/models"
"github.com/cli/go-gh" "github.com/cli/go-gh"
"github.com/cli/go-gh/pkg/api" "github.com/cli/go-gh/pkg/api"
@@ -105,9 +106,7 @@ func GetSessionsStartingWith(prefix string) ([]string, error) {
} }
func GetRunDetails(controller string, runId int) (map[string]interface{}, error) { func GetRunDetails(controller string, runId int) (map[string]interface{}, error) {
opts := api.ClientOptions{ opts := gopts
Headers: map[string]string{"Accept": "application/vnd.github.v3+json"},
}
client, err := gh.RESTClient(&opts) client, err := gh.RESTClient(&opts)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -121,9 +120,7 @@ func GetRunDetails(controller string, runId int) (map[string]interface{}, error)
} }
func GetRunRepositoryDetails(controller string, runId int, nwo string) (map[string]interface{}, error) { func GetRunRepositoryDetails(controller string, runId int, nwo string) (map[string]interface{}, error) {
opts := api.ClientOptions{ opts := gopts
Headers: map[string]string{"Accept": "application/vnd.github.v3+json"},
}
client, err := gh.RESTClient(&opts) client, err := gh.RESTClient(&opts)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -173,9 +170,7 @@ func SaveSession(name string, controller string, runs []models.Run, language str
} }
func SubmitRun(controller string, language string, repoChunk []string, bundle string) (int, error) { func SubmitRun(controller string, language string, repoChunk []string, bundle string) (int, error) {
opts := api.ClientOptions{ opts := gopts
Headers: map[string]string{"Accept": "application/vnd.github.v3+json"},
}
client, err := gh.RESTClient(&opts) client, err := gh.RESTClient(&opts)
if err != nil { if err != nil {
return -1, err return -1, err
@@ -197,7 +192,8 @@ func SubmitRun(controller string, language string, repoChunk []string, bundle st
return -1, err return -1, err
} }
response := make(map[string]interface{}) response := make(map[string]interface{})
err = client.Post(fmt.Sprintf("repos/%s/code-scanning/codeql/variant-analyses", controller), &buf, &response) // err = client.Post(fmt.Sprintf("repos/%s/code-scanning/codeql/variant-analyses", controller), &buf, &response)
err = client.Post(fmt.Sprintf("http://localhost:8080/repos/%s/code-scanning/codeql/variant-analyses", controller), &buf, &response)
if err != nil { if err != nil {
return -1, err return -1, err
} }
@@ -614,7 +610,9 @@ func DownloadResults(task models.DownloadTask) error {
func DownloadDatabase(task models.DownloadTask) error { func DownloadDatabase(task models.DownloadTask) error {
targetPath := filepath.Join(task.OutputDir, fmt.Sprintf("%s_db.zip", task.OutputFilename)) targetPath := filepath.Join(task.OutputDir, fmt.Sprintf("%s_db.zip", task.OutputFilename))
opts := api.ClientOptions{ opts := api.ClientOptions{
Headers: map[string]string{"Accept": "application/zip"}, Headers: map[string]string{"Accept": "application/zip"},
Host: "localhost",
AuthToken: "lh_12",
} }
client, err := gh.HTTPClient(&opts) client, err := gh.HTTPClient(&opts)
if err != nil { if err != nil {
@@ -633,3 +631,13 @@ func DownloadDatabase(task models.DownloadTask) error {
err = os.WriteFile(targetPath, content, os.ModePerm) err = os.WriteFile(targetPath, content, os.ModePerm)
return nil return nil
} }
var gopts api.ClientOptions
func init() {
gopts = api.ClientOptions{
Headers: map[string]string{"Accept": "application/vnd.github.v3+json"},
Host: "localhost",
AuthToken: "lh_12",
}
}