Added support for artifact being single file (#177)

Author: alex5517

pkg/artifact/git/repository.go

@@ -87,11 +87,24 @@ func PullRepository(ctx context.Context, a *artifact.Artifact, opts *RepositoryO
 		tmpDstDir = filepath.Join(tmpDstDir, a.RelativePath)
 	}
 
-	// Move the directory to the final destination
-	if err := os.Rename(
-		tmpDstDir,
-		a.DestDir()); err != nil {
-		return nil, fmt.Errorf("renaming directory: %w", err)
+	fi, err := os.Stat(tmpDstDir)
+	if err != nil {
+		return nil, fmt.Errorf("stat temporary artifact: %w", err)
+	}
+
+	finalDest := a.DestDir()
+
+	if !fi.IsDir() {
+		// The artifact is a single file. Create the destination directory
+		// and adjust the destination path to include the filename.
+		if err = os.MkdirAll(finalDest, file.FileModeNewDirectory); err != nil {
+			return nil, fmt.Errorf("creating destination directory for file: %w", err)
+		}
+		finalDest = filepath.Join(finalDest, filepath.Base(tmpDstDir))
+	}
+
+	if err = os.Rename(tmpDstDir, finalDest); err != nil {
+		return nil, fmt.Errorf("moving artifact to destination: %w", err)
 	}
 
 	artifactVersion := artifact.FirstVersionOrLatest(a.Version)

pkg/artifact/git/repository_test.go

@@ -44,6 +44,54 @@ func TestPullRepository(t *testing.T) {
 		assert.DirExists(t, artifactDir)
 	})
 
+	t.Run("success_with_single_file_artifact", func(t *testing.T) {
+		tmpDir, err := os.MkdirTemp("", "go-common-test-")
+		require.NoError(t, err)
+		defer os.RemoveAll(tmpDir)
+
+		art := &artifact.Artifact{
+			Name:         "my-repo",
+			URL:          "https://github.com/example/my-repo.git",
+			BaseDir:      tmpDir,
+			RelativePath: "single-file.yaml",
+		}
+
+		mockRepo := git.NewMockRepository(t)
+		mockRepo.On("PlainCloneContext", mock.Anything, mock.Anything, mock.Anything).
+			Run(func(args mock.Arguments) {
+				cloneDestPath := args.Get(1).(string)
+
+				err = os.WriteFile(filepath.Join(cloneDestPath, "single-file.yaml"), []byte("file content"), 0644)
+				require.NoError(t, err)
+				err = os.WriteFile(filepath.Join(cloneDestPath, "other-file.yaml"), []byte("file content"), 0644)
+				require.NoError(t, err)
+				err = os.MkdirAll(filepath.Join(cloneDestPath, "example"), 0755)
+				require.NoError(t, err)
+				err = os.MkdirAll(filepath.Join(cloneDestPath, ".git"), 0755)
+				require.NoError(t, err)
+			}).
+			Return(&gogit.Repository{}, nil)
+
+		opts := &RepositoryOptions{
+			Repository: mockRepo,
+		}
+
+		result, err := PullRepository(context.Background(), art, opts)
+
+		require.NoError(t, err)
+		require.NotNil(t, result)
+
+		finalDir := art.DestDir()
+		finalFile := filepath.Join(finalDir, "single-file.yaml")
+		noExistDir := filepath.Join(finalDir, "example")
+		noExistFile := filepath.Join(finalDir, "other-file.yaml")
+
+		assert.DirExists(t, finalDir, "The final destination directory should be created")
+		assert.FileExists(t, finalFile, "The artifact file should exist in the destination directory")
+		assert.NoDirExists(t, noExistDir, "The final destination should not contain example directory")
+		assert.NoFileExists(t, noExistFile, "The final destination should not contain other-file.yaml")
+	})
+
 	t.Run("error_no_repository", func(t *testing.T) {
 		art := &artifact.Artifact{
 			Name: "my-repo",