refactor: improve object conversion

Author: thde

get/database.go

@@ -22,7 +22,7 @@ type databaseCmd struct {
 func (cmd *databaseCmd) run(ctx context.Context, client *api.Client, get *Cmd,
 	databaseResources resource.ManagedList, databaseKind string,
 	connectionStringHandler func(context.Context, *api.Client, resource.Managed) error,
-	databasesHandler func([]resource.Managed, *Cmd, bool) error,
+	databasesHandler func(resource.ManagedList, *Cmd, bool) error,
 	caCertHandler func(resource.Managed) (string, error),
 ) error {
 	if cmd.out == nil {
@@ -61,9 +61,9 @@ func (cmd *databaseCmd) run(ctx context.Context, client *api.Client, get *Cmd,
 
 	switch get.Format {
 	case full:
-		return databasesHandler(databaseResources.GetItems(), get, true)
+		return databasesHandler(databaseResources, get, true)
 	case noHeader:
-		return databasesHandler(databaseResources.GetItems(), get, false)
+		return databasesHandler(databaseResources, get, false)
 	case yamlOut:
 		return format.PrettyPrintObjects(databaseResources.GetItems(), format.PrintOpts{Out: get.writer})
 	case jsonOut:

get/mysql.go

@@ -40,17 +40,17 @@ func (cmd *mySQLCmd) print(ctx context.Context, client *api.Client, list client.
 	)
 }
 
-func (cmd *mySQLCmd) printMySQLInstances(resources []resource.Managed, get *Cmd, header bool) error {
+func (cmd *mySQLCmd) printMySQLInstances(resources resource.ManagedList, get *Cmd, header bool) error {
+	dbs, ok := resources.(*storage.MySQLList)
+	if !ok {
+		return fmt.Errorf("expected %T, got %T", &storage.MySQLList{}, dbs)
+	}
+
 	if header {
 		get.writeHeader("NAME", "FQDN", "LOCATION", "MACHINE TYPE")
 	}
 
-	for _, mg := range resources {
-		db, ok := mg.(*storage.MySQL)
-		if !ok {
-			return fmt.Errorf("expected mysql, got %T", mg)
-		}
-
+	for _, db := range dbs.Items {
 		get.writeTabRow(db.Namespace, db.Name, db.Status.AtProvider.FQDN, string(db.Spec.ForProvider.Location), db.Spec.ForProvider.MachineType.String())
 	}
 

get/mysqldatabase.go

@@ -43,26 +43,18 @@ func (cmd *mysqlDatabaseCmd) print(ctx context.Context, client *api.Client, list
 	)
 }
 
-func (cmd *mysqlDatabaseCmd) printMySQLDatabases(databases []resource.Managed, get *Cmd, header bool) error {
+func (cmd *mysqlDatabaseCmd) printMySQLDatabases(resources resource.ManagedList, get *Cmd, header bool) error {
+	dbs, ok := resources.(*storage.MySQLDatabaseList)
+	if !ok {
+		return fmt.Errorf("expected %T, got %T", &storage.MySQLDatabaseList{}, dbs)
+	}
+
 	if header {
 		get.writeHeader("NAME", "FQDN", "LOCATION", "COLLATION", "SIZE", "CONNECTIONS")
 	}
 
-	for _, mg := range databases {
-		db, ok := mg.(*storage.MySQLDatabase)
-		if !ok {
-			return fmt.Errorf("expected %T, got %T", &storage.MySQLDatabase{}, mg)
-		}
-
-		get.writeTabRow(
-			db.Namespace,
-			db.Name,
-			db.Status.AtProvider.FQDN,
-			string(db.Spec.ForProvider.Location),
-			db.Spec.ForProvider.CharacterSet.Collation,
-			db.Status.AtProvider.Size.String(),
-			strconv.FormatUint(uint64(db.Status.AtProvider.Connections), 10),
-		)
+	for _, db := range dbs.Items {
+		get.writeTabRow(db.Namespace, db.Name, db.Status.AtProvider.FQDN, string(db.Spec.ForProvider.Location), db.Spec.ForProvider.CharacterSet.Collation, db.Status.AtProvider.Size.String(), strconv.FormatUint(uint64(db.Status.AtProvider.Connections), 10))
 	}
 
 	return get.tabWriter.Flush()

get/postgres.go

@@ -40,17 +40,17 @@ func (cmd *postgresCmd) print(ctx context.Context, client *api.Client, list clie
 	)
 }
 
-func (cmd *postgresCmd) printPostgresInstances(resources []resource.Managed, get *Cmd, header bool) error {
+func (cmd *postgresCmd) printPostgresInstances(resources resource.ManagedList, get *Cmd, header bool) error {
+	dbs, ok := resources.(*storage.PostgresList)
+	if !ok {
+		return fmt.Errorf("expected %T, got %T", &storage.PostgresList{}, dbs)
+	}
+
 	if header {
 		get.writeHeader("NAME", "FQDN", "LOCATION", "MACHINE TYPE")
 	}
 
-	for _, mg := range resources {
-		db, ok := mg.(*storage.Postgres)
-		if !ok {
-			return fmt.Errorf("expected %T, got %T", &storage.Postgres{}, mg)
-		}
-
+	for _, db := range dbs.Items {
 		get.writeTabRow(db.Namespace, db.Name, db.Status.AtProvider.FQDN, string(db.Spec.ForProvider.Location), db.Spec.ForProvider.MachineType.String())
 	}
 

get/postgresdatabase.go

@@ -42,25 +42,18 @@ func (cmd *postgresDatabaseCmd) print(ctx context.Context, client *api.Client, l
 	)
 }
 
-func (cmd *postgresDatabaseCmd) printPostgresDatabases(resources []resource.Managed, get *Cmd, header bool) error {
+func (cmd *postgresDatabaseCmd) printPostgresDatabases(resources resource.ManagedList, get *Cmd, header bool) error {
+	dbs, ok := resources.(*storage.PostgresDatabaseList)
+	if !ok {
+		return fmt.Errorf("expected %T, got %T", &storage.PostgresDatabaseList{}, dbs)
+	}
+
 	if header {
 		get.writeHeader("NAME", "FQDN", "LOCATION", "SIZE", "CONNECTIONS")
 	}
 
-	for _, mg := range resources {
-		db, ok := mg.(*storage.PostgresDatabase)
-		if !ok {
-			return fmt.Errorf("expected %T, got %T", &storage.PostgresDatabase{}, mg)
-		}
-
-		get.writeTabRow(
-			db.Namespace,
-			db.Name,
-			db.Status.AtProvider.FQDN,
-			string(db.Spec.ForProvider.Location),
-			db.Status.AtProvider.Size.String(),
-			strconv.FormatUint(uint64(db.Status.AtProvider.Connections), 10),
-		)
+	for _, db := range dbs.Items {
+		get.writeTabRow(db.Namespace, db.Name, db.Status.AtProvider.FQDN, string(db.Spec.ForProvider.Location), db.Status.AtProvider.Size.String(), strconv.FormatUint(uint64(db.Status.AtProvider.Connections), 10))
 	}
 
 	return get.tabWriter.Flush()