fix: delete unused urls for embedded packages (#1609)

Author: vjripoll

build/embedded/Makefile

@@ -4,7 +4,6 @@ GOARCH=$(shell $(GOCMD) env GOARCH)
 BINARY_NAME=embedded-downloader-$(GOOS)-$(GOARCH)
 # flags
 ARCH?=amd64
-STAGING?=false
 
 .DEFAULT_GOAL := all
 
@@ -21,7 +20,7 @@ dependencies:
 
 .PHONY: run
 run:
-	@go run ./... -arch $(ARCH) -staging $(STAGING)
+	@go run ./... -arch $(ARCH)
 
 .PHONY: test
 test:

build/embedded/README.md

@@ -44,7 +44,7 @@ make clean
 make run
 
 #flags
-STAGING=true ARCH=amd64 make run
+ARCH=amd64 make run
 ```
 
 ## Test

build/embedded/config.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"gopkg.in/yaml.v3"
 	"os"
 	"strings"
@@ -14,13 +15,6 @@ var errRequiredValue = errors.New("required value missing")
 
 type Config struct {
 	Artifacts []Artifact `yaml:"artifacts"`
-	defaults  Defaults   `yaml:"-"`
-}
-
-type Defaults struct {
-	Destination string `yaml:"destination"`
-	URL         string `yaml:"url"`
-	StagingURL  string `yaml:"staging_url"`
 }
 
 type Artifact struct {
@@ -63,68 +57,63 @@ func (f File) parseSrc(artifact Artifact) (string, error) {
 	return renderTemplate(tpl, artifact)
 }
 
-func configFromFile(staging bool, arch string, versions map[string]string) (Config, error) {
+func configFromFile(arch string, versions map[string]string) (Config, error) {
 	// Read the YAML file into a byte slice
 	yamlFile, err := os.ReadFile("embedded.yaml")
 	if err != nil {
 		return Config{}, errors.Join(errLoadingConfig, err)
 	}
-	return config(staging, arch, versions, yamlFile)
+	return config(arch, versions, yamlFile)
 }
 
-func config(staging bool, arch string, versions map[string]string, content []byte) (Config, error) {
+func config(arch string, versions map[string]string, content []byte) (Config, error) {
 	// Unmarshal YAML into Config struct
 	var cnf Config
 	err := yaml.Unmarshal(content, &cnf)
 	if err != nil {
 		return Config{}, errors.Join(errLoadingConfig, err)
 	}
 
-	// Unmarshal YAML into Config Defaults struct
-	err = yaml.Unmarshal(content, &cnf.defaults)
-	if err != nil {
-		return Config{}, errors.Join(errLoadingConfig, err)
-	}
-
-	// validate required
-	if cnf.defaults.URL == "" {
-		return Config{}, errors.Join(errRequiredValue, errors.New("cnf.defaults.URL is missing"))
-	}
-	if cnf.defaults.Destination == "" {
-		return Config{}, errors.Join(errRequiredValue, errors.New("cnf.defaults.Destination is missing"))
-	}
-	if cnf.defaults.StagingURL == "" {
-		return Config{}, errors.Join(errRequiredValue, errors.New("cnf.defaults.StagingURL is missing"))
+	if err := processAndValidateConfig(arch, versions, &cnf); err != nil {
+		return Config{}, err
 	}
 
-	expandDefaults(staging, arch, versions, &cnf)
-
 	return cnf, nil
 }
 
-func expandDefaults(staging bool, arch string, versions map[string]string, cnf *Config) {
-	// fill the non specified values with defaults
-	defaultUrl := cnf.defaults.URL
-	if staging {
-		defaultUrl = cnf.defaults.StagingURL
-	}
-
+func processAndValidateConfig(arch string, versions map[string]string, cnf *Config) error {
 	for i := range cnf.Artifacts {
-		if version, ok := versions[cnf.Artifacts[i].Name]; ok {
-			cnf.Artifacts[i].Version = version
+		artifact := &cnf.Artifacts[i]
+
+		if artifact.Name == "" {
+			return fmt.Errorf("artifact at index %d is missing a required 'name'", i)
 		}
-		if cnf.Artifacts[i].URL == "" {
-			cnf.Artifacts[i].URL = defaultUrl
+
+		if artifact.URL == "" {
+			return fmt.Errorf("artifact '%s' is missing required field 'url'", artifact.Name)
 		}
-		if cnf.Artifacts[i].Arch == "" {
-			cnf.Artifacts[i].Arch = arch
+
+		artifact.Arch = arch
+
+		if v, ok := versions[artifact.Name]; ok {
+			artifact.Version = v
+		} else {
+			return fmt.Errorf("version not found for artifact: '%s'", artifact.Name)
 		}
-		for j := range cnf.Artifacts[i].Files {
-			if cnf.Artifacts[i].Files[j].Dest == "" {
-				cnf.Artifacts[i].Files[j].Dest = cnf.defaults.Destination
+
+		for j := range artifact.Files {
+			file := &artifact.Files[j]
+
+			if file.Src == "" {
+				return fmt.Errorf("file '%s' in artifact '%s' is missing a required 'src' field", file.Name, artifact.Name)
+			}
+
+			if file.Dest == "" {
+				return fmt.Errorf("file '%s' in artifact '%s' is missing required field 'dest'", file.Name, artifact.Name)
 			}
 		}
 	}
+	return nil
 }
 
 // newTemplate creates a new template and adds the helper trimv function