Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/service discovery #228

Merged
merged 12 commits into from
Jul 9, 2024
12 changes: 9 additions & 3 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ type Components struct {
Storage Component `mapstructure:"storage"`
}

type ServiceScanConfig struct {
Enabled bool `json:"enabled"`
Interval time.Duration `json:"interval"`
}

type Server struct {
Account string `json:"account"`
DiscoveryURL string `json:"discoveryUrl"`
Expand All @@ -59,9 +64,10 @@ type Configurations struct {
}

type CapabilitiesConfig struct {
Capabilities Capabilities `mapstructure:"capabilities"`
Components Components `mapstructure:"components"`
Configurations Configurations `mapstructure:"configurations"`
Capabilities Capabilities `mapstructure:"capabilities"`
Components Components `mapstructure:"components"`
Configurations Configurations `mapstructure:"configurations"`
ServiceScanConfig ServiceScanConfig `mapstructure:"serviceScanConfig"`
}

func LoadCapabilitiesConfig(path string) (CapabilitiesConfig, error) {
Expand Down
4 changes: 4 additions & 0 deletions config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ func TestLoadCapabilities(t *testing.T) {
DiscoveryURL: "foo.com",
},
},
ServiceScanConfig: ServiceScanConfig{
Interval: 60 * time.Second,
Enabled: true,
},
},
},
}
Expand Down
6 changes: 5 additions & 1 deletion configuration/capabilities.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,9 @@
"discoveryUrl": "foo.com",
"otelUrl": null
}
}
},
"serviceScanConfig":{
"enabled": true,
"interval": "60s"
}
}
40 changes: 37 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,46 @@ require (
go.opentelemetry.io/otel v1.22.0
go.opentelemetry.io/otel/trace v1.22.0
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
gotest.tools/v3 v3.5.0
k8s.io/api v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2
k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/IBM/sarama v1.42.1 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/eapache/go-resiliency v1.4.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/elastic/elastic-transport-go/v8 v8.4.0 // indirect
github.com/elastic/go-elasticsearch/v8 v8.12.0 // indirect
github.com/go-redis/redis/v8 v8.11.5 // indirect
github.com/go-sql-driver/mysql v1.7.1 // indirect
github.com/gocql/gocql v1.6.0 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
github.com/jcmturner/gofork v1.7.6 // indirect
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/montanaflynn/stats v0.7.0 // indirect
github.com/streadway/amqp v1.1.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
go.etcd.io/etcd/api/v3 v3.5.11 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
go.etcd.io/etcd/client/v3 v3.5.11 // indirect
)

require (
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
Expand Down Expand Up @@ -159,6 +192,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/kubescape/kubescape-network-scanner v0.0.15
github.com/kubescape/kubescape/v3 v3.0.4 // indirect
github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 // indirect
github.com/kubescape/regolibrary v1.0.315 // indirect
Expand Down Expand Up @@ -192,7 +226,7 @@ require (
github.com/pborman/indent v1.2.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pierrec/lz4/v4 v4.1.15 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/profile v1.7.0 // indirect
Expand Down Expand Up @@ -259,8 +293,8 @@ require (
gonum.org/v1/gonum v0.9.1 // indirect
google.golang.org/api v0.159.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
Expand Down
Loading
Loading