add support for queries in actions

agustin-conductor · agustin-conductor · commit cd8185d6bb5d · 2025-12-02T09:55:58.000-03:00
diff --git a/examples/sqlserver-test.yml b/examples/sqlserver-test.yml
@@ -11,6 +11,98 @@ connect:
   user: "${DB_USER}"
   password: "${DB_PASSWORD}"
 
+actions:
+  update_user_attributes:
+    name: Update User Attributes
+    description: Update the attributes of a user. Only provide the attributes you want to update.
+    action_type:
+      - account
+      - account_update_profile
+    arguments:
+      user_id:
+        name: User ID
+        type: string
+        required: true
+        description: The ID of the user to update
+      attrs:
+        name: Attributes
+        type: string_map
+        required: true
+        description: The updated attribute data (map of attribute names to values)
+      attrs_update_mask:
+        name: Attributes Update Mask
+        type: string_list
+        required: true
+        description: The attributes to update (list of attribute names from attrs to actually update)
+    vars:
+      # Map each attribute in the attrs argument to a variable and a flag to indicate if the attribute should be updated
+      manager_id: "'manager_id' in input.attrs ? input.attrs['manager_id'] : null"
+      update_manager_id: "'manager_id' in input.attrs_update_mask"
+      first_name: "'first_name' in input.attrs ? input.attrs['first_name'] : null"
+      update_first_name: "'first_name' in input.attrs_update_mask"
+      middle_name: "'middle_name' in input.attrs ? input.attrs['middle_name'] : null"
+      update_middle_name: "'middle_name' in input.attrs_update_mask"
+      last_name: "'last_name' in input.attrs ? input.attrs['last_name'] : null"
+      update_last_name: "'last_name' in input.attrs_update_mask"
+      job_title: "'job_title' in input.attrs ? input.attrs['job_title'] : null"
+      update_job_title: "'job_title' in input.attrs_update_mask"
+      department: "'department' in input.attrs ? input.attrs['department'] : null"
+      update_department: "'department' in input.attrs_update_mask"
+      employee_id: "'employee_id' in input.attrs ? input.attrs['employee_id'] : null"
+      update_employee_id: "'employee_id' in input.attrs_update_mask"
+      employee_number: "'employee_number' in input.attrs ? input.attrs['employee_number'] : null"
+      update_employee_number: "'employee_number' in input.attrs_update_mask"
+    # We define the whole update logic with conditional attributes using CASE statements
+    # Note: SQL Server examples has the attributes split between Users and EmployeeData tables
+    queries: 
+      - |
+        -- Update Users table fields
+        UPDATE Users
+        SET
+          ManagerID = CASE 
+            WHEN ?<update_manager_id> = 1 THEN CAST(?<manager_id> AS INT)
+            ELSE ManagerID
+          END,
+          EmployeeID = CASE 
+            WHEN ?<update_employee_id> = 1 THEN ?<employee_id>
+            ELSE EmployeeID
+          END
+        WHERE Username = ?<user_id>;
+      - |
+        -- Update EmployeeData table fields
+        UPDATE ed
+        SET
+          attr_first_name = CASE 
+            WHEN ?<update_first_name> = 1 THEN ?<first_name>
+            ELSE ed.attr_first_name
+          END,
+          attr_middle_name = CASE 
+            WHEN ?<update_middle_name> = 1 THEN ?<middle_name>
+            ELSE ed.attr_middle_name
+          END,
+          attr_last_name = CASE 
+            WHEN ?<update_last_name> = 1 THEN ?<last_name>
+            ELSE ed.attr_last_name
+          END,
+          JobTitle = CASE 
+            WHEN ?<update_job_title> = 1 THEN ?<job_title>
+            ELSE ed.JobTitle
+          END,
+          Department = CASE 
+            WHEN ?<update_department> = 1 THEN ?<department>
+            ELSE ed.Department
+          END,
+          EmployeeNumber = CASE 
+            WHEN ?<update_employee_number> = 1 THEN CAST(?<employee_number> AS INT)
+            ELSE ed.EmployeeNumber
+          END
+        FROM (
+          SELECT TOP 1 EmployeeDataID, UserID
+          FROM EmployeeData
+          WHERE UserID = (SELECT UserID FROM Users WHERE Username = ?<user_id>)
+        ) ed_sub
+        INNER JOIN EmployeeData ed ON ed.EmployeeDataID = ed_sub.EmployeeDataID
+
 # Definition of different resource types managed by this connector
 resource_types:
   # Configuration for "user" resources in SQL Server
@@ -40,11 +132,19 @@ resource_types:
           END as last_login,
           u.ManagerID as manager_id,
           m.Username as manager_username,
