forked from argoproj/argo-cd
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: getting version based on synced revision (#341)
- Loading branch information
1 parent
b98b02a
commit 4a252db
Showing
8 changed files
with
253 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| ### Features | ||
| - feat: event-reporter: report change revisions metadata in app annotations | ||
| - feat: argocd-repo-server: support for arrays in promotion versionSource | ||
| - feat: event-reporter: getting version based on synced revision | ||
| - feat: argocd-repo-server: suppress 'version not found' error message when version configuration is not provided |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
178 changes: 178 additions & 0 deletions
178
reposerver/repository/app_version_parseVersionValue_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| package repository | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| log "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| // Correctly extracts version when jsonPathExpression matches a string value | ||
| func TestParseVersionValueWithString(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": "1.0.0", | ||
| } | ||
| jsonPathExpression := "$.version" | ||
| expectedVersion := "1.0.0" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Handles non-string version values gracefully | ||
| func TestParseVersionValueWithNonString(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": 123, | ||
| } | ||
| jsonPathExpression := "$.version" | ||
| expectedVersion := "" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Logs appropriate message when version value is non-string | ||
| func TestParseVersionValueWithNonString1(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": 1.0, | ||
| } | ||
| jsonPathExpression := "$.version" | ||
|
|
||
| // Capture log output | ||
| var logOutput bytes.Buffer | ||
| log.SetOutput(&logOutput) | ||
|
|
||
| _ = parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| expectedLogMessage := "Version value is not a string. Got: 1" | ||
| if !strings.Contains(logOutput.String(), expectedLogMessage) { | ||
| t.Errorf("Expected log message containing '%s', but got '%s'", expectedLogMessage, logOutput.String()) | ||
| } | ||
| } | ||
|
|
||
| // Correctly extracts version when jsonPathExpression matches an array with a string value | ||
| func TestParseVersionValueWithArray(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": []interface{}{"1.0.0"}, | ||
| } | ||
| jsonPathExpression := "$.version" | ||
| expectedVersion := "1.0.0" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Returns empty string when jsonPathExpression does not match any value | ||
| func TestParseVersionValueWhenJsonPathExpressionDoesNotMatch(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": "1.0.0", | ||
| } | ||
| jsonPathExpression := "$.nonexistent" | ||
| expectedVersion := "" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Handles nil jsonObj without crashing | ||
| func TestParseVersionValueWithNilJSONObj(t *testing.T) { | ||
| var jsonObj interface{} | ||
| jsonPathExpression := "$.version" | ||
| expectedVersion := "" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Handles empty jsonPathExpression without crashing | ||
| func TestParseVersionValueWithEmptyExpression(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": "1.0.0", | ||
| } | ||
| jsonPathExpression := "" | ||
| expectedVersion := "" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Handles jsonPathExpression that matches an empty array | ||
| func TestParseVersionValueWithEmptyArray(t *testing.T) { | ||
| jsonObj := []interface{}{} | ||
| jsonPathExpression := "$.version" | ||
| expectedVersion := "" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Handles jsonPathExpression that matches a non-string array | ||
| func TestParseVersionValueWithNonStringArray(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": []interface{}{1.0, 2.0, 3.0}, | ||
| } | ||
| jsonPathExpression := "$.version" | ||
| expectedVersion := "" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Handles jsonPathExpression that matches a nil value | ||
| func TestParseVersionValueWithNil(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": nil, | ||
| } | ||
| jsonPathExpression := "$.version" | ||
| expectedVersion := "" | ||
|
|
||
| actualVersion := parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| if actualVersion != expectedVersion { | ||
| t.Errorf("Expected version %s, but got %s", expectedVersion, actualVersion) | ||
| } | ||
| } | ||
|
|
||
| // Logs appropriate message when version value is nil | ||
| func TestParseVersionValueWithNilVersion(t *testing.T) { | ||
| jsonObj := map[string]interface{}{ | ||
| "version": nil, | ||
| } | ||
| jsonPathExpression := "$.version" | ||
|
|
||
| var buf bytes.Buffer | ||
| log.SetOutput(&buf) | ||
|
|
||
| _ = parseVersionValue(jsonPathExpression, jsonObj) | ||
|
|
||
| logOutput := buf.String() | ||
| expectedLog := "Version value is not a string. Got: nil" | ||
| if !strings.Contains(logOutput, expectedLog) { | ||
| t.Errorf("Expected log message: %s, but got: %s", expectedLog, logOutput) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters