Skip to content

Commit 8bad17a

Browse files
richardjenningsrichardjennings
committed
update deps (#5)
1 parent 109e552 commit 8bad17a

File tree

12 files changed

+297
-138
lines changed

12 files changed

+297
-138
lines changed

‎.github/workflows/codeql.yml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ "main" ]
17+
pull_request:
18+
branches: [ "main" ]
19+
schedule:
20+
- cron: '27 3 * * 5'
21+
22+
jobs:
23+
24+
analyze:
25+
name: Analyze (${{ matrix.language }})
26+
# Runner size impacts CodeQL analysis time. To learn more, please see:
27+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
28+
# - https://gh.io/supported-runners-and-hardware-resources
29+
# - https://gh.io/using-larger-runners (github.com only)
30+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
31+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
32+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
33+
permissions:
34+
# required for all workflows
35+
security-events: write
36+
37+
# required to fetch internal or private CodeQL packs
38+
packages: read
39+
40+
# only required for workflows in private repositories
41+
actions: read
42+
contents: read
43+
44+
strategy:
45+
fail-fast: false
46+
matrix:
47+
include:
48+
- language: go
49+
build-mode: autobuild
50+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
51+
# Use `c-cpp` to analyze code written in C, C++ or both
52+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
53+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
54+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
55+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
56+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
57+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
58+
steps:
59+
- name: Checkout repository
60+
uses: actions/checkout@v4
61+
62+
- name: Setup Go environment
63+
uses: actions/setup-go@v5.0.1
64+
with:
65+
# The Go version to download (if necessary) and use. Supports semver spec and ranges. Be sure to enclose this option in single quotation marks.
66+
go-version: 1.22
67+
68+
# Initializes the CodeQL tools for scanning.
69+
- name: Initialize CodeQL
70+
uses: github/codeql-action/init@v3
71+
with:
72+
languages: ${{ matrix.language }}
73+
build-mode: ${{ matrix.build-mode }}
74+
# If you wish to specify custom queries, you can do so here or in a config file.
75+
# By default, queries listed here will override any specified in a config file.
76+
# Prefix the list here with "+" to use these queries and those in the config file.
77+
78+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
79+
# queries: security-extended,security-and-quality
80+
81+
# If the analyze step fails for one of the languages you are analyzing with
82+
# "We were unable to automatically build your code", modify the matrix above
83+
# to set the build mode to "manual" for that language. Then modify this step
84+
# to build your code.
85+
# ℹ️ Command-line programs to run using the OS shell.
86+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
87+
- if: matrix.build-mode == 'manual'
88+
run: |
89+
echo 'If you are using a "manual" build mode for one or more of the' \
90+
'languages you are analyzing, replace this with the commands to build' \
91+
'your code, for example:'
92+
echo ' make bootstrap'
93+
echo ' make release'
94+
exit 1
95+
96+
- name: Perform CodeQL Analysis
97+
uses: github/codeql-action/analyze@v3
98+
with:
99+
category: "/language:${{matrix.language}}"

‎.github/workflows/golanglint-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v3
1313
- uses: actions/setup-go@v4
1414
with:
15-
go-version: '1.20'
15+
go-version: '1.22'
1616
cache: false
1717
- name: golangci-lint
1818
uses: golangci/golangci-lint-action@v3

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
fetch-depth: 2
1414
- uses: actions/setup-go@v3
1515
with:
16-
go-version: '1.20'
16+
go-version: '1.22'
1717
- name: Run tests
1818
run: go test -v ./...

‎LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2024 Richard Jennings
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33

44
test:
55
go test -v ./...
6+
7+
lint:
8+
golangci-lint run ./...

‎SECURITY.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
Use this section to tell people about which versions of your project are
6+
currently being supported with security updates.
7+
8+
| Version | Supported |
9+
| ------- | ------------------ |
10+
| 5.1.x | :white_check_mark: |
11+
| 5.0.x | :x: |
12+
| 4.0.x | :white_check_mark: |
13+
| < 4.0 | :x: |
14+
15+
## Reporting a Vulnerability
16+
17+
Use this section to tell people how to report a vulnerability.
18+
19+
Tell them where to go, how often they can expect to get an update on a
20+
reported vulnerability, what to expect if the vulnerability is accepted or
21+
declined, etc.

‎cmd/serve.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"crypto/tls"
5-
"github.com/richardjennings/ingress-nginx-opa/internal"
5+
"github.com/richardjennings/opa-nginx/internal"
66
"github.com/spf13/cobra"
77
"log"
88
"net/http"

‎go.mod

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,66 @@
1-
module github.com/richardjennings/ingress-nginx-opa
1+
module github.com/richardjennings/opa-nginx
22

3-
go 1.20
3+
go 1.22
44

