Linter

Author: baptmaury

cmd/autocomplete/databases_ng_list.go

@@ -17,7 +17,7 @@ func DatabasesNgListAutoComplete(ctx context.Context) error {
 	databases, err := client.Preview().DatabasesList(ctx)
 	if err == nil {
 		for _, db := range databases {
-			fmt.Println(db.DatabaseInfo.ID)
+			fmt.Println(db.ID)
 		}
 	}
 

dbng/create.go

@@ -46,7 +46,7 @@ func Create(ctx context.Context, params scalingo.DatabaseCreateParams, wait bool
 		spinner.Start()
 		defer spinner.Stop()
 
-		err = waitForRunningDatabase(ctx, c, db.DatabaseInfo.ID)
+		err = waitForRunningDatabase(ctx, c, db.ID)
 		if err != nil {
 			return errors.Wrap(ctx, err, "wait for running database")
 		}

dbng/destroy.go

@@ -20,7 +20,7 @@ func Destroy(ctx context.Context, appID string) error {
 		return errors.Wrap(ctx, err, "delete database")
 	}
 
-	io.Warningf("You're going to delete database %s ('%s'),\n", db.DatabaseInfo.ID, db.DatabaseInfo.Name)
+	io.Warningf("You're going to delete database %s ('%s'),\n", db.ID, db.Name)
 	io.Warning()
 	io.Warning("This operation is irreversible, all data including backups of your database will be deleted.")
 
@@ -32,7 +32,7 @@ func Destroy(ctx context.Context, appID string) error {
 	}
 	fmt.Println()
 
-	if validationID != db.DatabaseInfo.ID && validationID != db.DatabaseInfo.Name {
+	if validationID != db.ID && validationID != db.Name {
 		return errors.Newf(ctx, "'%s' is not the ID or the name of the database, aborting…\n", validationID)
 	}
 
@@ -41,7 +41,7 @@ func Destroy(ctx context.Context, appID string) error {
 		return errors.Wrap(ctx, err, "delete database")
 	}
 
-	io.Statusf("The database %s has been deleted.", db.DatabaseInfo.ID)
+	io.Statusf("The database %s has been deleted.", db.ID)
 
 	return nil
 }

dbng/info.go

@@ -35,10 +35,10 @@ func Info(ctx context.Context, appID string) error {
 	}
 
 	data := [][]string{
-		{"ID", db.DatabaseInfo.ID},
-		{"Name", db.DatabaseInfo.Name},
-		{"Type", db.DatabaseInfo.Technology},
-		{"Plan", db.DatabaseInfo.Plan},
+		{"ID", db.ID},
+		{"Name", db.Name},
+		{"Type", db.Technology},
+		{"Plan", db.Plan},
 		{"Status", string(db.Database.Status)},
 		{"Version", db.Database.ReadableVersion},
 		{"Force TLS  ", forceSSL},

dbng/list.go

@@ -37,10 +37,10 @@ func List(ctx context.Context) error {
 		role := utils.AppRole(currentUser, &db.App)
 
 		_ = t.Append([]string{
-			db.DatabaseInfo.ID,
-			db.DatabaseInfo.Name,
-			db.DatabaseInfo.Technology,
-			db.DatabaseInfo.Plan,
+			db.ID,
+			db.Name,
+			db.Technology,
+			db.Plan,
 			string(role),
 			string(db.Database.Status),
 			db.App.Project.Name,

utils/consent.go

@@ -84,7 +84,7 @@ func CheckForConsent(ctx context.Context, resourceName string, consentTypes ...C
 	}
 
 	for _, db := range dbs {
-		if db.DatabaseInfo.Name == resourceName || db.DatabaseInfo.ID == resourceName {
+		if db.Name == resourceName || db.ID == resourceName {
 			// The operator is a collaborator, no consent needed
 			return
 		}