Skip to content

Commit

Permalink
store: rename HSS references to fleetdb
Browse files Browse the repository at this point in the history
  • Loading branch information
@joelrebel
joelrebel committed Apr 4, 2024
1 parent 9606566 commit 6b1fc62
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 330 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ The [sandbox README.md](https://github.com/metal-toolbox/sandbox/blob/main/READM
The diagram below depicts the services flasher depends on:
```mermaid
graph TB
a((Flasher))-- 1. Query Asset BMC creds, attributes -->ss[(Serverservice)]
a((Flasher))-- 1. Query Asset BMC creds, attributes -->ss[(FleetDBAPI)]
a((Flasher))-- 2. Query current inventory -->sb(ServerA BMC)
a((Flasher))-- 3. Fetch firmware files -->sa(Firmware file store)
a((Flasher))-- 4. install firmware -->sb(ServerA BMC)
Expand Down
2 changes: 1 addition & 1 deletion cmd/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func initStore(ctx context.Context, config *app.Configuration, logger *logrus.Lo
case strings.HasSuffix(storeKind, ".yml"), strings.HasSuffix(storeKind, ".yaml"):
return store.NewYamlInventory(storeKind)
case storeKind == string(model.InventoryStoreServerservice):
return store.NewServerserviceStore(ctx, config.ServerserviceOptions, logger)
return store.NewServerserviceStore(ctx, config.FleetDBAPIOptions, logger)
}

return nil, errors.Wrap(ErrInventoryStore, "expected a valid inventory store parameter")
Expand Down
6 changes: 3 additions & 3 deletions cmd/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
var cmdVersion = &cobra.Command{
Use: "version",
Short: "Print Flasher version along with dependency information.",
Run: func(cmd *cobra.Command, args []string) {
Run: func(_ *cobra.Command, args []string) {
fmt.Printf(
"commit: %s\nbranch: %s\ngit summary: %s\nbuildDate: %s\nversion: %s\nGo version: %s\nbmclib version: %s\nserverservice version: %s",
version.GitCommit, version.GitBranch, version.GitSummary, version.BuildDate, version.AppVersion, version.GoVersion, version.BmclibVersion, version.ServerserviceVersion)
"commit: %s\nbranch: %s\ngit summary: %s\nbuildDate: %s\nversion: %s\nGo version: %s\nbmclib version: %s\nFleetDB API version: %s",
version.GitCommit, version.GitBranch, version.GitSummary, version.BuildDate, version.AppVersion, version.GoVersion, version.BmclibVersion, version.FleetDBAPIVersion)

},
}
Expand Down
198 changes: 0 additions & 198 deletions docs/serverservice.md
View file

This file was deleted.

13 changes: 4 additions & 9 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,18 @@ require (
github.com/jeremywohl/flatten v1.0.1
github.com/jinzhu/copier v0.4.0
github.com/jpillora/backoff v1.0.0
github.com/metal-toolbox/rivets v1.0.2-0.20240321173737-71ffdb3bf742
github.com/metal-toolbox/fleetdb v0.16.9
github.com/metal-toolbox/rivets v1.0.2
github.com/mitchellh/mapstructure v1.5.0
github.com/nats-io/nats-server/v2 v2.10.11
github.com/nats-io/nats.go v1.33.1
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.19.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
go.hollow.sh/serverservice v0.16.2
go.hollow.sh/toolbox v0.6.2
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
go.uber.org/goleak v1.3.0
go.uber.org/mock v0.4.0
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
golang.org/x/net v0.22.0
Expand Down Expand Up @@ -95,10 +91,9 @@ require (
github.com/lib/pq v1.10.9 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nats-io/jwt/v2 v2.5.5 // indirect
github.com/nats-io/nats.go v1.33.1 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
Expand Down Expand Up @@ -127,6 +122,7 @@ require (
github.com/volatiletech/sqlboiler v3.7.1+incompatible // indirect
github.com/volatiletech/sqlboiler/v4 v4.16.2 // indirect
github.com/volatiletech/strmangle v0.0.6 // indirect
go.hollow.sh/toolbox v0.6.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
Expand All @@ -140,7 +136,6 @@ require (
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.168.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
Expand Down
11 changes: 4 additions & 7 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,10 +555,10 @@ github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4
github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw=
github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/metal-toolbox/rivets v1.0.1-0.20240311140746-9e07088bc9ba h1:/UQOTjbz7UcGHe5CgC/t+8njrDCHFTOGvGRsaF1BMDo=
github.com/metal-toolbox/rivets v1.0.1-0.20240311140746-9e07088bc9ba/go.mod h1:KyxerbVyMrt9sMYulthYvxR+1Ji9kr87RCaWucxahjw=
github.com/metal-toolbox/rivets v1.0.2-0.20240321173737-71ffdb3bf742 h1:HRt0hqcj7U74RtkLkRqErG8lZVVfgQKm6n3tcNUNBEk=
github.com/metal-toolbox/rivets v1.0.2-0.20240321173737-71ffdb3bf742/go.mod h1:EMQJRT1mjIyFRXxvKNaBlz7Z4Sp88rTaGO8W18olN2I=
github.com/metal-toolbox/fleetdb v0.16.9 h1:cU8izN7tTi4dnGisP43MgK2ddtbrJJ4zLLwIS3wRABw=
github.com/metal-toolbox/fleetdb v0.16.9/go.mod h1:L2FavoKCdpewj759/MepRmbInSE0JpuSOMnXJho9u3o=
github.com/metal-toolbox/rivets v1.0.2 h1:cdLXPcGZOw0v8BP2driAMvBTf+PF9Eua2UnUpBFyDrs=
github.com/metal-toolbox/rivets v1.0.2/go.mod h1:EMQJRT1mjIyFRXxvKNaBlz7Z4Sp88rTaGO8W18olN2I=
github.com/microsoft/go-mssqldb v0.17.0/go.mod h1:OkoNGhGEs8EZqchVTtochlXruEhEOaO4S0d2sB5aeGQ=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
Expand Down Expand Up @@ -766,8 +766,6 @@ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dY
go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU=
go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
go.hollow.sh/serverservice v0.16.2 h1:0wt0XJC/rm4OdovB6g8Fsx7BT2X71pG0keJiiLZaY+w=
go.hollow.sh/serverservice v0.16.2/go.mod h1:Zr99vSFO++ZlDjEf9rtPWi3TiMgMswJCW3D6LIFmMDM=
go.hollow.sh/toolbox v0.6.2 h1:g0qKvo7rVgZ05dh7qxbAymPixumCd4MxVbq9gs90/3c=
go.hollow.sh/toolbox v0.6.2/go.mod h1:nl+5RDDyYY/+wukOUzHHX2mOyWKRjlTOXUcGxny+tns=
go.infratographer.com/x v0.3.9 h1:fsfF/w5zHgiNAHvYmvsWlICNha2X53WNLVSKOkyPnWo=
Expand Down Expand Up @@ -986,7 +984,6 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand Down
Loading

0 comments on commit 6b1fc62

Please sign in to comment.