chore(pkg): change deis to drycc

duanhongyi · duanhongyi · commit 5c1dfa7b5446 · 2019-01-21T13:38:02.000+08:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
 # How to Contribute
 
-This project is part of Hephy. You can find the latest contribution
-guidelines [at the Hephy project](https://github.com/teamhephy/deis/blob/master/CONTRIBUTING.md).
+This project is part of Drycc. You can find the latest contribution
+guidelines [at the Drycc project](https://github.com/drycc/drycc/blob/master/CONTRIBUTING.md).
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -1,4 +1,4 @@
-# Hephy Maintainers
+# Drycc Maintainers
 
-This project is part of Hephy. The official maintainers documentation is
-located [in the main project](https://github.com/teamhephy/deis/blob/master/MAINTAINERS.md).
+This project is part of Drycc. The official maintainers documentation is
+located [in the main project](https://github.com/drycc/drycc/blob/master/MAINTAINERS.md).
diff --git a/README.md b/README.md
@@ -1,19 +1,19 @@
-# Hephy Pkg
+# Drycc Pkg
 
-[![Build Status](https://travis-ci.org/deis/pkg.svg?branch=master)](https://travis-ci.org/deis/pkg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/teamhephy/pkg)](https://goreportcard.com/report/github.com/teamhephy/pkg)
-[![GoDoc](https://godoc.org/github.com/teamhephy/pkg?status.svg)](https://godoc.org/github.com/teamhephy/pkg)
+[![Build Status](https://travis-ci.org/drycc/pkg.svg?branch=master)](https://travis-ci.org/drycc/pkg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/drycc/pkg)](https://goreportcard.com/report/github.com/drycc/pkg)
+[![GoDoc](https://godoc.org/github.com/drycc/pkg?status.svg)](https://godoc.org/github.com/drycc/pkg)
 
-The Hephy Pkg project contains shared Go libraries that are used by
-several Hephy projects.
+The Drycc Pkg project contains shared Go libraries that are used by
+several Drycc projects.
 
 ## Usage
 
 Add this project to your `vendor/` directory using Godeps or
 [glide](https://github.com/Masterminds/glide):
 
 ```
-$ glide get --import github.com/teamhephy/pkg
+$ glide get --import github.com/drycc/pkg
 ```
 
 (The `--import` flag will get any additional dependencies.)
diff --git a/aboutme/aboutme.go b/aboutme/aboutme.go
@@ -185,7 +185,7 @@ func (me *Me) loadPod() (*v1.Pod, string, error) {
 //
 // The selector must be a label selector.
 func (me *Me) findPodInNamespaces(selector string) (*v1.Pod, string, error) {
-	// Get the deis namespace. If it does not exist, get the default namespce.
+	// Get the drycc namespace. If it does not exist, get the default namespce.
 	s, err := labels.Parse(selector)
 	if err == nil {
 		ns, err := me.c.CoreV1().Namespaces().List(metav1.ListOptions{LabelSelector: s.String()})
diff --git a/env/envvar_test.go b/env/envvar_test.go
@@ -11,9 +11,9 @@ import (
 func TestGet(t *testing.T) {
 	reg, router, cxt := cookoo.Cookoo()
 
-	drink := "DEIS_DRINK_OF_CHOICE"
-	cookies := "DEIS_FAVORITE_COOKIES"
-	snack := "DEIS_SNACK_TIME"
+	drink := "DRYCC_DRINK_OF_CHOICE"
+	cookies := "DRYCC_FAVORITE_COOKIES"
+	snack := "DRYCC_SNACK_TIME"
 	snackVal := fmt.Sprintf("$%s and $%s cookies", drink, cookies)
 
 	// Set drink, but not cookies.
@@ -102,7 +102,7 @@ func TestGetInterpolation(t *testing.T) {
 		t.Error(err)
 	}
 
-	if os.Getenv("TEST_ENV2") != "deis" {
-		t.Errorf("Expected 'deis', got '%s'", os.Getenv("TEST_ENV2"))
+	if os.Getenv("TEST_ENV2") != "drycc" {
+		t.Errorf("Expected 'drycc', got '%s'", os.Getenv("TEST_ENV2"))
 	}
 }
diff --git a/etcd/discovery/discovery.go b/etcd/discovery/discovery.go
@@ -8,11 +8,11 @@ import (
 	"github.com/Masterminds/cookoo"
 )
 
-var TokenFile = "/var/run/secrets/deis/etcd/discovery/token"
+var TokenFile = "/var/run/secrets/drycc/etcd/discovery/token"
 
-const ClusterDiscoveryURL = "http://%s:%s/v2/keys/deis/discovery/%s"
-const ClusterSizeKey = "deis/discovery/%s/_config/size"
-const ClusterStatusKey = "deis/status/%s/%s"
+const ClusterDiscoveryURL = "http://%s:%s/v2/keys/drycc/discovery/%s"
+const ClusterSizeKey = "drycc/discovery/%s/_config/size"
+const ClusterStatusKey = "drycc/status/%s/%s"
 
 // Token reads the discovery token from the TokenFile and returns it.
 func Token() ([]byte, error) {
diff --git a/etcd/etcd.go b/etcd/etcd.go
@@ -172,7 +172,7 @@ func FindSSHUser(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interr
 
 	k := client.NewKeysAPI(cli)
 
-	res, err := k.Get(dctx(), "/deis/builder/users", &client.GetOptions{Recursive: true})
+	res, err := k.Get(dctx(), "/drycc/builder/users", &client.GetOptions{Recursive: true})
 	if err != nil {
 		log.Warnf(c, "Error querying etcd: %s", err)
 		return "", err
@@ -209,7 +209,7 @@ func StoreHostKeys(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Inte
 	defaultCiphers := []string{"rsa", "dsa", "ecdsa", "ed25519"}
 	cli := p.Get("client", nil).(client.Client)
 	ciphers := p.Get("ciphers", defaultCiphers).([]string)
-	basepath := p.Get("basepath", "/deis/builder").(string)
+	basepath := p.Get("basepath", "/drycc/builder").(string)
 
 	k := client.NewKeysAPI(cli)
 	res, err := k.Get(dctx(), "sshHostKey", &client.GetOptions{})
@@ -408,8 +408,8 @@ func MakeDir(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt)
 // - path (string): The path to watch
 func Watch(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 
-	// etcdctl -C $ETCD watch --recursive /deis/services
-	path := p.Get("path", "/deis/services").(string)
+	// etcdctl -C $ETCD watch --recursive /drycc/services
+	path := p.Get("path", "/drycc/services").(string)
 	cli := p.Get("client", nil).(client.Client)
 	k := client.NewKeysAPI(cli)
 
diff --git a/etcd/members.go b/etcd/members.go
@@ -92,7 +92,7 @@ func RemoveMemberByName(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo
 // 	- namespace (string): The namespace we're operating in
 func RemoveStaleMembers(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	eclient := p.Get("client", nil).(client.Client)
-	label := p.Get("label", "name=deis-etcd-1").(string)
+	label := p.Get("label", "name=drycc-etcd-1").(string)
 	ns := p.Get("namespace", "default").(string)
 
 	// Should probably pass in the client from the context.
diff --git a/glide.yaml b/glide.yaml
@@ -1,4 +1,4 @@
-package: github.com/teamhephy/pkg
+package: github.com/drycc/pkg
 ignore:
 - appengine
 import:
diff --git a/log/doc.go b/log/doc.go
@@ -1,10 +1,10 @@
-// Package log provides functionality to output human readable, colorful test to STDOUT and STDERR. It's best used for programs, such as CLI apps, that write output to people rather than machines. It is not intended for logging to log aggregators or other systems. It takes advantage of the github.com/teamhephy/pkg/prettyprint to provide colorful output.
+// Package log provides functionality to output human readable, colorful test to STDOUT and STDERR. It's best used for programs, such as CLI apps, that write output to people rather than machines. It is not intended for logging to log aggregators or other systems. It takes advantage of the github.com/drycc/pkg/prettyprint to provide colorful output.
 //
 // This package provides global functions for use as well as a 'Logger' struct that you can instantiate at-will for customized logging. All global funcs operate on a DefaultLogger, which is pre-configured to log to os.Stdout and os.Stderr, with debug logs turned off.
 //
 // Example usage of global functions:
 //
-//  import "github.com/teamhephy/pkg/log"
+//  import "github.com/drycc/pkg/log"
 //  log.Info("Hello Gophers!") // equivalent of log.DefaultLogger.Info("hello gophers!")
 //  log.Debug("log.DefaultLogger initializes with debug logs turned off, so you can't see me!")
 //  log.DefaultLogger.SetDebug(true)
diff --git a/log/log.go b/log/log.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/teamhephy/pkg/prettyprint"
+	"github.com/drycc/pkg/prettyprint"
 )
 
 // Color is the representation of a color, to be used in Colorize
diff --git a/prettyprint/colorizer.go b/prettyprint/colorizer.go
@@ -53,30 +53,30 @@ var Colors = map[string]string{
 	"HiPurple":    "\033[35m",
 	"HiCyan":      "\033[36m",
 	"HiWhite":     "\033[37m",
-	"Deis1":       "\033[31m● \033[34m▴ \033[32m■\033[0m",
-	"Deis2":       "\033[32m■ \033[31m● \033[34m▴\033[0m",
-	"Deis3":       "\033[34m▴ \033[32m■ \033[31m●\033[0m",
-	"Deis":        "\033[31m● \033[34m▴ \033[32m■\n\033[32m■ \033[31m● \033[34m▴\n\033[34m▴ \033[32m■ \033[31m●\n",
+	"Drycc1":       "\033[31m● \033[34m▴ \033[32m■\033[0m",
+	"Drycc2":       "\033[32m■ \033[31m● \033[34m▴\033[0m",
+	"Drycc3":       "\033[34m▴ \033[32m■ \033[31m●\033[0m",
+	"Drycc":        "\033[31m● \033[34m▴ \033[32m■\n\033[32m■ \033[31m● \033[34m▴\n\033[34m▴ \033[32m■ \033[31m●\n",
 }
 
-// DeisIfy returns a pretty-printed deis logo along with the corresponding message
-func DeisIfy(msg string) string {
+// DryccIfy returns a pretty-printed drycc logo along with the corresponding message
+func DryccIfy(msg string) string {
 	var t = struct {
 		Msg string
 		C   map[string]string
 	}{
 		Msg: msg,
 		C:   Colors,
 	}
-	tpl := "{{.C.Deis1}}\n{{.C.Deis2}} {{.Msg}}\n{{.C.Deis3}}\n"
+	tpl := "{{.C.Drycc1}}\n{{.C.Drycc2}} {{.Msg}}\n{{.C.Drycc3}}\n"
 	var buf bytes.Buffer
-	template.Must(template.New("deis").Parse(tpl)).Execute(&buf, t)
+	template.Must(template.New("drycc").Parse(tpl)).Execute(&buf, t)
 	return buf.String()
 }
 
-// Logo returns a colorized Deis logo with no space for text.
+// Logo returns a colorized Drycc logo with no space for text.
 func Logo() string {
-	return Colorize("{{.Deis}}")
+	return Colorize("{{.Drycc}}")
 }
 
 // NoColor strips colors from the template.
diff --git a/prettyprint/colorizer_test.go b/prettyprint/colorizer_test.go
@@ -45,9 +45,9 @@ func ExampleColorizeVars() {
 	fmt.Println(out)
 }
 
-func TestDeisIfy(t *testing.T) {
-	d := DeisIfy("Test")
-	if strings.Contains(d, "Deis1") {
+func TestDryccIfy(t *testing.T) {
+	d := DryccIfy("Test")
+	if strings.Contains(d, "Drycc1") {
 		t.Errorf("Failed to compile template")
 	}
 	if !strings.Contains(d, "Test") {
@@ -57,8 +57,8 @@ func TestDeisIfy(t *testing.T) {
 
 func TestLogo(t *testing.T) {
 	l := Logo()
-	if l != Colors["Deis"] {
-		t.Errorf("Expected \n%s\n, Got\n%s\n", Colors["Deis"], Logo())
+	if l != Colors["Drycc"] {
+		t.Errorf("Expected \n%s\n, Got\n%s\n", Colors["Drycc"], Logo())
 	}
 }
 
diff --git a/time/time.go b/time/time.go
@@ -2,34 +2,34 @@ package time
 
 import "time"
 
-// DeisDatetimeFormat is the standard date/time representation used in Deis.
-const DeisDatetimeFormat = "2006-01-02T15:04:05MST"
+// DryccDatetimeFormat is the standard date/time representation used in Drycc.
+const DryccDatetimeFormat = "2006-01-02T15:04:05MST"
 
 // Different format to deal with the pyopenssl formatting
 // http://www.pyopenssl.org/en/stable/api/crypto.html#OpenSSL.crypto.X509.get_notAfter
 const PyOpenSSLTimeDateTimeFormat = "2006-01-02T15:04:05"
 
-// Time represents the standard datetime format used across the Deis Platform.
+// Time represents the standard datetime format used across the Drycc Platform.
 type Time struct {
 	*time.Time
 }
 
 func (t *Time) format() string {
-	return t.Format(DeisDatetimeFormat)
+	return t.Format(DryccDatetimeFormat)
 }
 
 // MarshalJSON implements the json.Marshaler interface.
-// The time is a quoted string in Deis' datetime format.
+// The time is a quoted string in Drycc' datetime format.
 func (t *Time) MarshalJSON() ([]byte, error) {
-	return []byte(t.Format(`"` + DeisDatetimeFormat + `"`)), nil
+	return []byte(t.Format(`"` + DryccDatetimeFormat + `"`)), nil
 }
 
 // UnmarshalText implements the encoding.TextUnmarshaler interface.
-// The time is expected to be in Deis' datetime format.
+// The time is expected to be in Drycc' datetime format.
 func (t *Time) UnmarshalText(data []byte) error {
 	tt, err := time.Parse(time.RFC3339, string(data))
 	if _, ok := err.(*time.ParseError); ok {
-		tt, err = time.Parse(DeisDatetimeFormat, string(data))
+		tt, err = time.Parse(DryccDatetimeFormat, string(data))
 		if _, ok := err.(*time.ParseError); ok {
 			tt, err = time.Parse(PyOpenSSLTimeDateTimeFormat, string(data))
 		}
@@ -39,12 +39,12 @@ func (t *Time) UnmarshalText(data []byte) error {
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.
-// The time is expected to be a quoted string in Deis' datetime format.
+// The time is expected to be a quoted string in Drycc' datetime format.
 func (t *Time) UnmarshalJSON(data []byte) error {
 	// Fractional seconds are handled implicitly by Parse.
 	tt, err := time.Parse(`"`+time.RFC3339+`"`, string(data))
 	if _, ok := err.(*time.ParseError); ok {
-		tt, err = time.Parse(`"`+DeisDatetimeFormat+`"`, string(data))
+		tt, err = time.Parse(`"`+DryccDatetimeFormat+`"`, string(data))
 		if _, ok := err.(*time.ParseError); ok {
 			tt, err = time.Parse(`"`+PyOpenSSLTimeDateTimeFormat+`"`, string(data))
 		}
diff --git a/utils/utils.go b/utils/utils.go
@@ -1,6 +1,6 @@
 package utils
 
-// this is code taken from the v2 branch of github.com/teamhephy/deis/tests/utils
+// this is code taken from the v2 branch of github.com/drycc/drycc/tests/utils
 
 import (
 	"bufio"

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ import (`
`11`	`11`	`func TestGet(t *testing.T) {`
`12`	`12`	`reg, router, cxt := cookoo.Cookoo()`
`13`	`13`
`14`		`- drink := "DEIS_DRINK_OF_CHOICE"`
`15`		`- cookies := "DEIS_FAVORITE_COOKIES"`
`16`		`- snack := "DEIS_SNACK_TIME"`
	`14`	`+ drink := "DRYCC_DRINK_OF_CHOICE"`
	`15`	`+ cookies := "DRYCC_FAVORITE_COOKIES"`
	`16`	`+ snack := "DRYCC_SNACK_TIME"`
`17`	`17`	`snackVal := fmt.Sprintf("$%s and $%s cookies", drink, cookies)`
`18`	`18`
`19`	`19`	`// Set drink, but not cookies.`
`@@ -102,7 +102,7 @@ func TestGetInterpolation(t *testing.T) {`
`102`	`102`	`t.Error(err)`
`103`	`103`	`}`
`104`	`104`
`105`		`- if os.Getenv("TEST_ENV2") != "deis" {`
`106`		`- t.Errorf("Expected 'deis', got '%s'", os.Getenv("TEST_ENV2"))`
	`105`	`+ if os.Getenv("TEST_ENV2") != "drycc" {`
	`106`	`+ t.Errorf("Expected 'drycc', got '%s'", os.Getenv("TEST_ENV2"))`
`107`	`107`	`}`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package: github.com/teamhephy/pkg`
	`1`	`+package: github.com/drycc/pkg`
`2`	`2`	`ignore:`
`3`	`3`	`- appengine`
`4`	`4`	`import:`