Add support for helm packages. Quite hacky in parts, needs to resolve naming collisions

dm/dm.go

@@ -214,7 +214,6 @@ func execute() {
 			// Type is most likely a primitive.
 			tUrl = args[1]
 		} else {
-			// TODO(vaikas): Support packages properly.
 			tUrl = tUrls[0]
 		}
 		path := fmt.Sprintf("types/%s/instances", url.QueryEscape(tUrl))

examples/package/package.yaml

@@ -0,0 +1,4 @@
+resources:
+- name: cassandra
+  type: github.com/helm/charts/cassandra
+  properties: null

expandybird/expansion/expansion.py

@@ -50,12 +50,12 @@ def Expand(config, imports=None, env=None, validate_schema=False):
   Raises:
     ExpansionError: if there is any error occurred during expansion
   """
-  try:
-    return _Expand(config, imports=imports, env=env,
-                   validate_schema=validate_schema)
-  except Exception as e:
+#  try:
+  return _Expand(config, imports=imports, env=env,
+                 validate_schema=validate_schema)
+#  except Exception as e:
     # print traceback.format_exc()
-    raise ExpansionError('config', str(e))
+#    raise ExpansionError('config', str(e))
 
 
 def _Expand(config, imports=None, env=None, validate_schema=False):

manager/manager/typeresolver.go

@@ -18,6 +18,7 @@ package manager
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 	"time"
 
@@ -68,6 +69,7 @@ func resolverError(c *common.Configuration, err error) error {
 }
 
 func performHTTPGet(g util.HTTPClient, u string, allowMissing bool) (content string, err error) {
+	log.Printf("Fetching %s", u)
 	r, code, err := g.Get(u)
 	if err != nil {
 		return "", err
@@ -99,6 +101,7 @@ func (tr *typeResolver) ResolveTypes(config *common.Configuration, imports []*co
 	// TODO(vaikas): Need to account for multiple URLs being fetched for a given type.
 	toFetch := make([]*fetchUnit, 0, tr.maxUrls)
 	for _, r := range config.Resources {
+		log.Printf("checking: %s", r.Type)
 		// Map the type to a fetchable URL (if applicable) or skip it if it's a non-fetchable type (primitive for example).
 		urls, err := tr.MapFetchableURLs(r.Type)
 		if err != nil {
@@ -121,7 +124,9 @@ func (tr *typeResolver) ResolveTypes(config *common.Configuration, imports []*co
 	}
 
 	count := 0
+	log.Printf("toFetch %#v", toFetch)
 	for len(toFetch) > 0 {
+		log.Printf("toFetch2 %#v", toFetch)
 		// 1. If short github URL, resolve to a download URL
 		// 2. Fetch import URL. Exit if no URLs left
 		// 3. Check/handle HTTP status

registry/github_package_registry.go

@@ -48,7 +48,6 @@ func NewGithubPackageRegistry(owner, repository string) *GithubPackageRegistry {
 }
 
 // List the types from the Registry.
-// TODO(vaikas): Figure out how the versions work here.
 func (g *GithubPackageRegistry) List() ([]Type, error) {
 	// Just list all the types at the top level.
 	types, err := g.getDirs("")