Change register command to apply

feast-dev · woop · Dec 13, 2018 · Dec 11, 2018 · Dec 12, 2018 · Dec 12, 2018
commit 3443bae6d360915bbe97012ac7db266c25f2743c
diff --git a/cli/feast/cmd/register.go → cli/feast/cmd/apply.go b/cli/feast/cmd/register.go → cli/feast/cmd/apply.go
@@ -21,18 +21,17 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
+	"github.com/gojektech/feast/cli/feast/pkg/parse"
 	"github.com/gojektech/feast/go-feast-proto/feast/core"
 
-	"feast/cli/feast/pkg/parse"
-
 	"github.com/spf13/cobra"
 )
 
-// registerCmd represents the register command
-var registerCmd = &cobra.Command{
-	Use:   "register [resource] [filepaths...]",
-	Short: "Register a resource given one or many yaml files.",
-	Long: `Register a resource from one or multiple yamls.
+// applyCmd represents the apply command
+var applyCmd = &cobra.Command{
+	Use:   "apply [resource] [filepaths...]",
+	Short: "Apply a resource given one or many yaml files.",
+	Long: `Apply a resource from one or multiple yamls.
 
 Valid resources include:
 - entity
@@ -41,17 +40,17 @@ Valid resources include:
 - storage
 
 Examples:
-- feast register entity entity.yml
-- feast register storage storage1.yml storage2.yml
-- feast register feature *-feature.yml`,
+- feast apply entity entity.yml
+- feast apply storage storage1.yml storage2.yml
+- feast apply feature *-feature.yml`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if len(args) == 0 {
 			return cmd.Help()
 		}
 
 		if len(args) < 2 {
 			fmt.Println(args)
-			return errors.New("invalid number of arguments for register command")
+			return errors.New("invalid number of arguments for apply command")
 		}
 
 		initConn()
@@ -62,75 +61,75 @@ Examples:
 
 		for _, fp := range paths {
 			if isYaml(fp) {
-				fmt.Printf("Registering %s at %s\n", resource, fp)
-				regID, err := register(ctx, coreCli, resource, fp)
+				fmt.Printf("Applying %s at %s\n", resource, fp)
+				regID, err := apply(ctx, coreCli, resource, fp)
 				if err != nil {
-					return fmt.Errorf("failed to register %s at path %s: %v", resource, fp, err)
+					return fmt.Errorf("failed to apply %s at path %s: %v", resource, fp, err)
 				}
-				fmt.Printf("Successfully registered %s %s\n", resource, regID)
+				fmt.Printf("Successfully applied %s %s\n", resource, regID)
 			}
 		}
 		return nil
 	},
 }
 
 func init() {
-	rootCmd.AddCommand(registerCmd)
+	rootCmd.AddCommand(applyCmd)
 }
 
