feat: fix/complete cloud-ldaps support (#781)

* feat: fix/update cloud-ldaps support

* add newline between responses

* Add missing fields to CloudLdapKeystore struct

Author: neilmartin83

examples/cloud_ldap/CreateCloudIdentityProviderLdap/CreateCloudIdentityProviderLdap.go

@@ -10,7 +10,7 @@ import (
 
 func main() {
 	// Define the path to the JSON configuration file
-	configFilePath := "/Users/dafyddwatkins/localtesting/jamfpro/clientconfig.json"
+	configFilePath := "/Users/Shared/GitHub/go-api-sdk-jamfpro/localtesting/clientconfig.json"
 
 	// Initialize the Jamf Pro client with the HTTP client configuration
 	client, err := jamfpro.BuildClientWithConfigFile(configFilePath)
@@ -22,14 +22,14 @@ func main() {
 	request := &jamfpro.ResourceCloudLdap{
 		CloudIdPCommon: &jamfpro.CloudIdPCommon{
 			ProviderName: "GOOGLE",
-			DisplayName:  "test",
+			DisplayName:  "Google LDAP",
 		},
 		Server: &jamfpro.CloudLdapServer{
 			Enabled: true,
 			Keystore: &jamfpro.CloudLdapKeystore{
-				Password:  "thing",
-				FileBytes: "WlhoaGJYQnNaU0J2WmlCaElHSmhjMlUyTkNCbGJtTnZaR1ZrSUhaaGJHbGtJSEF4TWk0Z2EyVjVjM1J2Y21VZ1ptbHNaUT09",
-				FileName:  "keystore.jks", // Added example filename
+				Password:  "supersecretpassword",
+				FileBytes: "MIIJsQIBAzCCCXcGCSqGS...",
+				FileName:  "keystore.p12", // Added example filename
 			},
 			UseWildcards:                             true,
 			ConnectionType:                           "LDAPS",
@@ -46,25 +46,25 @@ func main() {
 				SearchScope:           "ALL_SUBTREES",
 				ObjectClasses:         "inetOrgPerson",
 				SearchBase:            "ou=Users",
-				AdditionalSearchBase:  "thing",
-				UserID:                "mail",
-				Username:              "uid",
+				AdditionalSearchBase:  "",
+				UserID:                "uid",
+				Username:              "mail",
 				RealName:              "displayName",
 				EmailAddress:          "mail",
 				Department:            "departmentNumber",
-				Building:              "building",
-				Room:                  "room",
-				Phone:                 "phone",
-				Position:              "position",
+				Building:              "",
+				Room:                  "",
+				Phone:                 "",
+				Position:              "title",
 				UserUuid:              "uid",
 			},
 			GroupMappings: jamfpro.CloudIdentityProviderDefaultMappingsSubsetGroupMappings{
 				ObjectClassLimitation: "ANY_OBJECT_CLASSES",
 				SearchScope:           "ALL_SUBTREES",
 				ObjectClasses:         "groupOfNames",
 				SearchBase:            "ou=Groups",
-				GroupID:               "cn=",
-				GroupName:             "cn=",
+				GroupID:               "cn",
+				GroupName:             "cn",
 				GroupUuid:             "gidNumber",
 			},
 			MembershipMappings: jamfpro.CloudIdentityProviderDefaultMappingsSubsetMembershipMappings{

examples/cloud_ldap/DeleteCloudIdentityProviderLdapByID/DeleteCloudIdentityProviderLdapByID.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/deploymenttheory/go-api-sdk-jamfpro/sdk/jamfpro"
+)
+
+func main() {
+	// Define the path to the JSON configuration file
+	configFilePath := "/Users/Shared/GitHub/go-api-sdk-jamfpro/localtesting/clientconfig.json"
+
+	// Initialize the Jamf Pro client with the HTTP client configuration
+	client, err := jamfpro.BuildClientWithConfigFile(configFilePath)
+	if err != nil {
+		log.Fatalf("Failed to initialize Jamf Pro client: %v", err)
+	}
+
+	// Define the ID of the Cloud LDAP configuration you want to delete
+	ldapID := "1022" // Replace with your actual LDAP configuration ID
+
+	// Delete the Cloud LDAP configuration
+	err = client.DeleteCloudIdentityProviderLdapByID(ldapID)
+	if err != nil {
+		log.Fatalf("Error deleting cloud LDAP configuration: %v", err)
+	}
+
+	fmt.Printf("Successfully deleted Cloud LDAP configuration with ID: %s\n", ldapID)
+}

examples/cloud_ldap/GetCloudIdentityProviderLdapByID/GetCloudIdentityProviderLdapByID.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+
+	"github.com/deploymenttheory/go-api-sdk-jamfpro/sdk/jamfpro"
+)
+
+func main() {
+	// Define the path to the JSON configuration file
+	configFilePath := "/Users/Shared/GitHub/go-api-sdk-jamfpro/localtesting/clientconfig.json"
+
+	// Initialize the Jamf Pro client with the HTTP client configuration
+	client, err := jamfpro.BuildClientWithConfigFile(configFilePath)
+	if err != nil {
+		log.Fatalf("Failed to initialize Jamf Pro client: %v", err)
+	}
+
+	// Define the ID of the Cloud LDAP configuration you want to retrieve
+	cloudLdapID := "1019" // Replace with your actual Cloud LDAP ID
+
+	// Get the Cloud LDAP configuration by ID
+	cloudLdap, err := client.GetCloudIdentityProviderLdapByID(cloudLdapID)
+	if err != nil {
+		log.Fatalf("Error retrieving cloud LDAP configuration: %v", err)
+	}
+
+	// Pretty print the response in JSON
+	responseJSON, err := json.MarshalIndent(cloudLdap, "", "    ") // Indent with 4 spaces
+	if err != nil {
+		log.Fatalf("Error marshaling response data: %v", err)
+	}
+	fmt.Printf("Cloud LDAP Configuration (ID: %s):\n%s\n", cloudLdapID, string(responseJSON))
+}

examples/cloud_ldap/UpdateCloudIdentityProviderLdap/UpdateCloudIdentityProviderLdap.go

@@ -0,0 +1,107 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+
+	"github.com/deploymenttheory/go-api-sdk-jamfpro/sdk/jamfpro"
+)
+
+func main() {
+	// Define the path to the JSON configuration file
+	configFilePath := "/Users/Shared/GitHub/go-api-sdk-jamfpro/localtesting/clientconfig.json"
+
+	// Initialize the Jamf Pro client with the HTTP client configuration
+	client, err := jamfpro.BuildClientWithConfigFile(configFilePath)
+	if err != nil {
+		log.Fatalf("Failed to initialize Jamf Pro client: %v", err)
+	}
+
+	// Define the ID of the Cloud LDAP configuration you want to update
+	ldapID := "1022" // Replace with your actual LDAP configuration ID
+
+	// Create the update request body
+	request := &jamfpro.ResourceCloudLdap{
+		CloudIdPCommon: &jamfpro.CloudIdPCommon{
+			ID:           ldapID,
+			ProviderName: "GOOGLE",
+			DisplayName:  "Google LDAP Updated", // Example of updated display name
+		},
+		Server: &jamfpro.CloudLdapServer{
+			Enabled: true,
+			Keystore: &jamfpro.CloudLdapKeystore{
+				Password:  "supersecretpassword",
+				FileBytes: "MIIJsQIBAzCCCXcGCSqGS...",
+				FileName:  "keystore.p12",
+			},
+			UseWildcards:                             true,
+			ConnectionType:                           "LDAPS",
+			ServerUrl:                                "ldap.google.com",
+			DomainName:                               "jamf.com",
+			Port:                                     636,
+			ConnectionTimeout:                        15,
+			SearchTimeout:                            60,
+			MembershipCalculationOptimizationEnabled: true,
+		},
+		Mappings: &jamfpro.CloudLdapMappings{
+			UserMappings: jamfpro.CloudIdentityProviderDefaultMappingsSubsetUserMappings{
+				ObjectClassLimitation: "ANY_OBJECT_CLASSES",
+				SearchScope:           "ALL_SUBTREES",
+				ObjectClasses:         "inetOrgPerson",
+				SearchBase:            "ou=Users",
+				AdditionalSearchBase:  "",
+				UserID:                "uid",
+				Username:              "mail",
+				RealName:              "displayName",
+				EmailAddress:          "mail",
+				Department:            "departmentNumber",
+				Building:              "",
+				Room:                  "",
+				Phone:                 "",
+				Position:              "title",
+				UserUuid:              "uid",
+			},
+			GroupMappings: jamfpro.CloudIdentityProviderDefaultMappingsSubsetGroupMappings{
+				ObjectClassLimitation: "ANY_OBJECT_CLASSES",
+				SearchScope:           "ALL_SUBTREES",
+				ObjectClasses:         "groupOfNames",
+				SearchBase:            "ou=Groups",
+				GroupID:               "cn",
+				GroupName:             "cn",
+				GroupUuid:             "gidNumber",
+			},
+			MembershipMappings: jamfpro.CloudIdentityProviderDefaultMappingsSubsetMembershipMappings{
+				GroupMembershipMapping: "memberOf",
+			},
+		},
+	}
+
+	// Update the Cloud LDAP configuration
+	resp, err := client.UpdateCloudIdentityProviderLdap(ldapID, request)
+	if err != nil {
+		log.Fatalf("Error updating cloud LDAP configuration: %v", err)
+	}
+
+	// Pretty print the response
+	responseJSON, err := json.MarshalIndent(resp, "", "    ")
+	if err != nil {
+		log.Fatalf("Error marshaling response data: %v", err)
+	}
+
+	fmt.Printf("Successfully updated Cloud LDAP configuration with ID %s:\n%s\n", ldapID, string(responseJSON))
+
+	// Optionally fetch and display the updated configuration
+	updatedConfig, err := client.GetCloudIdentityProviderLdapByID(ldapID)
+	if err != nil {
+		log.Fatalf("Error fetching updated configuration: %v", err)
+	}
+
+	// Pretty print the updated configuration
+	updatedJSON, err := json.MarshalIndent(updatedConfig, "", "    ")
+	if err != nil {
+		log.Fatalf("Error marshaling updated configuration data: %v", err)
+	}
+
+	fmt.Printf("\nFull Updated Configuration:\n%s\n", string(updatedJSON))
+}

sdk/jamfpro/jamfproapi_cloud_ldap.go

@@ -5,14 +5,21 @@
 
 package jamfpro
 
-import "fmt"
+import (
+	"fmt"
+)
 
 // TODO - Figure out if we need this.
 
 const uriCloudLdaps = "/api/v2/cloud-ldaps"
 
 // Responses
 
+type ResponseCloudIdentityProviderLdapCreated struct {
+	ID   string `json:"id"`
+	Href string `json:"href"`
+}
+
 type ResponseCloudIdentityProviderDefaultMappings struct {
 	CloudIdentityProviderDefaultMappingsSubsetUserMappings       CloudIdentityProviderDefaultMappingsSubsetUserMappings       `json:"userMappings"`
 	CloudIdentityProviderDefaultMappingsSubsetGroupMappings      CloudIdentityProviderDefaultMappingsSubsetGroupMappings      `json:"groupMappings"`
@@ -50,7 +57,7 @@ type CloudIdentityProviderDefaultMappingsSubsetGroupMappings struct {
 }
 
 type CloudIdentityProviderDefaultMappingsSubsetMembershipMappings struct {
-	GroupMembershipMapping string `json:"memberOf"`
+	GroupMembershipMapping string `json:"groupMembershipMapping"`
 }
 
 type ResourceCloudLdap struct {
@@ -60,6 +67,7 @@ type ResourceCloudLdap struct {
 }
 
 type CloudIdPCommon struct {
+	ID           string `json:"id,omitempty"`
 	ProviderName string `json:"providerName"` // GOOGLE or AZURE
 	DisplayName  string `json:"displayName"`
 }
@@ -78,9 +86,12 @@ type CloudLdapServer struct {
 }
 
 type CloudLdapKeystore struct {
-	Password  string `json:"password"`
-	FileBytes string `json:"fileBytes"`
-	FileName  string `json:"fileName"`
+	Type           string `json:"type,omitempty"`
+	ExpirationDate string `json:"expirationDate,omitempty"`
+	Subject        string `json:"subject,omitempty"`
+	FileName       string `json:"fileName,omitempty"`
+	Password       string `json:"password,omitempty"`
+	FileBytes      string `json:"fileBytes,omitempty"`
 }
 
 type CloudLdapMappings struct {
@@ -109,12 +120,11 @@ func (c *Client) GetDefaultCloudIdentityProviderDefaultMappings(providerName str
 }
 
 // CreateCloudIdentityProviderLdap creates a new Cloud Identity Provider configuration
-func (c *Client) CreateCloudIdentityProviderLdap(config *ResourceCloudLdap) (*ResponseCloudIdentityProviderDefaultMappings, error) {
+func (c *Client) CreateCloudIdentityProviderLdap(config *ResourceCloudLdap) (*ResponseCloudIdentityProviderLdapCreated, error) {
 	endpoint := uriCloudLdaps
 
-	// Send the request
-	var out ResponseCloudIdentityProviderDefaultMappings
-	resp, err := c.HTTP.DoRequest("POST", endpoint, config, &out)
+	var response ResponseCloudIdentityProviderLdapCreated
+	resp, err := c.HTTP.DoRequest("POST", endpoint, config, &response)
 	if err != nil {
 		return nil, fmt.Errorf(errMsgFailedCreate, "cloud identity provider", err)
 	}
@@ -123,5 +133,55 @@ func (c *Client) CreateCloudIdentityProviderLdap(config *ResourceCloudLdap) (*Re
 		defer resp.Body.Close()
 	}
 
+	return &response, nil
+}
+
+// GetCloudIdentityProviderLdapByID retrieves a specific Cloud Identity Provider LDAP configuration by ID
+func (c *Client) GetCloudIdentityProviderLdapByID(id string) (*ResourceCloudLdap, error) {
+	endpoint := fmt.Sprintf("%s/%s", uriCloudLdaps, id)
+
+	var out ResourceCloudLdap
+	resp, err := c.HTTP.DoRequest("GET", endpoint, nil, &out)
+	if err != nil {
+		return nil, fmt.Errorf(errMsgFailedGet, "cloud identity provider LDAP", err)
+	}
+
+	if resp != nil && resp.Body != nil {
+		defer resp.Body.Close()
+	}
+
 	return &out, nil
 }
+
+// UpdateCloudIdentityProviderLdap updates an existing Cloud Identity Provider LDAP configuration
+func (c *Client) UpdateCloudIdentityProviderLdap(id string, config *ResourceCloudLdap) (*ResourceCloudLdap, error) {
+	endpoint := fmt.Sprintf("%s/%s", uriCloudLdaps, id)
+
+	var out ResourceCloudLdap
+	resp, err := c.HTTP.DoRequest("PUT", endpoint, config, &out)
+	if err != nil {
+		return nil, fmt.Errorf(errMsgFailedUpdate, "cloud identity provider LDAP", err)
+	}
+
+	if resp != nil && resp.Body != nil {
+		defer resp.Body.Close()
+	}
+
+	return &out, nil
+}
+
+// DeleteCloudIdentityProviderLdapByID deletes a Cloud Identity Provider LDAP configuration by ID
+func (c *Client) DeleteCloudIdentityProviderLdapByID(id string) error {
+	endpoint := fmt.Sprintf("%s/%s", uriCloudLdaps, id)
+
+	resp, err := c.HTTP.DoRequest("DELETE", endpoint, nil, nil)
+	if err != nil {
+		return fmt.Errorf(errMsgFailedDelete, "cloud identity provider LDAP", err)
+	}
+
+	if resp != nil && resp.Body != nil {
+		defer resp.Body.Close()
+	}
+
+	return nil
+}