Merge pull request #47 from ConductorOne/feature/employee-id-and-last-login

[BB-536][BB-537] Add employee ID and last login support

Author: btipling

CLAUDE.md

@@ -0,0 +1,19 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Build, Test, and Lint Commands
+- Build: `make build` - Builds the baton-sql binary
+- Run tests: `go test ./...` - Run all tests
+- Run specific test: `go test ./pkg/path/to/package -run TestName` 
+- Run tests with verbose output: `go test -v ./...`
+- Lint: `make lint` - Runs golangci-lint
+
+## Code Style Guidelines
+- Error handling: Use `fmt.Errorf` with context; check specific errors with `errors.Is`
+- Imports: Standard lib first, then third-party, then project imports, alphabetized within groups
+- Naming: CamelCase for exported, camelCase for unexported; special handling for ID, URL, HTTP, API
+- Tests: Table-driven tests with testify/require; format TestStructName_methodName
+- Line length: Maximum 200 characters
+- Comments: Complete sentences ending with periods for exported items
+- Absolutely no usage of log.Fatal or log.Panic (enforced by ruleguard)

Dockerfile.test

@@ -0,0 +1,26 @@
+FROM golang:1.24-alpine as builder
+
+WORKDIR /app
+
+# Copy go mod files
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Copy source code
+COPY . .
+
+# Build the application
+RUN go build -o baton-sql ./cmd/baton-sql
+
+# Create final container
+FROM alpine:3.18
+
+RUN apk add --no-cache ca-certificates bash curl
+
+WORKDIR /app
+
+# Copy binary from builder
+COPY --from=builder /app/baton-sql .
+
+# Default command
+CMD ["/app/baton-sql"]

docker-compose-postgres-test.yml

@@ -0,0 +1,38 @@
+services:
+  # PostgreSQL Database for testing employee_id and last_login features
+  postgres:
+    image: postgres:14
+    container_name: baton-postgres-test
+    environment:
+      POSTGRES_USER: baton
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: batondb
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./test/postgres-init.sql:/docker-entrypoint-initdb.d/init.sql
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "baton"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  # Connector test container
+  baton-sql-test:
+    build:
+      context: .
+      dockerfile: Dockerfile.test
+    container_name: baton-sql-postgres-test
+    depends_on:
+      postgres:
+        condition: service_healthy
+    volumes:
+      - ./examples:/examples
+      - ./test:/test
+    command: >
+      /bin/bash -c "
+        # Wait for PostgreSQL to be fully ready
+        sleep 5
+        # Run the baton-sql connector with PostgreSQL test configuration
+        /app/baton-sql --config-path /examples/postgres-test.yml --log-level debug
+      "

docker-compose-test.yml

