From f3de11e72df1e50c5aaf167c757ce0d5827a2459 Mon Sep 17 00:00:00 2001 From: Michael Hohn Date: Tue, 27 Feb 2024 15:18:08 -0800 Subject: [PATCH] testing: hardcode a local url 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 --- README.org | 2 +- utils/utils.go | 34 +++++++++++++++++++++------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/README.org b/README.org index 1e21274..2a408b9 100644 --- a/README.org +++ b/README.org @@ -200,7 +200,7 @@ ./gh-mrva -h # In log-submit-the-mrva-job.log after edit - SN=60 + SN=93 ./gh-mrva submit --language cpp --session mirva-session-$SN \ --list mirva-list \ --query /Users/hohn/local/gh-mrva/FlatBuffersFunc.ql >& log-submit-$SN.log & diff --git a/utils/utils.go b/utils/utils.go index a1178c2..9dadff4 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -7,8 +7,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/google/uuid" - "gopkg.in/yaml.v3" "io" "log" "os" @@ -19,6 +17,9 @@ import ( "text/template" "time" + "github.com/google/uuid" + "gopkg.in/yaml.v3" + "github.com/GitHubSecurityLab/gh-mrva/models" "github.com/cli/go-gh" "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) { - opts := api.ClientOptions{ - Headers: map[string]string{"Accept": "application/vnd.github.v3+json"}, - } + opts := gopts client, err := gh.RESTClient(&opts) if err != nil { 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) { - opts := api.ClientOptions{ - Headers: map[string]string{"Accept": "application/vnd.github.v3+json"}, - } + opts := gopts client, err := gh.RESTClient(&opts) if err != nil { 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) { - opts := api.ClientOptions{ - Headers: map[string]string{"Accept": "application/vnd.github.v3+json"}, - } + opts := gopts client, err := gh.RESTClient(&opts) if err != nil { return -1, err @@ -197,7 +192,8 @@ func SubmitRun(controller string, language string, repoChunk []string, bundle st return -1, err } 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 { return -1, err } @@ -614,7 +610,9 @@ func DownloadResults(task models.DownloadTask) error { func DownloadDatabase(task models.DownloadTask) error { targetPath := filepath.Join(task.OutputDir, fmt.Sprintf("%s_db.zip", task.OutputFilename)) 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) if err != nil { @@ -633,3 +631,13 @@ func DownloadDatabase(task models.DownloadTask) error { err = os.WriteFile(targetPath, content, os.ModePerm) 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", + } +}