Fix config loader to correctly extract host name

Author: cbullinger

usage-examples/go/atlas-sdk-go/CHANGELOG.md

@@ -5,7 +5,7 @@ Notable changes to the project.
 ## v1.1 (2025-06-17)
 ### Added
 - Example scripts for fetching cross-organization billing information.
- 
+
 ## v1.0 (2025-05-29)
 ### Added
 - Initial project structure with example scripts for fetching logs and metrics.

usage-examples/go/atlas-sdk-go/INTERNAL_README.md

@@ -8,6 +8,15 @@ SDK for Go. Code examples are used in the Atlas Architecture Center docs, and
 a sanitized copy of the project is available in a user-facing "artifact repo": 
 https://github.com/mongodb/atlas-architecture-go-sdk.
 
+## Terms
+
+Artifact Repo
+The user-facing GitHub repo that contains the sanitized version of this project (i.e. stripped of any internal comments, markup, test files, etc.).
+Files are copied
+
+
+
+
 ## Project Structure
 ```text
 .

usage-examples/go/atlas-sdk-go/examples/monitoring/logs/main.go

@@ -42,13 +42,16 @@ func main() {
 		HostName: cfg.HostName,
 		LogName:  "mongodb",
 	}
+	fmt.Printf("Request parameters: GroupID=%s, HostName=%s, LogName=%s\n",
+		cfg.ProjectID, cfg.HostName, p.LogName)
 	rc, err := logs.FetchHostLogs(ctx, client.MonitoringAndLogsApi, p)
 	if err != nil {
 		errors.ExitWithError("Failed to fetch logs", err)
 	}
 	defer fileutils.SafeClose(rc)
 
 	// Prepare output paths
+	// If the ATLAS_DOWNLOADS_DIR env variable is set, it will be used as the base directory for output files
 	outDir := "logs"
 	prefix := fmt.Sprintf("%s_%s", p.HostName, p.LogName)
 	gzPath, err := fileutils.GenerateOutputPath(outDir, prefix, "gz")

usage-examples/go/atlas-sdk-go/internal/billing/collector.go

@@ -37,7 +37,7 @@ type ProjectInfo struct {
 
 // CollectLineItemBillingData retrieves all pending invoices for the specified organization,
 // transforms them into detailed billing records, and filters out items processed before lastProcessedDate.
-// Returns a slice of billing Details or an error if no valid invoices or line items are found.
+// Returns a slice of billing Details if pending invoices exists or an error if the operation fails.
 func CollectLineItemBillingData(ctx context.Context, sdk admin.InvoicesApi, orgSdk admin.OrganizationsApi, orgID string, lastProcessedDate *time.Time) ([]Detail, error) {
 	req := sdk.ListPendingInvoices(ctx, orgID)
 	r, _, err := req.Execute()
@@ -46,11 +46,9 @@ func CollectLineItemBillingData(ctx context.Context, sdk admin.InvoicesApi, orgS
 		return nil, errors.FormatError("list pending invoices", orgID, err)
 	}
 	if r == nil || !r.HasResults() || len(r.GetResults()) == 0 {
-		return nil, &errors.NotFoundError{Resource: "pending invoices", ID: orgID}
+		return nil, nil
 	}
 
-	fmt.Printf("Found %d pending invoice(s)\n", len(r.GetResults()))
-
 	// Get organization name
 	orgName, err := getOrganizationName(ctx, orgSdk, orgID)
 	if err != nil {
@@ -112,7 +110,7 @@ func processInvoices(invoices []admin.BillingInvoice, orgID, orgName string, las
 	return billingDetails, nil
 }
 
-// getOrganizationName fetches organization name from API or returns orgID if not found
+// getOrganizationName fetches an organization's name for the given organization ID.
 func getOrganizationName(ctx context.Context, sdk admin.OrganizationsApi, orgID string) (string, error) {
 	req := sdk.GetOrganization(ctx, orgID)
 	org, _, err := req.Execute()

usage-examples/go/atlas-sdk-go/internal/config/loadconfig.go

@@ -3,6 +3,7 @@ package config
 import (
 	"encoding/json"
 	"os"
+	"strings"
 
 	"atlas-sdk-go/internal/errors"
 )
@@ -37,11 +38,26 @@ func LoadConfig(path string) (*Config, error) {
 		return nil, errors.WithContext(err, "parsing configuration file")
 	}
 
+	if config.OrgID == "" {
+		return nil, &errors.ValidationError{
+			Message: "organization ID is required in configuration",
+		}
+	}
 	if config.ProjectID == "" {
 		return nil, &errors.ValidationError{
 			Message: "project ID is required in configuration",
 		}
 	}
 
+	if config.HostName == "" {
+		if host, _, ok := strings.Cut(config.ProcessID, ":"); ok {
+			config.HostName = host
+		} else {
+			return nil, &errors.ValidationError{
+				Message: "process ID must be in the format 'hostname:port'",
+			}
+		}
+	}
+
 	return &config, nil
 }

usage-examples/go/atlas-sdk-go/internal/fileutils/io.go

@@ -52,8 +52,18 @@ func SafeCopy(dst io.Writer, src io.Reader) error {
 // :remove-start:
 
 // SafeDelete removes files generated in the specified directory
-// NOTE: INTERNAL ONLY FUNCTION; remove this and "path/filepath" import from Bluehawked files
+// NOTE: INTERNAL ONLY FUNCTION; before running `bluehawk.sh`, ensure this this and "path/filepath" import are marked for removal
 func SafeDelete(dir string) error {
+	// Check for global downloads directory
+	defaultDir := os.Getenv("ATLAS_DOWNLOADS_DIR")
+	if defaultDir != "" {
+		dir = filepath.Join(defaultDir, dir)
+	}
+	// Check if directory exists before attempting to walk it
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
+		return errors.WithContext(err, "directory does not exist")
+	}
+
 	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return errors.WithContext(err, "walking directory")