From 0884f89431cd26bcc9674b3b7ab628b090f5881e Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Tue, 7 Dec 2021 13:31:39 +0100 Subject: Implement Cobra CLI tooling, Viper config tooling (#336) * start pulling out + replacing urfave and config * replace many many instances of config * move more stuff => viper * properly remove urfave * move some flags to root command * add testrig commands to root * alias config file keys * start adding cli parsing tests * reorder viper init * remove config path alias * fmt * change config file keys to non-nested * we're more or less in business now * tidy up the common func * go fmt * get tests passing again * add note about the cliparsing tests * reorganize * update docs with changes * structure cmd dir better * rename + move some files around * fix dangling comma --- cmd/gotosocial/smtpflags.go | 59 --------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 cmd/gotosocial/smtpflags.go (limited to 'cmd/gotosocial/smtpflags.go') diff --git a/cmd/gotosocial/smtpflags.go b/cmd/gotosocial/smtpflags.go deleted file mode 100644 index 5c790ef7e..000000000 --- a/cmd/gotosocial/smtpflags.go +++ /dev/null @@ -1,59 +0,0 @@ -/* - GoToSocial - Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package main - -import ( - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/urfave/cli/v2" -) - -func smtpFlags(flagNames, envNames config.Flags, defaults config.Defaults) []cli.Flag { - return []cli.Flag{ - &cli.StringFlag{ - Name: flagNames.SMTPHost, - Usage: "Host of the smtp server. Eg., 'smtp.eu.mailgun.org'", - Value: defaults.SMTPHost, - EnvVars: []string{envNames.SMTPHost}, - }, - &cli.IntFlag{ - Name: flagNames.SMTPPort, - Usage: "Port of the smtp server. Eg., 587", - Value: defaults.SMTPPort, - EnvVars: []string{envNames.SMTPPort}, - }, - &cli.StringFlag{ - Name: flagNames.SMTPUsername, - Usage: "Username to authenticate with the smtp server as. Eg., 'postmaster@mail.example.org'", - Value: defaults.SMTPUsername, - EnvVars: []string{envNames.SMTPUsername}, - }, - &cli.StringFlag{ - Name: flagNames.SMTPPassword, - Usage: "Password to pass to the smtp server.", - Value: defaults.SMTPPassword, - EnvVars: []string{envNames.SMTPPassword}, - }, - &cli.StringFlag{ - Name: flagNames.SMTPFrom, - Usage: "Address to use as the 'from' field of the email. Eg., 'gotosocial@example.org'", - Value: defaults.SMTPFrom, - EnvVars: []string{envNames.SMTPFrom}, - }, - } -} -- cgit v1.2.3