WG96/97 Content and Templates structure + design updates

cmd/capi-server/api/capi_server.proto

@@ -171,7 +171,8 @@ message Template {
   repeated Parameter parameters = 4;
   string body = 5;
   repeated TemplateObject objects = 6;
-  string error = 7;
+  string error = 7; 
+  string provider = 8;
 }
 
 message Parameter {

cmd/capi-server/api/capi_server.swagger.json

@@ -595,6 +595,9 @@
         },
         "error": {
           "type": "string"
+        },
+        "provider": {
+          "type": "string"
         }
       }
     },

cmd/capi-server/pkg/server/server.go

@@ -51,32 +51,48 @@ func (s *server) ListTemplates(ctx context.Context, msg *capiv1_proto.ListTempla
 	}
 	templates := []*capiv1_proto.Template{}
 
-	if msg.Provider != "" {
-		tl = filterTemplatesByProvider(tl, msg.Provider)
-	}
 
 	for _, t := range tl {
 		templates = append(templates, ToTemplateResponse(t))
 	}
 
+	if msg.Provider != "" {
+		templates = filterTemplatesByProvider(templates, msg.Provider)
+	}
+
 	sort.Slice(templates, func(i, j int) bool { return templates[i].Name < templates[j].Name })
 	return &capiv1_proto.ListTemplatesResponse{Templates: templates, Total: int32(len(tl))}, err
 }
 
-func filterTemplatesByProvider(tl map[string]*capiv1.CAPITemplate, provider string) map[string]*capiv1.CAPITemplate {
-	templates := map[string]*capiv1.CAPITemplate{}
+func getProvider(t *capiv1.CAPITemplate) string {
+	meta, err := capi.ParseTemplateMeta(t)
 
-	for name, t := range tl {
-		providerKind := formatProviderName(provider)
-		meta, err := capi.ParseTemplateMeta(t)
-		if err != nil {
-			continue
+	if err != nil {
+		return ""
+	}
+
+	for _, obj := range meta.Objects {
+		switch obj.Kind {
+		case "AWSCluster":
+			return "AWSCluster"
+		case "AzureCluster":
+			return "AzureCluster"
+		case "VSphereCluster":
+			return "VSphereCluster"
 		}
+	}
 
-		for _, obj := range meta.Objects {
-			if obj.Kind == providerKind {
-				templates[name] = t
-			}
+	return "Generic"
+}
+
+func filterTemplatesByProvider(tl []*capiv1_proto.Template, provider string) []*capiv1_proto.Template {
+	templates := []*capiv1_proto.Template{}
+
+	for _, t := range tl {
+		providerKind := formatProviderName(provider)
+
+		if (t.Provider == providerKind) {
+			templates = append(templates, t)
 		}
 	}
 

cmd/capi-server/pkg/server/server_test.go

@@ -53,17 +53,18 @@ func TestListTemplates(t *testing.T) {
 		{
 			name: "1 template",
 			clusterState: []runtime.Object{
-				makeTemplateConfigMap("template1", makeTemplate(t)),
+				makeTemplateConfigMap("template1", makeTemplateWithProvider(t, "AWSCluster")),
 			},
 			expected: []*capiv1_protos.Template{
 				{
 					Name:        "cluster-template-1",
 					Description: "this is test template 1",
+					Provider:    "AWSCluster",
 					Objects: []*capiv1_protos.TemplateObject{
 						{
 							Name:       string("${CLUSTER_NAME}"),
 							ApiVersion: "fooversion",
-							Kind:       "fookind",
+							Kind:       "AWSCluster",
 							Parameters: []string{"CLUSTER_NAME"},
 						},
 					},
@@ -88,6 +89,7 @@ func TestListTemplates(t *testing.T) {
 				{
 					Name:        "cluster-template-1",
 					Description: "this is test template 1",
+					Provider:    "Generic",
 					Objects: []*capiv1_protos.TemplateObject{
 						{
 							Name:       string("${CLUSTER_NAME}"),
@@ -106,6 +108,7 @@ func TestListTemplates(t *testing.T) {
 				{
 					Name:        "cluster-template-2",
 					Description: "this is test template 2",
+					Provider:    "Generic",
 					Objects: []*capiv1_protos.TemplateObject{
 						{
 							Name:       string("${CLUSTER_NAME}"),
@@ -170,6 +173,7 @@ func TestListTemplates_FilterByProvider(t *testing.T) {
 				{
 					Name:        "cluster-template-2",
 					Description: "this is test template 2",
+					Provider:    "AWSCluster",
 					Objects: []*capiv1_protos.TemplateObject{
 						{
 							Name:       string("${CLUSTER_NAME}"),
@@ -200,6 +204,7 @@ func TestListTemplates_FilterByProvider(t *testing.T) {
 				{
 					Name:        "cluster-template-2",
 					Description: "this is test template 2",
+					Provider:    "AWSCluster",
 					Objects: []*capiv1_protos.TemplateObject{
 						{
 							Name:       string("${CLUSTER_NAME}"),
@@ -274,6 +279,7 @@ func TestGetTemplate(t *testing.T) {
 			expected: &capiv1_protos.Template{
 				Name:        "cluster-template-1",
 				Description: "this is test template 1",
+				Provider:    "Generic",
 				Objects: []*capiv1_protos.TemplateObject{
 					{
 						Name:       string("${CLUSTER_NAME}"),

cmd/capi-server/pkg/server/template_response.go

@@ -12,6 +12,7 @@ func ToTemplateResponse(t *capiv1.CAPITemplate) *capiv1_proto.Template {
 	res := &capiv1_proto.Template{
 		Name:        t.GetName(),
 		Description: t.Spec.Description,
+		Provider:    getProvider(t),
 	}
 
 	meta, err := capi.ParseTemplateMeta(t)

cmd/capi-server/pkg/server/template_response_test.go

@@ -18,9 +18,11 @@ func TestToTemplate(t *testing.T) {
 		err      error
 	}{
 		{
-			name:     "empty",
-			value:    "",
-			expected: &capiv1_protos.Template{},
+			name:  "empty",
+			value: "",
+			expected: &capiv1_protos.Template{
+				Provider: "Generic",
+			},
 		},
 		{
 			name: "Basics",
@@ -31,7 +33,8 @@ metadata:
   name: foo
 `,
 			expected: &capiv1_protos.Template{
-				Name: "foo",
+				Name:     "foo",
+				Provider: "Generic",
 			},
 		},
 		{
@@ -57,6 +60,7 @@ metadata:
 			expected: &capiv1_protos.Template{
 				Name:        "cluster-template-1",
 				Description: "this is test template 1",
+				Provider:    "Generic",
 				Objects: []*capiv1_protos.TemplateObject{
 					{
 						ApiVersion: "fooversion",

ui-cra/package.json

@@ -39,7 +39,6 @@
     "moment": "2.25.3",
     "polished": "3.6.3",
     "prettier": "^2.3.0",
-    "randomcolor": "^0.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-jsonschema-form": "^1.8.1",