@@ -0,0 +1,39 @@
+services:
+  # MySQL Database for testing employee_id and last_login features
+  mysql:
+    image: mysql:8.0
+    container_name: baton-mysql-test
+    environment:
+      MYSQL_ROOT_PASSWORD: rootpassword
+      MYSQL_DATABASE: batondb
+      MYSQL_USER: baton
+      MYSQL_PASSWORD: password
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./test/mysql-init.sql:/docker-entrypoint-initdb.d/init.sql
+    healthcheck:
+      test: ["CMD", "mysql", "-ubaton", "-ppassword", "-e", "SELECT 1"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  # Connector test container
+  baton-sql-test:
+    build:
+      context: .
+      dockerfile: Dockerfile.test
+    container_name: baton-sql-test
+    depends_on:
+      mysql:
+        condition: service_healthy
+    volumes:
+      - ./examples:/examples
+      - ./test:/test
+    command: >
+      /bin/bash -c "
+        # Wait for MySQL to be fully ready
+        sleep 5
+        # Run the baton-sql connector with test configuration
+        /app/baton-sql --config-path /examples/mysql-test.yml --log-level debug
+      "

examples/mysql-local-test.yml

@@ -0,0 +1,143 @@
+---
+# Application name for this connector configuration
+app_name: MySQL Local Test
+app_description: Test configuration for MySQL with employee_id and last_login support (for local testing)
+
+# Connection settings for the MySQL database
+connect:
+  # Data Source Name (DSN) for our local MySQL instance running in Docker
+  dsn: "mysql://baton:password@localhost:3306/batondb"
+
+# Definition of different resource types managed by this connector
+resource_types:
+  # Configuration for "user" resources in MySQL
+  user:
+    # Display name for this resource type
+    name: "User"
+    # Description providing context about what a user represents
+    description: "A user within the MySQL system"
+    # Settings for listing user records from the database
+    list:
+      # SQL query to fetch user-related data including employee_id, last_login, and manager information
+      query: |
+        SELECT
+          u.id, 
+          u.username,
+          u.email,
+          u.employee_id,
+          u.status,
+          u.account_type,
+          u.created_at,
+          u.last_login,
+          u.manager_id,
+          m.username as manager_username,
+          m.email as manager_email
+        FROM
+          users u
+        LEFT JOIN 
+          users m ON u.manager_id = m.id
+      # Pagination configuration (using offset for MySQL)
+      pagination:
+        strategy: "offset"
+        primary_key: "id"
+      # Mapping of query results to resource fields
+      map:
+        # Unique identifier for the user resource 
+        id: ".username"
+        # Field to display as the resource's name
+        display_name: ".username"
+        # Additional description for the user resource
+        description: ".username"
+        # Extra attributes (traits) for the user resource
+        traits:
+          user:
+            # Map status from database (active, disabled) to proper resource status
+            status: ".status"
+            # Login identifier - username
+            login: ".username"
+            # Email addresses
+            emails:
+              - ".email"
+            # Account type mapping
+            account_type: ".account_type"
+            # Employee ID mapping
+            employee_ids:
+              - ".employee_id"
+            # Last login timestamp mapping
+            last_login: ".last_login"
+            # Manager information
+            manager_id: ".manager_id"
+            manager_email: ".manager_email"
+            
+            # Profile details for the user
+            profile:
+              user_id: ".id"
+              created_at: ".created_at"
+              last_login: ".last_login"
+              manager_id: ".manager_id"
+              manager_username: ".manager_username"
+              manager_email: ".manager_email"
+              
+  # Configuration for "role" resources 
+  role:
+    # Display name for the role resource type
+    name: "Role"
+    # Brief description of what a role signifies
+    description: "A role within the MySQL system"
+    # Settings for listing roles from the database
+    list:
+      # SQL query to retrieve roles
+      query: |
+        SELECT
+          id,
+          role_name
+        FROM
+          roles
+      # Pagination configuration
+      pagination:
+        strategy: "offset"
+        primary_key: "id"
+      # Mapping of each query result to role resource fields
+      map:
+        # Unique role identifier
+        id: ".role_name"
+        # Display name for the role
+        display_name: ".role_name"
+        # Role description
+        description: ".role_name"
+        # Additional role-specific traits
+        traits:
+          role:
+            # Profile mapping for the role
+            profile:
+              role_id: ".id"
+              
+    # Define a static entitlement for role membership
+    static_entitlements:
+      - id: "member"
+        display_name: "'Member'"
+        description: "'Role member'"
+        purpose: "assignment"
+        grantable_to:
+          - "user"
+
+    # Dynamic grants based on SQL queries to associate users with roles
+    grants:
+      - query: |
+          SELECT 
+            u.username,
+            r.role_name
+          FROM 
+            users u
+          JOIN 
+            user_roles ur ON u.id = ur.user_id
+          JOIN 
+            roles r ON r.id = ur.role_id
+        pagination:
+          strategy: "offset"
+          primary_key: "username"
+        map:
+          - skip_if: ".role_name != resource.ID"
+            principal_id: ".username"
+            principal_type: "user"
+            entitlement_id: "member"