Skip to content

Commit 4ac92f6

Browse files
zivnevozivnevo
authored
Merge branch 'main' into user-connections
2 parents f43a3a9 + d867dba commit 4ac92f6

7 files changed

+40
-40
lines changed

‎.github/workflows/codeql-analysis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
44+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
4545

4646
# Initializes the CodeQL tools for scanning.
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d
48+
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
4949
with:
5050
languages: ${{ matrix.language }}
5151
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d
59+
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 https://git.io/JvXDl
@@ -70,4 +70,4 @@ jobs:
7070
# make release
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d
73+
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169

‎.github/workflows/go-build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
build-and-test:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1717

1818
- name: Set up Go
19-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
19+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
2020
with:
2121
go-version-file: ./go.mod
2222

@@ -29,9 +29,9 @@ jobs:
2929
test-docker:
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
32+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3333
- name: Build Docker image
34-
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85
34+
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
3535
id: build_docker
3636
with:
3737
context: .

‎.github/workflows/golangci-lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
name: golangci-lint
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
15-
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
15+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
1616
with:
1717
go-version-file: ./go.mod
18-
- uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86
18+
- uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8
1919
with:
2020
version: latest

‎.github/workflows/make-release.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
packages: write
1717
steps:
1818
- name: Check out the repo
19-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2020

2121
- name: Log in to Docker Hub
2222
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
@@ -26,14 +26,14 @@ jobs:
2626
password: ${{ secrets.GITHUB_TOKEN }}
2727

2828
- name: Build and push Docker image
29-
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85
29+
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
3030
with:
3131
context: .
3232
push: true
3333
tags: ghcr.io/np-guard/net-top-analyzer:${{ github.ref_name }}
3434

3535
- name: Set up Go
36-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
36+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
3737
with:
3838
go-version: 'stable'
3939

‎.github/workflows/test-output-validity.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ jobs:
1818
build-and-test-output:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2222

2323
- name: Set up Go
24-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
24+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
2525
with:
2626
go-version-file: ./go.mod
2727

2828
- name: Build
2929
run: make
3030

3131
- name: Bring up a live cluster
32-
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde
32+
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3
3333

3434
- name: Test output on a live cluster
3535
run: |

‎go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.22.0
55
toolchain go1.22.2
66

77
require (
8-
github.com/np-guard/netpol-analyzer v1.2.0
8+
github.com/np-guard/netpol-analyzer v1.2.1
99
github.com/openshift/api v0.0.0-20230502160752-c71432710382
10-
github.com/stretchr/testify v1.9.0
10+
github.com/stretchr/testify v1.10.0
1111
gopkg.in/yaml.v3 v3.0.1
1212
k8s.io/api v0.30.0
1313
k8s.io/apimachinery v0.30.0
@@ -42,12 +42,12 @@ require (
4242
github.com/pmezard/go-difflib v1.0.0 // indirect
4343
github.com/xlab/treeprint v1.2.0 // indirect
4444
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
45-
golang.org/x/net v0.24.0 // indirect
45+
golang.org/x/net v0.33.0 // indirect
4646
golang.org/x/oauth2 v0.19.0 // indirect
47-
golang.org/x/sync v0.7.0 // indirect
48-
golang.org/x/sys v0.19.0 // indirect
49-
golang.org/x/term v0.19.0 // indirect
50-
golang.org/x/text v0.14.0 // indirect
47+
golang.org/x/sync v0.10.0 // indirect
48+
golang.org/x/sys v0.28.0 // indirect
49+
golang.org/x/term v0.27.0 // indirect
50+
golang.org/x/text v0.21.0 // indirect
5151
golang.org/x/time v0.5.0 // indirect
5252
google.golang.org/protobuf v1.33.0 // indirect
5353
gopkg.in/inf.v0 v0.9.1 // indirect

‎go.sum

+16-16
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/
8383
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
8484
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
8585
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
86-
github.com/np-guard/netpol-analyzer v1.2.0 h1:Hk8cWkOZ6n/rAQRnTZJ9r61aKgRmoYkvW8VZhJgztS0=
87-
github.com/np-guard/netpol-analyzer v1.2.0/go.mod h1:TkDwB3ToxRSr8xdpa5TTvbya64VfjQ97je99DjVA+k4=
86+
github.com/np-guard/netpol-analyzer v1.2.1 h1:TmO0ObAEQymhxEbZ6h/iVaUItRXufMNpyUrDsGA9u88=
87+
github.com/np-guard/netpol-analyzer v1.2.1/go.mod h1:TkDwB3ToxRSr8xdpa5TTvbya64VfjQ97je99DjVA+k4=
8888
github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
8989
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
9090
github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
@@ -107,8 +107,8 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
107107
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
108108
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
109109
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
110-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
111-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
110+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
111+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
112112
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
113113
github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
114114
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -132,8 +132,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
132132
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
133133
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
134134
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
135-
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
136-
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
135+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
136+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
137137
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
138138
golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg=
139139
golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8=
@@ -142,23 +142,23 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
142142
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
143143
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
144144
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
145-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
146-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
145+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
146+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
147147
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
148148
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
149149
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
150150
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
151151
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
152152
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
153-
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
154-
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
153+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
154+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
155155
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
156-
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
157-
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
156+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
157+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
158158
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
159159
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
160-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
161-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
160+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
161+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
162162
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
163163
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
164164
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -169,8 +169,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
169169
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
170170
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
171171
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
172-
golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
173-
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
172+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
173+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
174174
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
175175
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
176176
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 commit comments

Comments
 (0)