fix unit tests

common/cpp/include/asapo/common/networking.h

@@ -28,10 +28,10 @@ enum Opcode : uint8_t {
   kOpcodeGetBufferData,
   kOpcodeAuthorize,
   kOpcodeTransferMetaData,
-  kOpcodePersistStream,
   kOpcodeDeleteStream,
   kOpcodeGetMeta,
   kOpcodeCount,
+  kOpcodePersistStream
 };
 
 inline std::string OpcodeToString(uint8_t code) {
@@ -44,8 +44,8 @@ inline std::string OpcodeToString(uint8_t code) {
         case kOpcodeAuthorize:return "authorize";
         case kOpcodeTransferMetaData:return "transfer metadata";
         case kOpcodeDeleteStream:return "delete stream";
-        case kOpcodePersistStream:return "persist stream";
         case kOpcodeGetMeta:return "get meta";
+        case kOpcodePersistStream:return "persist stream";
         default:return "unknown op";
     }
 }

discovery/src/asapo_discovery/protocols/protocol_test.go

@@ -14,24 +14,22 @@ type protocolTest struct {
 }
 
 var protocolTests = []protocolTest{
-// consumer
+	// consumer
 	{"consumer", "v0.6", true, "current", "v0.6"},
 	{"consumer", "v0.5", true, "deprecates", "v0.5"},
 	{"consumer", "v0.4", true, "deprecates", "v0.4"},
-	{"consumer", "v0.3", true, "deprecates", "v0.3"},
-	{"consumer", "v0.2", true, "deprecates", "v0.2"},
-	{"consumer", "v0.1", true, "deprecates", "v0.1"},
+	{"consumer", "v0.3", false, "deprecated", "v0.3"},
+	{"consumer", "v0.2", false, "deprecated", "v0.2"},
+	{"consumer", "v0.1", false, "deprecated", "v0.1"},
 	{"consumer", "v1000.2", false, "unknown", "unknown protocol"},
 
-
-
-// producer
+	// producer
 	{"producer", "v0.6", true, "current", "v0.6"},
 	{"producer", "v0.5", true, "deprecates", "v0.5"},
 	{"producer", "v0.4", true, "deprecates", "v0.4"},
 	{"producer", "v0.3", true, "deprecates", "v0.3"},
-	{"producer", "v0.2", true, "deprecates", "v0.2"},
-	{"producer", "v0.1", true, "deprecates", "v0.1"},
+	{"producer", "v0.2", false, "deprecated", "v0.2"},
+	{"producer", "v0.1", false, "deprecated", "v0.1"},
 	{"producer", "v1000.2", false, "unknown", "unknown protocol"},
 }
 

discovery/src/asapo_discovery/server/get_version_test.go

@@ -19,31 +19,31 @@ var versionTests = []struct {
 	message string
 }{
 	{"", versionInfo{
-		SoftwareVersion:        coreVer,
-		ClientProtocol: protocols.ProtocolInfo{},
-		ClientSupported:        "",
+		SoftwareVersion: coreVer,
+		ClientProtocol:  protocols.ProtocolInfo{},
+		ClientSupported: "",
 	}, http.StatusOK, "no client"},
 	{"?client=consumer", versionInfo{
 		SoftwareVersion: coreVer,
-		ClientProtocol:     protocols.ProtocolInfo{"", nil},
-		ClientSupported:            "no",
+		ClientProtocol:  protocols.ProtocolInfo{"", nil},
+		ClientSupported: "no",
 	}, http.StatusOK, "consumer client, no protocol"},
 
 	{"?client=consumer&protocol=v0.6", versionInfo{
 		SoftwareVersion: coreVer,
-		ClientProtocol:     protocols.ProtocolInfo{"v0.1 (deprecates at 2022-06-01 00:00:00 +0000 UTC)",
-			map[string]string{"Authorizer":"v0.1", "Broker":"v0.1", "Data cache service":"v0.1", "Discovery":"v0.1", "File Transfer":"v0.1"}},
-		ClientSupported:            "yes",
+		ClientProtocol: protocols.ProtocolInfo{"v0.6 (current)",
+			map[string]string{"Authorizer": "v0.2", "Broker": "v0.6", "Data cache service": "v0.1", "Discovery": "v0.1", "File Transfer": "v0.2"}},
+		ClientSupported: "yes",
 	}, http.StatusOK, "consumer client"},
 	{"?client=producer&protocol=v0.6", versionInfo{
-		SoftwareVersion:        coreVer,
-		ClientProtocol: protocols.ProtocolInfo{"v0.1 (deprecates at 2022-06-01 00:00:00 +0000 UTC)",map[string]string{"Discovery":"v0.1", "Receiver":"v0.1"}},
-		ClientSupported:        "yes",
+		SoftwareVersion: coreVer,
+		ClientProtocol:  protocols.ProtocolInfo{"v0.6 (current)", map[string]string{"Discovery": "v0.1", "Receiver": "v0.6"}},
+		ClientSupported: "yes",
 	}, http.StatusOK, "producer client"},
 	{"?client=producer&protocol=v1000.2", versionInfo{
-		SoftwareVersion:        coreVer,
-		ClientProtocol: protocols.ProtocolInfo{"v1000.2 (unknown protocol)",nil},
-		ClientSupported:        "no",
+		SoftwareVersion: coreVer,
+		ClientProtocol:  protocols.ProtocolInfo{"v1000.2 (unknown protocol)", nil},
+		ClientSupported: "no",
 	}, http.StatusOK, "producer client unknown"},
 }
 
