Commit bfe560ee authored by Eric Chiang's avatar Eric Chiang

rename

parent 1cbb7700
......@@ -4,8 +4,8 @@ MAINTAINER Eric Chiang <eric.chiang@coreos.com>
RUN apk add --update ca-certificates
COPY bin/poke /poke
COPY bin/dex /dex
ENTRYPOINT ["/poke"]
ENTRYPOINT ["/dex"]
CMD ["version"]
......@@ -73,7 +73,7 @@ type RemoteIdentity struct {
`UserID` fields will be added to the `AuthRequest`, `AuthCode` and `RefreshToken`
structs. When a user logs in successfully through a connector
[here](https://github.com/coreos/poke/blob/95a61454b522edd6643ced36b9d4b9baa8059556/server/handlers.go#L227),
[here](https://github.com/coreos/dex/blob/95a61454b522edd6643ced36b9d4b9baa8059556/server/handlers.go#L227),
the server will attempt to either get the user, or create one if none exists with
the remote identity.
......
PROJ=poke
PROJ=dex
ORG_PATH=github.com/coreos
REPO_PATH=$(ORG_PATH)/$(PROJ)
export PATH := $(PWD)/bin:$(PATH)
VERSION=$(shell ./scripts/git-version)
DOCKER_REPO=quay.io/ericchiang/poke
DOCKER_REPO=quay.io/ericchiang/dex
DOCKER_IMAGE=$(DOCKER_REPO):$(VERSION)
export GOBIN=$(PWD)/bin
......@@ -17,10 +17,10 @@ LD_FLAGS="-w -X $(REPO_PATH)/version.Version=$(VERSION)"
GOOS=$(shell go env GOOS)
GOARCH=$(shell go env GOARCH)
build: bin/poke bin/example-app
build: bin/dex bin/example-app
bin/poke: FORCE
@go install -ldflags $(LD_FLAGS) $(REPO_PATH)/cmd/poke
bin/dex: FORCE
@go install -ldflags $(LD_FLAGS) $(REPO_PATH)/cmd/dex
bin/example-app: FORCE
@go install -ldflags $(LD_FLAGS) $(REPO_PATH)/cmd/example-app
......@@ -43,7 +43,7 @@ lint:
done
.PHONY: docker-build
docker-build: bin/poke
docker-build: bin/dex
@docker build -t $(DOCKER_IMAGE) .
.PHONY: docker-push
......
......@@ -3,14 +3,14 @@ package main
import (
"fmt"
"github.com/coreos/poke/connector"
"github.com/coreos/poke/connector/github"
"github.com/coreos/poke/connector/ldap"
"github.com/coreos/poke/connector/mock"
"github.com/coreos/poke/connector/oidc"
"github.com/coreos/poke/storage"
"github.com/coreos/poke/storage/kubernetes"
"github.com/coreos/poke/storage/memory"
"github.com/coreos/dex/connector"
"github.com/coreos/dex/connector/github"
"github.com/coreos/dex/connector/ldap"
"github.com/coreos/dex/connector/mock"
"github.com/coreos/dex/connector/oidc"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/kubernetes"
"github.com/coreos/dex/storage/memory"
)
// Config is the config format for the main application.
......
......@@ -3,7 +3,7 @@ package main
import (
"testing"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/storage"
"github.com/kylelemons/godebug/pretty"
yaml "gopkg.in/yaml.v2"
......
......@@ -9,7 +9,7 @@ import (
func commandRoot() *cobra.Command {
rootCmd := &cobra.Command{
Use: "poke",
Use: "dex",
Run: func(cmd *cobra.Command, args []string) {
cmd.Help()
os.Exit(2)
......
......@@ -10,8 +10,8 @@ import (
"github.com/spf13/cobra"
yaml "gopkg.in/yaml.v2"
"github.com/coreos/poke/server"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/server"
"github.com/coreos/dex/storage"
)
func commandServe() *cobra.Command {
......@@ -19,7 +19,7 @@ func commandServe() *cobra.Command {
Use: "serve [ config file ]",
Short: "Connect to the storage and begin serving requests.",
Long: ``,
Example: "poke serve c.yaml",
Example: "dex serve c.yaml",
RunE: serve,
}
}
......
......@@ -4,7 +4,7 @@ import (
"fmt"
"runtime"
"github.com/coreos/poke/version"
"github.com/coreos/dex/version"
"github.com/spf13/cobra"
)
......
......@@ -13,7 +13,7 @@ import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/github"
"github.com/coreos/poke/connector"
"github.com/coreos/dex/connector"
)
const baseURL = "https://api.github.com"
......
......@@ -7,7 +7,7 @@ import (
"gopkg.in/ldap.v2"
"github.com/coreos/poke/connector"
"github.com/coreos/dex/connector"
)
// Config holds the configuration parameters for the LDAP connector.
......
......@@ -8,7 +8,7 @@ import (
"net/http"
"net/url"
"github.com/coreos/poke/connector"
"github.com/coreos/dex/connector"
)
// New returns a mock connector which requires no user interaction. It always returns
......
......@@ -11,7 +11,7 @@ import (
"golang.org/x/net/context"
"golang.org/x/oauth2"
"github.com/coreos/poke/connector"
"github.com/coreos/dex/connector"
)
// Config holds configuration options for OpenID Connect logins.
......
......@@ -12,10 +12,10 @@ spec:
app: dex
spec:
containers:
- image: quay.io/ericchiang/poke
- image: quay.io/ericchiang/dex
name: dex
command:
- "/poke"
- "/dex"
- "serve"
- "/dex/config.yaml"
env:
......
# NOTE(ericchiang): Create a separate block for each dependency so it's clear
# which dependencies require which transitive dependencies.
package: github.com/coreos/poke
package: github.com/coreos/dex
import:
- package: github.com/spf13/cobra
......
......@@ -15,8 +15,8 @@ import (
"github.com/gorilla/mux"
jose "gopkg.in/square/go-jose.v2"
"github.com/coreos/poke/connector"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/connector"
"github.com/coreos/dex/storage"
)
func (s *Server) handlePublicKeys(w http.ResponseWriter, r *http.Request) {
......
......@@ -10,7 +10,7 @@ import (
"strings"
"time"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/storage"
)
// TODO(ericchiang): clean this file up and figure out more idiomatic error handling.
......
......@@ -13,7 +13,7 @@ import (
"golang.org/x/net/context"
"gopkg.in/square/go-jose.v2"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/storage"
)
// rotationStrategy describes a strategy for generating cryptographic keys, how
......
......@@ -11,8 +11,8 @@ import (
"github.com/gorilla/mux"
"github.com/coreos/poke/connector"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/connector"
"github.com/coreos/dex/storage"
)
// Connector is a connector with metadata.
......
......@@ -14,9 +14,9 @@ import (
"golang.org/x/net/context"
"golang.org/x/oauth2"
"github.com/coreos/poke/connector/mock"
"github.com/coreos/poke/storage"
"github.com/coreos/poke/storage/memory"
"github.com/coreos/dex/connector/mock"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/memory"
)
func mustLoad(s string) *rsa.PrivateKey {
......
......@@ -5,7 +5,7 @@ import (
"net/http"
"text/template"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/storage"
)
type connectorInfo struct {
......
......@@ -22,8 +22,8 @@ import (
"golang.org/x/net/context"
yaml "gopkg.in/yaml.v2"
"github.com/coreos/poke/storage"
"github.com/coreos/poke/storage/kubernetes/k8sapi"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/kubernetes/k8sapi"
)
type client struct {
......
......@@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/storage"
)
func muster(t *testing.T) func(err error) {
......
......@@ -10,8 +10,8 @@ import (
homedir "github.com/mitchellh/go-homedir"
"golang.org/x/net/context"
"github.com/coreos/poke/storage"
"github.com/coreos/poke/storage/kubernetes/k8sapi"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/kubernetes/k8sapi"
)
const (
......
......@@ -4,7 +4,7 @@ import (
"os"
"testing"
"github.com/coreos/poke/storage/storagetest"
"github.com/coreos/dex/storage/storagetest"
)
func TestLoadClient(t *testing.T) {
......
......@@ -5,8 +5,8 @@ import (
jose "gopkg.in/square/go-jose.v2"
"github.com/coreos/poke/storage"
"github.com/coreos/poke/storage/kubernetes/k8sapi"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/kubernetes/k8sapi"
)
// There will only ever be a single keys resource. Maintain this by setting a
......
......@@ -5,7 +5,7 @@ import (
"errors"
"sync"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/storage"
)
// New returns an in memory storage.
......
......@@ -3,7 +3,7 @@ package memory
import (
"testing"
"github.com/coreos/poke/storage/storagetest"
"github.com/coreos/dex/storage/storagetest"
)
func TestStorage(t *testing.T) {
......
......@@ -4,7 +4,7 @@ import (
"reflect"
"testing"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/storage"
)
func TestStaticClients(t *testing.T) {
......
......@@ -8,7 +8,7 @@ import (
"testing"
"time"
"github.com/coreos/poke/storage"
"github.com/coreos/dex/storage"
)
var neverExpire = time.Now().Add(time.Hour * 24 * 365 * 100)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment