Merge pull request #308 from Kostov6/http_cache_test

Http cache test and resource name bugfix
gardener · Feb 8, 2024 · a748420 · a748420
2 parents 68aff7d + f60aace
commit a748420
Show file tree

Hide file tree

Showing 22 changed files with 1,145 additions and 307 deletions.
diff --git a/cmd/app/initilization.go b/cmd/app/initilization.go
@@ -95,7 +95,7 @@ func newRepositoryHost(host string, client *github.Client, httpClient *http.Clie
 	if host == "github.com" {
 		rawHost = "raw.githubusercontent.com"
 	}
-	return githubhttpcache.NewGHC(host, client, httpClient, &osshim.OsShim{}, []string{host, rawHost}, localMappings, options)
+	return githubhttpcache.NewGHC(host, client, client.Repositories, client.Git, httpClient, &osshim.OsShim{}, []string{host, rawHost}, localMappings, options)
 }
 
 // NewReactor creates a Reactor from Options

diff --git a/pkg/manifest/manifest.go b/pkg/manifest/manifest.go
@@ -38,27 +38,24 @@ func processManifest(f nodeTransformation, node *Node, parent *Node, manifest *N
 }
 
 func loadManifestStructure(node *Node, parent *Node, manifest *Node, r resourcehandlers.Registry) error {
-	var (
-		err         error
-		content     string
-		newManifest string
-	)
 	if node.Manifest == "" {
 		return nil
 	}
 	fs, err := r.Get(manifest.Manifest)
 	if err != nil {
 		return err
 	}
-	if newManifest, err = fs.ToAbsLink(manifest.Manifest, node.Manifest); err != nil {
+	newManifest, err := fs.ToAbsLink(manifest.Manifest, node.Manifest)
+	if err != nil {
 		return fmt.Errorf("can't build manifest node %s absolute URL : %w ", node.Manifest, err)
 	}
 	node.Manifest = newManifest
 	fs, err = r.Get(node.Manifest)
 	if err != nil {
 		return err
 	}
-	if content, err = fs.ManifestFromURL(node.Manifest); err != nil {
+	content, err := fs.ManifestFromURL(node.Manifest)
+	if err != nil {
 		return fmt.Errorf("can't get manifest file content : %w", err)
 	}
 	if err = yaml.Unmarshal([]byte(content), node); err != nil {

diff --git a/pkg/osfakes/httpclient/httpclientfakes/fake_client.go b/pkg/osfakes/httpclient/httpclientfakes/fake_client.go
diff --git a/pkg/osfakes/osshim/osshimfakes/fake_os.go b/pkg/osfakes/osshim/osshimfakes/fake_os.go
diff --git a/pkg/readers/link/resource_link.go b/pkg/readers/link/resource_link.go
@@ -7,7 +7,6 @@ package link
 import (
 	"fmt"
 	"net/url"
-	"path"
 	"regexp"
 )
 
@@ -100,13 +99,3 @@ func (r *Resource) GetRepoURL() string {
 func (r *Resource) GetRawURL() string {
 	return fmt.Sprintf("https://%s/%s/%s/raw/%s/%s", r.Host, r.Owner, r.Repo, r.Ref, r.Path)
 }
-
-// GetResourceName returns the name of the resource (including extension), if resource path is empty returns '.'
-func (r *Resource) GetResourceName() string {
-	return path.Base(r.Path)
-}
-
-// GetResourceExt returns the resource name extension, empty string if when no extension exists
-func (r *Resource) GetResourceExt() string {
-	return path.Ext(r.Path)
-}