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.

Sign up for GitHub

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

feat(BUX-417): remove unused env #408

Merged
merged 2 commits into from
Jan 16, 2024
Merged

feat(BUX-417): remove unused env #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f31935
chore(BUX-417): remove DefaultNote and SkipInitializeWithVersion
pawellewandowski98 Jan 16, 2024
468d2af
chore(BUX-417): update bux version
pawellewandowski98 Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions config/config.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop

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