Make Bucket for S3 targets mendatory and don't show error logs (#447)

Signed-off-by: Frank Jogeleit <[email protected]>
kyverno · Jun 8, 2024 · 9a90648 · 9a90648
1 parent 2230842
commit 9a90648
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pkg/config/target_factory.go b/pkg/config/target_factory.go
@@ -612,20 +612,18 @@ func (f *TargetFactory) createS3Client(config, parent *S3) target.Client {
  return nil
  }
 
+ setFallback(&config.Bucket, parent.Bucket)
+ if config.Bucket == "" {
+ return nil
+ }
+
  sugar := zap.S()
 
  if err := checkAWSConfig(config.Name, config.AWSConfig, parent.AWSConfig); err != nil {
  sugar.Error(err)
 
  return nil
  }
-
- setFallback(&config.Bucket, parent.Bucket)
- if config.Bucket == "" {
- sugar.Errorf("%s.Bucket has not been declared", config.Name)
- return nil
- }
-
  setFallback(&config.Region, os.Getenv("AWS_REGION"))
  setFallback(&config.Prefix, parent.Prefix, "policy-reporter")
  setFallback(&config.KmsKeyID, parent.KmsKeyID)

diff --git a/pkg/config/target_factory_test.go b/pkg/config/target_factory_test.go
@@ -284,7 +284,7 @@ func Test_ResolveTargetWithoutHost(t *testing.T) {
  }
  })
  t.Run("GCS.Credentials", func(t *testing.T) {
- if len(factory.GCSClients(&config.GCS{Bucket: "policy-reporter"})) != 0 {
+ if len(factory.GCSClients(&config.GCS{Bucket: "policy-reporter", Credentials: "{}"})) != 0 {
  t.Error("Expected Client to be nil if no accessKey is configured")
  }
  })