Skip to content

Commit 5fc21e1

Browse files
tronghnmortenlj
andcommitted
database: skip granting superfluous role
Co-authored-by: Morten Lied Johansen <[email protected]>
1 parent f2d2de0 commit 5fc21e1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

internal/pkg/database/database.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ import (
55
"database/sql"
66
"errors"
77
"fmt"
8+
"log/slog"
9+
"net/http"
10+
"strconv"
11+
"time"
12+
813
"github.com/nais/cloudsql-migrator/internal/pkg/common_main"
914
"github.com/nais/cloudsql-migrator/internal/pkg/config"
1015
"github.com/nais/cloudsql-migrator/internal/pkg/instance"
@@ -14,10 +19,6 @@ import (
1419
"google.golang.org/api/sqladmin/v1"
1520
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1621
"k8s.io/apimachinery/pkg/util/rand"
17-
"log/slog"
18-
"net/http"
19-
"strconv"
20-
"time"
2122
)
2223

2324
func PrepareSourceDatabase(ctx context.Context, cfg *config.Config, source *resolved.Instance, databaseName string, gcpProject *resolved.GcpProject, mgr *common_main.Manager) error {
@@ -264,8 +265,7 @@ func ChangeOwnership(ctx context.Context, mgr *common_main.Manager, target *reso
264265

265266
logger.Info("reassigning ownership from cloudsqlexternalsync to app user", "database", databaseName, "user", target.AppUsername)
266267

267-
_, err = dbConn.ExecContext(ctx, "GRANT cloudsqlexternalsync to cloudsqlsuperuser;"+
268-
"REASSIGN OWNED BY cloudsqlexternalsync to cloudsqlsuperuser;")
268+
_, err = dbConn.ExecContext(ctx, "REASSIGN OWNED BY cloudsqlexternalsync to cloudsqlsuperuser;")
269269
if err != nil {
270270
return err
271271
}

0 commit comments

Comments
 (0)