improve envdecode error handling

accounts/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 	"strings"
 
@@ -79,8 +80,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	// sanitize config

glauth/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	"github.com/owncloud/ocis/glauth/pkg/config"
@@ -70,8 +71,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

graph-explorer/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
@@ -68,8 +69,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

graph/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
@@ -69,8 +70,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

idp/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	"github.com/owncloud/ocis/idp/pkg/config"
@@ -71,8 +72,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

ocis-pkg/config/envdecode/envdecode_test.go

@@ -411,7 +411,7 @@ func TestDecodeErrors(t *testing.T) {
 
 	var tcrd testConfigRequiredDefault
 	defer func() {
-		recover()
+		_ = recover()
 	}()
 	_ = Decode(&tcrd)
 	t.Fatal("This should not have been reached. A panic should have occured.")

ocis/pkg/command/root.go

@@ -1,6 +1,7 @@
 package command
 
 import (
+	"errors"
 	"os"
 
 	"github.com/owncloud/ocis/ocis-pkg/config"
@@ -62,8 +63,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

ocs/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
@@ -72,8 +73,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

proxy/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
@@ -71,8 +72,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

settings/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
@@ -72,8 +73,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

store/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
@@ -72,8 +73,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

thumbnails/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
@@ -72,8 +73,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 	return nil
 }

web/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
@@ -70,8 +71,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil

webdav/pkg/command/root.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
@@ -70,8 +71,11 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
-		return err
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
 	}
 
 	return nil