Skip to content

Commit

Permalink
Remove go-server code from repository (#155)
Browse files Browse the repository at this point in the history
  • Loading branch information
lampajr authored Nov 17, 2023
1 parent 5a98a6b commit 3e286f3
Show file tree
Hide file tree
Showing 46 changed files with 10 additions and 20,819 deletions.
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ USER root
RUN yum install -y nodejs npm java-11

# Copy the go source
COPY ["Makefile", "main.go", "gqlgen.yml", ".openapi-generator-ignore", "openapitools.json", "./"]
COPY ["Makefile", "main.go", ".openapi-generator-ignore", "openapitools.json", "./"]

# Download protoc compiler v24.3
RUN wget -q https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip -O protoc.zip && \
Expand All @@ -28,7 +28,6 @@ RUN make deps
COPY bin/ bin/
COPY cmd/ cmd/
COPY api/ api/
COPY config/ config/
COPY internal/ internal/
COPY pkg/ pkg/

Expand All @@ -40,8 +39,6 @@ RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 make clean model-registry
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
WORKDIR /
# copy the metadata library
COPY --from=builder /workspace/config ./config
# copy the registry binary
COPY --from=builder /workspace/model-registry .
USER 65532:65532
Expand Down
37 changes: 7 additions & 30 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,7 @@ internal/converter/generated/converter.go: internal/converter/*.go
goverter gen github.com/opendatahub-io/model-registry/internal/converter/

.PHONY: gen/converter
gen/converter: gen/grpc internal/converter/generated/converter.go gen/graph

.PHONY: gen/graph
gen/graph: internal/model/graph/models_gen.go

internal/model/graph/models_gen.go: api/graphql/*.graphqls gqlgen.yml
gqlgen generate
gen/converter: gen/grpc internal/converter/generated/converter.go

# validate the openapi schema
.PHONY: openapi/validate
Expand Down Expand Up @@ -103,7 +97,7 @@ vet:

.PHONY: clean
clean:
rm -Rf ./model-registry internal/ml_metadata/proto/*.go internal/model/graph/models_gen.go internal/converter/generated/*.go pkg/openapi
rm -Rf ./model-registry internal/ml_metadata/proto/*.go internal/converter/generated/*.go pkg/openapi

bin/go-enum:
GOBIN=$(PROJECT_BIN) go install github.com/searKing/golang/tools/go-enum@v1.2.97
Expand All @@ -114,9 +108,6 @@ bin/protoc-gen-go:
bin/protoc-gen-go-grpc:
GOBIN=$(PROJECT_BIN) go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0

bin/gqlgen:
GOBIN=$(PROJECT_BIN) go install github.com/99designs/gqlgen@v0.17.36

bin/golangci-lint:
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_BIN) v1.54.2

Expand Down Expand Up @@ -146,7 +137,7 @@ clean/deps:
rm -Rf bin/*

.PHONY: deps
deps: bin/go-enum bin/protoc-gen-go bin/protoc-gen-go-grpc bin/gqlgen bin/golangci-lint bin/goverter bin/openapi-generator-cli
deps: bin/go-enum bin/protoc-gen-go bin/protoc-gen-go-grpc bin/golangci-lint bin/goverter bin/openapi-generator-cli

.PHONY: vendor
vendor:
Expand All @@ -157,7 +148,7 @@ build: gen vet lint
go build

.PHONY: gen
gen: deps gen/grpc gen/openapi gen/converter gen/graph
gen: deps gen/grpc gen/openapi gen/converter
go generate ./...

.PHONY: lint
Expand All @@ -177,27 +168,13 @@ test-nocache: gen
test-cover: gen
go test ./internal/... ./pkg/... -cover -count=1

.PHONY: run/migrate
run/migrate: gen
go run main.go migrate --logtostderr=true -m config/metadata-library

metadata.sqlite.db: run/migrate

.PHONY: run/server
run/server: gen metadata.sqlite.db
go run main.go serve --logtostderr=true

.PHONY: run/proxy
run/proxy: gen
go run main.go proxy --logtostderr=true

.PHONY: run/client
run/client: gen
python test/python/test_mlmetadata.py

.PHONY: serve
serve: build
./model-registry serve --logtostderr=true
.PHONY: proxy
proxy: build
./model-registry proxy --logtostderr=true

# login to docker
.PHONY: docker/login
Expand Down
175 changes: 0 additions & 175 deletions api/graphql/base-schema.graphqls

This file was deleted.

99 changes: 0 additions & 99 deletions api/graphql/ml-metadata.graphqls

This file was deleted.

Loading

0 comments on commit 3e286f3

Please sign in to comment.