Skip to content

Commit

Permalink
feat(BUX-417): remove unused env (#408)
Browse files Browse the repository at this point in the history
* chore(BUX-417): remove DefaultNote and SkipInitializeWithVersion

* chore(BUX-417): update bux version
  • Loading branch information
pawellewandowski98 authored Jan 16, 2024
1 parent ad2f9d0 commit 7b13b4f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 17 deletions.
2 changes: 0 additions & 2 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,6 @@ type PaymailConfig struct {
Beef *BeefConfig `json:"beef" mapstructure:"beef"`
// DefaultFromPaymail IE: from@domain.com.
DefaultFromPaymail string `json:"default_from_paymail" mapstructure:"default_from_paymail"`
// DefaultNote IE: message needed for address resolution.
DefaultNote string `json:"default_note" mapstructure:"default_note"`
// Domains is a list of allowed domains.
Domains []string `json:"domains" mapstructure:"domains"`
// DomainValidationEnabled should be turned off if hosted domain is not paymail related.
Expand Down
22 changes: 10 additions & 12 deletions config/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,16 @@ func getDbDefaults() *DbConfig {
URI: "mongodb://localhost:27017/xapi",
},
SQL: &datastore.SQLConfig{
Driver: "postgresql",
ExistingConnection: nil,
Host: "localhost",
Name: "xapi",
Password: "",
Port: "5432",
Replica: false,
SkipInitializeWithVersion: true,
TimeZone: "UTC",
TxTimeout: 10 * time.Second,
User: "postgres",
Driver: "postgresql",
ExistingConnection: nil,
Host: "localhost",
Name: "xapi",
Password: "",
Port: "5432",
Replica: false,
TimeZone: "UTC",
TxTimeout: 10 * time.Second,
User: "postgres",
},
SQLite: &datastore.SQLiteConfig{
DatabasePath: "./bux.db",
Expand Down Expand Up @@ -142,7 +141,6 @@ func getPaymailDefaults() *PaymailConfig {
PulseAuthToken: "mQZQ6WmxURxWz5ch", // #nosec G101
},
DefaultFromPaymail: "from@domain.com",
DefaultNote: "bux Address Resolution",
Domains: []string{"localhost"},
DomainValidationEnabled: true,
Enabled: true,
Expand Down
1 change: 0 additions & 1 deletion config/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ func loadPaymail(appConfig *AppConfig, options []bux.ClientOps) []bux.ClientOps
options = append(options, bux.WithPaymailSupport(
appConfig.Paymail.Domains,
appConfig.Paymail.DefaultFromPaymail,
appConfig.Paymail.DefaultNote,
appConfig.Paymail.DomainValidationEnabled,
appConfig.Paymail.SenderValidationEnabled,
))
Expand Down
2 changes: 1 addition & 1 deletion go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7b13b4f

Please sign in to comment.