Remove the caching used while developing, and fix some console printing

dolittle · Mar 19, 2022 · 1cc21d0 · 1cc21d0
1 parent 6e5f7e8
commit 1cc21d0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 45 deletions.
diff --git a/artifacts/graph.go b/artifacts/graph.go
@@ -2,6 +2,7 @@ package artifacts
 
 import (
 	"fmt"
+	"os"
 	"sync"
 )
 
@@ -25,7 +26,7 @@ func CreateGraphFor(runtime *ReleaseListResolver, sdks map[string]*ReleaseListRe
 		defer wg.Done()
 		releases, err := runtime.ListAndResolve()
 		if err != nil {
-			fmt.Println("Failed to list Runtime releases", err)
+			fmt.Fprintln(os.Stderr, "Failed to list Runtime releases", err)
 			return
 		}
 
@@ -40,7 +41,7 @@ func CreateGraphFor(runtime *ReleaseListResolver, sdks map[string]*ReleaseListRe
 			defer wg.Done()
 			releases, err := resolver.ListAndResolve()
 			if err != nil {
-				fmt.Println("Failed to list", sdk, "SDK releases", err)
+				fmt.Fprintln(os.Stderr, "Failed to list", sdk, "SDK releases", err)
 				return
 			}
 

diff --git a/artifacts/lister.go b/artifacts/lister.go
@@ -45,7 +45,6 @@ func (listResolver *ReleaseListResolver) ListAndResolve() (Releases, error) {
 		wg.Add(1)
 		go func(releasedVersion *semver.Version) {
 			defer wg.Done()
-			fmt.Println("Resolving dependency for version", releasedVersion.String())
 			contractsVersion, err := listResolver.resolver.ResolveDependencyForVersion(releasedVersion)
 			if err != nil {
 				return

diff --git a/main.go b/main.go
@@ -2,6 +2,10 @@ package main
 
 import (
 	"dolittle.io/contracts-compatibility/artifacts"
+	"dolittle.io/contracts-compatibility/dependencies/dotnet"
+	"dolittle.io/contracts-compatibility/registries/docker"
+	"dolittle.io/contracts-compatibility/registries/npm"
+	"dolittle.io/contracts-compatibility/registries/nuget"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -44,50 +48,26 @@ func main() {
 }
 
 func createGraph() (*artifacts.Graph, error) {
-	//token, err := docker.GetAuthTokenFor("dolittle/runtime")
-	//if err != nil {
-	//	fmt.Println("Token error", err)
-	//	return
-	//}
-	//
-	//cache, err := os.Create("graph.json")
-	//if err != nil {
-	//	fmt.Println("Failed to open graph.json file")
-	//	return
-	//}
-	//
-	//graph := artifacts.CreateGraphFor(
-	//	artifacts.NewReleaseListResolver(
-	//		docker.NewReleaseListerFor(token, "dolittle/runtime"),
-	//		docker.NewDependencyResolverFor(token, "dolittle/runtime", dotnet.NewDepsResolverFor("Dolittle.Runtime.Contracts"), "app/Dolittle.Runtime.Server.deps.json", "app/Server.deps.json"),
-	//	),
-	//	map[string]*artifacts.ReleaseListResolver{
-	//		"DotNET": artifacts.NewReleaseListResolver(
-	//			nuget.NewReleaseListerFor("Dolittle.SDK.Services"),
-	//			nuget.NewDependencyResolverFor("Dolittle.SDK.Services", "Dolittle.Contracts"),
-	//		),
-	//		"JavaScript": artifacts.NewReleaseListResolver(
-	//			npm.NewReleaseListerFor("@dolittle/sdk.services"),
-	//			npm.NewDependencyResolverFor("@dolittle/sdk.services", "@dolittle/contracts"),
-	//		),
-	//	},
-	//)
-	//
-	//encoder := json.NewEncoder(cache)
-	//encoder.SetIndent("", "  ")
-	//encoder.Encode(graph)
-	//cache.Close()
-
-	cache, err := os.Open("graph.json")
-	if err != nil {
-		return nil, err
-	}
-
-	graph := &artifacts.Graph{}
-	err = json.NewDecoder(cache).Decode(graph)
+	token, err := docker.GetAuthTokenFor("dolittle/runtime")
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("could not get Docker Hub authentication token, %w", err)
 	}
 
+	graph := artifacts.CreateGraphFor(
+		artifacts.NewReleaseListResolver(
+			docker.NewReleaseListerFor(token, "dolittle/runtime"),
+			docker.NewDependencyResolverFor(token, "dolittle/runtime", dotnet.NewDepsResolverFor("Dolittle.Runtime.Contracts"), "app/Dolittle.Runtime.Server.deps.json", "app/Server.deps.json"),
+		),
+		map[string]*artifacts.ReleaseListResolver{
+			"DotNET": artifacts.NewReleaseListResolver(
+				nuget.NewReleaseListerFor("Dolittle.SDK.Services"),
+				nuget.NewDependencyResolverFor("Dolittle.SDK.Services", "Dolittle.Contracts"),
+			),
+			"JavaScript": artifacts.NewReleaseListResolver(
+				npm.NewReleaseListerFor("@dolittle/sdk.services"),
+				npm.NewDependencyResolverFor("@dolittle/sdk.services", "@dolittle/contracts"),
+			),
+		},
+	)
 	return graph, nil
 }