Skip to content

Commit

Permalink
use application type (and make configurable) (#54)
Browse files Browse the repository at this point in the history 
* use application type (and make configurable)

* fix test

* add one more error check
  • Loading branch information
@jacobsee
jacobsee authored Sep 5, 2023
1 parent 881a6d0 commit c41b015
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 92 deletions.
3 changes: 3 additions & 0 deletions cmd/serve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ func init() {
viperBindFlag("governor.token-url", serveCmd.Flags().Lookup("governor-token-url"))
serveCmd.Flags().String("governor-audience", "http://api:3001/", "oauth audience for client credential flow")
viperBindFlag("governor.audience", serveCmd.Flags().Lookup("governor-audience"))
serveCmd.Flags().String("governor-application-type", "slack", "application type slug to be listening to events for")
viperBindFlag("governor.application-type", serveCmd.Flags().Lookup("governor-application-type"))

// NATS related flags
serveCmd.Flags().String("nats-url", "nats://127.0.0.1:4222", "NATS server connection url")
Expand Down Expand Up @@ -176,6 +178,7 @@ func serve(cmdCtx context.Context, _ *viper.Viper) error {
reconciler.WithInterval(viper.GetDuration("reconciler.interval")),
reconciler.WithUserGroupPrefix(viper.GetString("slack.usergroup-prefix")),
reconciler.WithDryRun(viper.GetBool("dryrun")),
reconciler.WithApplicationType(viper.GetString("governor.application-type")),
)

if viper.GetBool("reconciler.locking") {
Expand Down
49 changes: 25 additions & 24 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ require (
github.com/gin-gonic/gin v1.9.1
github.com/gofrs/uuid v4.4.0+incompatible
github.com/metal-toolbox/auditevent v0.8.0
github.com/metal-toolbox/governor-api v0.1.0
github.com/metal-toolbox/governor-api v0.1.6
github.com/mitchellh/go-homedir v1.1.0
github.com/nats-io/nats-server/v2 v2.9.14
github.com/nats-io/nats.go v1.27.1
github.com/nats-io/nats-server/v2 v2.9.15
github.com/nats-io/nats.go v1.28.0
github.com/slack-go/slack v0.12.2
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.15.0
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.8.4
github.com/zsais/go-gin-prometheus v0.1.0
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.40.0
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.42.0
go.opentelemetry.io/otel v1.16.0
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
go.opentelemetry.io/otel/sdk v1.16.0
Expand All @@ -32,11 +32,12 @@ require (

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/bytedance/sonic v1.9.1 // indirect
github.com/bytedance/sonic v1.10.0-rc3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/cockroachdb/cockroach-go/v2 v2.3.3 // indirect
github.com/coreos/go-oidc/v3 v3.5.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.0 // indirect
github.com/cockroachdb/cockroach-go/v2 v2.3.5 // indirect
github.com/coreos/go-oidc/v3 v3.6.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05 // indirect
github.com/friendsofgo/errors v0.9.2 // indirect
Expand All @@ -46,10 +47,10 @@ require (
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/go-playground/validator/v10 v10.14.1 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.0 // indirect
Expand All @@ -59,7 +60,7 @@ require (
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.14.0 // indirect
github.com/jackc/pgconn v1.14.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
Expand All @@ -68,8 +69,8 @@ require (
github.com/jackc/pgx/v4 v4.18.1 // indirect
github.com/jmoiron/sqlx v1.3.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/magiconair/properties v1.8.7 // indirect
Expand All @@ -82,13 +83,13 @@ require (
github.com/nats-io/jwt/v2 v2.3.0 // indirect
github.com/nats-io/nkeys v0.4.4 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.15.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand All @@ -99,13 +100,13 @@ require (
github.com/volatiletech/null/v8 v8.1.2 // indirect
github.com/volatiletech/randomize v0.0.1 // indirect
github.com/volatiletech/sqlboiler/v4 v4.14.2 // indirect
github.com/volatiletech/strmangle v0.0.4 // indirect
go.hollow.sh/toolbox v0.5.1 // indirect
github.com/volatiletech/strmangle v0.0.5 // indirect
go.hollow.sh/toolbox v0.6.1 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/arch v0.4.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
Expand Down
Loading

0 comments on commit c41b015

Please sign in to comment.