Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump dex to latest #8582

Merged
merged 5 commits into from
Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion atc/atccmd/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -1745,7 +1745,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,
})
Expand Down
18 changes: 10 additions & 8 deletions atc/creds/kubernetes/kubernetes_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package kubernetes_test

import (
"context"

"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/creds"
Expand Down Expand Up @@ -76,14 +78,14 @@ var _ = Describe("Kubernetes", func() {

Entry("team-scoped vars with a value field", Example{
Setup: func() {
fakeClientset.CoreV1().Secrets("prefix-some-team").Create(&v1.Secret{
fakeClientset.CoreV1().Secrets("prefix-some-team").Create(context.TODO(), &v1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: secretName,
},
Data: map[string][]byte{
"value": []byte("some-value"),
},
})
}, metav1.CreateOptions{})
},

Template: "((" + secretName + "))",
Expand All @@ -92,14 +94,14 @@ var _ = Describe("Kubernetes", func() {

Entry("pipeline-scoped vars with a value field", Example{
Setup: func() {
fakeClientset.CoreV1().Secrets("prefix-some-team").Create(&v1.Secret{
fakeClientset.CoreV1().Secrets("prefix-some-team").Create(context.TODO(), &v1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "some-pipeline." + secretName,
},
Data: map[string][]byte{
"value": []byte("some-value"),
},
})
}, metav1.CreateOptions{})
},

Template: "((" + secretName + "))",
Expand All @@ -108,14 +110,14 @@ var _ = Describe("Kubernetes", func() {

Entry("pipeline-scoped vars with arbitrary fields", Example{
Setup: func() {
fakeClientset.CoreV1().Secrets("prefix-some-team").Create(&v1.Secret{
fakeClientset.CoreV1().Secrets("prefix-some-team").Create(context.TODO(), &v1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "some-pipeline." + secretName,
},
Data: map[string][]byte{
"some-field": []byte("some-field-value"),
},
})
}, metav1.CreateOptions{})
},

Template: atc.Source{
Expand All @@ -130,14 +132,14 @@ var _ = Describe("Kubernetes", func() {

Entry("pipeline-scoped vars with arbitrary fields accessed via template", Example{
Setup: func() {
fakeClientset.CoreV1().Secrets("prefix-some-team").Create(&v1.Secret{
fakeClientset.CoreV1().Secrets("prefix-some-team").Create(context.TODO(), &v1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "some-pipeline." + secretName,
},
Data: map[string][]byte{
"some-field": []byte("some-field-value"),
},
})
}, metav1.CreateOptions{})
},

Template: "((" + secretName + ".some-field))",
Expand Down
3 changes: 2 additions & 1 deletion atc/creds/kubernetes/secrets.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package kubernetes

import (
"context"
"fmt"
"strings"
"time"
Expand Down Expand Up @@ -84,7 +85,7 @@ func (secrets Secrets) findSecret(namespace, name string) (*v1.Secret, bool, err
var secret *v1.Secret
var err error

secret, err = secrets.client.CoreV1().Secrets(namespace).Get(name, metav1.GetOptions{})
secret, err = secrets.client.CoreV1().Secrets(namespace).Get(context.TODO(), name, metav1.GetOptions{})

if err != nil && k8serr.IsNotFound(err) {
return nil, false, nil
Expand Down
2 changes: 0 additions & 2 deletions cmd/concourse/main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:generate go run github.com/markbates/pkger/cmd/pkger -o ./cmd/concourse

package main

import (
Expand Down
12 changes: 0 additions & 12 deletions cmd/concourse/pkged.go

This file was deleted.

93 changes: 41 additions & 52 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,89 +1,82 @@
module github.com/concourse/concourse

require (
cloud.google.com/go/trace v1.2.0 // indirect
code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c
code.cloudfoundry.org/credhub-cli v0.0.0-20190415201820-e3951663d25c
code.cloudfoundry.org/garden v0.0.0-20181108172608-62470dc86365
code.cloudfoundry.org/lager v2.0.0+incompatible
code.cloudfoundry.org/localip v0.0.0-20170223024724-b88ad0dea95c
code.cloudfoundry.org/urljoiner v0.0.0-20170223060717-5cabba6c0a50
github.com/Azure/go-autorest/autorest v0.10.1 // indirect
github.com/Azure/go-autorest/autorest/adal v0.8.3 // indirect
github.com/DataDog/datadog-go v3.2.0+incompatible
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v0.20.1
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.25.18
github.com/caarlos0/env v3.5.0+incompatible
github.com/cenkalti/backoff v2.2.1+incompatible
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/dex v0.3.0
github.com/concourse/dex v1.5.0
github.com/concourse/flag v1.1.0
github.com/concourse/go-archive v1.0.1
github.com/concourse/retryhttp v1.0.2
github.com/containerd/cgroups v0.0.0-20191220161829-06e718085901 // indirect
github.com/containerd/containerd v1.3.2
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/creack/pty v1.1.9 // indirect
github.com/cyberark/conjur-api-go v0.6.0
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/fatih/color v1.10.0
github.com/felixge/httpsnoop v1.0.1
github.com/fatih/color v1.13.0
github.com/felixge/httpsnoop v1.0.3
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/gobuffalo/packr v1.30.1
github.com/goccy/go-yaml v1.8.8
github.com/gogo/googleapis v1.3.1 // indirect
github.com/gogo/protobuf v1.3.2
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
github.com/google/jsonapi v0.0.0-20180618021926-5d047c6bc66b
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/gophercloud/gophercloud v0.10.0 // indirect
github.com/gorilla/websocket v1.4.1
github.com/gorilla/websocket v1.5.0
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/go-rootcerts v1.0.2
github.com/hashicorp/go-version v1.2.0 // indirect
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/imdario/mergo v0.3.6
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf
github.com/influxdata/influxdb1-client v0.0.0-20190118215656-f8cdb5d5f175
github.com/jessevdk/go-flags v1.4.0
github.com/klauspost/compress v1.9.7
github.com/jessevdk/go-flags v1.5.0
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.10.0
github.com/markbates/pkger v0.17.1
github.com/mattn/go-colorable v0.1.8
github.com/mattn/go-isatty v0.0.12
github.com/lib/pq v1.10.7
github.com/mattn/go-colorable v0.1.12
github.com/mattn/go-isatty v0.0.14
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.3
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
github.com/miekg/dns v1.1.6
github.com/mitchellh/mapstructure v1.1.2
github.com/miekg/dns v1.1.41
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
github.com/onsi/ginkgo v1.12.0
github.com/onsi/gomega v1.10.0
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.4.0
github.com/prometheus/client_golang v1.13.0
github.com/racksec/srslog v0.0.0-20180709174129-a4725f04ec91
github.com/sirupsen/logrus v1.4.2
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.0
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
github.com/spf13/pflag v1.0.5 // indirect
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/square/certstrap v1.1.1
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.7.0
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
github.com/stretchr/testify v1.8.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
Expand All @@ -96,21 +89,17 @@ require (
go.opentelemetry.io/otel/oteltest v0.20.0
go.opentelemetry.io/otel/sdk v0.20.0
go.opentelemetry.io/otel/trace v0.20.0
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
golang.org/x/tools v0.1.5 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/square/go-jose.v2 v2.4.1
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
k8s.io/client-go v11.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
k8s.io/utils v0.0.0-20190829053155-3a4a5477acf8 // indirect
sigs.k8s.io/yaml v1.1.0
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
gopkg.in/square/go-jose.v2 v2.6.0
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
)

go 1.16
Expand Down