Merge pull request #65 from fluxcd/artifact-mock-srv

Author: hiddeco

controllers/gitrepository_controller_test.go

@@ -39,7 +39,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
-	"github.com/fluxcd/source-controller/internal/testserver"
+	"github.com/fluxcd/source-controller/pkg/testserver"
 )
 
 var _ = Describe("GitRepositoryReconciler", func() {

controllers/helmchart_controller_test.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
-	"github.com/fluxcd/source-controller/internal/testserver"
+	"github.com/fluxcd/source-controller/pkg/testserver"
 )
 
 var _ = Describe("HelmChartReconciler", func() {
@@ -46,7 +46,7 @@ var _ = Describe("HelmChartReconciler", func() {
 	Context("HelmChart", func() {
 		var (
 			namespace  *corev1.Namespace
-			helmServer *testserver.Helm
+			helmServer *testserver.HelmServer
 			err        error
 		)
 

controllers/helmrepository_controller_test.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
-	"github.com/fluxcd/source-controller/internal/testserver"
+	"github.com/fluxcd/source-controller/pkg/testserver"
 )
 
 var _ = Describe("HelmRepositoryReconciler", func() {
@@ -45,7 +45,7 @@ var _ = Describe("HelmRepositoryReconciler", func() {
 	Context("HelmRepository", func() {
 		var (
 			namespace  *corev1.Namespace
-			helmServer *testserver.Helm
+			helmServer *testserver.HelmServer
 			err        error
 		)
 

pkg/testserver/artifact.go

@@ -0,0 +1,96 @@
+/*
+Copyright 2020 The Flux CD contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package testserver
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"crypto/sha1"
+	"errors"
+	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+)
+
+func NewTempArtifactServer() (*ArtifactServer, error) {
+	server, err := NewTempHTTPServer()
+	if err != nil {
+		return nil, err
+	}
+	artifact := &ArtifactServer{server}
+	return artifact, nil
+}
+
+type ArtifactServer struct {
+	*HTTPServer
+}
+
+type File struct {
+	Name string
+	Body string
+}
+
+// ArtifactFromBytes creates a tar.gz artifact from the given files and
+// returns the file name of the artifact.
+func (s *ArtifactServer) ArtifactFromBytes(files []File) (string, error) {
+	fileName := calculateArtifactName(files)
+	filePath := filepath.Join(s.docroot, fileName)
+	gzFile, err := os.Create(filePath)
+	if err != nil {
+		return "", err
+	}
+	defer gzFile.Close()
+
+	gw := gzip.NewWriter(gzFile)
+	defer gw.Close()
+
+	tw := tar.NewWriter(gw)
+	defer tw.Close()
+
+	for _, f := range files {
+		hdr := &tar.Header{
+			Name: f.Name,
+			Mode: 0600,
+			Size: int64(len(f.Body)),
+		}
+		if err := tw.WriteHeader(hdr); err != nil {
+			return "", err
+		}
+		if _, err := tw.Write([]byte(f.Body)); err != nil {
+			return "", err
+		}
+	}
+	return fileName, nil
+}
+
+// URLForFile returns the URL the given file can be reached at or
+// an error if the server has not been started.
+func (s *ArtifactServer) URLForFile(file string) (string, error) {
+	if s.URL() == "" {
+		return "", errors.New("server must be started to be able to determine the URL of the given file")
+	}
+	return path.Join(s.URL(), file), nil
+}
+
+func calculateArtifactName(files []File) string {
+	h := sha1.New()
+	for _, f := range files {
+		h.Write([]byte(f.Body))
+	}
+	return fmt.Sprintf("%x.tar.gz", h.Sum(nil))
+}

internal/testserver/git.go pkg/testserver/git.gointernal/testserver/git.go renamed to pkg/testserver/git.go

@@ -25,39 +25,39 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-func NewTempHelmServer() (*Helm, error) {
+func NewTempHelmServer() (*HelmServer, error) {
 	server, err := NewTempHTTPServer()
 	if err != nil {
 		return nil, err
 	}
-	helm := &Helm{server}
+	helm := &HelmServer{server}
 	return helm, nil
 }
 
-type Helm struct {
-	*HTTP
+type HelmServer struct {
+	*HTTPServer
 }
 
-func (s *Helm) GenerateIndex() error {
-	index, err := repo.IndexDirectory(s.HTTP.docroot, s.HTTP.URL())
+func (s *HelmServer) GenerateIndex() error {
+	index, err := repo.IndexDirectory(s.HTTPServer.docroot, s.HTTPServer.URL())
 	if err != nil {
 		return err
 	}
 	d, err := yaml.Marshal(index)
 	if err != nil {
 		return err
 	}
-	f := filepath.Join(s.HTTP.docroot, "index.yaml")
+	f := filepath.Join(s.HTTPServer.docroot, "index.yaml")
 	return ioutil.WriteFile(f, d, 0644)
 }
 
-func (s *Helm) PackageChart(path string) error {
+func (s *HelmServer) PackageChart(path string) error {
 	return s.PackageChartWithVersion(path, "")
 }
 
-func (s *Helm) PackageChartWithVersion(path, version string) error {
+func (s *HelmServer) PackageChartWithVersion(path, version string) error {
 	pkg := action.NewPackage()
-	pkg.Destination = s.HTTP.docroot
+	pkg.Destination = s.HTTPServer.docroot
 	pkg.Version = version
 	_, err := pkg.Run(path, nil)
 	return err

internal/testserver/helm.go pkg/testserver/helm.gointernal/testserver/helm.go renamed to pkg/testserver/helm.go

@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 )
 
-func NewTempHTTPServer() (*HTTP, error) {
+func NewTempHTTPServer() (*HTTPServer, error) {
 	tmpDir, err := ioutil.TempDir("", "http-test-")
 	if err != nil {
 		return nil, err
@@ -34,28 +34,28 @@ func NewTempHTTPServer() (*HTTP, error) {
 	return srv, nil
 }
 
-func NewHTTPServer(docroot string) *HTTP {
+func NewHTTPServer(docroot string) *HTTPServer {
 	root, err := filepath.Abs(docroot)
 	if err != nil {
 		panic(err)
 	}
-	return &HTTP{
+	return &HTTPServer{
 		docroot: root,
 	}
 }
 
-type HTTP struct {
+type HTTPServer struct {
 	docroot    string
 	middleware func(http.Handler) http.Handler
 	server     *httptest.Server
 }
 
-func (s *HTTP) WithMiddleware(m func(handler http.Handler) http.Handler) *HTTP {
+func (s *HTTPServer) WithMiddleware(m func(handler http.Handler) http.Handler) *HTTPServer {
 	s.middleware = m
 	return s
 }
 
-func (s *HTTP) Start() {
+func (s *HTTPServer) Start() {
 	s.server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		handler := http.FileServer(http.Dir(s.docroot))
 		if s.middleware != nil {
@@ -66,7 +66,7 @@ func (s *HTTP) Start() {
 	}))
 }
 
-func (s *HTTP) StartTLS(cert, key, ca []byte) error {
+func (s *HTTPServer) StartTLS(cert, key, ca []byte) error {
 	s.server = httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		handler := http.FileServer(http.Dir(s.docroot))
 		if s.middleware != nil {
@@ -88,25 +88,24 @@ func (s *HTTP) StartTLS(cert, key, ca []byte) error {
 	cp.AppendCertsFromPEM(ca)
 	config.RootCAs = cp
 
-	config.BuildNameToCertificate()
 	config.ServerName = "example.com"
 	s.server.TLS = &config
 
 	s.server.StartTLS()
 	return nil
 }
 
-func (s *HTTP) Stop() {
+func (s *HTTPServer) Stop() {
 	if s.server != nil {
 		s.server.Close()
 	}
 }
 
-func (s *HTTP) Root() string {
+func (s *HTTPServer) Root() string {
 	return s.docroot
 }
 
-func (s *HTTP) URL() string {
+func (s *HTTPServer) URL() string {
 	if s.server != nil {
 		return s.server.URL
 	}