minor fixups

sigstore · Jul 30, 2023 · bb128a6 · bb128a6
1 parent 741c0f7
commit bb128a6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/cmd/rekor-server/app/root.go b/cmd/rekor-server/app/root.go
@@ -93,9 +93,9 @@ func init() {
 Memory and file-based signers should only be used for testing.`)
 	rootCmd.PersistentFlags().String("rekor_server.signer-passwd", "", "Password to decrypt signer private key")
 
-	rootCmd.PersistentFlags().String("rekor_server.new_entry_publisher", "", "URL for pub/sub queue to send messages to when new entries are added to the log. Ignored if not set.")
-	rootCmd.PersistentFlags().Bool("rekor_server.publish_new_entry_protobuf", false, "Whether to publish events for new log entries in Protobuf wire format. Requires new_entry_publisher to be configured.")
-	rootCmd.PersistentFlags().Bool("rekor_server.publish_new_entry_json", false, "Whether to publish events for new log entries in CloudEvents JSON format. Requires new_entry_publisher to be configured.")
+	rootCmd.PersistentFlags().String("rekor_server.new_entry_publisher", "", "URL for pub/sub queue to send messages to when new entries are added to the log. Ignored if not set. Supported providers: [gcppubsub]")
+	rootCmd.PersistentFlags().Bool("rekor_server.publish_events_protobuf", false, "Whether to publish events in Protobuf wire format. Applies to all enabled event types.")
+	rootCmd.PersistentFlags().Bool("rekor_server.publish_events_json", false, "Whether to publish events in CloudEvents JSON format. Applies to all enabled event types.")
 
 	rootCmd.PersistentFlags().Uint16("port", 3000, "Port to bind to")
 

diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -120,14 +120,14 @@ func NewAPI(treeID uint) (*API, error) {
 
 	var newEntryPublisher pubsub.Publisher
 	if p := viper.GetString("rekor_server.new_entry_publisher"); p != "" {
-		if !viper.GetBool("rekor_server.publish_new_entry_protobuf") && !viper.GetBool("rekor_server.publish_new_entry_json") {
-			return nil, fmt.Errorf("%q is configured but neither %q or %q are enabled", "new_entry_publisher", "publish_new_entry_protobuf", "publish_new_entry_json")
+		if !viper.GetBool("rekor_server.publish_events_protobuf") && !viper.GetBool("rekor_server.publish_events_json") {
+			return nil, fmt.Errorf("%q is configured but neither %q or %q are enabled", "new_entry_publisher", "publish_events_protobuf", "publish_events_json")
 		}
 		newEntryPublisher, err = pubsub.Get(ctx, p)
 		if err != nil {
 			return nil, fmt.Errorf("init event publisher: %w", err)
 		}
-		log.ContextLogger(ctx).Debugf("Initialized new entry event publisher: %s", p)
+		log.ContextLogger(ctx).Infof("Initialized new entry event publisher: %s", p)
 	}
 
 	return &API{

diff --git a/pkg/api/entries.go b/pkg/api/entries.go
@@ -35,7 +35,6 @@ import (
 	"github.com/transparency-dev/merkle/rfc6962"
 	"google.golang.org/genproto/googleapis/rpc/code"
 	"google.golang.org/grpc/codes"
-	"google.golang.org/protobuf/encoding/prototext"
 
 	"github.com/sigstore/rekor/pkg/events"
 	"github.com/sigstore/rekor/pkg/events/newentry"
@@ -329,10 +328,10 @@ func createLogEntry(params entries.CreateLogEntryParams) (models.LogEntry, middl
 				log.ContextLogger(ctx).Error(err)
 				return
 			}
-			if viper.GetBool("rekor_server.publish_new_entry_protobuf") {
+			if viper.GetBool("rekor_server.publish_events_protobuf") {
 				go publishEvent(ctx, api.newEntryPublisher, event, events.ContentTypeProtobuf)
 			}
-			if viper.GetBool("rekor_server.publish_new_entry_json") {
+			if viper.GetBool("rekor_server.publish_events_json") {
 				go publishEvent(ctx, api.newEntryPublisher, event, events.ContentTypeJSON)
 			}
 		}()
@@ -346,8 +345,6 @@ func publishEvent(ctx context.Context, publisher pubsub.Publisher, event *events
 	incPublishEvent(event.Type().Name(), contentType, err == nil)
 	if err != nil {
 		log.ContextLogger(ctx).Error(err)
-	} else {
-		log.ContextLogger(ctx).Debugf("Published new entry event (%s): %s", contentType, prototext.Format(event.Message()))
 	}
 }