Add creation timestamp to Project (#483)

Signed-off-by: Sunghoon Kang <[email protected]>
akuity · Jul 24, 2023 · 1c73e70 · 1c73e70
1 parent 3623d88
commit 1c73e70
Show file tree

Hide file tree

Showing 7 changed files with 267 additions and 214 deletions.
diff --git a/api/service/v1alpha1/service.proto b/api/service/v1alpha1/service.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package akuity.io.kargo.service.v1alpha1;
 
+import "google/protobuf/timestamp.proto";
+
 option go_package = "github.com/akuity/kargo/pkg/api/service/v1alpha1;svcv1alpha1";
 
 import "v1alpha1/generated.proto";
@@ -85,14 +87,15 @@ message PromoteStageResponse {
 
 message Project {
   string name = 1;
+  google.protobuf.Timestamp create_time = 2;
 }
 
 message CreateProjectRequest {
   string name = 1;
 }
 
 message CreateProjectResponse {
-  string name = 1;
+  Project project = 1;
 }
 
 message ListProjectsRequest {

diff --git a/internal/api/handler/create_project_v1alpha1.go b/internal/api/handler/create_project_v1alpha1.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/bufbuild/connect-go"
 	"github.com/pkg/errors"
+	"google.golang.org/protobuf/types/known/timestamppb"
 	corev1 "k8s.io/api/core/v1"
 	kubeerr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -58,7 +59,10 @@ func CreateProjectV1Alpha1(
 			return nil, connect.NewError(connect.CodeInternal, err)
 		}
 		return connect.NewResponse(&svcv1alpha1.CreateProjectResponse{
-			Name: ns.Name,
+			Project: &svcv1alpha1.Project{
+				Name:       ns.Name,
+				CreateTime: timestamppb.New(ns.CreationTimestamp.Time),
+			},
 		}), nil
 	}
 }
diff --git a/internal/api/handler/list_projects_v1alpha1.go b/internal/api/handler/list_projects_v1alpha1.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/bufbuild/connect-go"
+	"google.golang.org/protobuf/types/known/timestamppb"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -34,7 +35,8 @@ func ListProjectsV1Alpha1(
 		var projects []*svcv1alpha1.Project
 		for _, ns := range nsList.Items {
 			projects = append(projects, &svcv1alpha1.Project{
-				Name: ns.Name,
+				Name:       ns.Name,
+				CreateTime: timestamppb.New(ns.CreationTimestamp.Time),
 			})
 		}
 

diff --git a/internal/cli/project/create.go b/internal/cli/project/create.go
@@ -8,7 +8,11 @@ import (
 	"github.com/bufbuild/connect-go"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/utils/pointer"
 
+	kubev1alpha1 "github.com/akuity/kargo/api/v1alpha1"
 	"github.com/akuity/kargo/internal/cli/option"
 	v1alpha1 "github.com/akuity/kargo/pkg/api/service/v1alpha1"
 	"github.com/akuity/kargo/pkg/api/service/v1alpha1/svcv1alpha1connect"
@@ -34,9 +38,22 @@ func newCreateCommand(opt *option.Option) *cobra.Command {
 			if err != nil {
 				return errors.Wrap(err, "create project")
 			}
-			_, _ = fmt.Fprintf(opt.IOStreams.Out, "Project Created: %q", res.Msg.GetName())
-			return nil
+			if pointer.StringDeref(opt.PrintFlags.OutputFormat, "") == "" {
+				_, _ = fmt.Fprintf(opt.IOStreams.Out, "Project Created: %q", res.Msg.GetProject().GetName())
+				return nil
+			}
+			var project unstructured.Unstructured
+			project.SetAPIVersion(kubev1alpha1.GroupVersion.String())
+			project.SetKind("Project")
+			project.SetCreationTimestamp(metav1.NewTime(res.Msg.GetProject().GetCreateTime().AsTime()))
+			project.SetName(project.GetName())
+			printer, err := opt.PrintFlags.ToPrinter()
+			if err != nil {
+				return errors.Wrap(err, "new printer")
+			}
+			return printer.PrintObj(&project, opt.IOStreams.Out)
 		},
 	}
+	opt.PrintFlags.AddFlags(cmd)
 	return cmd
 }
diff --git a/internal/cli/project/list.go b/internal/cli/project/list.go
@@ -38,6 +38,7 @@ func newListCommand(opt *option.Option) *cobra.Command {
 				item := &unstructured.Unstructured{}
 				item.SetAPIVersion(kubev1alpha1.GroupVersion.String())
 				item.SetKind("Project")
+				item.SetCreationTimestamp(metav1.NewTime(project.GetCreateTime().AsTime()))
 				item.SetName(project.GetName())
 				list.Items = append(list.Items, *item)
 			}
@@ -49,8 +50,7 @@ func newListCommand(opt *option.Option) *cobra.Command {
 			if err != nil {
 				return errors.Wrap(err, "new printer")
 			}
-			err = printer.PrintObj(list, opt.IOStreams.Out)
-			return err
+			return printer.PrintObj(list, opt.IOStreams.Out)
 		},
 	}
 	opt.PrintFlags.AddFlags(cmd)