Bugfix/50 http and fin capability do not implement gettype string (#51)

Author: MaartendeKruijf

internal/capability/fin/fin.go

@@ -24,12 +24,16 @@ func New(finProtocol protocol.IFinProtocol) *FinCapability {
 	return &FinCapability{finProtocol: finProtocol}
 }
 
+func (FinCapability *FinCapability) GetType() string {
+	return "soarca-fin"
+}
+
 func (finCapability *FinCapability) Execute(
 	metadata execution.Metadata,
 	command cacao.Command,
 	authentication cacao.AuthenticationInformation,
 	target cacao.AgentTarget,
-	variables map[string]cacao.Variable) (map[string]cacao.Variable, error) {
+	variables cacao.Variables) (cacao.Variables, error) {
 
 	finCommand := finModel.NewCommand()
 	finCommand.CommandSubstructure.Command = command.Command

internal/capability/http/http.go

@@ -30,9 +30,12 @@ func init() {
 	log = logger.Logger(component, logger.Info, "", logger.Json)
 }
 
+func (httpCapability *HttpCapability) GetType() string {
+	return "soarca-http-api"
+}
+
 // What to do if there is no agent or target?
 // And maybe no auth info either?
-
 func (httpCapability *HttpCapability) Execute(
 	metadata execution.Metadata,
 	command cacao.Command,

internal/fin/protocol/protocol.go

@@ -38,7 +38,7 @@ func init() {
 }
 
 type IFinProtocol interface {
-	SendCommand(fin.Command) (map[string]cacao.Variable, error)
+	SendCommand(fin.Command) (cacao.Variables, error)
 }
 
 type FinProtocol struct {
@@ -55,7 +55,7 @@ func New(guid guid.IGuid, topic Topic, broker Broker, port int) FinProtocol {
 	return prot
 }
 
-func (protocol *FinProtocol) SendCommand(command fin.Command) (map[string]cacao.Variable, error) {
+func (protocol *FinProtocol) SendCommand(command fin.Command) (cacao.Variables, error) {
 
 	client, err := protocol.Connect(command.CommandSubstructure.Authentication)
 	if err != nil {

test/unittest/capability/fin/fin_test.go

@@ -49,7 +49,7 @@ func TestFinExecution(t *testing.T) {
 
 	//expectedCommand.CommandSubstructure.Context.GeneratedOn = ""
 
-	expectedVariableMap := map[string]cacao.Variable{"expected_variable": variable1}
+	expectedVariableMap := cacao.NewVariables(variable1)
 
 	//mockGuid.On("New").Return(id)
 	mockFinProtocol.On("SendCommand", expectedCommand).Return(expectedVariableMap, nil)

test/unittest/mocks/mock_finprotocol/mock_finprotocol.go

@@ -11,7 +11,7 @@ type MockFinProtocol struct {
 	mock.Mock
 }
 
-func (finProtocol *MockFinProtocol) SendCommand(command fin.Command) (map[string]cacao.Variable, error) {
+func (finProtocol *MockFinProtocol) SendCommand(command fin.Command) (cacao.Variables, error) {
 	args := finProtocol.Called(command)
-	return args.Get(0).(map[string]cacao.Variable), args.Error(1)
+	return args.Get(0).(cacao.Variables), args.Error(1)
 }