From ef28b1a4af10a9f8ae7baa7a999a80f6ebc11c02 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 22 Jul 2021 06:27:33 +0200
Subject: [PATCH] Rename migration functions (6->9)

---
 pkg/provision/migrations_202109_rbac.go      | 6 +++---
 pkg/provision/migrations_202109_rbac_test.go | 4 ++--
 pkg/provision/migrations_202109_roles.go     | 2 +-
 pkg/provision/provision.go                   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/provision/migrations_202109_rbac.go b/pkg/provision/migrations_202109_rbac.go
index 8767dec73..f7640a1cd 100644
--- a/pkg/provision/migrations_202109_rbac.go
+++ b/pkg/provision/migrations_202109_rbac.go
@@ -14,7 +14,7 @@ import (
 )
 
 // MigrateOperations creates system roles
-func migratePre202106RbacRules(ctx context.Context, log *zap.Logger, s store.Storer) error {
+func migratePre202109RbacRules(ctx context.Context, log *zap.Logger, s store.Storer) error {
 	return store.Tx(ctx, s, func(ctx context.Context, s store.Storer) error {
 		rr, _, err := store.SearchRbacRules(ctx, s, rbac.RuleFilter{})
 		if err != nil {
@@ -25,7 +25,7 @@ func migratePre202106RbacRules(ctx context.Context, log *zap.Logger, s store.Sto
 		for _, r := range rr {
 			var (
 				cr     = *r
-				action = migratePre202106RbacRule(r)
+				action = migratePre202109RbacRule(r)
 			)
 
 			if action != 0 {
@@ -50,7 +50,7 @@ func migratePre202106RbacRules(ctx context.Context, log *zap.Logger, s store.Sto
 //  0 - no action
 // -1 - remove
 //  1 - update
-func migratePre202106RbacRule(r *rbac.Rule) (op int) {
+func migratePre202109RbacRule(r *rbac.Rule) (op int) {
 	const (
 		nsSep = "::"
 		nsDef = "corteza"
diff --git a/pkg/provision/migrations_202109_rbac_test.go b/pkg/provision/migrations_202109_rbac_test.go
index 47fad3da4..a0a0601da 100644
--- a/pkg/provision/migrations_202109_rbac_test.go
+++ b/pkg/provision/migrations_202109_rbac_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func Test_migratePre202106RbacRule(t *testing.T) {
+func Test_migratePre202109RbacRule(t *testing.T) {
 	tcc := []struct {
 		wantOp   int
 		rule     *rbac.Rule
@@ -23,7 +23,7 @@ func Test_migratePre202106RbacRule(t *testing.T) {
 	}
 	for _, tc := range tcc {
 		t.Run(tc.rule.String(), func(t *testing.T) {
-			require.Equal(t, tc.wantOp, migratePre202106RbacRule(tc.rule))
+			require.Equal(t, tc.wantOp, migratePre202109RbacRule(tc.rule))
 			if tc.wantRule != nil {
 				require.Equal(t, tc.wantRule.String(), tc.rule.String())
 			}
diff --git a/pkg/provision/migrations_202109_roles.go b/pkg/provision/migrations_202109_roles.go
index 2237b4a13..fd78fcca5 100644
--- a/pkg/provision/migrations_202109_roles.go
+++ b/pkg/provision/migrations_202109_roles.go
@@ -8,7 +8,7 @@ import (
 	"go.uber.org/zap"
 )
 
-func migratePre202106Roles(ctx context.Context, log *zap.Logger, s store.Storer) (err error) {
+func migratePre202109Roles(ctx context.Context, log *zap.Logger, s store.Storer) (err error) {
 	const (
 		obsoleteEveryoneID uint64 = 1
 		obsoleteAdminsID   uint64 = 2
diff --git a/pkg/provision/provision.go b/pkg/provision/provision.go
index 9982fde0e..6a6ac0544 100644
--- a/pkg/provision/provision.go
+++ b/pkg/provision/provision.go
@@ -28,9 +28,9 @@ func Run(ctx context.Context, log *zap.Logger, s store.Storer, provisionOpt opti
 		// Migrations:
 		func() error { return migrateApplications(ctx, s) },
 		func() error { return migrateEmailTemplates(ctx, log.Named("email-templates"), s) },
-		func() error { return migratePre202106Roles(ctx, log.Named("pre-202106-roles"), s) },
-		func() error { return migratePre202106RbacRules(ctx, log.Named("pre-202106-rbac-rules"), s) },
-		func() error { return cleanupPre202109Settings(ctx, log.Named("pre-202106-rbac-rules"), s) },
+		func() error { return migratePre202109Roles(ctx, log.Named("pre-202109-roles"), s) },
+		func() error { return migratePre202109RbacRules(ctx, log.Named("pre-202109-rbac-rules"), s) },
+		func() error { return cleanupPre202109Settings(ctx, log.Named("pre-202109-settings"), s) },
 
 		// Config (full & partial)
 		func() error { return importConfig(ctx, log.Named("config"), s, provisionOpt.Path) },