Merge pull request #2 from jjackson-s/feature

Merging previous PR

cmd/configschema/configwiz/configwiz/component.go

@@ -53,15 +53,8 @@ func handleComponent(
 ) {
 	typeMap := map[string]interface{}{}
 	m[componentGroup+"s"] = typeMap
-	var err error
-	var cfgInfo configschema.CfgInfo
 	for _, name := range names {
-		if strings.Contains(name, "/") {
-			compName := strings.Split(name, "/")[0]
-			cfgInfo, err = configschema.GetCfgInfo(factories, componentGroup, compName)
-		} else {
-			cfgInfo, err = configschema.GetCfgInfo(factories, componentGroup, name)
-		}
+		cfgInfo, err := configschema.GetCfgInfo(factories, componentGroup, strings.Split(name, "/")[0])
 		if err != nil {
 			panic(err)
 		}
@@ -97,11 +90,11 @@ func handleField(p indentingPrinter, field *configschema.Field, out map[string]i
 	p.println("Field: " + field.Name)
 	typ := resolveType(field)
 	if typ != "" {
-		p.print("Type:  " + typ)
+		typString := "Type: " + typ
 		if typ == "time.Duration" {
-			fmt.Print(" (examples: 1h2m3s, 5m10s, 45s)")
+			typString += " (examples: 1h2m3s, 5m10s, 45s)"
 		}
-		p.print("\n")
+		p.println(typString)
 	}
 	if field.Doc != "" {
 		p.println("Docs:  " + strings.ReplaceAll(field.Doc, "\n", " "))

cmd/configschema/configwiz/configwiz/pipelines.go

@@ -25,7 +25,7 @@ import (
 	"go.opentelemetry.io/collector/component/componenterror"
 )
 
-const invalid string = "Invalid input. Try again."
+const invalidMsg = "Invalid input. Try again."
 
 func pipelinesWizard(factories component.Factories) map[string]interface{} {
 	out := map[string]interface{}{}
@@ -64,7 +64,7 @@ func singlePipelineWizard(factories component.Factories) (string, rpe) {
 	case "2":
 		return pipelineTypeWizard("traces", receiverNames(factories, isTracesReceiver), processorNames(factories, isTracesProcessor), exporterNames(factories, isTracesExporter))
 	}
-	fmt.Println(invalid)
+	fmt.Println(invalidMsg)
 	return singlePipelineWizard(factories)
 }
 
@@ -128,7 +128,7 @@ func componentNameWizard(pr indentingPrinter, componentType string, componentNam
 	}
 	i, _ := strconv.Atoi(choice)
 	if i < 0 || i > len(componentNames)-1 {
-		fmt.Println(invalid)
+		fmt.Println(invalidMsg)
 		return componentNameWizard(pr, componentType, componentNames)
 	}
 	key := componentNames[i]