update: explicitly handle artifact types when pushing

Co-authored-by: Federico Di Pierro <[email protected]> Signed-off-by: Lorenzo Susini <[email protected]>
falcosecurity · Jul 31, 2023 · 8eb9184 · 8eb9184
1 parent 83f13d1
commit 8eb9184
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -71,7 +71,9 @@ const (
 	// Default values is set every 24 hours.
 	FollowResync = time.Hour * 24
 
+	//
 	// Viper configuration keys.
+	//
 
 	// RegistryCredentialConfigKey is the Viper key for the credentials store path configuration.
 	//#nosec G101 -- false positive
@@ -82,8 +84,10 @@ const (
 	RegistryAuthBasicKey = "registry.auth.basic"
 	// RegistryAuthGcpKey is the Viper key for gcp authentication configuration.
 	RegistryAuthGcpKey = "registry.auth.gcp"
+
 	// IndexesKey is the Viper key for indexes configuration.
 	IndexesKey = "indexes"
+
 	// ArtifactFollowEveryKey is the Viper key for follower "every" configuration.
 	ArtifactFollowEveryKey = "artifact.follow.every"
 	// ArtifactFollowCronKey is the Viper key for follower "cron" configuration.
@@ -100,16 +104,18 @@ const (
 	ArtifactFollowAssetsDirKey = "artifact.follow.assetsdir"
 	// ArtifactFollowTmpDirKey is the Viper key for follower "pluginsDir" configuration.
 	ArtifactFollowTmpDirKey = "artifact.follow.tmpdir"
+
 	// ArtifactInstallArtifactsKey is the Viper key for installer "artifacts" configuration.
 	ArtifactInstallArtifactsKey = "artifact.install.refs"
-	// ArtifactInstallRulesfilesDirKey is the Viper key for follower "rulesFilesDir" configuration.
+	// ArtifactInstallRulesfilesDirKey is the Viper key for installer "rulesFilesDir" configuration.
 	ArtifactInstallRulesfilesDirKey = "artifact.install.rulesfilesdir"
-	// ArtifactInstallPluginsDirKey is the Viper key for follower "pluginsDir" configuration.
+	// ArtifactInstallPluginsDirKey is the Viper key for installer "pluginsDir" configuration.
 	ArtifactInstallPluginsDirKey = "artifact.install.pluginsdir"
-	// ArtifactInstallAssetsDirKey is the Viper key for follower "pluginsDir" configuration.
+	// ArtifactInstallAssetsDirKey is the Viper key for installer "pluginsDir" configuration.
 	ArtifactInstallAssetsDirKey = "artifact.install.assetsdir"
 	// ArtifactInstallResolveDepsKey is the Viper key for installer "resolveDeps" configuration.
 	ArtifactInstallResolveDepsKey = "artifact.install.resolveDeps"
+
 	// ArtifactAllowedTypesKey is the Viper key for the whitelist of artifacts to be installed in the system.
 	ArtifactAllowedTypesKey = "artifact.allowedTypes"
 	// ArtifactNoVerifyKey is the Viper key for skipping signature verification.

diff --git a/pkg/oci/pusher/pusher.go b/pkg/oci/pusher/pusher.go
@@ -167,7 +167,7 @@ func (p *Pusher) Push(ctx context.Context, artifactType oci.ArtifactType,
 		}
 	}
 
-	if artifactType != oci.Plugin {
+	if artifactType == oci.Rulesfile || artifactType == oci.Asset {
 		// We should have only one manifestDesc for any not arch dependent artifact.
 		rootDesc = manifestDescs[0]
 	} else {

diff --git a/pkg/options/directory_options.go b/pkg/options/directory_options.go
@@ -15,8 +15,9 @@
 package options
 
 import (
-	"github.com/falcosecurity/falcoctl/internal/config"
 	"github.com/spf13/cobra"
+
+	"github.com/falcosecurity/falcoctl/internal/config"
 )
 
 const (