trim whitespace in sonic-environment file

Author: iljarotar

Makefile

@@ -35,7 +35,7 @@ test-generate: docker-build
 
 .PHONY: lint
 lint:
-	golangci-lint run -p bugs -p unused
+	golangci-lint run
 
 .PHONY: docker-build
 docker-build:

cmd/generate.go

@@ -25,57 +25,55 @@ var generateCmd = &cobra.Command{
 
 		env, err := p.GetEnvironment(sonicEnvFile)
 		if err != nil {
-			return fmt.Errorf("failed to get environment information:%w", err)
+			return fmt.Errorf("failed to get environment information: %w", err)
 		}
 
 		inputBytes, err := os.ReadFile(inputFile)
 		if err != nil {
-			fmt.Printf("failed to read input file, %v\n", err)
-			os.Exit(1)
+			return fmt.Errorf("failed to read input file: %w", err)
 		}
 
 		values, err := values.UnmarshalValues(inputBytes)
 		if err != nil {
-			fmt.Printf("failed to parse input file, %v\n", err)
-			os.Exit(1)
+			return fmt.Errorf("failed to parse input file: %w", err)
 		}
 
 		if platformFile == "" {
 			platformFile = fmt.Sprintf("%s/%s/platform.json", deviceDir, env.Platform)
 		}
 		platformBytes, err := os.ReadFile(platformFile)
 		if err != nil {
-			return fmt.Errorf("failed to read platform.json file:%w", err)
+			return fmt.Errorf("failed to read platform.json file: %w", err)
 		}
 
 		platform, err := p.UnmarshalPlatformJSON(platformBytes)
 		if err != nil {
-			return fmt.Errorf("failed to parse platform.json:%w", err)
+			return fmt.Errorf("failed to parse platform.json: %w", err)
 		}
 
 		versionBytes, err := os.ReadFile(sonicVersionFile)
 		if err != nil {
-			return fmt.Errorf("failed to read version file:%w", err)
+			return fmt.Errorf("failed to read version file: %w", err)
 		}
 
 		version, err := v.UnmarshalVersion(versionBytes)
 		if err != nil {
-			return fmt.Errorf("failed to parse version file:%w", err)
+			return fmt.Errorf("failed to parse version file: %w", err)
 		}
 
 		configDB, err := configdb.GenerateConfigDB(values, platform, env, version)
 		if err != nil {
-			return fmt.Errorf("failed to generate config:%w", err)
+			return fmt.Errorf("failed to generate config: %w", err)
 		}
 
 		configDBBytes, err := json.MarshalIndent(configDB, "", "  ")
 		if err != nil {
-			return fmt.Errorf("failed to serialize json:%w", err)
+			return fmt.Errorf("failed to serialize json: %w", err)
 		}
 
 		err = os.WriteFile(outputFile, configDBBytes, 0644) //nolint:gosec
 		if err != nil {
-			return fmt.Errorf("failed to write file:%w", err)
+			return fmt.Errorf("failed to write file: %w", err)
 		}
 
 		return nil

platform/environment.go

@@ -34,6 +34,7 @@ func GetEnvironment(envFile string) (*Environment, error) {
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
 		line := scanner.Text()
+		line = strings.Trim(line, "\n\t ")
 		if p, ok := strings.CutPrefix(line, "PLATFORM="); ok {
 			platform = p
 		}

tests/1/sonic-environment

@@ -1,2 +1,2 @@
-PLATFORM=x86_64-accton_as7726_32x-r0
-HWSKU=Accton-AS7726-32X
+	PLATFORM=x86_64-accton_as7726_32x-r0
+    HWSKU=Accton-AS7726-32X