update source resolver

Signed-off-by: Tom Kennedy <ktom@vmware.com>
buildpacks-community · Oct 24, 2023 · 809ad17 · 809ad17
1 parent 812ba5d
commit 809ad17
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/pkg/git/fetch_test.go b/pkg/git/fetch_test.go
@@ -108,6 +108,7 @@ func testGitCheckout(t *testing.T, when spec.G, it spec.S) {
 		})
 
         it("initializes submodules", func() {
+            fetcher.InitializeSubmodules = true 
             err := fetcher.Fetch(testDir, "https://github.com/git-fixtures/submodule", "master", metadataDir)
             require.NoError(t, err)
 

diff --git a/pkg/git/remote_git_resolver.go b/pkg/git/remote_git_resolver.go
@@ -26,10 +26,11 @@ func (*remoteGitResolver) Resolve(auth transport.AuthMethod, sourceConfig corev1
 	if err != nil {
 		return corev1alpha1.ResolvedSourceConfig{
 			Git: &corev1alpha1.ResolvedGitSource{
-				URL:      sourceConfig.Git.URL,
-				Revision: sourceConfig.Git.Revision,
-				Type:     corev1alpha1.Unknown,
-				SubPath:  sourceConfig.SubPath,
+				URL:                  sourceConfig.Git.URL,
+				Revision:             sourceConfig.Git.Revision,
+				Type:                 corev1alpha1.Unknown,
+				SubPath:              sourceConfig.SubPath,
+				InitializeSubmodules: sourceConfig.Git.InitializeSubmodules,
 			},
 		}, nil
 	}
@@ -38,21 +39,23 @@ func (*remoteGitResolver) Resolve(auth transport.AuthMethod, sourceConfig corev1
 		if ref.Name().Short() == sourceConfig.Git.Revision {
 			return corev1alpha1.ResolvedSourceConfig{
 				Git: &corev1alpha1.ResolvedGitSource{
-					URL:      sourceConfig.Git.URL,
-					Revision: ref.Hash().String(),
-					Type:     sourceType(ref),
-					SubPath:  sourceConfig.SubPath,
+					URL:                  sourceConfig.Git.URL,
+					Revision:             ref.Hash().String(),
+					Type:                 sourceType(ref),
+					SubPath:              sourceConfig.SubPath,
+					InitializeSubmodules: sourceConfig.Git.InitializeSubmodules,
 				},
 			}, nil
 		}
 	}
 
 	return corev1alpha1.ResolvedSourceConfig{
 		Git: &corev1alpha1.ResolvedGitSource{
-			URL:      sourceConfig.Git.URL,
-			Revision: sourceConfig.Git.Revision,
-			Type:     corev1alpha1.Commit,
-			SubPath:  sourceConfig.SubPath,
+			URL:                  sourceConfig.Git.URL,
+			Revision:             sourceConfig.Git.Revision,
+			Type:                 corev1alpha1.Commit,
+			SubPath:              sourceConfig.SubPath,
+			InitializeSubmodules: sourceConfig.Git.InitializeSubmodules,
 		},
 	}, nil
 }

diff --git a/pkg/reconciler/sourceresolver/sourceresolver_test.go b/pkg/reconciler/sourceresolver/sourceresolver_test.go
@@ -77,18 +77,20 @@ func testSourceResolver(t *testing.T, when spec.G, it spec.S) {
 					ServiceAccountName: serviceAccount,
 					Source: corev1alpha1.SourceConfig{
 						Git: &corev1alpha1.Git{
-							URL:      "https://github.com/build-me",
-							Revision: "1234",
+							URL:                  "https://github.com/build-me",
+							Revision:             "1234",
+							InitializeSubmodules: true,
 						},
 					},
 				},
 			}
 
 			resolvedSource := corev1alpha1.ResolvedSourceConfig{
 				Git: &corev1alpha1.ResolvedGitSource{
-					URL:      "https://example.com/something",
-					Revision: "abcdef",
-					Type:     corev1alpha1.Branch,
+					URL:                  "https://example.com/something",
+					Revision:             "abcdef",
+					Type:                 corev1alpha1.Branch,
+					InitializeSubmodules: true,
 				},
 			}