[bugfix] Include full BUILD file in version, not arg resolved config

Author: Christian Weichel

cmd/describe.go

@@ -155,16 +155,26 @@ func describePackage(pkg *leeway.Package) {
 			fmt.Fprintf(w, "\t%s\n", argdep)
 		}
 	}
-	fmt.Fprintf(w, "Dependencies:\n")
-	for _, dep := range deps {
-		fmt.Fprint(w, dep)
+	if len(pkg.Environment) > 0 {
+		fmt.Fprintf(w, "Build Environment Variables:\n")
+		for _, env := range pkg.Environment {
+			fmt.Fprintf(w, "\t%s\n", env)
+		}
+	}
+	if len(pkg.Dependencies) > 0 {
+		fmt.Fprintf(w, "Dependencies:\n")
+		for _, dep := range deps {
+			fmt.Fprint(w, dep)
+		}
 	}
-	fmt.Fprintf(w, "Sources:\n")
-	for _, src := range manifest {
-		segs := strings.Split(src, ":")
-		name := strings.TrimPrefix(segs[0], pkg.C.Origin+"/")
-		version := segs[1]
-		fmt.Fprintf(w, "\t%s\t%s\n", name, version)
+	if len(pkg.Sources) > 0 {
+		fmt.Fprintf(w, "Sources:\n")
+		for _, src := range manifest {
+			segs := strings.Split(src, ":")
+			name := strings.TrimPrefix(segs[0], pkg.C.Origin+"/")
+			version := segs[1]
+			fmt.Fprintf(w, "\t%s\t%s\n", name, version)
+		}
 	}
 }
 

pkg/leeway/package.go

@@ -213,6 +213,7 @@ func loadComponent(workspace *Workspace, path string, args Arguments) (Component
 
 		// add component BUILD file and additional sources to package sources
 		completeSources := make(map[string]struct{})
+		completeSources[path] = struct{}{}
 		for _, src := range pkg.Sources {
 			completeSources[src] = struct{}{}
 		}
@@ -314,8 +315,7 @@ type Package struct {
 	versionCache string
 
 	packageInternal
-	Config  PackageConfig `yaml:"config"`
-	rawYAML []byte
+	Config PackageConfig `yaml:"config"`
 
 	dependencies []*Package
 }
@@ -381,10 +381,6 @@ func (p *Package) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	if err != nil {
 		return err
 	}
-	p.rawYAML, err = yaml.Marshal(buf)
-	if err != nil {
-		return err
-	}
 
 	cfg, err := unmarshalTypeDependentConfig(tpe.Type, unmarshal)
 	if err != nil {
@@ -715,10 +711,6 @@ func (p *Package) Version() (string, error) {
 	}
 
 	h := sha1.New()
-	_, err = h.Write(p.rawYAML)
-	if err != nil {
-		return "", err
-	}
 	_, err = io.WriteString(h, strings.Join(manifest, "\n"))
 	if err != nil {
 		return "", err