[CR] Use standard db:"-" tag, copy all input to convertRawCommit

treeverse · Oct 28, 2020 · 3ff1f62 · 3ff1f62
1 parent ff6ee88
commit 3ff1f62
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/auth/model/model.go b/auth/model/model.go
@@ -76,7 +76,7 @@ func (s *Statements) Scan(src interface{}) error {
 
 type Credential struct {
 	AccessKeyID                   string    `db:"access_key_id"`
-	AccessSecretKey               string    `db:"not-a-tag-in-our-database" json:"-"`
+	AccessSecretKey               string    `db:"-" json:"-"`
 	AccessSecretKeyEncryptedBytes []byte    `db:"access_secret_key" json:"-"`
 	IssuedDate                    time.Time `db:"issued_date"`
 	UserID                        int       `db:"user_id"`

diff --git a/catalog/cataloger_get_commit.go b/catalog/cataloger_get_commit.go
@@ -31,7 +31,7 @@ func (c *cataloger) GetCommit(ctx context.Context, repository, reference string)
 		if err := tx.GetStruct(&rawCommit, query, branchID, ref.CommitID); err != nil {
 			return nil, err
 		}
-		commit := convertRawCommit(&rawCommit)
+		commit := convertRawCommit(rawCommit)
 		return commit, nil
 	}, c.txOpts(ctx, db.ReadOnly())...)
 	if err != nil {
@@ -40,7 +40,7 @@ func (c *cataloger) GetCommit(ctx context.Context, repository, reference string)
 	return res.(*CommitLog), err
 }
 
-func convertRawCommit(raw *commitLogRaw) *CommitLog {
+func convertRawCommit(raw commitLogRaw) *CommitLog {
 	metadata := raw.Metadata
 	if metadata == nil {
 		metadata = make(Metadata)

diff --git a/catalog/cataloger_list_commits.go b/catalog/cataloger_list_commits.go
@@ -74,8 +74,7 @@ func (c *cataloger) ListCommits(ctx context.Context, repository, branch string,
 func convertRawCommits(rawCommits []commitLogRaw) []*CommitLog {
 	commits := make([]*CommitLog, len(rawCommits))
 	for i, commit := range rawCommits {
-		copy := commit
-		commits[i] = convertRawCommit(&copy)
+		commits[i] = convertRawCommit(commit)
 	}
 	return commits
 }