wip

Author: Tomasz-Smelcerz-SAP

internal/manifest/img/layer.go

@@ -43,14 +43,14 @@ type (
 
 type Layers []Layer
 
-func (l Layer) ConvertToImageSpec(repo string) (*v1beta2.ImageSpec, error) {
+func (l Layer) ConvertToImageSpec(ociRepo string) (*v1beta2.ImageSpec, error) {
 	ociImage, ok := l.LayerRepresentation.(*OCI)
 	if !ok {
 		return nil, fmt.Errorf("%w: not an OCIImage", ErrLayerParsing)
 	}
 
 	return &v1beta2.ImageSpec{
-		Repo: repo, //Note: this value will be used to fetch the layer from the OCI registry
+		Repo: ociRepo, //Note: this value will be used to fetch the layer from the OCI registry
 		Name: ociImage.Name,
 		Ref:  ociImage.Ref,
 		Type: v1beta2.RefTypeMetadata(ociImage.Type),

internal/manifest/img/parse.go

@@ -58,7 +58,7 @@ func parseLayersByName(repo *genericocireg.RepositorySpec, descriptor *compdesc.
 	layers := Layers{}
 	for _, resource := range descriptor.Resources {
 		access := resource.Access
-		var layerRepresentation LayerRepresentation
+		var ociRef *OCI
 		spec, err := ocm.DefaultContext().AccessSpecForSpec(access)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create spec for acccess: %w", err)
@@ -75,11 +75,10 @@ func parseLayersByName(repo *genericocireg.RepositorySpec, descriptor *compdesc.
 			if !ok {
 				return nil, common.ErrTypeAssert
 			}
-			layerRef, err := getOCIRef(repo, descriptor, accessSpec)
+			ociRef, err = getOCIRef(repo, descriptor, accessSpec)
 			if err != nil {
 				return nil, fmt.Errorf("building the digest url: %w", err)
 			}
-			layerRepresentation = layerRef
 		// this resource type is not relevant for module rendering but for security scanning only
 		case ociartifact.Type:
 			fallthrough
@@ -99,7 +98,7 @@ func parseLayersByName(repo *genericocireg.RepositorySpec, descriptor *compdesc.
 		layers = append(
 			layers, Layer{
 				LayerName:           v1beta2.LayerName(resource.Name),
-				LayerRepresentation: layerRepresentation,
+				LayerRepresentation: ociRef,
 			},
 		)
 	}

internal/manifest/parser/template_to_module.go

@@ -23,7 +23,10 @@ import (
 	"github.com/kyma-project/lifecycle-manager/pkg/templatelookup"
 )
 
-var ErrConvertingToOCIAccessSpec = errors.New("failed converting resource.AccessSpec to *ociartifact.AccessSpec")
+var (
+	ErrConvertingToOCIAccessSpec = errors.New("failed converting resource.AccessSpec to *ociartifact.AccessSpec")
+	ErrConvertingToImgOCI        = errors.New("failed converting layerRepresentation to *img.OCI")
+)
 
 type Parser struct {
 	client.Client
@@ -41,6 +44,7 @@ func NewParser(clnt client.Client,
 		Client:              clnt,
 		descriptorProvider:  descriptorProvider,
 		remoteSyncNamespace: remoteSyncNamespace,
+		ociRepo:             ociRepo,
 	}
 }
 
@@ -174,7 +178,6 @@ func newManifestFromTemplate(
 		return nil, fmt.Errorf("could not parse descriptor: %w", err)
 	}
 
-	//repo := "http://k3d-kcp-registry.localhost:5000/component-descriptors" //TODO: Get from configuration
 	if err := translateLayersAndMergeIntoManifest(manifest, layers, repo); err != nil {
 		return nil, fmt.Errorf("could not translate layers and merge them: %w", err)
 	}
@@ -241,23 +244,41 @@ func translateLayersAndMergeIntoManifest(manifest *v1beta2.Manifest, layers img.
 	return nil
 }
 
-func insertLayerIntoManifest(manifest *v1beta2.Manifest, layer img.Layer, repo string) error {
+func insertLayerIntoManifest(manifest *v1beta2.Manifest, layer img.Layer, ociRepoFromConfig string) error {
 	switch layer.LayerName {
 	case v1beta2.DefaultCRLayer:
 		// default CR layer is not relevant for the manifest
 	case v1beta2.ConfigLayer:
-		imageSpec, err := layer.ConvertToImageSpec(repo)
+		imageSpec, err := layer.ConvertToImageSpec(ociRepoFromConfig)
 		if err != nil {
 			return fmt.Errorf("error while parsing config layer: %w", err)
 		}
 		manifest.Spec.Config = imageSpec
 	case v1beta2.RawManifestLayer:
-		installRaw, err := layer.ToInstallRaw()
+		ociImage, ok := layer.LayerRepresentation.(*img.OCI)
+		if !ok {
+			return fmt.Errorf("%w: actual type: %T", ErrConvertingToImgOCI, layer.LayerRepresentation)
+		}
+
+		//Use the repo from global config to fetch the layer from the OCI registry
+		//instead of the one from the layer (the same as in the ComponentDescriptor).
+		//These two repos may be different and the configured one is safer to use,
+		//as it is known to be reachable.
+		//After all, we've been able to read the ComponentDescriptor with it.
+		ociImageCopy := img.OCI{
+			Repo: ociRepoFromConfig,
+			Name: ociImage.Name,
+			Ref:  ociImage.Ref,
+			Type: ociImage.Type,
+		}
+
+		installRaw, err := ociImageCopy.ToInstallRaw()
 		if err != nil {
 			return fmt.Errorf("error while merging the generic install representation: %w", err)
 		}
 		fmt.Println(strings.Repeat("-", 80))
 		fmt.Printf("Inserting installRaw from layer of type %T\n", layer)
+		fmt.Printf("Inserting installRaw from layerRepresentation of type %T\n", layer.LayerRepresentation)
 		fmt.Printf("%s\n", string(installRaw))
 		fmt.Println(strings.Repeat("-", 80))
 		manifest.Spec.Install = v1beta2.InstallInfo{