Upgrade to latest gorm version and generate docs (#57)

Author: krishnamiriyala

build/install_tools.sh

@@ -4,7 +4,7 @@ set -eux
 source $(dirname "$0")/env.sh
 
 GOLNT_VERSION=v1.50.1
-GOMRK_VERSION=v0.4.2-0.20230402163522-cc78abbcb570
+GOMRK_VERSION=v1.1.0
 SHFMT_VERSION=v3.6.0
 TYPOS_VERSION=1.13.6
 

docs/DOCUMENTATION.md

@@ -13,7 +13,7 @@ require (
 	google.golang.org/grpc v1.53.0
 	google.golang.org/protobuf v1.28.1
 	gorm.io/driver/postgres v1.4.7
-	gorm.io/gorm v1.24.5
+	gorm.io/gorm v1.25.2
 )
 
 require (
@@ -30,4 +30,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace gorm.io/gorm => github.com/go-gorm/gorm v1.24.3
+replace gorm.io/gorm => github.com/go-gorm/gorm v1.25.2

go.mod

@@ -6,8 +6,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-gorm/gorm v1.24.3 h1:i7282zLDl02LqeOfKYIWYeDhqBc1VAY+uFeVjOfFqZ4=
-github.com/go-gorm/gorm v1.24.3/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
+github.com/go-gorm/gorm v1.25.2 h1:+kg2OobcNtV45/aVwqQSbynr+PK9GTeOJFdcvpsTVUg=
+github.com/go-gorm/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
@@ -24,7 +24,6 @@ github.com/jackc/pgx/v5 v5.2.0/go.mod h1:Ptn7zmohNsWEsdxRawMzk3gaKma2obW+NWTnKa0
 github.com/jackc/puddle/v2 v2.1.2/go.mod h1:2lpufsF5mRHO6SuZkm0fNYxM6SWHfvyFj62KwNzgels=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

go.sum

@@ -20,10 +20,11 @@ package datastore
 
 import (
 	"encoding/json"
-	"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
 	"hash/fnv"
 	"os"
 	"strconv"
+
+	"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/dbrole"
 )
 
 // Specifications for database user.

pkg/datastore/db_user.go

@@ -705,14 +705,14 @@ func TestProtoStoreMsg_String(t *testing.T) {
 	assert := assert.New(t)
 	p := setupDbContext(t, "TestProtoStoreMsg_String")
 	const id = "some-key"
-	var cpu = &pb.CPU{Brand: "Intel"}
-	var md = protostore.Metadata{Id: id, Revision: 10}
-	var orgId, _ = p.GetAuthorizer().GetOrgFromContext(AmericasPepsiAdminCtx)
+	cpu := &pb.CPU{Brand: "Intel"}
+	md := protostore.Metadata{Id: id, Revision: 10}
+	orgId, _ := p.GetAuthorizer().GetOrgFromContext(AmericasPepsiAdminCtx)
 	pMsg, err := p.MsgToPersist(AmericasPepsiAdminCtx, id, cpu, md)
 	if err != nil {
 		assert.FailNow("Failed to generate ProtoStoreMsg", err)
 	}
-	var isJson = func(str string) bool { return len(str) >= 2 && str[0] == '{' && str[len(str)-1] == '}' }
+	isJson := func(str string) bool { return len(str) >= 2 && str[0] == '{' && str[len(str)-1] == '}' }
 	for _, pMsgStr := range []string{pMsg.String(), fmt.Sprintf("%+v", pMsg)} {
 		assert.True(isJson(pMsgStr), "Expected string version of ProtoStoreMsg to be a JSON string")
 		assert.Contains(pMsgStr, id, "Expected unique ID of ProtoStoreMsg to be printed")

pkg/protostore/protostore_test.go

@@ -20,8 +20,10 @@ package test
 
 import (
 	"encoding/json"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/uuid"
+
 	"github.com/vmware-labs/multi-tenant-persistence-for-saas/pkg/authorizer"
 )