Bump the golang group across 1 directory with 19 updates (#220)

* Bump the golang group across 1 directory with 19 updates Bumps the golang group with 15 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/bramvdbogaerde/go-scp](https://github.com/bramvdbogaerde/go-scp) | `0.0.0-20201229172121-7a6c0268fa67` | `1.5.0` | | [github.com/cucumber/godog](https://github.com/cucumber/godog) | `0.14.1` | `0.15.0` | | [github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) | `1.7.0` | `1.8.0` | | [golang.org/x/crypto](https://github.com/golang/crypto) | `0.27.0` | `0.29.0` | | [google.golang.org/grpc](https://github.com/grpc/grpc-go) | `1.67.1` | `1.68.0` | | [k8s.io/api](https://github.com/kubernetes/api) | `0.31.1` | `0.31.2` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.31.1` | `0.31.2` | | [k8s.io/cri-api](https://github.com/kubernetes/cri-api) | `0.31.1` | `0.31.2` | | [github.com/gofrs/uuid](https://github.com/gofrs/uuid) | `4.3.1+incompatible` | `4.4.0+incompatible` | | [github.com/hashicorp/golang-lru](https://github.com/hashicorp/golang-lru) | `0.5.4` | `1.0.2` | | [golang.org/x/net](https://github.com/golang/net) | `0.29.0` | `0.31.0` | | [golang.org/x/oauth2](https://github.com/golang/oauth2) | `0.23.0` | `0.24.0` | | [golang.org/x/time](https://github.com/golang/time) | `0.6.0` | `0.8.0` | | google.golang.org/protobuf | `1.34.2` | `1.35.2` | | [sigs.k8s.io/structured-merge-diff/v4](https://github.com/kubernetes-sigs/structured-merge-diff) | `4.4.1` | `4.4.3` | Updates `github.com/bramvdbogaerde/go-scp` from 0.0.0-20201229172121-7a6c0268fa67 to 1.5.0 - [Release notes](https://github.com/bramvdbogaerde/go-scp/releases) - [Commits](https://github.com/bramvdbogaerde/go-scp/commits/v1.5.0) Updates `github.com/cucumber/godog` from 0.14.1 to 0.15.0 - [Release notes](https://github.com/cucumber/godog/releases) - [Changelog](https://github.com/cucumber/godog/blob/main/CHANGELOG.md) - [Commits](cucumber/godog@v0.14.1...v0.15.0) Updates `github.com/fsnotify/fsnotify` from 1.7.0 to 1.8.0 - [Release notes](https://github.com/fsnotify/fsnotify/releases) - [Changelog](https://github.com/fsnotify/fsnotify/blob/main/CHANGELOG.md) - [Commits](fsnotify/fsnotify@v1.7.0...v1.8.0) Updates `golang.org/x/crypto` from 0.27.0 to 0.29.0 - [Commits](golang/crypto@v0.27.0...v0.29.0) Updates `google.golang.org/grpc` from 1.67.1 to 1.68.0 - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.67.1...v1.68.0) Updates `k8s.io/api` from 0.31.1 to 0.31.2 - [Commits](kubernetes/api@v0.31.1...v0.31.2) Updates `k8s.io/apimachinery` from 0.31.1 to 0.31.2 - [Commits](kubernetes/apimachinery@v0.31.1...v0.31.2) Updates `k8s.io/client-go` from 0.31.1 to 0.31.2 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.31.1...v0.31.2) Updates `k8s.io/cri-api` from 0.31.1 to 0.31.2 - [Commits](kubernetes/cri-api@v0.31.1...v0.31.2) Updates `github.com/gofrs/uuid` from 4.3.1+incompatible to 4.4.0+incompatible - [Release notes](https://github.com/gofrs/uuid/releases) - [Commits](gofrs/uuid@v4.3.1...v4.4.0) Updates `github.com/hashicorp/golang-lru` from 0.5.4 to 1.0.2 - [Release notes](https://github.com/hashicorp/golang-lru/releases) - [Commits](hashicorp/golang-lru@v0.5.4...v1.0.2) Updates `golang.org/x/net` from 0.29.0 to 0.31.0 - [Commits](golang/net@v0.29.0...v0.31.0) Updates `golang.org/x/oauth2` from 0.23.0 to 0.24.0 - [Commits](golang/oauth2@v0.23.0...v0.24.0) Updates `golang.org/x/sys` from 0.25.0 to 0.27.0 - [Commits](golang/sys@v0.25.0...v0.27.0) Updates `golang.org/x/term` from 0.24.0 to 0.26.0 - [Commits](golang/term@v0.24.0...v0.26.0) Updates `golang.org/x/text` from 0.18.0 to 0.20.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.18.0...v0.20.0) Updates `golang.org/x/time` from 0.6.0 to 0.8.0 - [Commits](golang/time@v0.6.0...v0.8.0) Updates `google.golang.org/protobuf` from 1.34.2 to 1.35.2 Updates `sigs.k8s.io/structured-merge-diff/v4` from 4.4.1 to 4.4.3 - [Release notes](https://github.com/kubernetes-sigs/structured-merge-diff/releases) - [Changelog](https://github.com/kubernetes-sigs/structured-merge-diff/blob/master/RELEASE.md) - [Commits](kubernetes-sigs/structured-merge-diff@v4.4.1...v4.4.3) --- updated-dependencies: - dependency-name: github.com/bramvdbogaerde/go-scp dependency-type: direct:production update-type: version-update:semver-major dependency-group: golang - dependency-name: github.com/cucumber/godog dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang - dependency-name: github.com/fsnotify/fsnotify dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: golang - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-patch dependency-group: golang - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: golang - dependency-name: k8s.io/cri-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: golang - dependency-name: github.com/gofrs/uuid dependency-type: indirect update-type: version-update:semver-minor dependency-group: golang - dependency-name: github.com/hashicorp/golang-lru dependency-type: indirect update-type: version-update:semver-major dependency-group: golang - dependency-name: golang.org/x/net dependency-type: indirect update-type: version-update:semver-minor dependency-group: golang - dependency-name: golang.org/x/oauth2 dependency-type: indirect update-type: version-update:semver-minor dependency-group: golang - dependency-name: golang.org/x/sys dependency-type: indirect update-type: version-update:semver-minor dependency-group: golang - dependency-name: golang.org/x/term dependency-type: indirect update-type: version-update:semver-minor dependency-group: golang - dependency-name: golang.org/x/text dependency-type: indirect update-type: version-update:semver-minor dependency-group: golang - dependency-name: golang.org/x/time dependency-type: indirect update-type: version-update:semver-minor dependency-group: golang - dependency-name: google.golang.org/protobuf dependency-type: indirect update-type: version-update:semver-minor dependency-group: golang - dependency-name: sigs.k8s.io/structured-merge-diff/v4 dependency-type: indirect update-type: version-update:semver-patch dependency-group: golang ... Signed-off-by: dependabot[bot] <[email protected]> * fix errors based on dependency updates * linting and formatting fixes * fix linting * revert gofumpt as its conflicting with gofumpt in golangci-lint * fix test scripts for rhel 9 * remove linting script in favor of gh actions * update integration test scripts to run on rhel 9 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: root <[email protected]>
dell · Nov 22, 2024 · 40a2fda · 40a2fda
1 parent 83c15c2
commit 40a2fda
Show file tree

Hide file tree

Showing 20 changed files with 259 additions and 360 deletions.
diff --git a/Makefile b/Makefile
@@ -14,17 +14,14 @@
 # Includes the following generated file to get semantic version information
 
 MAJOR=1
-MINOR=10
+MINOR=12
 PATCH=0
 VERSION?="v$(MAJOR).$(MINOR).$(PATCH)"
 REGISTRY?="${REGISTRY_HOST}:${REGISTRY_PORT}/podmon"
 BASEIMAGE?="resiliency-ubimicro:latest"
 
 all: clean podman push
 
-check:
-	@scripts/check.sh ./internal/monitor ./internal/k8sapi ./internal/csiapi ./internal/criapi ./cmd/podmon  
-
 unit-test:
 	(cd cmd/podmon; make unit-test)
 
@@ -46,3 +43,17 @@ push:
 
 download-csm-common:
 	curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk
+
+.PHONY: actions
+actions: ## Run all the github action checks that run on a pull_request creation
+	act -l | grep -v ^Stage | grep pull_request | grep -v image_security_scan | awk '{print $$2}' | while read WF; do act pull_request --no-cache-server --platform ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest --job "$${WF}"; done
+
+.PHONY: check
+check: ## Echo instructions to run one specific workflow locally
+	@echo "GitHub Workflows can be run locally with the following command:"
+	@echo "act pull_request --no-cache-server --platform ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest --job <jobid>"
+	@echo
+	@echo "Where '<jobid>' is a Job ID returned by the command:"
+	@echo "act -l"
+	@echo
+	@echo "NOTE: if act if not installed, it can be from https://github.com/nektos/act"
diff --git a/cmd/podmon/main.go b/cmd/podmon/main.go
@@ -1,18 +1,14 @@
-/*
-* Copyright (c) 2021-2023 Dell Inc., or its subsidiaries. All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
- */
+//  Copyright © 2021-2023 Dell Inc. or its subsidiaries. All Rights Reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//       http://www.apache.org/licenses/LICENSE-2.0
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 
 package main
 

diff --git a/cmd/podmon/main_steps_test.go b/cmd/podmon/main_steps_test.go
@@ -1,19 +1,16 @@
-/*
-* Copyright (c) 2021-2022 Dell Inc., or its subsidiaries. All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
- */
-
+// Copyright © 2021-2022 Dell Inc. or its subsidiaries. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 package main
 
 import (

diff --git a/cmd/podmon/main_test.go b/cmd/podmon/main_test.go
@@ -1,18 +1,14 @@
-/*
-* Copyright (c) 2021-2022 Dell Inc., or its subsidiaries. All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
- */
+//  Copyright © 2021-2022 Dell Inc. or its subsidiaries. All Rights Reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//       http://www.apache.org/licenses/LICENSE-2.0
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 
 package main
 

diff --git a/go.mod b/go.mod
@@ -3,23 +3,23 @@ module podmon
 go 1.23
 
 require (
-	github.com/bramvdbogaerde/go-scp v0.0.0-20201229172121-7a6c0268fa67
+	github.com/bramvdbogaerde/go-scp v1.5.0
 	github.com/container-storage-interface/spec v1.10.0
-	github.com/cucumber/godog v0.14.1
+	github.com/cucumber/godog v0.15.0
 	github.com/dell/dell-csi-extensions/podmon v1.6.0
 	github.com/dell/gofsutil v1.17.0
-	github.com/fsnotify/fsnotify v1.7.0
+	github.com/fsnotify/fsnotify v1.8.0
 	github.com/golang/mock v1.6.0
 	github.com/kubernetes-csi/csi-lib-utils v0.19.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/crypto v0.27.0
-	google.golang.org/grpc v1.67.1
-	k8s.io/api v0.31.1
-	k8s.io/apimachinery v0.31.1
-	k8s.io/client-go v0.31.1
-	k8s.io/cri-api v0.31.1
+	golang.org/x/crypto v0.29.0
+	google.golang.org/grpc v1.68.0
+	k8s.io/api v0.31.2
+	k8s.io/apimachinery v0.31.2
+	k8s.io/client-go v0.31.2
+	k8s.io/cri-api v0.31.2
 )
 
 require (
@@ -32,7 +32,7 @@ require (
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/gofrs/uuid v4.3.1+incompatible // indirect
+	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -42,7 +42,7 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-memdb v1.3.4 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -66,14 +66,14 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
-	golang.org/x/time v0.6.0 // indirect
+	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/term v0.26.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
+	golang.org/x/time v0.8.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
@@ -83,6 +83,6 @@ require (
 	k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
 	k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )