Removed batched payloads in test and updated validate function signatures

Author: russell-stern

core/capabilities/vault/validator_test.go

@@ -247,7 +247,7 @@ func TestRequestValidator_BatchSizeLimit(t *testing.T) {
 		{
 			name: "create accepts batch at the limit",
 			call: func(t *testing.T, v *RequestValidator) error {
-				return v.ValidateCreateSecretsRequest(nil, &vaultcommon.CreateSecretsRequest{
+				return v.ValidateCreateSecretsRequest(t.Context(), nil, &vaultcommon.CreateSecretsRequest{
 					RequestId:        "request-id",
 					EncryptedSecrets: makeSecrets(2),
 				})
@@ -256,7 +256,7 @@ func TestRequestValidator_BatchSizeLimit(t *testing.T) {
 		{
 			name: "create rejects batch above the limit",
 			call: func(t *testing.T, v *RequestValidator) error {
-				return v.ValidateCreateSecretsRequest(nil, &vaultcommon.CreateSecretsRequest{
+				return v.ValidateCreateSecretsRequest(t.Context(), nil, &vaultcommon.CreateSecretsRequest{
 					RequestId:        "request-id",
 					EncryptedSecrets: makeSecrets(3),
 				})
@@ -266,7 +266,7 @@ func TestRequestValidator_BatchSizeLimit(t *testing.T) {
 		{
 			name: "update accepts batch at the limit",
 			call: func(t *testing.T, v *RequestValidator) error {
-				return v.ValidateUpdateSecretsRequest(nil, &vaultcommon.UpdateSecretsRequest{
+				return v.ValidateUpdateSecretsRequest(t.Context(), nil, &vaultcommon.UpdateSecretsRequest{
 					RequestId:        "request-id",
 					EncryptedSecrets: makeSecrets(2),
 				})
@@ -275,7 +275,7 @@ func TestRequestValidator_BatchSizeLimit(t *testing.T) {
 		{
 			name: "update rejects batch above the limit",
 			call: func(t *testing.T, v *RequestValidator) error {
-				return v.ValidateUpdateSecretsRequest(nil, &vaultcommon.UpdateSecretsRequest{
+				return v.ValidateUpdateSecretsRequest(t.Context(), nil, &vaultcommon.UpdateSecretsRequest{
 					RequestId:        "request-id",
 					EncryptedSecrets: makeSecrets(3),
 				})

core/services/ocr2/plugins/vault/plugin_test.go

@@ -8165,7 +8165,6 @@ func TestProperty_broadcastBlobPayloads_MaxSizePayloadsWithinBlobLimit(t *testin
 	maxIDNamespaceSize := cresettings.Default.VaultIdentifierNamespaceSizeLimit.DefaultValue
 	maxSecretsPerReq := vaulttypes.MaxBatchSize
 	maxBlobPayloadBytes := cresettings.Default.VaultMaxBlobPayloadSizeLimit.DefaultValue
-	numPayloads := 2 * maxRequestBatchSize
 
 	pubK, _, err := box.GenerateKey(rand.Reader)
 	require.NoError(t, err)
@@ -8197,10 +8196,14 @@ func TestProperty_broadcastBlobPayloads_MaxSizePayloadsWithinBlobLimit(t *testin
 
 	buildMaxSecretRequests := func() []*vaultcommon.SecretRequest {
 		reqs := make([]*vaultcommon.SecretRequest, maxSecretsPerReq)
+		encKeys := make([]string, 10)
+		for i := range encKeys {
+			encKeys[i] = encKey
+		}
 		for i := range reqs {
 			reqs[i] = &vaultcommon.SecretRequest{
 				Id:             maxIdentifier(),
-				EncryptionKeys: []string{encKey},
+				EncryptionKeys: encKeys,
 			}
 		}
 		return reqs
@@ -8218,78 +8221,66 @@ func TestProperty_broadcastBlobPayloads_MaxSizePayloadsWithinBlobLimit(t *testin
 		name    string
 		payload proto.Message
 	}{
-		{"GetSecretsRequest", &vaultcommon.GetSecretsRequest{
-			Requests:      buildMaxSecretRequests(),
-			OrgId:         maxIDOwnerField,
-			WorkflowOwner: maxIDOwnerField,
-		}},
-		{"CreateSecretsRequest", &vaultcommon.CreateSecretsRequest{
-			RequestId:        "req",
-			EncryptedSecrets: buildMaxEncryptedSecrets(),
-			OrgId:            maxIDOwnerField,
-			WorkflowOwner:    maxIDOwnerField,
-		}},
-		{"UpdateSecretsRequest", &vaultcommon.UpdateSecretsRequest{
-			RequestId:        "req",
-			EncryptedSecrets: buildMaxEncryptedSecrets(),
-			OrgId:            maxIDOwnerField,
-			WorkflowOwner:    maxIDOwnerField,
-		}},
-		{"DeleteSecretsRequest", &vaultcommon.DeleteSecretsRequest{
-			RequestId:     "req",
-			Ids:           buildMaxIdentifiers(),
-			OrgId:         maxIDOwnerField,
-			WorkflowOwner: maxIDOwnerField,
-		}},
-		{"ListSecretIdentifiersRequest", &vaultcommon.ListSecretIdentifiersRequest{
-			RequestId:     "req",
-			Owner:         maxIDOwnerField,
-			Namespace:     maxIDNamespaceField,
-			OrgId:         maxIDOwnerField,
-			WorkflowOwner: maxIDOwnerField,
-		}},
-	}
-
-	runBroadcast := func(t *testing.T, payloads [][]byte, ids []string) {
-		t.Helper()
-		lggr := logger.TestLogger(t)
-		r := &ReportingPlugin{
-			lggr:    lggr,
-			metrics: newTestMetrics(t),
-			marshalBlob: func(ocr3_1types.BlobHandle) ([]byte, error) {
-				return []byte("handle"), nil
+		{
+			name: "GetSecretsRequest",
+			payload: &vaultcommon.GetSecretsRequest{
+				Requests:      buildMaxSecretRequests(),
+				OrgId:         maxIDOwnerField,
+				WorkflowOwner: maxIDOwnerField,
 			},
-		}
-		fetcher := &callbackBlobFetcher{fn: func([]byte) error { return nil }}
-		result, err := r.broadcastBlobPayloads(t.Context(), fetcher, 1, payloads, ids)
-		require.NoError(t, err)
-		assert.Len(t, result, numPayloads, "expected all %d payloads to broadcast successfully", numPayloads)
+		},
+		{
+			name: "CreateSecretsRequest",
+			payload: &vaultcommon.CreateSecretsRequest{
+				RequestId:        "req",
+				EncryptedSecrets: buildMaxEncryptedSecrets(),
+				OrgId:            maxIDOwnerField,
+				WorkflowOwner:    maxIDOwnerField,
+			}},
+		{
+			name: "UpdateSecretsRequest",
+			payload: &vaultcommon.UpdateSecretsRequest{
+				RequestId:        "req",
+				EncryptedSecrets: buildMaxEncryptedSecrets(),
+				OrgId:            maxIDOwnerField,
+				WorkflowOwner:    maxIDOwnerField,
+			},
+		},
+		{
+			name: "DeleteSecretsRequest",
+			payload: &vaultcommon.DeleteSecretsRequest{
+				RequestId:     "req",
+				Ids:           buildMaxIdentifiers(),
+				OrgId:         maxIDOwnerField,
+				WorkflowOwner: maxIDOwnerField,
+			},
+		},
+		{
+			name: "ListSecretIdentifiersRequest",
+			payload: &vaultcommon.ListSecretIdentifiersRequest{
+				RequestId:     "req",
+				Owner:         maxIDOwnerField,
+				Namespace:     maxIDNamespaceField,
+				OrgId:         maxIDOwnerField,
+				WorkflowOwner: maxIDOwnerField,
+			},
+		},
 	}
 
 	for _, rt := range requestTypes {
 		t.Run(rt.name, func(t *testing.T) {
 			anyMsg, err := anypb.New(rt.payload)
 			require.NoError(t, err)
 
-			payloads := make([][]byte, numPayloads)
-			ids := make([]string, numPayloads)
-			for i := range numPayloads {
-				item := &vaultcommon.StoredPendingQueueItem{
-					Id:   fmt.Sprintf("req-%d", i),
-					Item: anyMsg,
-				}
-				itemBytes := protoMarshal(t, item)
-
-				// Property 1: each max-size payload must fit within the blob size limit.
-				assert.LessOrEqualf(t, len(itemBytes), maxBlobPayloadBytes,
-					"marshaled %s StoredPendingQueueItem (%d bytes) exceeds VaultMaxBlobPayloadSizeLimit (%d bytes)",
-					rt.name, len(itemBytes), maxBlobPayloadBytes)
-
-				payloads[i] = itemBytes
-				ids[i] = item.Id
+			item := &vaultcommon.StoredPendingQueueItem{
+				Id:   "req",
+				Item: anyMsg,
 			}
+			itemBytes := protoMarshal(t, item)
 
-			runBroadcast(t, payloads, ids)
+			assert.LessOrEqualf(t, len(itemBytes), maxBlobPayloadBytes,
+				"marshaled %s StoredPendingQueueItem (%d bytes) exceeds VaultMaxBlobPayloadSizeLimit (%d bytes)",
+				rt.name, len(itemBytes), maxBlobPayloadBytes)
 		})
 	}
 }