Chore: update go modules (#31)

* chore: update Go modules Signed-off-by: Takumi Yanagawa <[email protected]> * chore: upgrade go-git to v5 Signed-off-by: Takumi Yanagawa <[email protected]> --------- Signed-off-by: Takumi Yanagawa <[email protected]>
oscal-compass · Sep 12, 2024 · 2b0b410 · 2b0b410
1 parent 3c9e94e
commit 2b0b410
Show file tree

Hide file tree

Showing 7 changed files with 749 additions and 1,875 deletions.
diff --git a/go/controllers/utils/gitrepo/gitrepo.go b/go/controllers/utils/gitrepo/gitrepo.go
@@ -20,10 +20,10 @@ import (
 	"os"
 	"time"
 
-	"gopkg.in/src-d/go-git.v4"
-	"gopkg.in/src-d/go-git.v4/plumbing"
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"gopkg.in/src-d/go-git.v4/plumbing/transport/http"
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/transport/http"
 )
 
 type GitRepo struct {

diff --git a/go/controllers/utils/utils.go b/go/controllers/utils/utils.go
@@ -27,6 +27,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/go-git/go-git/v5"
+	githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/go-logr/logr"
 	c2pv1alpha1 "github.com/oscal-compass/compliance-to-policy/go/api/v1alpha1"
 	edge "github.com/oscal-compass/compliance-to-policy/go/controllers/edge.kcp.io/v1alpha1"
@@ -36,8 +38,6 @@ import (
 	internalcompliance "github.com/oscal-compass/compliance-to-policy/go/pkg/types/internalcompliance"
 	typesoscal "github.com/oscal-compass/compliance-to-policy/go/pkg/types/oscal"
 	cd "github.com/oscal-compass/compliance-to-policy/go/pkg/types/oscal/componentdefinition"
-	"gopkg.in/src-d/go-git.v4"
-	githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"

diff --git a/go/go.mod b/go/go.mod
diff --git a/go/go.sum b/go/go.sum
diff --git a/go/main.go b/go/main.go
@@ -33,6 +33,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	compliancetopolicycontrollerv1alpha1 "github.com/oscal-compass/compliance-to-policy/go/api/v1alpha1"
 	wgpolicyk8sv1alpha2 "github.com/oscal-compass/compliance-to-policy/go/controllers/wgpolicyk8s.io/v1alpha2"
@@ -84,9 +85,10 @@ func main() {
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:                 scheme,
-		MetricsBindAddress:     metricsAddr,
-		Port:                   9443,
+		Scheme: scheme,
+		Metrics: server.Options{
+			BindAddress: metricsAddr,
+		},
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "bce5c8a1.github.com",

diff --git a/go/pkg/gitutils.go b/go/pkg/gitutils.go
@@ -25,8 +25,8 @@ import (
 	"os"
 	"strings"
 
-	"gopkg.in/src-d/go-git.v4"
-	githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
+	"github.com/go-git/go-git/v5"
+	githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
 )
 
 type GitUtils struct {

diff --git a/go/pkg/kyverno/result2oscal.go b/go/pkg/kyverno/result2oscal.go
@@ -115,7 +115,7 @@ func (r *ResultToOscal) retrievePolicyReportResults(name string) []*typepolr.Pol
 		for _, result := range polr.Results {
 			policy := result.Policy
 			if policy == name {
-				prrs = append(prrs, result)
+				prrs = append(prrs, &result)
 			}
 		}
 	}