Skip to content

Commit

Permalink
Merge pull request #109 from m-lab/sandbox-kinkade
Browse files Browse the repository at this point in the history
Add ePoxy datastore entities for virtual machines, too
  • Loading branch information
nkinkade authored Dec 5, 2022
2 parents 8159204 + bd25572 commit 38e87b6
Show file tree
Hide file tree
Showing 6 changed files with 625 additions and 7 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ FROM golang:1.18 as build
# from HEAD.
ADD . /go/src/github.com/m-lab/epoxy
ENV CGO_ENABLED 0
ENV GO111MODULE=off
WORKDIR /go/src/github.com/m-lab/epoxy
RUN go get -d -t -v ./...
RUN go test -v ./...
Expand Down
4 changes: 0 additions & 4 deletions cmd/epoxy_admin/command/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ func runSync(cmd *cobra.Command, args []string) {
if machine.Project != fProject {
continue
}
// We only create ePoxy Host entities for physical machines.
if machine.Type != "physical" {
continue
}
if isHostnameInDatastore(machine.Hostname, entities) {
continue
}
Expand Down
2 changes: 1 addition & 1 deletion extension/request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"testing"
"time"

"github.com/renstrom/dedent"
"github.com/lithammer/dedent"
)

func TestRequest_Encode(t *testing.T) {
Expand Down
54 changes: 54 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
module github.com/m-lab/epoxy

go 1.18

require (
cloud.google.com/go/datastore v1.10.0
github.com/cavaliergopher/grab/v3 v3.0.1
github.com/google/go-github v17.0.0+incompatible
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/kr/pretty v0.3.1
github.com/kylelemons/godebug v1.1.0
github.com/lithammer/dedent v1.1.0
github.com/m-lab/go v0.1.54
github.com/prometheus/client_golang v1.14.0
github.com/spf13/cobra v1.6.1
golang.org/x/crypto v0.3.0
google.golang.org/api v0.103.0
)

require (
cloud.google.com/go v0.105.0 // indirect
cloud.google.com/go/compute v1.12.1 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
github.com/araddon/dateparse v0.0.0-20200409225146-d820a6159ab1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/net v0.2.0 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
)
Loading

0 comments on commit 38e87b6

Please sign in to comment.