Merge pull request #186 from deploymenttheory/dev

changed response struct to be dedicated for create and update

examples/computer_prestages/DeleteComputerPrestageByID/DeleteComputerPrestageByID.go

@@ -39,7 +39,7 @@ func main() {
 	}
 
 	// The ID of the computer prestage you want to delete
-	prestageID := "YOUR_PRESTAGE_ID_HERE"
+	prestageID := "1"
 
 	// Call DeleteComputerPrestageByID to delete the prestage
 	err = client.DeleteComputerPrestageByID(prestageID)

examples/computer_prestages/GetComputerPrestageByID/GetComputerPrestageByID.go

@@ -40,7 +40,7 @@ func main() {
 	}
 
 	// ID of the computer prestage you want to retrieve
-	prestageID := "11" // Replace with the actual ID
+	prestageID := "7" // Replace with the actual ID
 
 	// Call the GetComputerPrestageByID function
 	prestage, err := client.GetComputerPrestageByID(prestageID)

examples/printers/CreatePrinters/CreatePrinters.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/xml"
 	"fmt"
 	"log"
 
@@ -61,5 +62,10 @@ func main() {
 		return
 	}
 
-	fmt.Printf("Printer created successfully:\nID: %d\nName: %s\n", createdPrinter.ID, createdPrinter.Name)
+	configXML, err := xml.MarshalIndent(createdPrinter, "", "    ")
+	if err != nil {
+		log.Fatalf("Error marshaling created configuration to XML: %v", err)
+	}
+
+	fmt.Printf("Created Individual Disk Encryption Configuration:\n%s\n", configXML)
 }

examples/printers/DeleteAllPrinters/DeleteAllPrinters.go

@@ -0,0 +1,62 @@
+package main
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/deploymenttheory/go-api-sdk-jamfpro/sdk/http_client" // Import http_client for logging
+	"github.com/deploymenttheory/go-api-sdk-jamfpro/sdk/jamfpro"
+)
+
+func main() {
+	// Define the path to the JSON configuration file
+	configFilePath := "/Users/dafyddwatkins/GitHub/deploymenttheory/go-api-sdk-jamfpro/clientauth.json"
+
+	// Load the client OAuth credentials from the configuration file
+	authConfig, err := jamfpro.LoadClientAuthConfig(configFilePath)
+	if err != nil {
+		log.Fatalf("Failed to load client OAuth configuration: %v", err)
+	}
+
+	// Instantiate the default logger and set the desired log level
+	logger := http_client.NewDefaultLogger()
+	logLevel := http_client.LogLevelDebug // LogLevelNone // LogLevelWarning // LogLevelInfo  // LogLevelDebug
+
+	// Configuration for the jamfpro
+	config := jamfpro.Config{
+		InstanceName:       authConfig.InstanceName,
+		OverrideBaseDomain: authConfig.OverrideBaseDomain,
+		LogLevel:           logLevel,
+		Logger:             logger,
+		ClientID:           authConfig.ClientID,
+		ClientSecret:       authConfig.ClientSecret,
+	}
+
+	client, err := jamfpro.NewClient(config)
+	if err != nil {
+		log.Fatalf("Failed to create Jamf Pro client: %v", err)
+	}
+
+	// Fetch all printers
+	printers, err := client.GetPrinters()
+	if err != nil {
+		log.Fatalf("Error fetching printers: %v", err)
+	}
+
+	fmt.Println("Printers fetched. Starting deletion process:")
+
+	// Iterate over each printer and delete
+	for _, printer := range printers.Printer {
+		fmt.Printf("deleting printer ID: %d, Name: %s\n", printer.ID, printer.Name)
+
+		err = client.DeletePrinterByID(printer.ID)
+		if err != nil {
+			log.Printf("error deleting printer ID %d: %v\n", printer.ID, err)
+			continue // Move to the next printer if there's an error
+		}
+
+		fmt.Printf("printer ID %d deleted successfully.\n", printer.ID)
+	}
+
+	fmt.Println("Printer deletion process completed.")
+}

examples/printers/UpdatePrinterByID/UpdatePrinterByID.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/xml"
 	"fmt"
 	"log"
 
@@ -56,11 +57,27 @@ func main() {
 	}
 
 	id := 1 // Replace with the actual printer ID
-	updatedPrinter, err = client.UpdatePrinterByID(id, updatedPrinter)
+
+	response, err := client.UpdatePrinterByID(id, updatedPrinter)
 	if err != nil {
 		fmt.Println("Error updating printer:", err)
 		return
 	}
 
-	fmt.Println("Printer updated successfully:", updatedPrinter.Name)
+	fmt.Printf("Printer updated successfully, ID: %d\n", response.ID)
+
+	// Fetch the full details of the updated printer
+	updatedPrinterDetails, err := client.GetPrinterByID(response.ID)
+	if err != nil {
+		fmt.Println("Error fetching updated printer details:", err)
+		return
+	}
+
+	// Marshal the updated printer details to XML for display
+	printerXML, err := xml.MarshalIndent(updatedPrinterDetails, "", "    ")
+	if err != nil {
+		log.Fatalf("Error marshaling updated printer to XML: %v", err)
+	}
+
+	fmt.Printf("Updated Printer Details:\n%s\n", printerXML)
 }

