feat: add repository_id to AppSet generators (#15820) (#22416)

Signed-off-by: Gregor Eichelberger <[email protected]>

Author: geichelberger

applicationset/generators/scm_provider.go

@@ -253,6 +253,7 @@ func (g *SCMProviderGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha
 		params := map[string]any{
 			"organization":     repo.Organization,
 			"repository":       repo.Repository,
+			"repository_id":    repo.RepositoryId,
 			"url":              repo.URL,
 			"branch":           repo.Branch,
 			"sha":              repo.SHA,

applicationset/generators/scm_provider_test.go

@@ -25,6 +25,7 @@ func TestSCMProviderGenerateParams(t *testing.T) {
 				{
 					Organization: "myorg",
 					Repository:   "repo1",
+					RepositoryId: 190320251,
 					URL:          "[email protected]:myorg/repo1.git",
 					Branch:       "main",
 					SHA:          "0bc57212c3cbbec69d20b34c507284bd300def5b",
@@ -33,6 +34,7 @@ func TestSCMProviderGenerateParams(t *testing.T) {
 				{
 					Organization: "myorg",
 					Repository:   "repo2",
+					RepositoryId: 190320252,
 					URL:          "[email protected]:myorg/repo2.git",
 					Branch:       "main",
 					SHA:          "59d0",
@@ -42,6 +44,7 @@ func TestSCMProviderGenerateParams(t *testing.T) {
 				{
 					"organization":     "myorg",
 					"repository":       "repo1",
+					"repository_id":    190320251,
 					"url":              "[email protected]:myorg/repo1.git",
 					"branch":           "main",
 					"branchNormalized": "main",
@@ -53,6 +56,7 @@ func TestSCMProviderGenerateParams(t *testing.T) {
 				{
 					"organization":     "myorg",
 					"repository":       "repo2",
+					"repository_id":    190320252,
 					"url":              "[email protected]:myorg/repo2.git",
 					"branch":           "main",
 					"branchNormalized": "main",
@@ -69,6 +73,7 @@ func TestSCMProviderGenerateParams(t *testing.T) {
 				{
 					Organization: "myorg",
 					Repository:   "repo3",
+					RepositoryId: 190320253,
 					URL:          "[email protected]:myorg/repo3.git",
 					Branch:       "main",
 					SHA:          "0bc57212c3cbbec69d20b34c507284bd300def5b",
@@ -83,6 +88,7 @@ func TestSCMProviderGenerateParams(t *testing.T) {
 				{
 					"organization":                  "myorg",
 					"repository":                    "repo3",
+					"repository_id":                 190320253,
 					"url":                           "[email protected]:myorg/repo3.git",
 					"branch":                        "main",
 					"branchNormalized":              "main",
@@ -95,6 +101,52 @@ func TestSCMProviderGenerateParams(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "Repos with and without id",
+			repos: []*scm_provider.Repository{
+				{
+					Organization: "myorg",
+					Repository:   "repo4",
+					RepositoryId: "idaz09",
+					URL:          "[email protected]:myorg/repo4.git",
+					Branch:       "main",
+					SHA:          "0bc57212c3cbbec69d20b34c507284bd300def5b",
+				},
+				{
+					Organization: "myorg",
+					Repository:   "repo5",
+					URL:          "[email protected]:myorg/repo5.git",
+					Branch:       "main",
+					SHA:          "0bc57212c3cbbec69d20b34c507284bd300def5b",
+				},
+			},
+			expected: []map[string]any{
+				{
+					"organization":     "myorg",
+					"repository":       "repo4",
+					"repository_id":    "idaz09",
+					"url":              "[email protected]:myorg/repo4.git",
+					"branch":           "main",
+					"branchNormalized": "main",
+					"sha":              "0bc57212c3cbbec69d20b34c507284bd300def5b",
+					"short_sha":        "0bc57212",
+					"short_sha_7":      "0bc5721",
+					"labels":           "",
+				},
+				{
+					"organization":     "myorg",
+					"repository":       "repo5",
+					"repository_id":    nil,
+					"url":              "[email protected]:myorg/repo5.git",
+					"branch":           "main",
+					"branchNormalized": "main",
+					"sha":              "0bc57212c3cbbec69d20b34c507284bd300def5b",
+					"short_sha":        "0bc57212",
+					"short_sha_7":      "0bc5721",
+					"labels":           "",
+				},
+			},
+		},
 	}
 
 	for _, testCase := range cases {

docs/operator-manual/applicationset/Generators-SCM-Provider.md

@@ -442,6 +442,7 @@ spec:
 
 * `organization`: The name of the organization the repository is in.
 * `repository`: The name of the repository.
+* `repository_id`: The id of the repository.
 * `url`: The clone URL for the repository.
 * `branch`: The default branch of the repository.
 * `sha`: The Git commit SHA for the branch.