Merge pull request #39 from Vonage/fix/add-default-templates

fix: add entrypoint to default templates and reorder the templates

Author: dacheng293

pkg/config/manifest.go

@@ -69,9 +69,11 @@ func NewManifestWithDefaults() *Manifest {
 	return &Manifest{
 		Instance: Instance{
 			ApplicationID: "<please create an application on VONAGE APIs dashboard>",
+			Entrypoint:    []string{"<please include the entrypoint for your script>"},
 		},
 		Debug: Debug{
 			ApplicationID: "<please create an application on VONAGE APIs dashboard>",
+			Entrypoint:    []string{"<please include the entrypoint for your script>"},
 		},
 	}
 }

pkg/format/format.go

@@ -28,7 +28,6 @@ func GetTemplateOptions(templateNames []api.Product) TemplateOptions {
 		Labels:   make([]string, 0),
 		IDLookup: make(map[string]string),
 	}
-	options.Labels = append(options.Labels, SkipValue)
 	for _, r := range templateNames {
 		options.Labels = append(options.Labels, r.Name)
 		options.IDLookup[r.Name] = r.ID

pkg/format/format_test.go

@@ -290,7 +290,7 @@ func TestGetTemplateOptions(t *testing.T) {
 	}
 
 	expectedOptions := TemplateOptions{
-		Labels: []string{"SKIP", "template1", "template2", "template3"},
+		Labels: []string{"template1", "template2", "template3"},
 		IDLookup: map[string]string{
 			"template1": "1",
 			"template2": "2",

vcr/init/init.go

@@ -290,9 +290,6 @@ func askTemplate(ctx context.Context, opts *Options) error {
 	if err != nil {
 		return fmt.Errorf("failed to ask user to select a product template for runtime %s: %w", opts.manifest.Instance.Runtime, err)
 	}
-	if templateLabel == format.SkipValue {
-		return nil
-	}
 
 	selectedProductID := templateOptions.IDLookup[templateLabel]
 
@@ -335,13 +332,20 @@ func askTemplate(ctx context.Context, opts *Options) error {
 }
 
 func getProductTemplatesByLang(productList []api.Product, programmingLang string) []api.Product {
-	list := make([]api.Product, 0)
-	for _, l := range productList {
-		if programmingLang == strings.ToLower(l.ProgrammingLanguage) {
-			list = append(list, l)
+	starterProjects := make([]api.Product, 0)
+	otherProjects := make([]api.Product, 0)
+
+	for _, product := range productList {
+		if programmingLang == strings.ToLower(product.ProgrammingLanguage) {
+			if strings.HasPrefix(strings.ToLower(product.Name), "starter project") {
+				starterProjects = append(starterProjects, product)
+			} else {
+				otherProjects = append(otherProjects, product)
+			}
 		}
 	}
-	return list
+
+	return append(starterProjects, otherProjects...)
 }
 
 // uncompressToDir uncompresses the given tar.gz file bytes to the given directory.