From 4194f8d88f3bedab6841e80287c007f4c0e6f245 Mon Sep 17 00:00:00 2001 From: tsmethurst Date: Sat, 20 Mar 2021 19:44:18 +0100 Subject: [PATCH] fix lint errors --- .github/workflows/codeql-analysis.yml | 67 --------------------------- internal/oauth/html.go | 9 ---- internal/oauth/oauth_test.go | 5 +- 3 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml delete mode 100644 internal/oauth/html.go diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 06abbd044..000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# 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 ] - schedule: - - cron: '45 19 * * 1' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - language: [ 'go' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - 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@v1 - - # ℹī¸ 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@v1 diff --git a/internal/oauth/html.go b/internal/oauth/html.go deleted file mode 100644 index a3ae4318a..000000000 --- a/internal/oauth/html.go +++ /dev/null @@ -1,9 +0,0 @@ -package oauth - -const ( - signInHTML = ` -` - - authorizeHTML = ` -` -) diff --git a/internal/oauth/oauth_test.go b/internal/oauth/oauth_test.go index 9ee5ac9a8..6c3a17c14 100644 --- a/internal/oauth/oauth_test.go +++ b/internal/oauth/oauth_test.go @@ -2,6 +2,7 @@ package oauth import ( "context" + "fmt" "testing" "time" @@ -118,7 +119,9 @@ func (suite *OauthTestSuite) TestAPIInitialize() { r := api.New(suite.config, log) api := New(suite.tokenStore, suite.clientStore, suite.conn, log) - api.AddRoutes(r) + if err := api.AddRoutes(r); err != nil { + suite.FailNow(fmt.Sprintf("error initializing api: %s", err)) + } go r.Start() time.Sleep(30 * time.Second) // http://localhost:8080/oauth/authorize?client_id=a-known-client-id&response_type=code&redirect_uri=https://example.org