-          m.Email as manager_email
+          m.Email as manager_email,
+          ed.attr_first_name,
+          ed.attr_middle_name,
+          ed.attr_last_name,
+          ed.JobTitle as attr_job_title,
+          ed.Department as attr_department,
+          ed.EmployeeNumber as attr_employee_number
         FROM
           Users u
         LEFT JOIN 
           Users m ON u.ManagerID = m.UserID
+        LEFT JOIN
+          EmployeeData ed ON u.UserID = ed.UserID
         ORDER BY u.UserID
         OFFSET ?<Offset> ROWS FETCH NEXT ?<Limit> ROWS ONLY
       # Pagination configuration (using offset for SQL Server)
@@ -79,6 +179,12 @@ resource_types:
               manager_id: ".manager_id"
               manager_username: ".manager_username"
               manager_email: ".manager_email"
+              attr_first_name: ".attr_first_name"
+              attr_middle_name: ".attr_middle_name"
+              attr_last_name: ".attr_last_name"
+              attr_job_title: ".attr_job_title"
+              attr_department: ".attr_department"
+              attr_employee_number: ".attr_employee_number != null ? string(.attr_employee_number) : ''"
 
     # Account provisioning configuration for creating new user accounts
     account_provisioning:
@@ -130,9 +236,16 @@ resource_types:
             END as last_login,
             u.ManagerID as manager_id,
             m.Username as manager_username,
-            m.Email as manager_email
+            m.Email as manager_email,
+            ed.attr_first_name,
+            ed.attr_middle_name,
+            ed.attr_last_name,
+            ed.JobTitle as attr_job_title,
+            ed.Department as attr_department,
+            ed.EmployeeNumber as attr_employee_number
           FROM Users u
           LEFT JOIN Users m ON u.ManagerID = m.UserID
+          LEFT JOIN EmployeeData ed ON u.UserID = ed.UserID
           WHERE u.Username = ?<username>
       # Account creation configuration
       create:
