From cc63515754c4edcd4d40348ab703c8b1bdc607a8 Mon Sep 17 00:00:00 2001 From: Julien <38018054+Julien4218@users.noreply.github.com> Date: Tue, 1 Nov 2022 15:43:43 -0700 Subject: [PATCH] chore(install): add codecov utility (#1385) * chore(install): add codecov utility * chore(install): fix code cover job * chore(install): fix vulnerability * chore(install): fix vulnerability * chore(install): fix vulnerability --- .github/workflows/codeql.yml | 68 +++++++++++++++++++++++++++++++++++ .github/workflows/test.yml | 7 +++- internal/utils/http_client.go | 12 ++++--- 3 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 000000000..3277ccf9d --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,68 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ main ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ main ] + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'go' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c8ff1973..7c9c210f4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,7 +76,12 @@ jobs: ${{ runner.os }}-go- - name: Unit Tests - run: make test-unit + run: make test-unit cover-report + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 + with: + files: ./coverage/coverage.out test-integration: runs-on: ubuntu-latest diff --git a/internal/utils/http_client.go b/internal/utils/http_client.go index 0755c927b..959b54aa6 100644 --- a/internal/utils/http_client.go +++ b/internal/utils/http_client.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "html" "io/ioutil" "net/http" "strings" @@ -33,7 +34,7 @@ func (c *HTTPClient) Get(ctx context.Context, url string) ([]byte, error) { req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) if err != nil { log.WithFields(log.Fields{ - "url": url, + "url": html.EscapeString(url), "error": err.Error(), }).Debug("HTTPClient: error creating new GET request") return nil, err @@ -56,7 +57,7 @@ func (c *HTTPClient) Post(ctx context.Context, url string, requestBody []byte) ( req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, rBody) if err != nil { log.WithFields(log.Fields{ - "url": url, + "url": html.EscapeString(url), "error": err.Error(), }).Debug("HTTPClient: error creating new POST request") return nil, err @@ -87,17 +88,18 @@ func (c *HTTPClient) Do(req *http.Request) (*http.Response, error) { } respStatusCode := getResponseCodeString(resp) + url := req.URL.String() if err != nil || !isResponseSuccess(resp) { log.WithFields(log.Fields{ - "method": req.Method, + "method": html.EscapeString(req.Method), "statusCode": respStatusCode, - "url": req.URL.String(), + "url": html.EscapeString(url), "error": err, }).Debug("HTTPClient: error performing request") } if !isResponseSuccess(resp) { - err = fmt.Errorf("error performing %s request to %s: %s", req.Method, req.URL.String(), respStatusCode) + err = fmt.Errorf("error performing %s request to %s: %s", html.EscapeString(req.Method), html.EscapeString(url), respStatusCode) } return resp, err