Refactor APIHandler interface and LoadAPIHandler function to accept additional parameters

Author: ShocOne

apiintegrations/apihandler/apihandler.go

@@ -11,8 +11,8 @@ import (
 // APIHandler is an interface for encoding, decoding, and implenting contexual api functions for different API implementations.
 // It encapsulates behavior for encoding and decoding requests and responses.
 type APIHandler interface {
-	ConstructAPIResourceEndpoint(instanceName string, endpointPath string, log logger.Logger) string
-	ConstructAPIAuthEndpoint(instanceName string, endpointPath string, log logger.Logger) string
+	ConstructAPIResourceEndpoint(APIResourceEndpointIdentifier string, endpointPath string, log logger.Logger) string
+	ConstructAPIAuthEndpoint(APIAuthEndpointIdentifier string, endpointPath string, log logger.Logger) string
 	MarshalRequest(body interface{}, method string, endpoint string, log logger.Logger) ([]byte, error)
 	MarshalMultipartRequest(fields map[string]string, files map[string]string, log logger.Logger) ([]byte, string, error)
 	GetContentTypeHeader(method string, log logger.Logger) string
@@ -29,23 +29,24 @@ type APIHandler interface {
 	GetAPIRequestHeaders(endpoint string) map[string]string // Provides standard headers required for making API requests.
 }
 
-// LoadAPIHandler returns an APIHandler based on the provided API type.
-// 'apiType' parameter could be "jamf" or "graph" to specify which API handler to load.
-func LoadAPIHandler(apiType string, log logger.Logger) (APIHandler, error) {
+// Modify the function signature to accept instanceName, tenantID, and tenantName.
+func LoadAPIHandler(apiType, instanceName, tenantID, tenantName string, log logger.Logger) (APIHandler, error) {
 	var apiHandler APIHandler
 	switch apiType {
 	case "jamfpro":
 		apiHandler = &jamfpro.JamfAPIHandler{
-			Logger: log,
-			// Initialize with necessary parameters
+			Logger:       log,
+			InstanceName: instanceName, // Assuming you add InstanceName field to JamfAPIHandler
 		}
-		log.Info("API handler loaded successfully", zap.String("APIType", apiType))
+		log.Info("Jamf Pro API handler loaded successfully", zap.String("APIType", apiType), zap.String("InstanceName", instanceName))
 
 	case "msgraph":
 		apiHandler = &msgraph.GraphAPIHandler{
-			// Initialize with necessary parameters
+			Logger:     log,
+			TenantID:   tenantID,   // Assuming you add TenantID field to GraphAPIHandler
+			TenantName: tenantName, // Assuming you add TenantName field to GraphAPIHandler
 		}
-		log.Info("API handler loaded successfully", zap.String("APIType", apiType))
+		log.Info("Microsoft Graph API handler loaded successfully", zap.String("APIType", apiType), zap.String("TenantID", tenantID), zap.String("TenantName", tenantName))
 
 	default:
 		return nil, log.Error("Unsupported API type", zap.String("APIType", apiType))

apiintegrations/msgraph/msgraph_api_url.go

@@ -20,7 +20,7 @@ func (g *GraphAPIHandler) SetBaseDomain() string {
 // ConstructAPIResourceEndpoint constructs the full URL for a graph API resource endpoint path and logs the URL.
 func (g *GraphAPIHandler) ConstructAPIResourceEndpoint(tenantName string, endpointPath string, log logger.Logger) string {
 	urlBaseDomain := g.SetBaseDomain()
-	url := fmt.Sprintf("https://%s%s%s", tenantName, urlBaseDomain, endpointPath)
+	url := fmt.Sprintf("https://%s%s%s", g.TenantName, urlBaseDomain, endpointPath)
 	g.Logger.Debug(fmt.Sprintf("Constructed %s API resource endpoint URL", APIName), zap.String("URL", url))
 	return url
 }
@@ -32,7 +32,7 @@ func (g *GraphAPIHandler) ConstructAPIAuthEndpoint(tenantID string, endpointPath
 	const baseURL = "https://login.microsoftonline.com"
 
 	// Construct the full URL by combining the base URL, tenant ID, and endpoint path.
-	url := fmt.Sprintf("%s/%s%s", baseURL, tenantID, endpointPath)
+	url := fmt.Sprintf("%s/%s%s", baseURL, g.TenantID, endpointPath)
 
 	// Log the constructed URL for debugging purposes.
 	log.Debug("constructed Microsoft Graph API authentication URL", zap.String("URL", url))

httpclient/client.go

@@ -88,7 +88,7 @@ func BuildClient(config ClientConfig) (*Client, error) {
 	log.SetLevel(parsedLogLevel)
 
 	// Use the APIType from the config to determine which API handler to load
-	apiHandler, err := apihandler.LoadAPIHandler(config.Environment.APIType, log)
+	apiHandler, err := apihandler.LoadAPIHandler(config.Environment.APIType, config.Environment.InstanceName, config.Environment.TenantID, config.Environment.TenantName, log)
 	if err != nil {
 		log.Error("Failed to load API handler", zap.String("APIType", config.Environment.APIType), zap.Error(err))
 		return nil, err