diff --git a/admin/package.json b/admin/package.json
index 5e9379f..c35e765 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -1,5 +1,5 @@
{
- "name": "gurp-admin",
+ "name": "hetty-admin",
"version": "0.1.0",
"private": true,
"scripts": {
diff --git a/admin/src/components/Layout.tsx b/admin/src/components/Layout.tsx
index fa60702..cba9852 100644
--- a/admin/src/components/Layout.tsx
+++ b/admin/src/components/Layout.tsx
@@ -136,10 +136,7 @@ export function Layout(props: { children: React.ReactNode }): JSX.Element {
-
- 🥥
- {" "}
- Coco
+ Hetty
diff --git a/admin/src/pages/_app.tsx b/admin/src/pages/_app.tsx
index 9a5de7b..0da64f2 100644
--- a/admin/src/pages/_app.tsx
+++ b/admin/src/pages/_app.tsx
@@ -22,7 +22,7 @@ function App({ Component, pageProps }: AppProps): JSX.Element {
return (
- gurp
+ Hetty
- gurp
+ Hetty
);
}
diff --git a/cmd/main.go b/cmd/main.go
index 32bcedd..e63a177 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -12,9 +12,9 @@ import (
"os"
"strings"
- "github.com/dstotijn/gurp/pkg/api"
- "github.com/dstotijn/gurp/pkg/proxy"
- "github.com/dstotijn/gurp/pkg/reqlog"
+ "github.com/dstotijn/hetty/pkg/api"
+ "github.com/dstotijn/hetty/pkg/proxy"
+ "github.com/dstotijn/hetty/pkg/reqlog"
"github.com/99designs/gqlgen/graphql/handler"
"github.com/99designs/gqlgen/graphql/playground"
@@ -71,7 +71,7 @@ func main() {
adminRouter := router.MatcherFunc(func(req *http.Request, match *mux.RouteMatch) bool {
hostname, _ := os.Hostname()
host, _, _ := net.SplitHostPort(req.Host)
- return strings.EqualFold(host, hostname) || (req.Host == "gurp.proxy" || req.Host == "localhost:8080")
+ return strings.EqualFold(host, hostname) || (req.Host == "hetty.proxy" || req.Host == "localhost:8080")
}).Subrouter()
// GraphQL server.
diff --git a/go.mod b/go.mod
index 7288687..63dfa2e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/dstotijn/gurp
+module github.com/dstotijn/hetty
go 1.13
diff --git a/gqlgen.yml b/gqlgen.yml
index 48ed920..a711959 100644
--- a/gqlgen.yml
+++ b/gqlgen.yml
@@ -29,14 +29,13 @@ resolver:
# Optional: turn on to use []Thing instead of []*Thing
omit_slice_element_pointers: true
-
# Optional: set to speed up generation time by not performing a final validation pass.
# skip_validation: true
# gqlgen will search for any type names in the schema in these go packages
# if they match it will use them, otherwise it will generate them.
# autobind:
-# - "github.com/dstotijn/gurp/graph/model"
+# - "github.com/dstotijn/hetty/graph/model"
# This section declares type mapping between the GraphQL and go type systems
#
diff --git a/modd.conf b/modd.conf
index 9655c70..cdb77db 100644
--- a/modd.conf
+++ b/modd.conf
@@ -1,5 +1,5 @@
-@cert = $HOME/.ssh/gurp_cert.pem
-@key = $HOME/.ssh/gurp_key.pem
+@cert = $HOME/.ssh/hetty_cert.pem
+@key = $HOME/.ssh/hetty_key.pem
@dev = true
@adminPath = $PWD/admin/build
diff --git a/pkg/api/generated.go b/pkg/api/generated.go
index f7f9903..a13809b 100644
--- a/pkg/api/generated.go
+++ b/pkg/api/generated.go
@@ -446,7 +446,7 @@ func (ec *executionContext) _HttpRequestLog_method(ctx context.Context, field gr
}
res := resTmp.(HTTPMethod)
fc.Result = res
- return ec.marshalNHttpMethod2githubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPMethod(ctx, field.Selections, res)
+ return ec.marshalNHttpMethod2githubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPMethod(ctx, field.Selections, res)
}
func (ec *executionContext) _HttpRequestLog_proto(ctx context.Context, field graphql.CollectedField, obj *HTTPRequestLog) (ret graphql.Marshaler) {
@@ -576,7 +576,7 @@ func (ec *executionContext) _HttpRequestLog_response(ctx context.Context, field
}
res := resTmp.(*HTTPResponseLog)
fc.Result = res
- return ec.marshalOHttpResponseLog2ᚖgithubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPResponseLog(ctx, field.Selections, res)
+ return ec.marshalOHttpResponseLog2ᚖgithubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPResponseLog(ctx, field.Selections, res)
}
func (ec *executionContext) _HttpResponseLog_requestId(ctx context.Context, field graphql.CollectedField, obj *HTTPResponseLog) (ret graphql.Marshaler) {
@@ -781,7 +781,7 @@ func (ec *executionContext) _Query_httpRequestLog(ctx context.Context, field gra
}
res := resTmp.(*HTTPRequestLog)
fc.Result = res
- return ec.marshalOHttpRequestLog2ᚖgithubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPRequestLog(ctx, field.Selections, res)
+ return ec.marshalOHttpRequestLog2ᚖgithubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPRequestLog(ctx, field.Selections, res)
}
func (ec *executionContext) _Query_httpRequestLogs(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
@@ -815,7 +815,7 @@ func (ec *executionContext) _Query_httpRequestLogs(ctx context.Context, field gr
}
res := resTmp.([]HTTPRequestLog)
fc.Result = res
- return ec.marshalNHttpRequestLog2ᚕgithubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPRequestLogᚄ(ctx, field.Selections, res)
+ return ec.marshalNHttpRequestLog2ᚕgithubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPRequestLogᚄ(ctx, field.Selections, res)
}
func (ec *executionContext) _Query___type(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
@@ -2359,20 +2359,20 @@ func (ec *executionContext) marshalNBoolean2bool(ctx context.Context, sel ast.Se
return res
}
-func (ec *executionContext) unmarshalNHttpMethod2githubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPMethod(ctx context.Context, v interface{}) (HTTPMethod, error) {
+func (ec *executionContext) unmarshalNHttpMethod2githubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPMethod(ctx context.Context, v interface{}) (HTTPMethod, error) {
var res HTTPMethod
return res, res.UnmarshalGQL(v)
}
-func (ec *executionContext) marshalNHttpMethod2githubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPMethod(ctx context.Context, sel ast.SelectionSet, v HTTPMethod) graphql.Marshaler {
+func (ec *executionContext) marshalNHttpMethod2githubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPMethod(ctx context.Context, sel ast.SelectionSet, v HTTPMethod) graphql.Marshaler {
return v
}
-func (ec *executionContext) marshalNHttpRequestLog2githubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPRequestLog(ctx context.Context, sel ast.SelectionSet, v HTTPRequestLog) graphql.Marshaler {
+func (ec *executionContext) marshalNHttpRequestLog2githubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPRequestLog(ctx context.Context, sel ast.SelectionSet, v HTTPRequestLog) graphql.Marshaler {
return ec._HttpRequestLog(ctx, sel, &v)
}
-func (ec *executionContext) marshalNHttpRequestLog2ᚕgithubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPRequestLogᚄ(ctx context.Context, sel ast.SelectionSet, v []HTTPRequestLog) graphql.Marshaler {
+func (ec *executionContext) marshalNHttpRequestLog2ᚕgithubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPRequestLogᚄ(ctx context.Context, sel ast.SelectionSet, v []HTTPRequestLog) graphql.Marshaler {
ret := make(graphql.Array, len(v))
var wg sync.WaitGroup
isLen1 := len(v) == 1
@@ -2396,7 +2396,7 @@ func (ec *executionContext) marshalNHttpRequestLog2ᚕgithubᚗcomᚋdstotijnᚋ
if !isLen1 {
defer wg.Done()
}
- ret[i] = ec.marshalNHttpRequestLog2githubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPRequestLog(ctx, sel, v[i])
+ ret[i] = ec.marshalNHttpRequestLog2githubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPRequestLog(ctx, sel, v[i])
}
if isLen1 {
f(i)
@@ -2714,22 +2714,22 @@ func (ec *executionContext) marshalOBoolean2ᚖbool(ctx context.Context, sel ast
return ec.marshalOBoolean2bool(ctx, sel, *v)
}
-func (ec *executionContext) marshalOHttpRequestLog2githubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPRequestLog(ctx context.Context, sel ast.SelectionSet, v HTTPRequestLog) graphql.Marshaler {
+func (ec *executionContext) marshalOHttpRequestLog2githubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPRequestLog(ctx context.Context, sel ast.SelectionSet, v HTTPRequestLog) graphql.Marshaler {
return ec._HttpRequestLog(ctx, sel, &v)
}
-func (ec *executionContext) marshalOHttpRequestLog2ᚖgithubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPRequestLog(ctx context.Context, sel ast.SelectionSet, v *HTTPRequestLog) graphql.Marshaler {
+func (ec *executionContext) marshalOHttpRequestLog2ᚖgithubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPRequestLog(ctx context.Context, sel ast.SelectionSet, v *HTTPRequestLog) graphql.Marshaler {
if v == nil {
return graphql.Null
}
return ec._HttpRequestLog(ctx, sel, v)
}
-func (ec *executionContext) marshalOHttpResponseLog2githubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPResponseLog(ctx context.Context, sel ast.SelectionSet, v HTTPResponseLog) graphql.Marshaler {
+func (ec *executionContext) marshalOHttpResponseLog2githubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPResponseLog(ctx context.Context, sel ast.SelectionSet, v HTTPResponseLog) graphql.Marshaler {
return ec._HttpResponseLog(ctx, sel, &v)
}
-func (ec *executionContext) marshalOHttpResponseLog2ᚖgithubᚗcomᚋdstotijnᚋgurpᚋpkgᚋapiᚐHTTPResponseLog(ctx context.Context, sel ast.SelectionSet, v *HTTPResponseLog) graphql.Marshaler {
+func (ec *executionContext) marshalOHttpResponseLog2ᚖgithubᚗcomᚋdstotijnᚋhettyᚋpkgᚋapiᚐHTTPResponseLog(ctx context.Context, sel ast.SelectionSet, v *HTTPResponseLog) graphql.Marshaler {
if v == nil {
return graphql.Null
}
diff --git a/pkg/api/resolvers.go b/pkg/api/resolvers.go
index 91e3164..cd678e7 100644
--- a/pkg/api/resolvers.go
+++ b/pkg/api/resolvers.go
@@ -7,7 +7,7 @@ import (
"errors"
"fmt"
- "github.com/dstotijn/gurp/pkg/reqlog"
+ "github.com/dstotijn/hetty/pkg/reqlog"
)
type Resolver struct {
diff --git a/pkg/proxy/cert.go b/pkg/proxy/cert.go
index a997069..d8b5f66 100644
--- a/pkg/proxy/cert.go
+++ b/pkg/proxy/cert.go
@@ -141,7 +141,7 @@ func (c *CertConfig) cert(hostname string) (*tls.Certificate, error) {
SerialNumber: serial,
Subject: pkix.Name{
CommonName: hostname,
- Organization: []string{"Gurp"},
+ Organization: []string{"Hetty"},
},
SubjectKeyId: c.keyID,
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
diff --git a/pkg/reqlog/reqlog.go b/pkg/reqlog/reqlog.go
index 8bf65c8..66606b0 100644
--- a/pkg/reqlog/reqlog.go
+++ b/pkg/reqlog/reqlog.go
@@ -11,7 +11,7 @@ import (
"sync"
"time"
- "github.com/dstotijn/gurp/pkg/proxy"
+ "github.com/dstotijn/hetty/pkg/proxy"
"github.com/google/uuid"
)