fix: ignore unnecessary sonarcloud test file issues and rename fallba…

…ck members for better understanding

ocis-pkg/x/io/fsx/fallback.go

@@ -13,25 +13,25 @@ var (
 // FallbackFS is a filesystem that layers a primary filesystem on top of a secondary filesystem.
 type FallbackFS struct {
 	FS
-	layer *BaseFS
-	base  *BaseFS
+	primary   *BaseFS
+	secondary *BaseFS
 }
 
 // Primary returns the primary filesystem.
 func (d *FallbackFS) Primary() *BaseFS {
-	return d.base
+	return d.primary
 }
 
 // Secondary returns the secondary filesystem.
 func (d *FallbackFS) Secondary() *BaseFS {
-	return d.layer
+	return d.secondary
 }
 
 // NewFallbackFS returns a new FallbackFS instance.
-func NewFallbackFS(base, layer FS) *FallbackFS {
+func NewFallbackFS(primary, secondary FS) *FallbackFS {
 	return &FallbackFS{
-		FS:    FromAfero(afero.NewCopyOnWriteFs(layer, base)),
-		base:  &BaseFS{Fs: base},
-		layer: &BaseFS{Fs: layer},
+		FS:        FromAfero(afero.NewCopyOnWriteFs(secondary, primary)),
+		primary:   &BaseFS{Fs: primary},
+		secondary: &BaseFS{Fs: secondary},
 	}
 }

services/web/pkg/server/http/server.go

@@ -60,15 +60,13 @@ func Server(opts ...Option) (http.Service, error) {
 		fsx.NewBasePathFs(fsx.NewOsFs(), options.Config.Asset.CorePath),
 		fsx.NewBasePathFs(fsx.FromIOFS(web.Assets), "assets/core"),
 	)
-	appsFS := fsx.NewReadOnlyFs(
-		fsx.NewFallbackFS(
-			fsx.NewBasePathFs(fsx.NewOsFs(), options.Config.Asset.AppsPath),
-			fsx.NewBasePathFs(fsx.FromIOFS(web.Assets), "assets/apps"),
-		),
+	appsFS := fsx.NewFallbackFS(
+		fsx.NewReadOnlyFs(fsx.NewBasePathFs(fsx.NewOsFs(), options.Config.Asset.AppsPath)),
+		fsx.NewBasePathFs(fsx.FromIOFS(web.Assets), "assets/apps"),
 	)
 
 	// build and inject the list of applications into the config
-	for _, application := range apps.List(options.Logger, options.Config.Apps, coreFS.Primary().IOFS(), coreFS.Primary().IOFS()) {
+	for _, application := range apps.List(options.Logger, options.Config.Apps, appsFS.Secondary().IOFS(), appsFS.Primary().IOFS()) {
 		options.Config.Web.Config.ExternalApps = append(
 			options.Config.Web.Config.ExternalApps,
 			application.ToExternal(path.Join(options.Config.HTTP.Root, _customAppsEndpoint)),

sonar-project.properties

@@ -33,6 +33,17 @@ sonar.go.coverage.reportPaths=cache/coverage/*
 sonar.go.golangci-lint.reportPaths=cache/checkstyle/checkstyle.xml
 
 # Exclude files
-sonar.exclusions=**/third_party,docs/**,changelog/**,**/package.json,**/rollup.config.js,CHANGELOG.md,deployments/**,tests/**,vendor/**,vendor-bin/**,README.md,**/mocks/**,/protogen/**,services/search/pkg/query/kql/dictionary_gen.go
-sonar.coverage.exclusions=**/*_test.go,**mocks/**,/protogen/**,services/search/pkg/query/kql/dictionary_gen.go
+sonar.exclusions=**/third_party,docs/**,changelog/**,**/package.json,**/rollup.config.js,CHANGELOG.md,deployments/**,tests/**,vendor/**,vendor-bin/**,README.md,**/mocks/**,/protogen/**,**/*_gen.go
+sonar.coverage.exclusions=**/*_test.go,**mocks/**,/protogen/**,**/*_gen.go
 sonar.cpd.exclusions=**/*_test.go,**/revaconfig/**,services/settings/pkg/store/defaults/defaults.go
+
+# Rule exclusions
+sonar.issue.ignore.multicriteria=g1,g2
+
+# Ignore "Define a constant instead of duplicating this literal" rule for tests
+sonar.issue.ignore.multicriteria.g1.ruleKey=go:S1192
+sonar.issue.ignore.multicriteria.g1.resourceKey=**/*_test.go
+
+# Ignore "Rename function XXX to match the regular expression ^(_|[a-zA-Z0-9]+)$" rule for tests
+sonar.issue.ignore.multicriteria.g2.ruleKey=go:S100
+sonar.issue.ignore.multicriteria.g2.resourceKey=**/*_test.go