Refactor authentication examples to use client configuration file and environment variables

Author: ShocOne

examples/_templates/authentication/example_client_setup_with_configfile.go

@@ -1,3 +1,4 @@
+// This example demonstrates how to initialize the Jamf Pro client using the client configuration file.
 package main
 
 import (

examples/_templates/authentication/example_client_setup_with_env_vars.go

@@ -1,3 +1,4 @@
+// This example demonstrates how to initialize the Jamf Pro client using configurations loaded from environment variables.
 package main
 
 import (
@@ -11,25 +12,30 @@ import (
 Ensure environment variables are set before running in this mode.
 You will need to set the following environment variables:
 
+export LOG_LEVEL="warning"
+export HIDE_SENSITIVE_DATA="true"
+export INSTANCE_DOMAIN="your-instance-domain"
+export AUTH_METHOD="oauth2"
 export CLIENT_ID="your-client-id"
 export CLIENT_SECRET="your-client-secret"
-export INSTANCE_NAME="your-instance-name"
-export OVERRIDE_BASE_DOMAIN=""
-export API_TYPE="jamfpro"
-export LOG_LEVEL="LogLevelDebug"
-export LOG_OUTPUT_FORMAT="console"
-export LOG_CONSOLE_SEPARATOR=" "
-export HIDE_SENSITIVE_DATA="true"
+export BASIC_AUTH_USERNAME="your-basic-auth-username"
+export BASIC_AUTH_PASSWORD="your-basic-auth-password"
+export JAMF_LOAD_BALANCER_LOCK="true"
 export MAX_RETRY_ATTEMPTS="3"
-export ENABLE_DYNAMIC_RATE_LIMITING="true"
-export MAX_CONCURRENT_REQUESTS="5"
-export TOKEN_REFRESH_BUFFER_PERIOD="5m"
-export TOTAL_RETRY_DURATION="5m"
-export CUSTOM_TIMEOUT="10s"
+export ENABLE_DYNAMIC_RATE_LIMITING="false"
+export MAX_CONCURRENT_REQUESTS="1"
+export TOKEN_REFRESH_BUFFER_PERIOD_SECONDS="300"
+export TOTAL_RETRY_DURATION_SECONDS="60"
+export CUSTOM_TIMEOUT_SECONDS="60"
+export FOLLOW_REDIRECTS="true"
+export MAX_REDIRECTS="5"
+export ENABLE_CONCURRENCY_MANAGEMENT="true"
+export CUSTOM_COOKIES=""
+export MANDATORY_REQUEST_DELAY_MILLISECONDS="0"
+export RETRY_ELIGIABLE_REQUESTS="true"
 */
 
 func main() {
-
 	// Initialize the Jamf Pro client using configurations loaded from environment variables
 	client, err := jamfpro.BuildClientWithEnv()
 	if err != nil {

examples/_templates/authentication/example_client_setup_with_manual_conf.go

@@ -1,37 +1,40 @@
+// this file is used to demonstrate how to set up the client with a manual configuration
 package main
 
 import (
 	"fmt"
 	"log"
-	"time"
 
-	"github.com/deploymenttheory/go-api-http-client/httpclient"
 	"github.com/deploymenttheory/go-api-sdk-jamfpro/sdk/jamfpro"
 )
 
 func main() {
-	// Manually define the client configuration
-	config := httpclient.ClientConfig{
-		Environment: httpclient.EnvironmentConfig{
-			InstanceName:       "your-instance-name",
-			OverrideBaseDomain: "",        // Only required if you are not on jamfcloud.com
-			APIType:            "jamfpro", // Required to specify the API type
-		},
-		Auth: httpclient.AuthConfig{
-			ClientID:     "your-client-id",
-			ClientSecret: "your-client-secret",
-		},
-		ClientOptions: httpclient.ClientOptions{
-			LogLevel:                  "LogLevelDebug",
-			LogOutputFormat:           "console",
-			HideSensitiveData:         true,
-			MaxRetryAttempts:          5,
-			EnableDynamicRateLimiting: true,
-			MaxConcurrentRequests:     10,
-			TokenRefreshBufferPeriod:  5 * time.Minute,
-			TotalRetryDuration:        60 * time.Second,
-			CustomTimeout:             30 * time.Second,
-		},
+	// Define the configuration based on the new ConfigContainer struct
+	config := &jamfpro.ConfigContainer{
+		LogLevel:          "warning",
+		LogExportPath:     "", // Set this if you want to export logs to a file
+		HideSensitiveData: true,
+
+		InstanceDomain:       "your-instance-domain",
+		AuthMethod:           "oauth2", // Use "basic" for basic authentication
+		ClientID:             "your-client-id",
+		ClientSecret:         "your-client-secret",
+		Username:             "", // Set this if using basic auth
+		Password:             "", // Set this if using basic auth
+		JamfLoadBalancerLock: true,
+
+		CustomCookies:               []jamfpro.CustomCookie{},
+		MaxRetryAttempts:            3,
+		MaxConcurrentRequests:       1,
+		EnableDynamicRateLimiting:   false,
+		CustomTimeout:               60,  // in seconds
+		TokenRefreshBufferPeriod:    300, // in seconds
+		TotalRetryDuration:          60,  // in seconds
+		FollowRedirects:             true,
+		MaxRedirects:                5,
+		EnableConcurrencyManagement: true,
+		MandatoryRequestDelay:       0, // in milliseconds
+		RetryEligiableRequests:      true,
 	}
 
 	// Initialize the Jamf Pro client with the given configuration