particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro: the distro constructors cannot fail

Browse source 
Simplify the code by dropping the potential error return. The
constructor simply instantiates some maps, this cannot fail.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-03-22 12:54:36 +01:00 • committed by msehnout
parent 1345ca77fd
commit 08ff8ab81b
11 changed files with 24 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/fedora31/distro.go
View file

@ -44,7 +44,7 @@ type output struct {
const Distro = common.Fedora31
const ModulePlatformID = "platform:f31"
func New() (*Fedora31, error) {
func New() *Fedora31 {
const GigaByte = 1024 * 1024 * 1024
r := Fedora31{
@ -286,7 +286,7 @@ func New() (*Fedora31, error) {
},
}
return &r, nil
return &r
}
func (r *Fedora31) Name() string {

10
internal/distro/fedora31/distro_test.go
View file

@ -19,10 +19,7 @@ func TestListOutputFormats(t *testing.T) {
"vmdk",
}
f31, err := fedora31.New()
if err != nil {
t.Fatal(err)
}
f31 := fedora31.New()
if got := f31.ListOutputFormats(); !reflect.DeepEqual(got, want) {
t.Errorf("ListOutputFormats() = %v, want %v", got, want)
@ -96,10 +93,7 @@ func TestFilenameFromType(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
f31, err := fedora31.New()
if err != nil {
t.Fatal(err)
}
f31 := fedora31.New()
got, got1, err := f31.FilenameFromType(tt.args.outputFormat)
if (err != nil) != tt.wantErr {
t.Errorf("FilenameFromType() error = %v, wantErr %v", err, tt.wantErr)