bump dex to 0.4.0

remove pkger and use go embed for dex web assets

not sure why it insists on bumping containerd and friends as well

Signed-off-by: Rui Yang <ryang@pivotal.io>
Co-authored-by: Aidan Oldershaw <aoldershaw@pivotal.io>

Signed-off-by: Aidan Oldershaw <aoldershaw@pivotal.io>

atc/atccmd/command.go

@@ -1777,7 +1777,6 @@ func (cmd *RunCommand) constructAuthHandler(
 		Expiration:  cmd.Auth.AuthFlags.Expiration,
 		IssuerURL:   issuerURL.String(),
 		RedirectURL: redirectURL.String(),
-		WebHostURL:  "/sky/issuer",
 		SigningKey:  cmd.Auth.AuthFlags.SigningKey.PrivateKey,
 		Storage:     storage,
 	})

cmd/concourse/main.go

@@ -1,5 +1,3 @@
-//go:generate go run github.com/markbates/pkger/cmd/pkger -o ./cmd/concourse
-
 package main
 
 import (

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/DataDog/datadog-go v3.2.0+incompatible
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v0.11.0
 	github.com/Masterminds/squirrel v1.1.0
+	github.com/Microsoft/hcsshim v0.8.15 // indirect
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a
 	github.com/aws/aws-sdk-go v1.37.33
@@ -18,27 +19,21 @@ require (
 	github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect
 	github.com/cloudfoundry/socks5-proxy v0.0.0-20180530211953-3659db090cb2 // indirect
 	github.com/concourse/baggageclaim v1.11.0
-	github.com/concourse/dex v0.3.0
+	github.com/concourse/dex v0.4.0
 	github.com/concourse/flag v1.1.0
 	github.com/concourse/go-archive v1.0.1
 	github.com/concourse/retryhttp v1.1.0
-	github.com/containerd/cgroups v0.0.0-20191220161829-06e718085901 // indirect
-	github.com/containerd/containerd v1.3.4
-	github.com/containerd/continuity v0.0.0-20191214063359-1097c8bae83b // indirect
-	github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00 // indirect
-	github.com/containerd/go-cni v0.0.0-20200107172653-c154a49e2c75
-	github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c // indirect
-	github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd
+	github.com/containerd/containerd v1.5.0-beta.1
+	github.com/containerd/go-cni v1.0.1
+	github.com/containerd/typeurl v1.0.1
 	github.com/coreos/go-iptables v0.4.5
 	github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4
 	github.com/cyberark/conjur-api-go v0.7.1
-	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/fatih/color v1.9.0
 	github.com/felixge/httpsnoop v1.0.1
 	github.com/gobwas/glob v0.2.3
 	github.com/goccy/go-yaml v1.8.3
-	github.com/gogo/googleapis v1.3.1 // indirect
-	github.com/gogo/protobuf v1.3.1
+	github.com/gogo/protobuf v1.3.2
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
 	github.com/google/jsonapi v0.0.0-20180618021926-5d047c6bc66b
 	github.com/gorilla/websocket v1.4.2
@@ -47,15 +42,14 @@ require (
 	github.com/hashicorp/vault/api v1.0.5-0.20191108163347-bdd38fca2cff
 	github.com/hashicorp/vault/sdk v0.1.14-0.20191112033314-390e96e22eb2 // indirect
 	github.com/honeycombio/opentelemetry-exporter-go v0.11.0
-	github.com/imdario/mergo v0.3.6
+	github.com/imdario/mergo v0.3.10
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf
 	github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d
 	github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7
-	github.com/klauspost/compress v1.10.10
+	github.com/klauspost/compress v1.11.3
 	github.com/kr/pty v1.1.8
 	github.com/krishicks/yaml-patch v0.0.10
-	github.com/lib/pq v1.3.0
-	github.com/markbates/pkger v0.17.1
+	github.com/lib/pq v1.10.0
 	github.com/mattn/go-colorable v0.1.7
 	github.com/mattn/go-isatty v0.0.12
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0
@@ -65,18 +59,17 @@ require (
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
 	github.com/onsi/ginkgo v1.14.2
 	github.com/onsi/gomega v1.10.3
-	github.com/opencontainers/runtime-spec v1.0.1
+	github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/peterhellberg/link v1.0.0
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942
 	github.com/prometheus/client_golang v1.10.0
 	github.com/racksec/srslog v0.0.0-20180709174129-a4725f04ec91
-	github.com/sirupsen/logrus v1.6.0
+	github.com/sirupsen/logrus v1.8.1
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/square/certstrap v1.1.1
-	github.com/stretchr/testify v1.6.1
-	github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
+	github.com/stretchr/testify v1.7.0
 	github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc
 	github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958
 	github.com/vbauerster/mpb/v4 v4.6.1-0.20190319154207-3a6acfe12ac6
@@ -89,17 +82,17 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp v0.11.0
 	go.opentelemetry.io/otel/exporters/trace/jaeger v0.11.0
 	go.opentelemetry.io/otel/sdk v0.11.0
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
 	google.golang.org/api v0.32.0 // indirect
 	google.golang.org/grpc v1.32.0
 	gopkg.in/square/go-jose.v2 v2.5.1
-	gopkg.in/yaml.v2 v2.3.0
-	k8s.io/api v0.18.8
-	k8s.io/apimachinery v0.18.8
-	k8s.io/client-go v0.18.8
+	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/api v0.20.1
+	k8s.io/apimachinery v0.20.1
+	k8s.io/client-go v0.20.1
 	sigs.k8s.io/yaml v1.2.0
 )
 

skymarshal/dexserver/dexserver.go

@@ -3,6 +3,8 @@ package dexserver
 import (
 	"context"
 	"crypto/rsa"
+	"embed"
+	"io/fs"
 	"strings"
 	"time"
 
@@ -12,14 +14,12 @@ import (
 	s "github.com/concourse/concourse/skymarshal/storage"
 	"github.com/concourse/dex/server"
 	"github.com/concourse/dex/storage"
-	"github.com/markbates/pkger"
 	"golang.org/x/crypto/bcrypt"
 )
 
 type DexConfig struct {
 	Logger      lager.Logger
 	IssuerURL   string
-	WebHostURL  string
 	SigningKey  *rsa.PrivateKey
 	Expiration  time.Duration
 	Clients     map[string]string
@@ -28,6 +28,9 @@ type DexConfig struct {
 	Storage     s.Storage
 }
 
+//go:embed web
+var webFS embed.FS
+
 func NewDexServer(config *DexConfig) (*server.Server, error) {
 
 	newDexServerConfig, err := NewDexServerConfig(config)
@@ -94,12 +97,16 @@ func NewDexServerConfig(config *DexConfig) (server.Config, error) {
 		return server.Config{}, err
 	}
 
+	webFS, err := fs.Sub(webFS, "web")
+	if err != nil {
+		return server.Config{}, err
+	}
+
 	webConfig := server.WebConfig{
-		LogoURL: strings.TrimRight(config.WebHostURL, "/") + "/themes/concourse/logo.svg",
-		HostURL: config.WebHostURL,
+		LogoURL: "theme/logo.svg",
+		WebFS:   webFS,
 		Theme:   "concourse",
 		Issuer:  "Concourse",
-		Dir:     pkger.Include("/skymarshal/web"),
 	}
 
 	return server.Config{

skymarshal/dexserver/web/templates/header.html

@@ -5,17 +5,16 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>{{ issuer }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="{{ static "main.css" }}" rel="stylesheet">
-    <link href="{{ theme "styles.css" }}" rel="stylesheet">
-    <link rel="icon" href="{{ theme "favicon.png" }}">
+    <link href="{{ url .ReqPath "static/main.css" }}" rel="stylesheet">
+    <link href="{{ url .ReqPath "theme/styles.css" }}" rel="stylesheet">
+    <link rel="icon" href="{{ url .ReqPath "theme/favicon.png" }}">
   </head>
 
   <body class="theme-body">
     <div class="theme-navbar">
       <a class="theme-navbar__logo-wrap" href="/">
-        <img class="theme-navbar__logo" src="{{ logo }}">
+        <img class="theme-navbar__logo" src="{{ url .ReqPath logo }}">
       </a>
     </div>
 
     <div class="dex-container">
-

skymarshal/dexserver/web/themes/concourse/styles.css

@@ -2,14 +2,14 @@
   font-family: 'Inconsolata';
   font-style: normal;
   font-weight: 400;
-  src: url("../../static/fonts/Inconsolata-Regular.ttf");
+  src: url("../static/fonts/Inconsolata-Regular.ttf");
 }
 
 @font-face {
   font-family: 'Inconsolata';
   font-style: normal;
   font-weight: 700;
-  src: url("../../static/fonts/Inconsolata-Bold.ttf");
+  src: url("../static/fonts/Inconsolata-Bold.ttf");
 }