-func register(ctx context.Context, coreCli core.CoreServiceClient, resource string, fileLocation string) (string, error) {
+func apply(ctx context.Context, coreCli core.CoreServiceClient, resource string, fileLocation string) (string, error) {
 	yml, err := ioutil.ReadFile(fileLocation)
 	if err != nil {
 		return "", fmt.Errorf("error reading file at %s: %v", fileLocation, err)
 	}
 
 	switch resource {
 	case "feature":
-		return registerFeature(ctx, coreCli, yml)
+		return applyFeature(ctx, coreCli, yml)
 	case "featureGroup":
-		return registerFeatureGroup(ctx, coreCli, yml)
+		return applyFeatureGroup(ctx, coreCli, yml)
 	case "entity":
-		return registerEntity(ctx, coreCli, yml)
+		return applyEntity(ctx, coreCli, yml)
 	case "storage":
-		return registerStorage(ctx, coreCli, yml)
+		return applyStorage(ctx, coreCli, yml)
 	default:
 		return "", fmt.Errorf("invalid resource %s: please choose one of [feature, featureGroup, entity, storage]", resource)
 	}
 }
 
-func registerFeature(ctx context.Context, coreCli core.CoreServiceClient, yml []byte) (string, error) {
+func applyFeature(ctx context.Context, coreCli core.CoreServiceClient, yml []byte) (string, error) {
 	fs, err := parse.YamlToFeatureSpec(yml)
 	if err != nil {
 		return "", err
 	}
-	_, err = coreCli.RegisterFeature(ctx, fs)
+	_, err = coreCli.ApplyFeature(ctx, fs)
 	return fs.GetId(), err
 }
 
-func registerFeatureGroup(ctx context.Context, coreCli core.CoreServiceClient, yml []byte) (string, error) {
+func applyFeatureGroup(ctx context.Context, coreCli core.CoreServiceClient, yml []byte) (string, error) {
 	fgs, err := parse.YamlToFeatureGroupSpec(yml)
 	if err != nil {
 		return "", err
 	}
-	_, err = coreCli.RegisterFeatureGroup(ctx, fgs)
+	_, err = coreCli.ApplyFeatureGroup(ctx, fgs)
 	return fgs.GetId(), err
 }
 
-func registerEntity(ctx context.Context, coreCli core.CoreServiceClient, yml []byte) (string, error) {
+func applyEntity(ctx context.Context, coreCli core.CoreServiceClient, yml []byte) (string, error) {
 	es, err := parse.YamlToEntitySpec(yml)
 	if err != nil {
 		return "", err
 	}
-	_, err = coreCli.RegisterEntity(ctx, es)
+	_, err = coreCli.ApplyEntity(ctx, es)
 	return es.GetName(), err
 }
 
-func registerStorage(ctx context.Context, coreCli core.CoreServiceClient, yml []byte) (string, error) {
+func applyStorage(ctx context.Context, coreCli core.CoreServiceClient, yml []byte) (string, error) {
 	ss, err := parse.YamlToStorageSpec(yml)
 	if err != nil {
 		return "", err
 	}
-	_, err = coreCli.RegisterStorage(ctx, ss)
+	_, err = coreCli.ApplyStorage(ctx, ss)
 	return ss.GetId(), err
 }
 

diff --git a/cli/feast/cmd/version.go b/cli/feast/cmd/version.go
@@ -20,7 +20,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var version = "0.2.0"
+var version = "0.3.0"
 
 var versionCmd = &cobra.Command{
 	Use:   "version",

diff --git a/core/src/main/java/feast/core/grpc/CoreServiceImpl.java b/core/src/main/java/feast/core/grpc/CoreServiceImpl.java
@@ -233,13 +233,13 @@ public void listStorage(Empty request, StreamObserver<ListStorageResponse> respo
    * error will be returned.
    */
   @Override
-  public void registerFeature(
-      FeatureSpec request, StreamObserver<RegisterFeatureResponse> responseObserver) {
+  public void applyFeature(
+      FeatureSpec request, StreamObserver<ApplyFeatureResponse> responseObserver) {
     try {
       validator.validateFeatureSpec(request);
       FeatureInfo feature = specService.applyFeature(request);
-      RegisterFeatureResponse response =
-          RegisterFeatureResponse.newBuilder().setFeatureId(feature.getId()).build();
+      ApplyFeatureResponse response =
+          ApplyFeatureResponse.newBuilder().setFeatureId(feature.getId()).build();
       responseObserver.onNext(response);
       responseObserver.onCompleted();
     } catch (RegistrationException e) {
@@ -257,14 +257,14 @@ public void registerFeature(
    * error will be returned.
    */
   @Override
-  public void registerFeatureGroup(
+  public void applyFeatureGroup(
       FeatureGroupSpecProto.FeatureGroupSpec request,
-      StreamObserver<RegisterFeatureGroupResponse> responseObserver) {
+      StreamObserver<ApplyFeatureGroupResponse> responseObserver) {
     try {
       validator.validateFeatureGroupSpec(request);
       FeatureGroupInfo featureGroup = specService.applyFeatureGroup(request);
-      RegisterFeatureGroupResponse response =
-          RegisterFeatureGroupResponse.newBuilder().setFeatureGroupId(featureGroup.getId()).build();
+      ApplyFeatureGroupResponse response =
+          ApplyFeatureGroupResponse.newBuilder().setFeatureGroupId(featureGroup.getId()).build();
       responseObserver.onNext(response);
       responseObserver.onCompleted();
     } catch (RegistrationException e) {
@@ -282,13 +282,13 @@ public void registerFeatureGroup(
    * be returned.
    */
   @Override
-  public void registerEntity(
-      EntitySpec request, StreamObserver<RegisterEntityResponse> responseObserver) {
+  public void applyEntity(
+      EntitySpec request, StreamObserver<ApplyEntityResponse> responseObserver) {
     try {
       validator.validateEntitySpec(request);
       EntityInfo entity = specService.applyEntity(request);
-      RegisterEntityResponse response =
-          RegisterEntityResponse.newBuilder().setEntityName(entity.getName()).build();
+      ApplyEntityResponse response =
+          ApplyEntityResponse.newBuilder().setEntityName(entity.getName()).build();
       responseObserver.onNext(response);
       responseObserver.onCompleted();
     } catch (RegistrationException e) {
@@ -306,13 +306,13 @@ public void registerEntity(
    * be returned.
    */
   @Override
-  public void registerStorage(
-      StorageSpec request, StreamObserver<RegisterStorageResponse> responseObserver) {
+  public void applyStorage(
+      StorageSpec request, StreamObserver<ApplyStorageResponse> responseObserver) {
     try {
       validator.validateStorageSpec(request);
       StorageInfo storage = specService.registerStorage(request);
-      RegisterStorageResponse response =
-          RegisterStorageResponse.newBuilder().setStorageId(storage.getId()).build();
+      ApplyStorageResponse response =
+          ApplyStorageResponse.newBuilder().setStorageId(storage.getId()).build();
       responseObserver.onNext(response);
       responseObserver.onCompleted();
     } catch (RegistrationException e) {