Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(common): move inventory to separate folder #208

Merged
merged 3 commits into from
Oct 16, 2023
Merged

refactor(common): move inventory to separate folder #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d00d0a9
refactor(common): move inventory to separate folder
sandersms Oct 11, 2023
61b0ce6
Merge branch 'opiproject:main' into main
sandersms Oct 16, 2023
e6bdc14
refactor: fix deps for inventory
sandersms Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"net/http"
"time"

pc "github.com/opiproject/opi-api/common/v1/gen/go"
pc "github.com/opiproject/opi-api/inventory/v1/gen/go"
"github.com/opiproject/opi-smbios-bridge/pkg/inventory"

"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.19
require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
github.com/jaypipes/ghw v0.12.0
github.com/opiproject/opi-api v0.0.0-20231012135448-00e9f8d63cb4
github.com/opiproject/opi-api v0.0.0-20231016162146-d81cc5ee60d4
google.golang.org/grpc v1.58.3
)

Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ github.com/opiproject/opi-api v0.0.0-20231009064235-b166668c8a86 h1:lHZuWCy8La/n
github.com/opiproject/opi-api v0.0.0-20231009064235-b166668c8a86/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20231012135448-00e9f8d63cb4 h1:dvvG4m7/+P8rmQUO5LqxQij1Q5XmKjJ6LXnQ0+LFWvg=
github.com/opiproject/opi-api v0.0.0-20231012135448-00e9f8d63cb4/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20231016162146-d81cc5ee60d4 h1:q20p6Hg4Un2St+vnw1b1sMSYTDg6bK0PbNrMb5xi7QU=
github.com/opiproject/opi-api v0.0.0-20231016162146-d81cc5ee60d4/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
Expand Down
2 changes: 1 addition & 1 deletion pkg/inventory/inventory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"log"

"github.com/jaypipes/ghw"
pc "github.com/opiproject/opi-api/common/v1/gen/go"
pc "github.com/opiproject/opi-api/inventory/v1/gen/go"
)

// Server contains inventory related OPI services
Expand Down
2 changes: 1 addition & 1 deletion pkg/inventory/inventory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"google.golang.org/grpc/status"
"google.golang.org/grpc/test/bufconn"

pc "github.com/opiproject/opi-api/common/v1/gen/go"
pc "github.com/opiproject/opi-api/inventory/v1/gen/go"
)

func dialer() func(context.Context, string) (net.Conn, error) {
Expand Down