removes row restriction for boostrap load (#25)

Fixes #24

Author: RobertKielty

cmd/bootstrap/main.go

@@ -18,14 +18,12 @@ const (
 	apiTokenEnvVar             = "FOSSA_API_TOKEN"
 	spreadsheetEnvVar          = "MD_WORKSHEET"
 	googleWorkspaceCredentials = "WORKSPACE_CREDENTIALS_FILE"
-	defaultReadRange           = "Active!A1:J2100"
 	defaultDBPath              = "maintainers.db"
 	defaultMaxBackups          = 5
 	backupFileExt              = ".bak"
 )
 
 func main() {
-	var readRange string
 	var dbPath string
 	var seed bool
 	var doBackup bool
@@ -64,15 +62,14 @@ func main() {
 					pruneOldBackups(dbPath, maxBackups)
 				}
 			}
-			_, err := db.BootstrapSQLite(dbPath, spreadsheetID, readRange, credentialsPath, fossaToken, seed)
+			_, err := db.BootstrapSQLite(dbPath, spreadsheetID, credentialsPath, fossaToken, seed)
 			if err != nil {
 				log.Fatalf("bootstrap failed: %v", err)
 			}
 
 		},
 	}
 
-	rootCmd.Flags().StringVar(&readRange, "range", defaultReadRange, "Google Sheet read range")
 	rootCmd.Flags().StringVar(&dbPath, "db", defaultDBPath, "Path to SQLite database file")
 	rootCmd.Flags().BoolVar(&seed, "seed", true, "Whether to load seed data into the database")
 	rootCmd.Flags().BoolVar(&doBackup, "backup", true, "Whether to create a backup of the database if it exists")

db/bootstrap.go

@@ -32,7 +32,7 @@ const (
 	MailingListAddrHdr   string = "Mailing List Address"
 )
 
-func BootstrapSQLite(dbPath, spreadsheetID, readRange, worksheetCredentialsPath, fossaToken string, seed bool) (*gorm.DB, error) {
+func BootstrapSQLite(dbPath, spreadsheetID, worksheetCredentialsPath, fossaToken string, seed bool) (*gorm.DB, error) {
 	newLogger := logger.New(
 		log.New(os.Stdout, "\r\n", log.LstdFlags), // io writer
 		logger.Config{
@@ -87,7 +87,7 @@ func BootstrapSQLite(dbPath, spreadsheetID, readRange, worksheetCredentialsPath,
 		return nil, err
 	}
 
-	if err := loadMaintainersAndProjects(db, spreadsheetID, readRange, worksheetCredentialsPath); err != nil {
+	if err := loadMaintainersAndProjects(db, spreadsheetID, worksheetCredentialsPath); err != nil {
 		return nil, fmt.Errorf("bootstrap: failed to load maintainers and projects: %w", err)
 	}
 
@@ -102,7 +102,7 @@ func BootstrapSQLite(dbPath, spreadsheetID, readRange, worksheetCredentialsPath,
 
 // Reads the readRange data from spreadsheetID inserts it into db
 // The readRange from the worksheet MUST include the header row
-func loadMaintainersAndProjects(db *gorm.DB, spreadsheetID, readRange, credentialsPath string) error {
+func loadMaintainersAndProjects(db *gorm.DB, spreadsheetID, credentialsPath string) error {
 	ctx := context.Background()
 
 	srv, err := sheets.NewService(
@@ -115,7 +115,7 @@ func loadMaintainersAndProjects(db *gorm.DB, spreadsheetID, readRange, credentia
 		log.Fatalf("maintainerd: backend: loadMaintainersAndProjects: unable to retrieve Sheets client: %v", err)
 	}
 
-	rows, err := readSheetRows(ctx, srv, spreadsheetID, readRange)
+	rows, err := readSheetRows(ctx, srv, spreadsheetID)
 
 	if err != nil {
 		log.Fatalf("maintainerd-backend: loadMaintainersAndProjects - readSheetRows: %v", err)
@@ -211,16 +211,18 @@ func loadMaintainersAndProjects(db *gorm.DB, spreadsheetID, readRange, credentia
 
 // readSheetRows returns every row as a map keyed by the header row and carries forward the last non‐empty Project and
 // Status values when those cells are blank or missing.
-func readSheetRows(ctx context.Context, srv *sheets.Service, spreadsheetID, readRange string) ([]map[string]string, error) {
+// The readRange must include the header row.
+// The
+func readSheetRows(ctx context.Context, srv *sheets.Service, spreadsheetID string) ([]map[string]string, error) {
 	resp, err := srv.Spreadsheets.Values.
-		Get(spreadsheetID, readRange).
+		Get(spreadsheetID, "Active!A:J").
 		Context(ctx).
 		Do()
 	if err != nil {
-		return nil, fmt.Errorf("db: Using %s:%s unable to retrieve worksheet data: %w", spreadsheetID, readRange, err)
+		return nil, fmt.Errorf("db: Using %s unable to retrieve worksheet data: %w", spreadsheetID, err)
 	}
 	if len(resp.Values) == 0 {
-		return nil, fmt.Errorf("db: %s:%s worksheet is empty", spreadsheetID, readRange)
+		return nil, fmt.Errorf("db: %s worksheet is empty", spreadsheetID)
 	}
 
 	// First row → headers
@@ -540,7 +542,7 @@ func FirstOrCreateServiceUser(db *gorm.DB, user fossa.User) (*model.ServiceUser,
 		ServiceEmail:      user.Email,
 	}
 
-	// find a service user with fields in lookup, and if not found, create it with these values"
+	// find a service user with fields in lookup, and if not found, create it with these values
 	if err := db.Where(&lookup).Attrs(&create).FirstOrCreate(&su).Error; err != nil {
 		return nil, fmt.Errorf("loadFossa FirstOrCreateServiceUser failed for %v, err : %w", lookup, err)
 	}

go.mod

@@ -1,6 +1,8 @@
 module maintainerd
 
-go 1.24
+go 1.24.0
+
+toolchain go1.24.6
 
 require (
 	github.com/google/go-github/v55 v55.0.0
@@ -12,6 +14,7 @@ require (
 	google.golang.org/api v0.238.0
 	gorm.io/driver/sqlite v1.6.0
 	gorm.io/gorm v1.30.0
+	k8s.io/apimachinery v0.34.1
 )
 
 require (
@@ -23,9 +26,11 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -34,7 +39,10 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mattn/go-sqlite3 v1.14.22 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sagikazarmark/locafero v0.7.0 // indirect
@@ -43,12 +51,14 @@ require (
 	github.com/spf13/cast v1.7.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
 	go.opentelemetry.io/otel v1.36.0 // indirect
 	go.opentelemetry.io/otel/metric v1.36.0 // indirect
 	go.opentelemetry.io/otel/trace v1.36.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	golang.org/x/crypto v0.39.0 // indirect
 	golang.org/x/net v0.41.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
@@ -57,4 +67,7 @@ require (
 	google.golang.org/grpc v1.73.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 )