Change register to apply

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
 }
 

cli/feast/cmd/jobs.go

@@ -20,9 +20,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"feast/cli/feast/pkg/parse"
-	"feast/cli/feast/pkg/printer"
-
+	"github.com/gojektech/feast/cli/feast/pkg/parse"
+	"github.com/gojektech/feast/cli/feast/pkg/printer"
 	"github.com/gojektech/feast/go-feast-proto/feast/core"
 
 	"github.com/spf13/cobra"

cli/feast/cmd/list.go

@@ -17,12 +17,12 @@ package cmd
 import (
 	"context"
 	"errors"
-	"feast/cli/feast/pkg/util"
 	"fmt"
 	"os"
 	"strings"
 	"text/tabwriter"
 
+	"github.com/gojektech/feast/cli/feast/pkg/util"
 	"github.com/gojektech/feast/go-feast-proto/feast/core"
 
 	"github.com/golang/protobuf/ptypes/empty"

cli/feast/cmd/root.go

@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -42,7 +41,6 @@ func init() {
 
 func handleErr(err error) {
 	if err != nil {
-		fmt.Println(err)
 		os.Exit(1)
 	}
 }

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",

cli/feast/main.go

@@ -14,7 +14,7 @@
 
 package main
 
-import "feast/cli/feast/cmd"
+import "github.com/gojektech/feast/cli/feast/cmd"
 
 func main() {
 	cmd.Execute()

cli/feast/pkg/printer/job.go

@@ -15,10 +15,10 @@
 package printer
 
 import (
-	"feast/cli/feast/pkg/util"
 	"fmt"
 	"strings"
 
+	"github.com/gojektech/feast/cli/feast/pkg/util"
 	"github.com/gojektech/feast/go-feast-proto/feast/core"
 )
 

core/src/main/java/feast/core/grpc/CoreServiceImpl.java

@@ -233,20 +233,20 @@ 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.registerFeature(request);
-      RegisterFeatureResponse response =
-          RegisterFeatureResponse.newBuilder().setFeatureId(feature.getId()).build();
+      FeatureInfo feature = specService.applyFeature(request);
+      ApplyFeatureResponse response =
+          ApplyFeatureResponse.newBuilder().setFeatureId(feature.getId()).build();
       responseObserver.onNext(response);
       responseObserver.onCompleted();
     } catch (RegistrationException e) {
-      log.error("Error in registerFeature: {}", e);
+      log.error("Error in applyFeature: {}", e);
       responseObserver.onError(getRuntimeException(e));
     } catch (IllegalArgumentException e) {
-      log.error("Error in registerFeature: {}", e);
+      log.error("Error in applyFeature: {}", e);
       responseObserver.onError(getBadRequestException(e));
     }
   }
@@ -257,21 +257,21 @@ 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.registerFeatureGroup(request);
-      RegisterFeatureGroupResponse response =
-          RegisterFeatureGroupResponse.newBuilder().setFeatureGroupId(featureGroup.getId()).build();
+      FeatureGroupInfo featureGroup = specService.applyFeatureGroup(request);
+      ApplyFeatureGroupResponse response =
+          ApplyFeatureGroupResponse.newBuilder().setFeatureGroupId(featureGroup.getId()).build();
       responseObserver.onNext(response);
       responseObserver.onCompleted();
     } catch (RegistrationException e) {
-      log.error("Error in registerFeatureGroup: {}", e);
+      log.error("Error in applyFeatureGroup: {}", e);
       responseObserver.onError(getRuntimeException(e));
     } catch (IllegalArgumentException e) {
-      log.error("Error in registerFeatureGroup: {}", e);
+      log.error("Error in applyFeatureGroup: {}", e);
       responseObserver.onError(getBadRequestException(e));
     }
   }
@@ -282,20 +282,20 @@ 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.registerEntity(request);
-      RegisterEntityResponse response =
-          RegisterEntityResponse.newBuilder().setEntityName(entity.getName()).build();
+      EntityInfo entity = specService.applyEntity(request);
+      ApplyEntityResponse response =
+          ApplyEntityResponse.newBuilder().setEntityName(entity.getName()).build();
       responseObserver.onNext(response);
       responseObserver.onCompleted();
     } catch (RegistrationException e) {
-      log.error("Error in registerEntity: {}", e);
+      log.error("Error in applyEntity: {}", e);
       responseObserver.onError(getRuntimeException(e));
     } catch (IllegalArgumentException e) {
-      log.error("Error in registerEntity: {}", e);
+      log.error("Error in applyEntity: {}", e);
       responseObserver.onError(getBadRequestException(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) {

core/src/main/java/feast/core/job/ScheduledJobMonitor.java

@@ -19,7 +19,9 @@
 
 import com.google.common.base.Strings;
 import feast.core.dao.JobInfoRepository;
+import feast.core.log.Action;
 import feast.core.log.AuditLogger;
+import feast.core.log.Resource;
 import feast.core.model.JobInfo;
 import feast.core.model.JobStatus;
 import feast.core.model.Metrics;
@@ -74,9 +76,9 @@ public void pollStatusAndMetrics() {
       JobStatus jobStatus = jobMonitor.getJobStatus(jobId);
       if (job.getStatus() != jobStatus) {
         AuditLogger.log(
-            "Jobs",
+            Resource.JOB,
             jobId,
-            "Status Update",
+            Action.STATUS_CHANGE,
             "Job status updated from %s to %s",
             job.getStatus(),
             jobStatus);

core/src/main/java/feast/core/log/Action.java

@@ -0,0 +1,19 @@
+package feast.core.log;
+
+/**
+ * Actions taken for audit logging purposes
+ */
+public enum Action {
+  // Job-related actions
+  SUBMIT,
+  STATUS_CHANGE,
+  ABORT,
+
+  // Spec-related
+  UPDATE,
+  REGISTER,
+
+  // Storage-related
+  ADD,
+  SCHEMA_UPDATE,
+}

core/src/main/java/feast/core/log/AuditLogger.java

@@ -39,12 +39,12 @@ public class AuditLogger {
    * @param detail additional detail. Supports string formatting.
    * @param args arguments to the detail string
    */
-  public static void log(String resource, String id, String action, String detail, Object... args) {
+  public static void log(Resource resource, String id, Action action, String detail, Object... args) {
     Map<String, String> map = new TreeMap<>();
     map.put("timestamp", new Date().toString());
-    map.put("resource", resource);
+    map.put("resource", resource.toString());
     map.put("id", id);
-    map.put("action", action);
+    map.put("action", action.toString());
     map.put("detail", Strings.lenientFormat(detail, args));
     ObjectMessage msg = new ObjectMessage(map);
 

core/src/main/java/feast/core/log/Resource.java

@@ -0,0 +1,12 @@
+package feast.core.log;
+
+/**
+ * Resources interacted with, for audit logging purposes
+ */
+public enum Resource {
+  FEATURE,
+  FEATURE_GROUP,
+  ENTITY,
+  STORAGE,
+  JOB
+}