Merge pull request open-telemetry#69 from jjackson-s/feature

User formatting assistance and user error checking

Author: pmcollins

cmd/configschema/configwiz/configwiz/component.go

@@ -51,7 +51,7 @@ func handleComponent(
 	typeMap := map[string]interface{}{}
 	m[componentGroup+"s"] = typeMap
 	for _, name := range names {
-		cfgInfo, err := configschema.GetCfgInfo(factories, componentGroup, name)
+		cfgInfo, err := configschema.GetCfgInfo(factories, componentGroup, strings.Split(name, "/")[0])
 		if err != nil {
 			panic(err)
 		}
@@ -87,7 +87,11 @@ func handleField(p indentingPrinter, field *configschema.Field, out map[string]i
 	p.println("Field: " + field.Name)
 	typ := resolveType(field)
 	if typ != "" {
-		p.println("Type:  " + typ)
+		typString := "Type: " + typ
+		if typ == "time.Duration" {
+			typString += " (examples: 1h2m3s, 5m10s, 45s)"
+		}
+		p.println(typString)
 	}
 	if field.Doc != "" {
 		p.println("Docs:  " + strings.ReplaceAll(field.Doc, "\n", " "))
@@ -100,7 +104,6 @@ func handleField(p indentingPrinter, field *configschema.Field, out map[string]i
 	if field.Default != nil {
 		defaultVal = fmt.Sprintf("%v", field.Default)
 	}
-
 	in := readline(defaultVal)
 	if in == "" {
 		return

cmd/configschema/configwiz/configwiz/pipelines.go

@@ -25,6 +25,8 @@ import (
 	"go.opentelemetry.io/collector/component/componenterror"
 )
 
+const invalidMsg = "Invalid input. Try again."
+
 func pipelinesWizard(factories component.Factories) map[string]interface{} {
 	out := map[string]interface{}{}
 	for {
@@ -55,12 +57,15 @@ func singlePipelineWizard(factories component.Factories) (string, rpe) {
 	fmt.Print("> ")
 	pipelineID := readline("")
 	switch pipelineID {
+	case "":
+		return "", rpe{}
 	case "1":
 		return pipelineTypeWizard("metrics", receiverNames(factories, isMetricsReceiver), exporterNames(factories, isMetricsExporter))
 	case "2":
 		return pipelineTypeWizard("traces", receiverNames(factories, isTracesReceiver), exporterNames(factories, isTracesExporter))
 	}
-	return "", rpe{}
+	fmt.Println(invalidMsg)
+	return singlePipelineWizard(factories)
 }
 
 // pipelineTypeWizard for a given pipelineType (e.g. "metrics", "traces")
@@ -120,6 +125,10 @@ func componentNameWizard(pr indentingPrinter, componentType string, componentNam
 		return "", ""
 	}
 	i, _ := strconv.Atoi(choice)
+	if i < 0 || i > len(componentNames)-1 {
+		fmt.Println(invalidMsg)
+		return componentNameWizard(pr, componentType, componentNames)
+	}
 	key := componentNames[i]
 	pr.print(fmt.Sprintf("%s %s extended name (optional) > ", key, componentType))
 	return key, readline("")