Merge pull request #726 from deploymenttheory/dev-bug-package-upload

feat: removed mandatory package timeout, made it adjustable via funcs

Author: thejoeker12

go.mod

@@ -6,7 +6,7 @@ toolchain go1.23.6
 
 // Deploymenttheory
 require (
-	github.com/deploymenttheory/go-api-http-client v0.4.0
+	github.com/deploymenttheory/go-api-http-client v0.4.1
 	github.com/deploymenttheory/go-api-http-client-integrations v0.0.13
 )
 

go.sum

@@ -42,8 +42,8 @@ github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deploymenttheory/go-api-http-client v0.4.0 h1:YSgt8Gx3LzmSh5Pjt7zJ6ilAuTCmsy9Wzo2V4NajXmw=
-github.com/deploymenttheory/go-api-http-client v0.4.0/go.mod h1:wJIFm4S1jj4io+G3E3pxyhmHQXXiZ5ft0xZxorsWOSo=
+github.com/deploymenttheory/go-api-http-client v0.4.1 h1:NPvlOs2XT/QbF3r1LbKq7Wgzab6dt517hiysihRVjK0=
+github.com/deploymenttheory/go-api-http-client v0.4.1/go.mod h1:wJIFm4S1jj4io+G3E3pxyhmHQXXiZ5ft0xZxorsWOSo=
 github.com/deploymenttheory/go-api-http-client-integrations v0.0.13 h1:zqGfWtdtRpYaCcsje2//Hpha1eSO0vblbSVvRr8ax7k=
 github.com/deploymenttheory/go-api-http-client-integrations v0.0.13/go.mod h1:m9XNzP2pNsw8eg+Bdqjrnmn/QK1vrGsDDboabc//IdQ=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=

sdk/jamfpro/api_client_builders.go

@@ -90,7 +90,7 @@ func BuildClient(config *ConfigContainer) (*Client, error) {
 		MaxRetryAttempts:            config.MaxRetryAttempts,
 		MaxConcurrentRequests:       config.MaxConcurrentRequests,
 		EnableDynamicRateLimiting:   config.EnableDynamicRateLimiting,
-		CustomTimeout:               time.Duration(config.CustomTimeout) * time.Second,
+		Timeout:                     time.Duration(config.CustomTimeout) * time.Second,
 		TokenRefreshBufferPeriod:    time.Duration(config.TokenRefreshBufferPeriod) * time.Second,
 		TotalRetryDuration:          time.Duration(config.TotalRetryDuration) * time.Second,
 		MaxRedirects:                config.MaxRedirects,

sdk/jamfpro/jamfproapi_packages.go

@@ -10,12 +10,10 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"time"
 )
 
 // URI for Packages in the Jamf Pro Classic API
 const uriPackages = "/api/v1/packages"
-const packagesHttpTimeout = 10 * time.Minute
 
 // ResponsePackagesList struct to capture the JSON response for packages list
 type ResponsePackagesList struct {
@@ -276,9 +274,6 @@ func (c *Client) CreatePackage(packageMetadata ResourcePackage) (*ResponsePackag
 func (c *Client) UploadPackage(id string, filePaths []string) (*ResponsePackageCreatedAndUpdated, error) {
 	endpoint := fmt.Sprintf("%s/%s/upload", uriPackages, id)
 
-	c.HTTP.ModifyHttpTimeout(packagesHttpTimeout)
-	defer c.HTTP.ResetTimeout()
-
 	// Create a map for the files to be uploaded
 	files := map[string][]string{
 		"file": filePaths,