diff --git a/pkg/bsql/config.go b/pkg/bsql/config.go
@@ -433,7 +433,8 @@ type ActionConfig struct {
 	Arguments     map[string]ArgumentConfig `yaml:"arguments,omitempty" json:"arguments,omitempty" validate:"omitempty,dive"`
 	Vars          map[string]string         `yaml:"vars,omitempty" json:"vars,omitempty" validate:"omitempty"`
 	NoTransaction bool                      `yaml:"no_transaction,omitempty" json:"no_transaction,omitempty" validate:"omitempty"`
-	Query         string                    `yaml:"query" json:"query" validate:"required"`
+	Query         string                    `yaml:"query,omitempty" json:"query,omitempty" validate:"omitempty"`
+	Queries       []string                  `yaml:"queries,omitempty" json:"queries,omitempty" validate:"omitempty,dive"`
 	// TODO: add validation?
 	//revive:disable-next-line:line-length-limit // because it's a long field
 	ActionType []string `yaml:"action_type,omitempty" json:"action_type,omitempty" validate:"omitempty,dive,oneof=unspecified dynamic account account_update_profile account_disable account_enable"`
@@ -449,8 +450,8 @@ type ArgumentConfig struct {
 }
 
 func (a *ActionConfig) Validate() error {
-	if a.Query == "" {
-		return status.Errorf(codes.InvalidArgument, "query is required")
+	if a.Query == "" && len(a.Queries) == 0 {
+		return status.Errorf(codes.InvalidArgument, "query or queries is required")
 	}
 
 	for _, arg := range a.Arguments {
diff --git a/pkg/bsql/query.go b/pkg/bsql/query.go
@@ -399,10 +399,18 @@ func (s *SQLSyncer) normalizeValue(val any) any {
 		// Convert boolean to string for Oracle compatibility (Oracle DECODE expects CHAR)
 		// Only convert for Oracle to avoid breaking other databases
 		if s.dbEngine == database.Oracle {
+			result := "0"
 			if v {
-				return "1"
+				result = "1"
 			}
-			return "0"
+			return result
+		}
+		if s.dbEngine == database.MSSQL {
+			result := 0
+			if v {
+				result = 1
+			}
+			return result
 		}
 		// For other databases, return as-is (let the driver handle it)
 		return v
diff --git a/pkg/connector/action.go b/pkg/connector/action.go
@@ -128,8 +128,8 @@ func (c *Connector) RegisterActionManager(ctx context.Context) (connectorbuilder
 			actionSchema.Arguments = append(actionSchema.Arguments, arg)
 		}
 
-		if actionCfg.Query == "" {
-			return nil, fmt.Errorf("query is required for action: %s", actionKey)
+		if actionCfg.Query == "" && len(actionCfg.Queries) == 0 {
+			return nil, fmt.Errorf("query or queries is required for action: %s", actionKey)
 		}
 
 		cfg := actionCfg
@@ -204,7 +204,12 @@ func (c *Connector) handleQueryAction(ctx context.Context, actionKey string, act
 		argMap[k] = v
 	}
 
-	queries := []string{actionCfg.Query}
+	var queries []string
+	if len(actionCfg.Queries) > 0 {
+		queries = actionCfg.Queries
+	} else {
+		queries = []string{actionCfg.Query}
+	}
 	err = sqlSyncer.RunProvisioningQueries(ctx, queries, argMap, !actionCfg.NoTransaction)
 	if err != nil {
 		return nil, nil, err
diff --git a/test/sqlserver-init.sql b/test/sqlserver-init.sql
@@ -55,6 +55,9 @@ CREATE TABLE EmployeeData (
     Department NVARCHAR(100),
     JobTitle NVARCHAR(100),
     HireDate DATETIME2,
+    attr_first_name NVARCHAR(100),
+    attr_middle_name NVARCHAR(100),
+    attr_last_name NVARCHAR(100),
     FOREIGN KEY (UserID) REFERENCES Users(UserID) ON DELETE CASCADE
 );
 
@@ -114,14 +117,14 @@ INSERT INTO LoginHistory (UserID, LoginTime, LoginTimeText, LoginTimeAlt, LoginS
 ((SELECT UserID FROM Users WHERE Username = 'bob.developer'), '2025-04-18 14:30:00', '18-APR-2025 14:30:00', '18/04/2025 14:30:00', 1);
 
 -- Insert sample employee data
-INSERT INTO EmployeeData (UserID, EmployeeID, EmployeeNumber, EmployeeCode, Department, JobTitle, HireDate) VALUES
-((SELECT UserID FROM Users WHERE Username = 'admin'), 'EMP001', 10001, 'E-10001', 'IT', 'System Administrator', '2025-01-01'),
-((SELECT UserID FROM Users WHERE Username = 'jane.doe'), 'EMP002', 10002, 'E-10002', 'HR', 'HR Specialist', '2025-01-05'),
-((SELECT UserID FROM Users WHERE Username = 'john.smith'), 'EMP003', 10003, 'E-10003', 'Finance', 'Financial Analyst', '2025-01-10'),
-((SELECT UserID FROM Users WHERE Username = 'service.acct'), 'SVC001', 20001, 'S-20001', 'IT', 'Service Account', '2025-02-01'),
-((SELECT UserID FROM Users WHERE Username = 'disabled.user'), 'EMP004', 10004, 'E-10004', 'Marketing', 'Marketing Coordinator', '2025-02-15'),
-((SELECT UserID FROM Users WHERE Username = 'alice.manager'), 'EMP005', 10005, 'E-10005', 'IT', 'IT Manager', '2025-03-01'),
-((SELECT UserID FROM Users WHERE Username = 'bob.developer'), 'EMP006', 10006, 'E-10006', 'IT', 'Software Developer', '2025-03-05');
+INSERT INTO EmployeeData (UserID, EmployeeID, EmployeeNumber, EmployeeCode, Department, JobTitle, HireDate, attr_first_name, attr_middle_name, attr_last_name) VALUES
+((SELECT UserID FROM Users WHERE Username = 'admin'), 'EMP001', 10001, 'E-10001', 'IT', 'System Administrator', '2025-01-01', 'Admin', NULL, 'User'),
+((SELECT UserID FROM Users WHERE Username = 'jane.doe'), 'EMP002', 10002, 'E-10002', 'HR', 'HR Specialist', '2025-01-05', 'Jane', 'Marie', 'Doe'),
+((SELECT UserID FROM Users WHERE Username = 'john.smith'), 'EMP003', 10003, 'E-10003', 'Finance', 'Financial Analyst', '2025-01-10', 'John', 'Michael', 'Smith'),
+((SELECT UserID FROM Users WHERE Username = 'service.acct'), 'SVC001', 20001, 'S-20001', 'IT', 'Service Account', '2025-02-01', NULL, NULL, NULL),
+((SELECT UserID FROM Users WHERE Username = 'disabled.user'), 'EMP004', 10004, 'E-10004', 'Marketing', 'Marketing Coordinator', '2025-02-15', 'Disabled', NULL, 'User'),
+((SELECT UserID FROM Users WHERE Username = 'alice.manager'), 'EMP005', 10005, 'E-10005', 'IT', 'IT Manager', '2025-03-01', 'Alice', NULL, 'Manager'),
+((SELECT UserID FROM Users WHERE Username = 'bob.developer'), 'EMP006', 10006, 'E-10006', 'IT', 'Software Developer', '2025-03-05', 'Bob', NULL, 'Developer');
 
 -- Create indexes for better performance
 CREATE INDEX IX_Users_Username ON Users(Username);
