Remove files which are not needed

pkg/virt-api/BUILD.bazel

@@ -5,8 +5,6 @@ go_library(
     srcs = [
         "api.go",
         "ca-manager.go",
-        "filesystem.go",
-        "generated_mock_filesystem.go",
     ],
     importpath = "kubevirt.io/kubevirt/pkg/virt-api",
     visibility = ["//visibility:public"],
@@ -29,7 +27,6 @@ go_library(
         "//vendor/github.com/emicklei/go-restful:go_default_library",
         "//vendor/github.com/emicklei/go-restful-openapi:go_default_library",
         "//vendor/github.com/go-openapi/spec:go_default_library",
-        "//vendor/github.com/golang/mock/gomock:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/api/admissionregistration/v1beta1:go_default_library",

pkg/virt-api/api.go

@@ -25,7 +25,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"path/filepath"
 	"sync"
 
 	"github.com/emicklei/go-restful"
@@ -112,10 +111,6 @@ type virtAPIApp struct {
 	signingCertBytes []byte
 	certBytes        []byte
 	keyBytes         []byte
-	certFile         string
-	keyFile          string
-	caFile           string
-	signingCertFile  string
 	namespace        string
 	tlsConfig        *tls.Config
 }
@@ -935,27 +930,9 @@ func (app *virtAPIApp) createSubresourceApiservice() error {
 	return nil
 }
 
-func (app *virtAPIApp) setupTLS(fs Filesystem, caManager ClientCAManager) error {
+func (app *virtAPIApp) setupTLS(caManager ClientCAManager) error {
 
-	app.keyFile = filepath.Join(app.certsDirectory, "/key.pem")
-	app.certFile = filepath.Join(app.certsDirectory, "/cert.pem")
-	app.signingCertFile = filepath.Join(app.certsDirectory, "/signingCert.pem")
-
-	// Write the certs to disk
-	err := fs.WriteFile(app.keyFile, app.keyBytes, 0600)
-	if err != nil {
-		return err
-	}
-	err = fs.WriteFile(app.certFile, app.certBytes, 0600)
-	if err != nil {
-		return err
-	}
-	err = fs.WriteFile(app.signingCertFile, app.signingCertBytes, 0600)
-	if err != nil {
-		return err
-	}
-
-	certPair, err := tls.LoadX509KeyPair(app.certFile, app.keyFile)
+	certPair, err := tls.X509KeyPair(app.certBytes, app.keyBytes)
 	if err != nil {
 		return fmt.Errorf("some special error: %b", err)
 	}
@@ -1011,7 +988,7 @@ func (app *virtAPIApp) startTLS(stopCh <-chan struct{}) error {
 
 	caManager := NewClientCAManager(authConfigMapInformer.GetStore())
 
-	err := app.setupTLS(IOUtil{}, caManager)
+	err := app.setupTLS(caManager)
 	if err != nil {
 		return err
 	}

pkg/virt-api/api_test.go

@@ -25,9 +25,8 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"path/filepath"
 
-	restful "github.com/emicklei/go-restful"
+	"github.com/emicklei/go-restful"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -50,15 +49,13 @@ const namespaceKubevirt = "kubevirt"
 
 var _ = Describe("Virt-api", func() {
 	var app virtAPIApp
-	var tmpDir, keyFile, certFile, signingCertFile, caFile string
+	var tmpDir string
 	var server *ghttp.Server
 	var backend *httptest.Server
 	var ctrl *gomock.Controller
 	var authorizorMock *rest.MockVirtApiAuthorizor
-	var filesystemMock *MockFilesystem
 	var expectedValidatingWebhooks *admissionregistrationv1beta1.ValidatingWebhookConfiguration
 	var expectedMutatingWebhooks *admissionregistrationv1beta1.MutatingWebhookConfiguration
-	var restrictiveMode os.FileMode
 	subresourceAggregatedApiName := v1.SubresourceGroupVersion.Version + "." + v1.SubresourceGroupName
 	log.Log.SetIOWriter(GinkgoWriter)
 
@@ -71,11 +68,6 @@ var _ = Describe("Virt-api", func() {
 		Expect(err).ToNot(HaveOccurred())
 		app.virtCli, _ = kubecli.GetKubevirtClientFromFlags(server.URL(), "")
 		app.certsDirectory = tmpDir
-		keyFile = filepath.Join(app.certsDirectory, "/key.pem")
-		certFile = filepath.Join(app.certsDirectory, "/cert.pem")
-		caFile = filepath.Join(app.certsDirectory, "/clientCA.crt")
-		signingCertFile = filepath.Join(app.certsDirectory, "/signingCert.pem")
-		restrictiveMode = 0600
 
 		config, err := clientcmd.BuildConfigFromFlags(server.URL(), "")
 		Expect(err).ToNot(HaveOccurred())
@@ -84,7 +76,6 @@ var _ = Describe("Virt-api", func() {
 		Expect(err).ToNot(HaveOccurred())
 		ctrl = gomock.NewController(GinkgoT())
 		authorizorMock = rest.NewMockVirtApiAuthorizor(ctrl)
-		filesystemMock = NewMockFilesystem(ctrl)
 
 		// Reset go-restful
 		http.DefaultServeMux = new(http.ServeMux)
@@ -481,44 +472,6 @@ var _ = Describe("Virt-api", func() {
 			Expect(err).To(HaveOccurred())
 		}, 5)
 
-		It("should fail setupTLS without any data available at key write error", func() {
-			filesystemMock.EXPECT().
-				WriteFile(keyFile, app.keyBytes, restrictiveMode).
-				Return(errors.New("fake error writing " + caFile))
-			err := app.setupTLS(filesystemMock, nil)
-			Expect(err).To(HaveOccurred())
-		}, 5)
-
-		It("should fail setupTLS at keyBytes write error", func() {
-			filesystemMock.EXPECT().
-				WriteFile(keyFile, app.keyBytes, restrictiveMode).
-				Return(errors.New("fake error writing " + keyFile))
-			err := app.setupTLS(filesystemMock, nil)
-			Expect(err).To(HaveOccurred())
-		}, 5)
-
-		It("should fail setupTLS at certFile write error", func() {
-			filesystemMock.EXPECT().
-				WriteFile(keyFile, app.keyBytes, restrictiveMode)
-			filesystemMock.EXPECT().
-				WriteFile(certFile, app.certBytes, restrictiveMode).
-				Return(errors.New("fake error writing " + certFile))
-			err := app.setupTLS(filesystemMock, nil)
-			Expect(err).To(HaveOccurred())
-		}, 5)
-
-		It("should fail setupTLS at signingCertBytes write error", func() {
-			filesystemMock.EXPECT().
-				WriteFile(keyFile, app.keyBytes, restrictiveMode)
-			filesystemMock.EXPECT().
-				WriteFile(certFile, app.certBytes, restrictiveMode)
-			filesystemMock.EXPECT().
-				WriteFile(signingCertFile, app.signingCertBytes, restrictiveMode).
-				Return(errors.New("fake error writing " + signingCertFile))
-			err := app.setupTLS(filesystemMock, nil)
-			Expect(err).To(HaveOccurred())
-		}, 5)
-
 		It("should have default values for flags", func() {
 			app.AddFlags()
 			Expect(app.SwaggerUI).To(Equal("third_party/swagger-ui"))