feature/user mappings sdk v4.4.0 (#149)

This pull request introduces significant updates to the OneLogin
Terraform provider, primarily focused on adding support for User
Mappings, upgrading dependencies, and improving examples and
documentation. Key changes include the addition of a new
`onelogin_user_mappings` resource with full CRUD operations, updates to
the OneLogin SDK, and enhancements to code organization and examples.

### New Feature: User Mappings Support
* Added the `onelogin_user_mappings` resource, enabling full CRUD
operations for user mappings, including support for conditions and
actions. This involved changes to
`onelogin/resource_onelogin_user_mappings.go` and the addition of helper
functions for flattening conditions and actions
(`[[1]](diffhunk://#diff-ce3ef94c410a70a22a90ba56073b17b14984c1d1b782de5fc363bbd923d4c830L1-L3)`,
`[[2]](diffhunk://#diff-ce3ef94c410a70a22a90ba56073b17b14984c1d1b782de5fc363bbd923d4c830L37-R41)`,
`[[3]](diffhunk://#diff-ce3ef94c410a70a22a90ba56073b17b14984c1d1b782de5fc363bbd923d4c830L100-R137)`,
`[[4]](diffhunk://#diff-2db7de13637ce2a17759f61145cb5530c9b761a804ff577d690853867a4c0d47R113-R145)`).
* Updated the `Inflate` function to return an error for better error
handling during user mapping creation
(`[[1]](diffhunk://#diff-2db7de13637ce2a17759f61145cb5530c9b761a804ff577d690853867a4c0d47L57-R57)`,
`[[2]](diffhunk://#diff-2db7de13637ce2a17759f61145cb5530c9b761a804ff577d690853867a4c0d47L94-R94)`).
* Re-enabled the `onelogin_user_mappings` resource in the provider
configuration
(`[onelogin/provider.goL71-R71](diffhunk://#diff-67f9eb98d74e43b0177e4868b4575c740c8fed94dc98974964d3601c3c609b94L71-R71)`).

### Dependency Upgrades
* Upgraded the OneLogin SDK to version `v4.4.0` to support the new User
Mappings functionality
(`[go.modL9-R9](diffhunk://#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6L9-R9)`).
* Updated the `VERSION` in `GNUmakefile` to `0.8.0` to reflect the new
release
(`[GNUmakefileL13-R13](diffhunk://#diff-e3445fc75aa9c3e4a60fbe5394dcce12693022018216a8fbe0000fe9952850a6L13-R13)`).

### Documentation and Examples
* Updated `README.md` to include details about the new `v0.8.0` release,
including User Mappings support and examples for configuration
(`[[1]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R7-R15)`,
`[[2]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L67-R76)`).
* Added and updated examples for User Mappings in
`examples/onelogin_user_mapping_example.tf` and
`examples/onelogin_user_mapping_updated_example.tf`, showcasing basic
and advanced configurations
(`[[1]](diffhunk://#diff-2f572e4f691157993ece38eeb8b411a2016c0432171ca314669411e89abcaeabL1-R68)`,
`[[2]](diffhunk://#diff-34377eac802fb69d90811104fba7331a3df19103ce5ecace4d014229ae4dc2cdL1-R71)`).
* Updated the `getting-started/README.md` and `main.tf` files to reflect
the new provider version `0.8.0` and provide installation instructions
(`[[1]](diffhunk://#diff-ce2a8ca7a1f56da427e3b975745401cf814bdec361bd98d5b149338042b1bc94L49-R73)`,
`[[2]](diffhunk://#diff-ce2a8ca7a1f56da427e3b975745401cf814bdec361bd98d5b149338042b1bc94L85-R99)`,
`[[3]](diffhunk://#diff-686c7e2608ae0ae77dda823d90c8802afb9823cbe9c86c8b37e31a8968079d0aL5-R13)`).

### Code Quality and Testing
* Added new test cases to validate the `Inflate` function changes and
ensure proper error handling
(`[ol_schema/user_mapping/user_mapping_test.goL129-R130](diffhunk://#diff-ac10ab9fd6d69c7ffbdfdec6dc7262d4390f8a106a7805d377f20ffa7b942060L129-R130)`).
* Improved code organization and naming consistency by removing unused
imports and simplifying logic in `resource_onelogin_user_mappings.go`
(`[onelogin/resource_onelogin_user_mappings.goL16-L19](diffhunk://#diff-ce3ef94c410a70a22a90ba56073b17b14984c1d1b782de5fc363bbd923d4c830L16-L19)`).

These updates collectively enhance the functionality, usability, and
maintainability of the OneLogin Terraform provider.

Author: Subterrane

GNUmakefile

@@ -10,7 +10,7 @@ GO111MODULE=on
 
 PLUGINS_DIR=~/.terraform.d/plugins
 PLUGIN_PATH=onelogin.com/onelogin/onelogin
-VERSION=0.6.0
+VERSION=0.8.0
 
 clean:
 	rm -r ${DIST_DIR}

README.md

@@ -4,6 +4,15 @@
 
 ## Latest Updates
 
+### v0.8.0 - User Mappings Support
+
+This version adds support for User Mappings with the OneLogin SDK v4.4.0:
+
+- Added User Mappings resource with full CRUD operations
+- Updated OneLogin SDK to v4.4.0
+- Improved code organization and naming consistency
+- Added examples for User Mappings configuration
+
 ### v0.7.0 - SDK v4 Refactoring
 
 This version includes major internal refactoring to fully support OneLogin SDK v4:
@@ -64,7 +73,7 @@ terraform {
   required_providers {
     onelogin = {
       source  = "onelogin/onelogin"
-      version = "0.7.0"
+      version = "0.8.0"
     }
   }
 }

examples/onelogin_user_mapping_example.tf

@@ -1,17 +1,70 @@
-resource onelogin_user_mappings basic_test {
-  name = "Select Login"
-  enabled = true
-  match = "all"
-  position = 1
+terraform {
+  required_providers {
+    onelogin = {
+      source  = "onelogin/onelogin"
+      version = ">= 0.8.0"
+    }
+  }
+}
+
+provider "onelogin" {
+  # Set these variables with ONELOGIN_CLIENT_ID, ONELOGIN_CLIENT_SECRET environment variables
+  # Or provide them directly here (not recommended for sensitive values)
+}
+
+# Basic user mapping that applies a role to users with email domain @example.com
+resource "onelogin_user_mapping" "example_mapping" {
+  name     = "Example Domain Mapping"
+  match    = "all"                  # Match all conditions
+  enabled  = true
+  position = 1                      # Order in which mappings are evaluated
 
+  # Condition to check if user's email contains @example.com
+  conditions {
+    source   = "email"              # User attribute to check
+    operator = "contains"           # Operator for comparison
+    value    = "@example.com"       # Value to compare against
+  }
+
+  # Action to assign a role to matching users
+  # Note: Replace 12345 with actual role ID from your OneLogin account
   actions {
-    value = ["1"]
-    action = "set_status"
+    action = "set_role"
+    value  = ["12345"]
+  }
+}
+
+# More complex user mapping with multiple conditions and actions
+resource "onelogin_user_mapping" "department_mapping" {
+  name     = "Department Based Mapping"
+  match    = "all"                  # Match all conditions
+  enabled  = true
+  position = 2                      # Processed after the first mapping
+
+  # Check if user belongs to IT department
+  conditions {
+    source   = "department"
+    operator = "equals"
+    value    = "IT"
   }
 
+  # Check if user's title contains "Engineer"
   conditions {
-    operator = ">"
-    source = "last_login"
-    value = "90"
+    source   = "title"
+    operator = "contains"
+    value    = "Engineer"
   }
-}
+
+  # Assign multiple roles to matching users
+  # Note: Replace IDs with actual role IDs from your OneLogin account
+  actions {
+    action = "set_role"
+    value  = ["23456", "34567"]
+  }
+
+  # Set the user's group memberships
+  actions {
+    action = "set_groups"
+    value  = ["Engineers", "IT Staff"]
+  }
+}

examples/onelogin_user_mapping_updated_example.tf

@@ -1,17 +1,73 @@
-resource onelogin_user_mappings basic_test {
-  name = "Updated Login"
-  enabled = true
-  match = "all"
-  position = 1
+terraform {
+  required_providers {
+    onelogin = {
+      source  = "onelogin/onelogin"
+      version = ">= 0.8.0"
+    }
+  }
+}
 
-  actions {
-    value = ["2"]
-    action = "set_status"
+provider "onelogin" {
+  # Set these variables with ONELOGIN_CLIENT_ID, ONELOGIN_CLIENT_SECRET environment variables
+}
+
+# Updated version of the example mapping
+resource "onelogin_user_mapping" "example_mapping" {
+  name     = "Updated Domain Mapping"  # Changed name
+  match    = "any"                     # Changed from "all" to "any"
+  enabled  = true
+  position = 3                         # Changed position
+
+  # Original condition
+  conditions {
+    source   = "email"
+    operator = "contains"
+    value    = "@example.com"
   }
 
+  # Added condition
   conditions {
-    operator = ">"
-    source = "last_login"
-    value = "120"
+    source   = "email"
+    operator = "contains" 
+    value    = "@partner.com"
+  }
+
+  # Original action with updated role IDs
+  actions {
+    action = "set_role"
+    value  = ["45678"]                # Updated role ID
+  }
+  
+  # Added action to set custom attributes
+  actions {
+    action = "set_userprincipalname"
+    value  = ["${user.email}"]        # Dynamic value using user's email
   }
 }
+
+# Updated version of the department mapping with different approach
+resource "onelogin_user_mapping" "department_mapping" {
+  name     = "Engineering Team Mapping"  # Updated name
+  match    = "all"
+  enabled  = true
+  position = 4                           # Updated position
+
+  # Simplified condition - now just checking for Engineering department
+  conditions {
+    source   = "department"
+    operator = "equals"
+    value    = "Engineering"             # Changed from IT to Engineering
+  }
+
+  # Set specific custom attribute for engineers
+  actions {
+    action = "set_custom_attribute"
+    value  = ["employee_type", "technical"]
+  }
+
+  # Updated role assignments
+  actions {
+    action = "set_role"
+    value  = ["34567", "56789"]          # Updated role IDs
+  }
+}

getting-started/README.md

@@ -46,31 +46,31 @@ If you encounter issues with the provider availability in the Terraform Registry
 1. Create the plugins directory (adjust OS and architecture as needed):
    ```bash
    # For macOS Intel
-   mkdir -p ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/darwin_amd64
+   mkdir -p ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/darwin_amd64
 
    # For macOS Apple Silicon (M1/M2)
-   mkdir -p ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/darwin_arm64
+   mkdir -p ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/darwin_arm64
 
    # For Linux
-   mkdir -p ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/linux_amd64
+   mkdir -p ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/linux_amd64
 
    # For Windows
-   mkdir -p %APPDATA%\terraform.d\plugins\registry.terraform.io\onelogin\onelogin\0.7.0\windows_amd64
+   mkdir -p %APPDATA%\terraform.d\plugins\registry.terraform.io\onelogin\onelogin\0.8.0\windows_amd64
    ```
 
 2. Download the provider binary from GitHub releases:
    ```bash
    # For macOS Intel
-   curl -L https://github.com/onelogin/terraform-provider-onelogin/releases/download/v0.7.0/terraform-provider-onelogin_0.7.0_darwin_amd64.zip -o /tmp/provider.zip
+   curl -L https://github.com/onelogin/terraform-provider-onelogin/releases/download/v0.8.0/terraform-provider-onelogin_0.8.0_darwin_amd64.zip -o /tmp/provider.zip
 
    # For macOS Apple Silicon
-   curl -L https://github.com/onelogin/terraform-provider-onelogin/releases/download/v0.7.0/terraform-provider-onelogin_0.7.0_darwin_arm64.zip -o /tmp/provider.zip
+   curl -L https://github.com/onelogin/terraform-provider-onelogin/releases/download/v0.8.0/terraform-provider-onelogin_0.8.0_darwin_arm64.zip -o /tmp/provider.zip
 
    # For Linux
-   curl -L https://github.com/onelogin/terraform-provider-onelogin/releases/download/v0.7.0/terraform-provider-onelogin_0.7.0_linux_amd64.zip -o /tmp/provider.zip
+   curl -L https://github.com/onelogin/terraform-provider-onelogin/releases/download/v0.8.0/terraform-provider-onelogin_0.8.0_linux_amd64.zip -o /tmp/provider.zip
 
    # For Windows (using PowerShell)
-   Invoke-WebRequest -Uri https://github.com/onelogin/terraform-provider-onelogin/releases/download/v0.7.0/terraform-provider-onelogin_0.7.0_windows_amd64.zip -OutFile $env:TEMP\provider.zip
+   Invoke-WebRequest -Uri https://github.com/onelogin/terraform-provider-onelogin/releases/download/v0.8.0/terraform-provider-onelogin_0.8.0_windows_amd64.zip -OutFile $env:TEMP\provider.zip
    ```
 
 3. Extract and install:
@@ -82,21 +82,21 @@ If you encounter issues with the provider availability in the Terraform Registry
    ls -la /tmp/provider
 
    # For macOS Intel (adjust filenames based on what you see in the previous step)
-   cp /tmp/provider/terraform-provider-onelogin_v0.7.0 ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/darwin_amd64/
-   chmod +x ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/darwin_amd64/terraform-provider-onelogin_v0.7.0
+   cp /tmp/provider/terraform-provider-onelogin_v0.8.0 ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/darwin_amd64/
+   chmod +x ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/darwin_amd64/terraform-provider-onelogin_v0.8.0
 
    # For macOS Apple Silicon (adjust filenames based on what you see)
-   cp /tmp/provider/terraform-provider-onelogin_v0.7.0 ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/darwin_arm64/
-   chmod +x ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/darwin_arm64/terraform-provider-onelogin_v0.7.0
+   cp /tmp/provider/terraform-provider-onelogin_v0.8.0 ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/darwin_arm64/
+   chmod +x ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/darwin_arm64/terraform-provider-onelogin_v0.8.0
 
    # For Linux (adjust filenames based on what you see)
-   cp /tmp/provider/terraform-provider-onelogin_v0.7.0 ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/linux_amd64/
-   chmod +x ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.7.0/linux_amd64/terraform-provider-onelogin_v0.7.0
+   cp /tmp/provider/terraform-provider-onelogin_v0.8.0 ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/linux_amd64/
+   chmod +x ~/.terraform.d/plugins/registry.terraform.io/onelogin/onelogin/0.8.0/linux_amd64/terraform-provider-onelogin_v0.8.0
 
    # For Windows (using PowerShell) (adjust filenames based on what you see)
    Expand-Archive -Path $env:TEMP\provider.zip -DestinationPath $env:TEMP\provider
    Get-ChildItem -Path $env:TEMP\provider -Recurse
-   Copy-Item $env:TEMP\provider\terraform-provider-onelogin_v0.7.0.exe $env:APPDATA\terraform.d\plugins\registry.terraform.io\onelogin\onelogin\0.7.0\windows_amd64\
+   Copy-Item $env:TEMP\provider\terraform-provider-onelogin_v0.8.0.exe $env:APPDATA\terraform.d\plugins\registry.terraform.io\onelogin\onelogin\0.8.0\windows_amd64\
    ```
 
    > **Note:** The exact structure and filenames inside the zip may vary between releases. After extraction, check the actual contents with `ls` or `Get-ChildItem` and adjust the copy commands accordingly. The binary may be in a subdirectory or have a slightly different name.

getting-started/main.tf

@@ -2,15 +2,15 @@ terraform {
   required_providers {
     onelogin = {
       source  = "onelogin/onelogin"
-      version = "0.7.0"
+      version = "0.8.0"
     }
   }
 }
 
 provider "onelogin" {
   client_id     = "YOUR_CLIENT_ID"     # Replace with your OneLogin Client ID
   client_secret = "YOUR_CLIENT_SECRET" # Replace with your OneLogin Client Secret
-  url           = "YOUR_API_URL"       # Replace with your OneLogin API URL (e.g., "https://company.onelogin.com"). Note: The 'subdomain' attribute has been replaced by 'url' in version 0.6.0. Update your configuration by replacing 'subdomain = "company"' with 'url = "https://company.onelogin.com"'.
+  url           = "YOUR_API_URL"       # Replace with your OneLogin API URL (e.g., "https://company.onelogin.com")
 }
 
 # Example resource (uncomment if needed)

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/terraform-plugin-log v0.2.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
 	github.com/onelogin/onelogin-go-sdk v1.1.22
-	github.com/onelogin/onelogin-go-sdk/v4 v4.3.0
+	github.com/onelogin/onelogin-go-sdk/v4 v4.4.0
 	github.com/stretchr/testify v1.7.0
 )
 

go.sum

@@ -485,8 +485,8 @@ github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/onelogin/onelogin-go-sdk v1.1.22 h1:6EQkQLY3TVfRwS25zkIk7i069qTEbe6MCeQf8dkrC8o=
 github.com/onelogin/onelogin-go-sdk v1.1.22/go.mod h1:GM0+ziS1fhnPnxC2fLzVloxn+VzBwzXKkIaDOPoE5GU=
-github.com/onelogin/onelogin-go-sdk/v4 v4.3.0 h1:cvjVW20ra4xR3dr6yZZVlLMUKbvsnya79TLN/xZb3eY=
-github.com/onelogin/onelogin-go-sdk/v4 v4.3.0/go.mod h1:JjzflJ66T0yT7zYteMR1zQenaDblhIuYzpACmqFduNg=
+github.com/onelogin/onelogin-go-sdk/v4 v4.4.0 h1:jidCK/IFxHDtUdzyiE31vO9ANHTmgktpqo8swvHZGhk=
+github.com/onelogin/onelogin-go-sdk/v4 v4.4.0/go.mod h1:JjzflJ66T0yT7zYteMR1zQenaDblhIuYzpACmqFduNg=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=

ol_schema/user_mapping/user_mapping.go

@@ -54,7 +54,7 @@ func validMatch(val interface{}, key string) (warns []string, errs []error) {
 }
 
 // Inflate takes a key/value map of interfaces and uses the fields to construct a user mapping struct
-func Inflate(s map[string]interface{}) models.UserMapping {
+func Inflate(s map[string]interface{}) (models.UserMapping, error) {
 	out := models.UserMapping{}
 	if s["id"] != nil {
 		if id, err := strconv.Atoi(s["id"].(string)); err == nil {
@@ -91,7 +91,7 @@ func Inflate(s map[string]interface{}) models.UserMapping {
 			out.Actions = append(out.Actions, action)
 		}
 	}
-	return out
+	return out, nil
 }
 
 // Flatten takes a UserMappings array and converts it to an array of maps
@@ -110,3 +110,36 @@ func Flatten(UserMappings []models.UserMapping) []map[string]interface{} {
 	}
 	return out
 }
+
+// FlattenConditions converts an array of interface{} to an array of maps for conditions
+func FlattenConditions(conditions []interface{}) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(conditions))
+	for i, condition := range conditions {
+		if condMap, ok := condition.(map[string]interface{}); ok {
+			result[i] = map[string]interface{}{
+				"source":   condMap["source"],
+				"operator": condMap["operator"],
+				"value":    condMap["value"],
+			}
+		}
+	}
+	return result
+}
+
+// FlattenActions converts an array of interface{} to an array of maps for actions
+func FlattenActions(actions []interface{}) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(actions))
+	for i, action := range actions {
+		if actMap, ok := action.(map[string]interface{}); ok {
+			var vals []interface{}
+			if v, ok := actMap["value"].([]interface{}); ok {
+				vals = v
+			}
+			result[i] = map[string]interface{}{
+				"action": actMap["action"],
+				"value":  vals,
+			}
+		}
+	}
+	return result
+}

ol_schema/user_mapping/user_mapping_test.go

@@ -126,7 +126,8 @@ func TestInflate(t *testing.T) {
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			subj := Inflate(test.ResourceData)
+			subj, err := Inflate(test.ResourceData)
+			assert.Nil(t, err)
 			// Compare pointer values properly
 			if subj.ID != nil && test.ExpectedOutput.ID != nil {
 				assert.Equal(t, *test.ExpectedOutput.ID, *subj.ID)