Parse custom plugin identifier

Author: ofalvai

_tests/integration/validate_test.go

@@ -94,7 +94,7 @@ func Test_ValidateTest(t *testing.T) {
 			cmd := command.New(binPath(), "validate", "-c", "trigger_params_test_bitrise.yml")
 			out, err = cmd.RunAndReturnTrimmedCombinedOutput()
 		})
-		require.NoError(t, err)
+		require.NoError(t, err, out)
 		require.Equal(t, "Config is valid: \x1b[32;1mtrue\x1b[0m", out)
 		require.Equal(t, true, elapsed < runtimeLimit, runningTimeMsg, elapsed, elapsed-runtimeLimit)
 	}
@@ -251,7 +251,7 @@ func Test_ValidToolConfigValidateTest(t *testing.T) {
 		cmd := command.New(binPath(), "validate", "-c", configPth)
 		out, err = cmd.RunAndReturnTrimmedCombinedOutput()
 	})
-	require.NoError(t, err)
+	require.NoError(t, err, out)
 	require.Equal(t, "Config is valid: \x1b[32;1mtrue\x1b[0m", out)
 	require.Equal(t, true, elapsed < runtimeLimit, runningTimeMsg, elapsed, elapsed-runtimeLimit)
 }
@@ -269,7 +269,7 @@ func Test_InvalidToolConfigValidateTest(t *testing.T) {
 	})
 	require.Error(t, err, out)
 	require.Contains(t, out, "Config is valid: \x1b[31;1mfalse\x1b[0m")
-	require.Contains(t, out, "invalid provider")
+	require.Contains(t, out, "URL of extra plugin empty-url-tool is empty")
 	require.Equal(t, true, elapsed < runtimeLimit, runningTimeMsg, elapsed, elapsed-runtimeLimit)
 }
 

toolprovider/config.go

@@ -16,11 +16,19 @@ func getToolRequests(config models.BitriseDataModel) ([]provider.ToolRequest, er
 		if err != nil {
 			return nil, fmt.Errorf("parse %s version: %w", toolID, err)
 		}
+
+		var pluginIdentifier *string
+		if config.ToolConfig != nil && config.ToolConfig.ExtraPlugins != nil {
+			if pluginID, ok := config.ToolConfig.ExtraPlugins[toolID]; ok {
+				pluginIdentifier = &pluginID
+			}
+		}
+
 		toolRequests = append(toolRequests, provider.ToolRequest{
 			ToolName:           provider.ToolID(toolID),
 			UnparsedVersion:    v,
 			ResolutionStrategy: strategy,
-			// TODO: plugin identifier
+			PluginIdentifier: pluginIdentifier,
 		})
 	}