From 370cd82485b0ded163d21579cd2b74f33df658df Mon Sep 17 00:00:00 2001 From: Christian Kniep Date: Sun, 3 Jan 2021 10:02:06 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Bump=20version:=200.1.0=20=E2=86=92=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- cmd/boltdb/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 15e4f87..fdde6aa 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.0 +current_version = 0.2.0 commit = True tag = True diff --git a/cmd/boltdb/main.go b/cmd/boltdb/main.go index 2dc5db3..9094e24 100644 --- a/cmd/boltdb/main.go +++ b/cmd/boltdb/main.go @@ -29,7 +29,7 @@ func Log(handler http.Handler) http.Handler { func main() { flag.Parse() if *version { - fmt.Println(`v0.1.0`) + fmt.Println(`v0.2.0`) os.Exit(0) } port := os.Getenv("PORT") From b5780dbc716791685dc8332107fe0bdbe379e604 Mon Sep 17 00:00:00 2001 From: Christian Kniep Date: Sun, 3 Jan 2021 12:46:06 +0100 Subject: [PATCH 2/2] fixes #19 --- pkg/storage/dynamodb/machinetype_service.go | 19 ++++++++++++------- pkg/storage/dynamodb/service.go | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/pkg/storage/dynamodb/machinetype_service.go b/pkg/storage/dynamodb/machinetype_service.go index ef1fe7c..cfb0d24 100644 --- a/pkg/storage/dynamodb/machinetype_service.go +++ b/pkg/storage/dynamodb/machinetype_service.go @@ -38,9 +38,6 @@ func (s *machineTypeService) GetByUsername(username string) (mt *storage.Machine if err != nil { return } - log.Println("Found item:") - log.Println("Login: ", user.Login) - log.Println("Password: ", user.Password) mt = &storage.MachineType{ Login: user.Login, Password: user.Password, @@ -50,9 +47,6 @@ func (s *machineTypeService) GetByUsername(username string) (mt *storage.Machine if err != nil { return } - log.Println("Found item:") - log.Println("Type: ", typ.Type) - log.Println("Featuresd: ", typ.Features) mt.Features = strings.Split(typ.Features, ",") mt.DisplayName = typ.Type log.Printf("Return MT: %v", mt) @@ -67,8 +61,19 @@ func (s *machineTypeService) Delete(accountName string, id int64) error { return nil } -func (s *machineTypeService) List(accountName string) (mt []storage.MachineType, err error) { +func (s *machineTypeService) List(accountName string) (mts []storage.MachineType, err error) { log.Printf("mt.List(accountName=%s)", accountName) + typeItems, err := mhTableTypeList(svc, fmt.Sprintf("%s_types", mhDbTablePrefix)) + if err != nil { + return + } + for _, tItem := range typeItems { + mt := storage.MachineType{ + DisplayName: tItem.Type, + Features: strings.Split(tItem.Features, ","), + } + mts = append(mts, mt) + } return } diff --git a/pkg/storage/dynamodb/service.go b/pkg/storage/dynamodb/service.go index afd6082..1ae4d50 100644 --- a/pkg/storage/dynamodb/service.go +++ b/pkg/storage/dynamodb/service.go @@ -202,6 +202,20 @@ func mhTableUserScan(db *dynamodb.DynamoDB, tableName, usern string) (user Users return } +func mhTableTypeList(db *dynamodb.DynamoDB, tableName string) (typeItems []TypeItem, err error) { + log.Printf("List machine types in '%s'", tableName) + params := &dynamodb.ScanInput{ + TableName: aws.String(tableName), + } + result, err := svc.Scan(params) + if err != nil { + fmt.Println(err.Error()) + return + } + err = dynamodbattribute.UnmarshalListOfMaps(result.Items, &typeItems) + return +} + func mhTableTypeScan(db *dynamodb.DynamoDB, tableName, typen string) (typeItem TypeItem, err error) { log.Printf("Search for type '%s' in '%s'", typen, tableName) var queryInput = &dynamodb.QueryInput{