Skip to content

Commit

Permalink
Adds token file support and go mod
Browse files Browse the repository at this point in the history
  • Loading branch information
tlm committed Feb 4, 2019
1 parent f2b3caf commit c2c5368
Show file tree
Hide file tree
Showing 768 changed files with 1,095 additions and 382,321 deletions.
303 changes: 0 additions & 303 deletions Gopkg.lock

This file was deleted.

35 changes: 0 additions & 35 deletions Gopkg.toml

This file was deleted.

11 changes: 11 additions & 0 deletions cmd/disttrust.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@ func Run(cmd *cobra.Command, args []string) {
log.Fatalf("building providers: %v", err)
}

log.Debug("initialising providers")
for _, provider := range providers {
log := log.WithFields(log.Fields{
"provider_name": provider.Name(),
})
log.Info("initialising provider")
if err := provider.Initialise(); err != nil {
log.Fatalf("initialising provider: %v", err)
}
}

log.Debug("building members from config")
members, err := config.GetMembersWithProviderStore(confB.V, providers)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion config/member.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const (
)

func GetMembersWithProviderStore(v *viper.Viper,
store *provider.Store) ([]conductor.Member, error) {
store provider.Store) ([]conductor.Member, error) {
return GetMembers(v, ProviderFetcher(store.Fetch))
}

Expand Down
8 changes: 4 additions & 4 deletions config/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ const (
)

func GetProviderStore(v *viper.Viper,
s *provider.Store) (*provider.Store, error) {
s provider.Store) (provider.Store, error) {
return GetProviderStoreWithFactory(v, s, DefaultProviderFactory)
}

func GetProviderStoreWithFactory(v *viper.Viper, store *provider.Store,
factory ProviderFactory) (*provider.Store, error) {
func GetProviderStoreWithFactory(v *viper.Viper, store provider.Store,
factory ProviderFactory) (provider.Store, error) {
nstore := provider.NewStore()
providers := []providerConf{}
err := v.UnmarshalKey(Providers, &providers)
Expand Down Expand Up @@ -59,7 +59,7 @@ func GetProviderStoreWithFactory(v *viper.Viper, store *provider.Store,

if changed {
var err error
genP, err = mapper.MakeProvider(p.Options)
genP, err = mapper.MakeProvider(p.Name, p.Options)
if err != nil {
return nstore, errors.Wrapf(err, "getting provider for %s", p.Name)
}
Expand Down
Loading

0 comments on commit c2c5368

Please sign in to comment.