diff --git a/go.mod b/go.mod index 40bb9f1c..6296fdd0 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,8 @@ require ( github.com/gocolly/colly/v2 v2.1.0 github.com/gogo/status v1.1.0 github.com/google/uuid v1.3.0 + github.com/gorilla/feeds v1.1.1 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 github.com/imdario/mergo v0.3.11 // indirect @@ -33,6 +35,7 @@ require ( github.com/lib/pq v1.10.2 github.com/ory/hydra-client-go v1.10.6 github.com/pelletier/go-toml v1.8.1 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.13.0 github.com/rocky-linux/srpmproc v0.3.16 github.com/sirupsen/logrus v1.8.1 @@ -57,13 +60,12 @@ require ( k8s.io/apimachinery v0.22.1 k8s.io/client-go v0.22.1 openapi.peridot.resf.org/peridotopenapi v0.0.0-00010101000000-000000000000 + peridot.resf.org/apollo/pb v0.0.0-00010101000000-000000000000 // indirect peridot.resf.org/common v0.0.0-00010101000000-000000000000 peridot.resf.org/obsidian/pb v0.0.0-00010101000000-000000000000 peridot.resf.org/peridot/keykeeper/pb v0.0.0-00010101000000-000000000000 peridot.resf.org/peridot/pb v0.0.0-00010101000000-000000000000 peridot.resf.org/peridot/yumrepofs/pb v0.0.0-00010101000000-000000000000 - peridot.resf.org/secparse/admin/proto v0.0.0-00010101000000-000000000000 - peridot.resf.org/secparse/proto v0.0.0-00010101000000-000000000000 ) // Manual replace @@ -74,6 +76,7 @@ replace ( // sync-replace-start replace ( + peridot.resf.org/apollo/pb => ./bazel-bin/apollo/proto/v1/apollopb_go_proto_/peridot.resf.org/apollo/pb bazel.build/protobuf => ./bazel-bin/build/bazel/protobuf/bazelbuild_go_proto_/bazel.build/protobuf bazel.build/remote/execution/v2 => ./bazel-bin/build/bazel/remote/execution/v2/remoteexecution_go_proto_/bazel.build/remote/execution/v2 bazel.build/semver => ./bazel-bin/build/bazel/semver/semver_go_proto_/bazel.build/semver @@ -82,8 +85,6 @@ replace ( peridot.resf.org/peridot/keykeeper/pb => ./bazel-bin/peridot/proto/v1/keykeeper/keykeeperpb_go_proto_/peridot.resf.org/peridot/keykeeper/pb peridot.resf.org/peridot/yumrepofs/pb => ./bazel-bin/peridot/proto/v1/yumrepofs/yumrepofspb_go_proto_/peridot.resf.org/peridot/yumrepofs/pb peridot.resf.org/common => ./bazel-bin/proto/commonpb_go_proto_/peridot.resf.org/common - peridot.resf.org/secparse/admin/proto => ./bazel-bin/secparse/admin/proto/v1/secparseadminpb_go_proto_/peridot.resf.org/secparse/admin/proto - peridot.resf.org/secparse/proto => ./bazel-bin/secparse/proto/v1/secparsepb_go_proto_/peridot.resf.org/secparse/proto github.com/envoyproxy/protoc-gen-validate/validate => ./bazel-bin/vendor/github.com/envoyproxy/protoc-gen-validate/validate/go_default_library_/github.com/envoyproxy/protoc-gen-validate/validate ) // sync-replace-end diff --git a/go.sum b/go.sum index 1d0f8981..db475bf3 100644 --- a/go.sum +++ b/go.sum @@ -435,6 +435,8 @@ github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9 github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY= +github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= diff --git a/peridot/cmd/v1/peridotbuilder/main.go b/peridot/cmd/v1/peridotbuilder/main.go index fc3c8994..ffe1b9b6 100644 --- a/peridot/cmd/v1/peridotbuilder/main.go +++ b/peridot/cmd/v1/peridotbuilder/main.go @@ -31,6 +31,8 @@ package main import ( + "log" + "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -39,7 +41,6 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/types/known/anypb" - "log" builderv1 "peridot.resf.org/peridot/builder/v1" peridotcommon "peridot.resf.org/peridot/common" serverconnector "peridot.resf.org/peridot/db/connector" diff --git a/vendor/modules.txt b/vendor/modules.txt index 0c467746..eb845190 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -403,8 +403,6 @@ github.com/matttproud/golang_protobuf_extensions/pbutil github.com/mitchellh/go-homedir # github.com/mitchellh/mapstructure v1.4.1 github.com/mitchellh/mapstructure -# github.com/mmcdole/gofeed v1.1.3 -## explicit # github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd github.com/modern-go/concurrent # github.com/modern-go/reflect2 v1.0.2 @@ -447,8 +445,6 @@ github.com/prometheus/common/model github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util -# github.com/quay/goval-parser v0.8.7 -## explicit # github.com/rivo/uniseg v0.2.0 github.com/rivo/uniseg # github.com/robfig/cron v1.2.0