55
require (
6-
github.com/spf13/cobra v1.7.0
7-
github.com/stretchr/testify v1.8.4
8-
github.com/testcontainers/testcontainers-go v0.24.1
6+
github.com/spf13/cobra v1.8.0
7+
github.com/stretchr/testify v1.9.0
8+
github.com/testcontainers/testcontainers-go v0.30.0
99
)
1010

1111
require (
1212
dario.cat/mergo v1.0.0 // indirect
1313
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
1414
github.com/Microsoft/go-winio v0.6.1 // indirect
15-
github.com/Microsoft/hcsshim v0.11.0 // indirect
15+
github.com/Microsoft/hcsshim v0.11.4 // indirect
1616
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
17-
github.com/containerd/containerd v1.7.6 // indirect
17+
github.com/containerd/containerd v1.7.12 // indirect
18+
github.com/containerd/log v0.1.0 // indirect
1819
github.com/cpuguy83/dockercfg v0.3.1 // indirect
1920
github.com/davecgh/go-spew v1.1.1 // indirect
20-
github.com/docker/distribution v2.8.2+incompatible // indirect
21-
github.com/docker/docker v24.0.6+incompatible // indirect
22-
github.com/docker/go-connections v0.4.0 // indirect
21+
github.com/distribution/reference v0.5.0 // indirect
22+
github.com/docker/docker v25.0.5+incompatible // indirect
23+
github.com/docker/go-connections v0.5.0 // indirect
2324
github.com/docker/go-units v0.5.0 // indirect
25+
github.com/felixge/httpsnoop v1.0.4 // indirect
26+
github.com/go-logr/logr v1.4.1 // indirect
27+
github.com/go-logr/stdr v1.2.2 // indirect
2428
github.com/go-ole/go-ole v1.2.6 // indirect
2529
github.com/gogo/protobuf v1.3.2 // indirect
2630
github.com/golang/protobuf v1.5.3 // indirect
27-
github.com/google/uuid v1.3.1 // indirect
31+
github.com/google/uuid v1.6.0 // indirect
2832
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2933
github.com/klauspost/compress v1.16.0 // indirect
34+
github.com/kr/text v0.1.0 // indirect
3035
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
3136
github.com/magiconair/properties v1.8.7 // indirect
32-
github.com/moby/patternmatcher v0.5.0 // indirect
37+
github.com/moby/patternmatcher v0.6.0 // indirect
3338
github.com/moby/sys/sequential v0.5.0 // indirect
39+
github.com/moby/sys/user v0.1.0 // indirect
3440
github.com/moby/term v0.5.0 // indirect
3541
github.com/morikuni/aec v1.0.0 // indirect
3642
github.com/opencontainers/go-digest v1.0.0 // indirect
37-
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
38-
github.com/opencontainers/runc v1.1.5 // indirect
43+
github.com/opencontainers/image-spec v1.1.0 // indirect
3944
github.com/pkg/errors v0.9.1 // indirect
4045
github.com/pmezard/go-difflib v1.0.0 // indirect
4146
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
42-
github.com/shirou/gopsutil/v3 v3.23.7 // indirect
47+
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
4348
github.com/shoenig/go-m1cpu v0.1.6 // indirect
44-
github.com/sirupsen/logrus v1.9.0 // indirect
49+
github.com/sirupsen/logrus v1.9.3 // indirect
4550
github.com/spf13/pflag v1.0.5 // indirect
46-
github.com/tklauser/go-sysconf v0.3.11 // indirect
47-
github.com/tklauser/numcpus v0.6.0 // indirect
51+
github.com/tklauser/go-sysconf v0.3.12 // indirect
52+
github.com/tklauser/numcpus v0.6.1 // indirect
4853
github.com/yusufpapurcu/wmi v1.2.3 // indirect
54+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
55+
go.opentelemetry.io/otel v1.24.0 // indirect
56+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
57+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
4958
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
50-
golang.org/x/mod v0.9.0 // indirect
51-
golang.org/x/net v0.9.0 // indirect
52-
golang.org/x/sys v0.11.0 // indirect
53-
golang.org/x/tools v0.7.0 // indirect
54-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
55-
google.golang.org/grpc v1.57.0 // indirect
56-
google.golang.org/protobuf v1.30.0 // indirect
59+
golang.org/x/mod v0.16.0 // indirect
60+
golang.org/x/sys v0.16.0 // indirect
61+
golang.org/x/tools v0.13.0 // indirect
62+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
63+
google.golang.org/grpc v1.58.3 // indirect
64+
google.golang.org/protobuf v1.33.0 // indirect
5765
gopkg.in/yaml.v3 v3.0.1 // indirect
5866
)

0 commit comments

Comments
 (0)