Bug fixes, updates to functional tests

Author: nicholasjackson

ChangeLog.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## version 0.0.8
+
+## Bugfixes
+
+* Fix problem with home folder resolution on Windows
+* Add ipv6 DNS entries for resources
+
 ## version 0.0.7
 
 ## Ingress

functional_tests/features/documentaion.feature

@@ -7,4 +7,4 @@ Feature: Docmentation
     Given I apply the config "./test_fixtures/docs"
     And there should be 1 container running called "docs.docs.shipyard.run"
     And there should be 1 container running called "terminal.docs.shipyard.run"
-    And a call to "http://localhost:8080/" should result in status 200
+    And a call to "http://docs.docs.shipyard.run:8080/" should result in status 200

functional_tests/features/single_container.feature

@@ -7,11 +7,11 @@ Feature: Docker Container
     Then there should be 1 network called "onprem"
     And there should be 1 container running called "consul.container.shipyard.run"
     And there should be 1 container running called "consul-http.ingress.shipyard.run"
-    And a call to "http://localhost:18500/v1/agent/members" should result in status 200
+    And a call to "http://consul-http.ingress.shipyard.run:18500/v1/agent/members" should result in status 200
 
   Scenario: Single Container from Github Blueprint
     Given I apply the config "github.com/shipyard-run/shipyard/functional_tests/test_fixtures//single_container"
     Then there should be 1 network called "onprem"
     And there should be 1 container running called "consul.container.shipyard.run"
     And there should be 1 container running called "consul-http.ingress.shipyard.run"
-    And a call to "http://localhost:18500/v1/agent/members" should result in status 200
+    And a call to "http://consul-http.ingress.shipyard.run:18500/v1/agent/members" should result in status 200

functional_tests/features/single_k3s_cluster.feature

@@ -8,4 +8,4 @@ Feature: Kubernetes Cluster
     Then there should be 1 network called "cloud"
     And there should be 1 container running called "server.k3s.k8s_cluster.shipyard.run"
     And there should be 1 container running called "consul-http.ingress.shipyard.run"
-    And a call to "http://localhost:18500/v1/agent/members" should result in status 200
+    And a call to "http://consul-http.ingress.shipyard.run:18500/v1/agent/members" should result in status 200

functional_tests/test_fixtures/single_container/README.md

@@ -2,13 +2,13 @@
 title: Single Container Example
 author: Nic Jackson
 slug: single_container
-browser_windows: http://localhost:8080
+browser_windows: http://localhost:8500
 ---
 
 # Single Container
 
 This blueprint shows how you can create a single container with Shipyard
 
 ```shell
-curl localhost:8080
+curl localhost:8500
 ```

functional_tests/test_fixtures/single_container/container.hcl

@@ -28,4 +28,9 @@ container "consul" {
     key ="abc"
     value = "123"
   }
+  
+  env {
+    key ="abc"
+    value = "${shipyard()}"
+  }
 }

functional_tests/test_fixtures/single_container/ingress.hcl

@@ -8,6 +8,6 @@ container_ingress "consul-http" {
   port {
     local  = 8500
     remote = 8500
-    host   = 18500
+    host   = 8500
   }
 }

pkg/config/parse_test.go

@@ -31,7 +31,7 @@ func TestRunParsesBlueprintInMarkdownFormat(t *testing.T) {
 	assert.Equal(t, "Nic Jackson", c.Blueprint.Author)
 	assert.Equal(t, "Single Container Example", c.Blueprint.Title)
 	assert.Equal(t, "single_container", c.Blueprint.Slug)
-	assert.Equal(t, []string{"http://localhost:8080"}, c.Blueprint.BrowserWindows)
+	assert.Equal(t, []string{"http://localhost:8500"}, c.Blueprint.BrowserWindows)
 	assert.Contains(t, c.Blueprint.Intro, "# Single Container")
 }
 

pkg/config/parser.go

@@ -461,27 +461,13 @@ func buildContext() *hcl.EvalContext {
 	})
 
 	var HomeFunc = function.New(&function.Spec{
-		Params: []function.Parameter{
-			{
-				Name:             "home",
-				Type:             cty.NilType,
-				AllowDynamicType: true,
-			},
-		},
 		Type: function.StaticReturnType(cty.String),
 		Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
 			return cty.StringVal(utils.HomeFolder()), nil
 		},
 	})
 
 	var ShipyardFunc = function.New(&function.Spec{
-		Params: []function.Parameter{
-			{
-				Name:             "shipyard",
-				Type:             cty.NilType,
-				AllowDynamicType: true,
-			},
-		},
 		Type: function.StaticReturnType(cty.String),
 		Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
 			return cty.StringVal(utils.ShipyardHome()), nil