Merge 285c44e into backport/abhishek/fix-cve/generally-humble-sunbeam

hashicorp · Feb 11, 2025 · 73921df · 73921df
2 parents 03c0dae + 285c44e
commit 73921df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/agent/consul/state/txn.go b/agent/consul/state/txn.go
@@ -28,7 +28,7 @@ func (s *Store) txnKVS(tx WriteTxn, idx uint64, op *structs.TxnKVOp) (structs.Tx
 	var entry *structs.DirEntry
 	var err error
 
-	// enumcover: api.KVOp
+	// enumcover:api.KVOp
 	switch op.Verb {
 	case api.KVSet:
 		entry = &op.DirEnt
@@ -137,7 +137,7 @@ func (s *Store) txnKVS(tx WriteTxn, idx uint64, op *structs.TxnKVOp) (structs.Tx
 func txnSession(tx WriteTxn, idx uint64, op *structs.TxnSessionOp) error {
 	var err error
 
-	// enumcover: api.SessionOp
+	// enumcover:api.SessionOp
 	switch op.Verb {
 	case api.SessionDelete:
 		err = sessionDeleteWithSession(tx, &op.Session, idx)

diff --git a/agent/consul/txn_endpoint.go b/agent/consul/txn_endpoint.go
@@ -268,7 +268,7 @@ func (t *Txn) Read(args *structs.TxnReadRequest, reply *structs.TxnReadResponse)
 // nodeVerbValidate checks for a known operation type. For certain operations,
 // it also indicated if further "preApply" checks are required.
 func nodeVerbValidate(op api.NodeOp) (bool, error) {
-	// enumcover: api.NodeOp
+	// enumcover:api.NodeOp
 	switch op {
 	// Skip the pre-apply checks if this is a GET.
 	case api.NodeGet:
@@ -283,7 +283,7 @@ func nodeVerbValidate(op api.NodeOp) (bool, error) {
 // serviceVerbValidate checks for a known operation type. For certain operations,
 // it also indicated if further "preApply" checks are required.
 func serviceVerbValidate(op api.ServiceOp) (bool, error) {
-	// enumcover: api.ServiceOp
+	// enumcover:api.ServiceOp
 	switch op {
 	// Skip the pre-apply checks if this is a GET.
 	case api.ServiceGet:
@@ -298,7 +298,7 @@ func serviceVerbValidate(op api.ServiceOp) (bool, error) {
 // checkVerbValidate checks for a known operation type. For certain operations,
 // it also indicated if further "preApply" checks are required.
 func checkVerbValidate(op api.CheckOp) (bool, error) {
-	// enumcover: api.CheckOp
+	// enumcover:api.CheckOp
 	switch op {
 	// Skip the pre-apply checks if this is a GET.
 	case api.CheckGet:
@@ -312,7 +312,7 @@ func checkVerbValidate(op api.CheckOp) (bool, error) {
 
 // intentionVerbValidate checks for a known operation type.
 func intentionVerbValidate(op structs.IntentionOp) error {
-	// enumcover: structs.IntentionOp
+	// enumcover:structs.IntentionOp
 	switch op {
 	case structs.IntentionOpCreate, structs.IntentionOpDelete, structs.IntentionOpUpdate, structs.IntentionOpDeleteAll, structs.IntentionOpUpsert:
 		return nil
@@ -323,7 +323,7 @@ func intentionVerbValidate(op structs.IntentionOp) error {
 
 // sessionVerbValidate checks for a known operation type.
 func sessionVerbValidate(op api.SessionOp) error {
-	// enumcover: api.SessionOp
+	// enumcover:api.SessionOp
 	switch op {
 	case api.SessionDelete:
 		return nil