Merge pull request #21 from Conjur-Enterprise/no-env-error-msg

CNJR-0000: Fix unhelpful error message when specifying nonexistent en…

Author: szh

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.10.3] - 2025-02-07
+
+### Fixed
+- Fix unhelpful error message when specifying nonexistent environment
+  [cyberark/summon#63](https://github.com/cyberark/summon-conjur/issues/63)
+
 ## [0.10.2] - 2025-01-10
 
 ### Changed

pkg/secretsyml/secretsyml.go

@@ -153,6 +153,13 @@ func parseEnvironment(ymlContent, env string, subs map[string]string) (SecretsMa
 	out := make(map[string]SecretsMap)
 
 	if err := yaml.Unmarshal([]byte(ymlContent), &out); err != nil {
+		// Check if the error is due to there being no environment sections
+		if _, err = parseRegular(ymlContent, subs); err == nil {
+			// If a regular parse is successful, then the error is due to the environment not existing
+			return nil, fmt.Errorf("No such environment '%v' found in secrets file", env)
+		}
+
+		// Otherwise, return the YAML parsings original error
 		return nil, err
 	}
 

pkg/secretsyml/secretsyml_test.go

@@ -168,6 +168,22 @@ MissingEnvironment:
 		})
 	})
 
+	t.Run("Given an environment with no sections", func(t *testing.T) {
+		testEnv := "TestEnvironment"
+		// This input has no environment sections, but the environment is specified
+		input := `SOME_VAR: value`
+
+		t.Run("It should error", func(t *testing.T) {
+			_, err := ParseFromString(input, testEnv, map[string]string{"env": "prod"})
+			assert.Error(t, err)
+
+			// Should return the same error message as before, not a YAML parsing error
+			errMessage := fmt.Sprintf("No such environment '%v' found in secrets file", testEnv)
+			assert.EqualError(t, err, errMessage)
+		})
+	})
+
+
 	t.Run("Given a common section and environment ", func(t *testing.T) {
 		testEnv := "TestEnvironment"
 		input := `common: