Skip to content

Proto file fixes #1

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

Merged
zhilingc merged 2 commits into from
Dec 11, 2018
Merged

Proto file fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b12f0cc
Use symlink to refer proto files
Dec 10, 2018
04546dd
Update golang proto generation
Dec 11, 2018
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
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ scratch*
**/bin/
dependency-reduced-pom.xml

# Generated proto files
go-feast-proto/*

# govendor
vendor

Expand Down
3 changes: 2 additions & 1 deletion cli/feast/cmd/jobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import (

"feast/cli/feast/pkg/parse"
"feast/cli/feast/pkg/printer"
"feast/go-feast-proto/feast/core"

"github.com/gojektech/feast/go-feast-proto/feast/core"

"github.com/spf13/cobra"
)
Expand Down
3 changes: 2 additions & 1 deletion cli/feast/cmd/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ import (
"context"
"errors"
"feast/cli/feast/pkg/util"
"feast/go-feast-proto/feast/core"
"fmt"
"os"
"strings"
"text/tabwriter"

"github.com/gojektech/feast/go-feast-proto/feast/core"

"github.com/golang/protobuf/ptypes/empty"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/feast/cmd/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"io/ioutil"
"path/filepath"

"feast/go-feast-proto/feast/core"
"github.com/gojektech/feast/go-feast-proto/feast/core"

"feast/cli/feast/pkg/parse"

Expand Down
4 changes: 2 additions & 2 deletions cli/feast/pkg/parse/yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/ghodss/yaml"

"feast/go-feast-proto/feast/specs"
"feast/go-feast-proto/feast/types"
"github.com/gojektech/feast/go-feast-proto/feast/specs"
"github.com/gojektech/feast/go-feast-proto/feast/types"
)

// YamlToFeatureSpec parses the given yaml and outputs the corresponding
Expand Down
4 changes: 2 additions & 2 deletions cli/feast/pkg/parse/yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"github.com/golang/protobuf/ptypes/timestamp"

"feast/go-feast-proto/feast/specs"
"feast/go-feast-proto/feast/types"
"github.com/gojektech/feast/go-feast-proto/feast/specs"
"github.com/gojektech/feast/go-feast-proto/feast/types"

"github.com/google/go-cmp/cmp"
)
Expand Down
3 changes: 2 additions & 1 deletion cli/feast/pkg/printer/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ package printer

import (
"feast/cli/feast/pkg/util"
"feast/go-feast-proto/feast/core"
"fmt"
"strings"

"github.com/gojektech/feast/go-feast-proto/feast/core"
)

// PrintJobDetail pretty prints the given job detail
Expand Down
1 change: 1 addition & 0 deletions core/src/main/proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../protos
6 changes: 0 additions & 6 deletions core/src/main/proto/Makefile
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions core/src/main/proto/README.md
View file
Open in desktop

This file was deleted.

151 changes: 0 additions & 151 deletions core/src/main/proto/feast/core/CoreService.proto
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions core/src/main/proto/feast/core/JobService.proto
View file
Open in desktop

This file was deleted.

Loading