Merge pull request #104 from SomtochiAma/git-repository

Base git repository working

Author: k8s-ci-robot

go.mod

@@ -5,6 +5,7 @@ go 1.13
 require (
 	github.com/blang/semver v3.5.0+incompatible
 	github.com/evanphx/json-patch v4.5.0+incompatible
+	github.com/go-git/go-git/v5 v5.1.0
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v1.0.0

go.sum

@@ -20,9 +20,10 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	addonsv1alpha1 "sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/apis/v1alpha1"
@@ -47,6 +48,11 @@ func NewManifestLoader(channel string) (*ManifestLoader, error) {
 		return &ManifestLoader{repo: repo}, nil
 	}
 
+	if strings.Contains(channel, "git//") || strings.Contains(channel, ".git") {
+		repo := NewGitRepository(channel)
+		return &ManifestLoader{repo: repo}, nil
+	}
+
 	repo := NewFSRepository(channel)
 	return &ManifestLoader{repo: repo}, nil
 }

pkg/patterns/addon/pkg/loaders/fs.go

@@ -0,0 +1,124 @@
+package loaders
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/go-git/go-git/v5"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/yaml"
+)
+
+type GitRepository struct {
+	baseURL string
+	subDir  string
+	branch  string
+}
+
+var _ Repository = &GitRepository{}
+
+// NewGitRepository constructs an GitRepository
+func NewGitRepository(baseurl string) *GitRepository {
+	repo := parseGitURL(baseurl)
+	return &repo
+}
+
+func (r *GitRepository) LoadChannel(ctx context.Context, name string) (*Channel, error) {
+	if !allowedChannelName(name) {
+		return nil, fmt.Errorf("invalid channel name: %q", name)
+	}
+
+	log := log.Log
+	log.WithValues("baseURL", r.baseURL).Info("loading channel")
+	log.WithValues("baseURL", r.baseURL).Info("cloning git repository")
+
+	if r.subDir != "" {
+		name = r.subDir + "/" + name
+	}
+	b, err := r.readURL(name)
+	if err != nil {
+		log.WithValues("path", name).Error(err, "error reading channel")
+		return nil, err
+	}
+
+	channel := &Channel{}
+	if err := yaml.Unmarshal(b, channel); err != nil {
+		return nil, fmt.Errorf("error parsing channel bytes %s: %v", string(b), err)
+	}
+
+	return channel, nil
+}
+
+func (r *GitRepository) LoadManifest(ctx context.Context, packageName string, id string) (map[string]string, error) {
+	if !allowedManifestId(packageName) {
+		return nil, fmt.Errorf("invalid package name: %q", id)
+	}
+
+	if !allowedManifestId(id) {
+		return nil, fmt.Errorf("invalid manifest id: %q", id)
+	}
+
+	log := log.Log
+	log.WithValues("package", packageName).Info("loading package")
+
+	var filePath string
+	if r.subDir == "" {
+		filePath = path.Join("packages", packageName, id, "manifest.yaml")
+	} else {
+		filePath = path.Join(r.subDir, "packages", packageName, id, "manifest.yaml")
+	}
+
+	b, err := r.readURL(filePath)
+
+	if err != nil {
+		return nil, fmt.Errorf("error reading package %s: %v", filePath, err)
+	}
+	result := map[string]string{
+		filePath: string(b),
+	}
+
+	return result, nil
+}
+
+func (r *GitRepository) readURL(url string) ([]byte, error) {
+	repoDir := "/tmp/repo"
+	filePath := filepath.Join(repoDir, url)
+	fmt.Println(r.baseURL)
+	_, err := git.PlainClone(repoDir, false, &git.CloneOptions{
+		URL: r.baseURL,
+	})
+	if err != nil && err != git.ErrRepositoryAlreadyExists {
+		return nil, err
+	}
+
+	b, err := ioutil.ReadFile(filePath)
+	if err != nil {
+		return nil, err
+	}
+
+	return b, nil
+}
+
+func parseGitURL(url string) GitRepository {
+	// checks for git:: suffix
+	var subdir string
+	if strings.HasPrefix(url, "git::") {
+		url = strings.TrimPrefix(url, "git::")
+	}
+
+	// checks for subdirectories
+	if strings.Contains(url, ".git//") {
+		urlComponent := strings.SplitN(url, ".git//", 2)
+		url = urlComponent[0] + ".git"
+		subdir = urlComponent[1]
+	}
+
+	return GitRepository{
+		baseURL: url,
+		subDir:  subdir,
+	}
+}

pkg/patterns/addon/pkg/loaders/git.go

@@ -0,0 +1,40 @@
+package loaders
+
+import (
+	"testing"
+)
+
+func TestParseGitURL(t *testing.T) {
+	tests := []struct {
+		rawURL  string
+		baseURL string
+		subDir  string
+	}{
+		{
+			rawURL:  "https://github.com/testRepository.git",
+			baseURL: "https://github.com/testRepository.git",
+			subDir:  "",
+		},
+		{
+			rawURL:  "git::https://github.com/testRepository.git",
+			baseURL: "https://github.com/testRepository.git",
+			subDir:  "",
+		},
+		{
+			rawURL:  "git::https://github.com/testRepository.git//subDir/package",
+			baseURL: "https://github.com/testRepository.git",
+			subDir:  "subDir/package",
+		},
+	}
+
+	for _, tt := range tests {
+		gitRepo := parseGitURL(tt.rawURL)
+		if gitRepo.baseURL != tt.baseURL {
+			t.Errorf("Expected base url: %v, got %v", tt.baseURL, gitRepo.baseURL)
+		}
+
+		if gitRepo.subDir != tt.subDir {
+			t.Errorf("Expected base url: %v, got %v", tt.subDir, gitRepo.subDir)
+		}
+	}
+}

pkg/patterns/addon/pkg/loaders/git_test.go

@@ -19,9 +19,10 @@ package status
 import (
 	"context"
 	"fmt"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"reflect"
 
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"