replace deprecated pkg

Signed-off-by: Xavier Coulon <xcoulon@redhat.com>

pkg/templates/nstemplatetiers/nstemplatetier_generator.go

@@ -99,8 +99,7 @@ func loadTemplatesByTiers(assets Assets) (map[string]*templates, error) {
 		parts := strings.Split(name, "/")
 		// skip any name that does not have 3 parts
 		if len(parts) != 2 {
-			log.Info("skipping template asset: invalid name format", "name", name)
-			continue
+			return nil, errors.Wrapf(err, "unable to load templates: invalid name format for file '%s'", name)
 		}
 		tier := parts[0]
 		filename := parts[1]
@@ -124,7 +123,7 @@ func loadTemplatesByTiers(assets Assets) (map[string]*templates, error) {
 		case filename == "cluster.yaml":
 			results[tier].clusterTemplate = &tmpl
 		default:
-			log.Info("skipping asset: unknown scope for file", "name", name)
+			return nil, errors.Wrapf(err, "unable to load templates: unknown scope for file '%s'", name)
 		}
 	}
 	return results, nil

pkg/templates/nstemplatetiers/nstemplatetier_generator_test.go

@@ -21,15 +21,16 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestCreateOrUpdateResources(t *testing.T) {
 
 	s := scheme.Scheme
 	err := apis.AddToScheme(s)
 	require.NoError(t, err)
-	logf.SetLogger(logf.ZapLogger(true))
+	logf.SetLogger(zap.Logger(true))
 
 	t.Run("ok", func(t *testing.T) {
 

pkg/templates/nstemplatetiers/nstemplatetier_generator_whitebox_test.go

@@ -135,6 +135,49 @@ func TestLoadTemplatesByTiers(t *testing.T) {
 			require.Error(t, err)
 			assert.Contains(t, err.Error(), "unable to load templates: an error occurred")
 		})
+
+		t.Run("invalid filename scope", func(t *testing.T) {
+			// given
+			fakeAssetNames := func() []string {
+				return []string{`metadata.yaml`, `advanced/foo.yaml`} // '/advanced/foo.yaml' is not a valid filename
+			}
+			fakeAssets := func(name string) ([]byte, error) {
+				switch name {
+				case "metadata.yaml":
+					return []byte(`advanced/foo.yaml: "123456a"`), nil // just make sure the asset exists
+				case "advanced/foo.yaml":
+					return []byte(`foo:bar`), nil // just make sure the asset exists
+				default:
+					return testnstemplatetiers.Asset(name)
+				}
+			}
+			assets := NewAssets(fakeAssetNames, fakeAssets)
+			// when
+			_, err := loadTemplatesByTiers(assets)
+			// then
+			require.Error(t, err)
+			assert.Contains(t, err.Error(), "unable to load templates: invalid name format for file for 'foo.yaml'")
+		})
+
+		t.Run("invalid filename format", func(t *testing.T) {
+			// given
+			fakeAssetNames := func() []string {
+				return []string{`metadata.yaml`, `advanced/foo.yaml`} // '/advanced/foo.yaml' is not a valid filename
+			}
+			fakeAssets := func(name string) ([]byte, error) {
+				if name == "advanced/foo.yaml" {
+					return []byte("foo"), nil // just make sure the asset exists
+				}
+				return testnstemplatetiers.Asset(name)
+			}
+			assets := NewAssets(fakeAssetNames, fakeAssets)
+			// when
+			_, err := loadTemplatesByTiers(assets)
+			// then
+			require.Error(t, err)
+			assert.Contains(t, err.Error(), "unable to load templates: invalid name format for file for 'advanced/foo.yaml'")
+		})
+
 	})
 }