Merge pull request #77 from deis/76-remove-extract-domain

ref(pkg): remove extract-domain

Author: Matthew Fisher

Makefile

@@ -17,7 +17,7 @@ BINARY_DEST_DIR := rootfs/usr/bin
 # Common flags passed into Go's linker.
 LDFLAGS := "-s -X main.version=${VERSION}"
 IMAGE_PREFIX ?= deis
-BINARIES := extract-domain extract-types extract-version generate-buildhook get-app-config get-app-values publish-release-controller yaml2json-procfile
+BINARIES := extract-types extract-version generate-buildhook get-app-config get-app-values publish-release-controller yaml2json-procfile
 STANDALONE := extract-types  generate-buildhook yaml2json-procfile
 # Docker Root FS
 BINDIR := ./rootfs

pkg/src/extract-domain.go

@@ -29,7 +29,6 @@ type BuildHook struct {
 // BuildHookResponse represents a controller's build-hook response object.
 type BuildHookResponse struct {
 	Release map[string]int `json:"release"`
-	Domains []string       `json:"domains"`
 }
 
 // Config represents a Deis application's configuration.

pkg/types.go

@@ -36,24 +36,6 @@ func ParseConfig(body []byte) (*Config, error) {
 	return &config, err
 }
 
-// ParseDomain returns the domain field from the bytes of a build hook response.
-func ParseDomain(bytes []byte) (string, error) {
-	var hook BuildHookResponse
-	if err := json.Unmarshal(bytes, &hook); err != nil {
-		return "", err
-	}
-
-	if hook.Domains == nil {
-		return "", fmt.Errorf("invalid application domain")
-	}
-
-	if len(hook.Domains) < 1 {
-		return "", fmt.Errorf("invalid application domain")
-	}
-
-	return hook.Domains[0], nil
-}
-
 // ParseReleaseVersion returns the version field from the bytes of a build hook response.
 func ParseReleaseVersion(bytes []byte) (int, error) {
 	var hook BuildHookResponse

pkg/utils.go

@@ -86,20 +86,6 @@ func TestParseConfigGood(t *testing.T) {
 	}
 }
 
-func TestParseDomainGood(t *testing.T) {
-	// mock controller build-hook response
-	resp := []byte(`{"release": {"version": 1},
-"domains": ["test.example.com", "test2.example.com"]}`)
-
-	domain, err := ParseDomain(resp)
-	if err != nil {
-		t.Errorf("expected to parse domain, got '%v'", err)
-	}
-	if domain != "test.example.com" {
-		t.Errorf("expected 'test.example.com', got '%s'", domain)
-	}
-}
-
 func TestParseReleaseVersionGood(t *testing.T) {
 	// mock controller build-hook response
 	resp := []byte(`{"release": {"version": 1},

pkg/utils_test.go

@@ -196,10 +196,9 @@ if [ $CODE -ne 0 ]; then
 fi
 
 RELEASE=$(echo $PUBLISH_RELEASE | extract-version)
-DOMAIN=$(echo $PUBLISH_RELEASE | extract-domain)
 indent "done, $APP_NAME:v$RELEASE deployed to Deis"
 echo
-indent "http://$DOMAIN"
+indent "Use \`deis open\` to view this application in your browser."
 echo
 indent "To learn more, use \`deis help\` or visit http://deis.io"
 echo