@@ -55,9 +55,9 @@ func TestVersionTests(t *testing.T) {
 			var info versionInfo
 			json.Unmarshal(w.Body.Bytes(), &info)
 			fmt.Println(w.Body.String())
-			assert.Equal(t, test.result.ClientProtocol,info.ClientProtocol, test.message)
-			if test.message!="no client" {
-				assert.Equal(t, true,len(info.SupportedProtocols)>0, test.message)
+			assert.Equal(t, test.result.ClientProtocol, info.ClientProtocol, test.message)
+			if test.message != "no client" {
+				assert.Equal(t, true, len(info.SupportedProtocols) > 0, test.message)
 			}
 		}
 	}

producer/api/c/include/asapo/producer_c.h

@@ -29,10 +29,10 @@ enum AsapoOpcode {
     kOpcodeGetBufferData,
     kOpcodeAuthorize,
     kOpcodeTransferMetaData,
-    kOpcodePersistStream,
     kOpcodeDeleteStream,
     kOpcodeGetMeta,
-    kOpcodeCount
+    kOpcodeCount,
+    kOpcodePersistStream
 };
 
 

producer/api/cpp/src/producer_c_glue.cpp

@@ -24,10 +24,10 @@ extern "C" {
                   kOpcodeGetBufferData == asapo::Opcode::kOpcodeGetBufferData&&
                   kOpcodeAuthorize == asapo::Opcode::kOpcodeAuthorize&&
                   kOpcodeTransferMetaData == asapo::Opcode::kOpcodeTransferMetaData&&
-                  kOpcodePersistStream == asapo::Opcode::kOpcodePersistStream&&
                   kOpcodeDeleteStream == asapo::Opcode::kOpcodeDeleteStream&&
                   kOpcodeGetMeta == asapo::Opcode::kOpcodeGetMeta&&
-                  kOpcodeCount == asapo::Opcode::kOpcodeCount,
+                  kOpcodeCount == asapo::Opcode::kOpcodeCount&&
+                  kOpcodePersistStream == asapo::Opcode::kOpcodePersistStream,
                   "incompatible bit reps between c++ and c for asapo::OpCode");
     static_assert(kTcp == asapo::RequestHandlerType::	              kTcp&&
                   kFilesystem == asapo::RequestHandlerType::	              kFilesystem,

receiver/src/request_handler/request_factory.cpp

@@ -96,10 +96,6 @@ Error RequestFactory::AddHandlersToRequest(std::unique_ptr<Request>& request,
         request->AddHandler(&request_handler_delete_stream_);
         break;
     }
-    case Opcode::kOpcodePersistStream: {
-        request->AddHandler(&request_handler_persist_stream_);
-        break;
-    }
     case Opcode::kOpcodeLastStream: {
         request->AddHandler(&request_handler_db_last_stream_);
         break;
@@ -108,6 +104,10 @@ Error RequestFactory::AddHandlersToRequest(std::unique_ptr<Request>& request,
         request->AddHandler(&request_handler_db_get_meta_);
         break;
     }
+    case Opcode::kOpcodePersistStream: {
+        request->AddHandler(&request_handler_persist_stream_);
+        break;
+    }
     default:
         return ReceiverErrorTemplates::kInvalidOpCode.Generate();
     }

receiver/unittests/mock_receiver_config.cpp

@@ -82,7 +82,7 @@ Error SetReceiverConfigWithError (const ReceiverConfig& config, std::string erro
     config_string += "," +  Key("AuthorizationServer", error_field) + "\"" + config.authorization_server + "\"";
     config_string += "," +  Key("LogLevel", error_field) + "\"" + log_level + "\"";
     config_string += "," +  Key("Tag", error_field) + "\"" + config.tag + "\"";
-    config_string += "," +  Key("MaxNumPersistedStreams", error_field) + "\"" + std::to_string(config.max_num_persisted_streams) + "\"";
+    config_string += "," +  Key("MaxNumPersistedStreams", error_field) + std::to_string(config.max_num_persisted_streams);
     config_string += "," +  Key("Kafka", error_field) + "{";
     config_string += Key("Enabled", error_field) + (config.kafka_config.enabled ? "true" : "false") ;
     config_string += "}";