examples/printers/UpdatePrinterByName/UpdatePrinterByName.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/xml"
 	"fmt"
 	"log"
 
@@ -56,11 +57,27 @@ func main() {
 	}
 
 	name := "HP 9th Floor" // Replace with the actual printer name
-	updatedPrinter, err = client.UpdatePrinterByName(name, updatedPrinter)
+
+	response, err := client.UpdatePrinterByName(name, updatedPrinter)
 	if err != nil {
 		fmt.Println("Error updating printer:", err)
 		return
 	}
 
-	fmt.Println("Printer updated successfully:", updatedPrinter.Name)
+	fmt.Printf("Printer updated successfully, ID: %d\n", response.ID)
+
+	// Fetch the full details of the updated printer
+	updatedPrinterDetails, err := client.GetPrinterByID(response.ID)
+	if err != nil {
+		fmt.Println("Error fetching updated printer details:", err)
+		return
+	}
+
+	// Marshal the updated printer details to XML for display
+	printerXML, err := xml.MarshalIndent(updatedPrinterDetails, "", "    ")
+	if err != nil {
+		log.Fatalf("Error marshaling updated printer to XML: %v", err)
+	}
+
+	fmt.Printf("Updated Printer Details:\n%s\n", printerXML)
 }

sdk/jamfpro/classicapi_printers.go

@@ -25,6 +25,10 @@ type PrintersListItem struct {
 	Name string `xml:"name"`
 }
 
+type ResponsePrinterCreateAndUpdate struct {
+	ID int `xml:"id"`
+}
+
 // Resource
 
 // ResourcePrinter represents the detailed structure of a single printer.
@@ -99,7 +103,7 @@ func (c *Client) GetPrinterByName(name string) (*ResourcePrinter, error) {
 }
 
 // CreatePrinters creates a new printer on the Jamf Pro server.
-func (c *Client) CreatePrinter(printer *ResourcePrinter) (*ResourcePrinter, error) {
+func (c *Client) CreatePrinter(printer *ResourcePrinter) (*ResponsePrinterCreateAndUpdate, error) {
 	endpoint := fmt.Sprintf("%s/id/0", uriPrinters)
 
 	// Wrap the printer with the desired XML name using an anonymous struct
@@ -110,7 +114,7 @@ func (c *Client) CreatePrinter(printer *ResourcePrinter) (*ResourcePrinter, erro
 		ResourcePrinter: printer,
 	}
 
-	var responsePrinter ResourcePrinter
+	var responsePrinter ResponsePrinterCreateAndUpdate
 	resp, err := c.HTTP.DoRequest("POST", endpoint, &requestBody, &responsePrinter)
 	if err != nil {
 		return nil, fmt.Errorf(errMsgFailedCreate, "printer", err)
@@ -124,7 +128,7 @@ func (c *Client) CreatePrinter(printer *ResourcePrinter) (*ResourcePrinter, erro
 }
 
 // UpdatePrinterByID updates a printer by its ID.
-func (c *Client) UpdatePrinterByID(id int, printer *ResourcePrinter) (*ResourcePrinter, error) {
+func (c *Client) UpdatePrinterByID(id int, printer *ResourcePrinter) (*ResponsePrinterCreateAndUpdate, error) {
 	endpoint := fmt.Sprintf("%s/id/%d", uriPrinters, id)
 
 	// Wrap the printer with the desired XML name using an anonymous struct
@@ -135,7 +139,7 @@ func (c *Client) UpdatePrinterByID(id int, printer *ResourcePrinter) (*ResourceP
 		ResourcePrinter: printer,
 	}
 
-	var responsePrinter ResourcePrinter
+	var responsePrinter ResponsePrinterCreateAndUpdate
 	resp, err := c.HTTP.DoRequest("PUT", endpoint, &requestBody, &responsePrinter)
 	if err != nil {
 		return nil, fmt.Errorf(errMsgFailedUpdateByID, "printer", id, err)
@@ -149,7 +153,7 @@ func (c *Client) UpdatePrinterByID(id int, printer *ResourcePrinter) (*ResourceP
 }
 
 // UpdatePrinterByName updates a printer by its name.
-func (c *Client) UpdatePrinterByName(name string, printer *ResourcePrinter) (*ResourcePrinter, error) {
+func (c *Client) UpdatePrinterByName(name string, printer *ResourcePrinter) (*ResponsePrinterCreateAndUpdate, error) {
 	endpoint := fmt.Sprintf("%s/name/%s", uriPrinters, name)
 
 	// Wrap the printer with the desired XML name using an anonymous struct
@@ -160,7 +164,7 @@ func (c *Client) UpdatePrinterByName(name string, printer *ResourcePrinter) (*Re
 		ResourcePrinter: printer,
 	}
 
-	var responsePrinter ResourcePrinter
+	var responsePrinter ResponsePrinterCreateAndUpdate
 	resp, err := c.HTTP.DoRequest("PUT", endpoint, &requestBody, &responsePrinter)
 	if err != nil {
 		return nil, fmt.Errorf(errMsgFailedUpdateByName, "printer", name, err)