From 13ae2f54b6b48915302f5060089b7b99240a0a85 Mon Sep 17 00:00:00 2001 From: Francesco Ilario Date: Mon, 18 Mar 2024 12:56:56 +0100 Subject: [PATCH 1/4] Add public-viewer configuration Signed-off-by: Francesco Ilario --- go.mod | 2 ++ go.sum | 2 -- pkg/configuration/publicviewer_config.go | 25 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 pkg/configuration/publicviewer_config.go diff --git a/go.mod b/go.mod index 3da48343..de1d169b 100644 --- a/go.mod +++ b/go.mod @@ -112,3 +112,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +replace github.com/codeready-toolchain/api => ../api diff --git a/go.sum b/go.sum index d5015c48..4ac7e10d 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,6 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9 h1:Lm7bFLrzfJzrUiRGVqtsSaZMpj+akLiR/fvAFjjE9gM= -github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9/go.mod h1:cfNN6YPX4TORvhhZXMSjSPesqAHlB3nD/WAfGe4WLKQ= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= diff --git a/pkg/configuration/publicviewer_config.go b/pkg/configuration/publicviewer_config.go new file mode 100644 index 00000000..d6c7b0a6 --- /dev/null +++ b/pkg/configuration/publicviewer_config.go @@ -0,0 +1,25 @@ +package configuration + +import ( + toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1" +) + +type PublicViewerConfig struct { + Config toolchainv1alpha1.PublicViewerConfig +} + +func (c PublicViewerConfig) Enabled() bool { + return c.Config.Enabled +} + +func (c PublicViewerConfig) Username() *string { + return &c.Config.Username +} + +func (c PublicViewerConfig) IsPublicViewer(username string) bool { + if !c.Enabled() { + return false + } + + return c.Config.Username == username +} From eed3c6250f34b8a231d86537ba9d1ba54d72220b Mon Sep 17 00:00:00 2001 From: Francesco Ilario Date: Mon, 18 Mar 2024 13:21:24 +0100 Subject: [PATCH 2/4] update public viewer config Signed-off-by: Francesco Ilario --- pkg/configuration/publicviewer_config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/configuration/publicviewer_config.go b/pkg/configuration/publicviewer_config.go index d6c7b0a6..802816c5 100644 --- a/pkg/configuration/publicviewer_config.go +++ b/pkg/configuration/publicviewer_config.go @@ -12,8 +12,8 @@ func (c PublicViewerConfig) Enabled() bool { return c.Config.Enabled } -func (c PublicViewerConfig) Username() *string { - return &c.Config.Username +func (c PublicViewerConfig) Username() string { + return c.Config.Username } func (c PublicViewerConfig) IsPublicViewer(username string) bool { From 87027670d9b3a7fe43c44bcdc24e8d005d8f6ce0 Mon Sep 17 00:00:00 2001 From: Francesco Ilario Date: Fri, 22 Mar 2024 17:31:35 +0100 Subject: [PATCH 3/4] Update go mod Signed-off-by: Francesco Ilario --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index de1d169b..25f54a7d 100644 --- a/go.mod +++ b/go.mod @@ -113,4 +113,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/codeready-toolchain/api => ../api +replace github.com/codeready-toolchain/api => github.com/filariow/toolchain-api v0.0.0-20240322163859-f974f2dbbc8e diff --git a/go.sum b/go.sum index 4ac7e10d..5d5b61ef 100644 --- a/go.sum +++ b/go.sum @@ -166,6 +166,8 @@ github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwo github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/filariow/toolchain-api v0.0.0-20240322163859-f974f2dbbc8e h1:h+uO6jYovPD3j9VIo9JajpmTZIyl7x6wSap/4RjS6aw= +github.com/filariow/toolchain-api v0.0.0-20240322163859-f974f2dbbc8e/go.mod h1:cfNN6YPX4TORvhhZXMSjSPesqAHlB3nD/WAfGe4WLKQ= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= From 5a72dad62c0bea700ed8a8e0a6ec867e41f5292b Mon Sep 17 00:00:00 2001 From: Francesco Ilario Date: Mon, 25 Mar 2024 18:59:46 +0100 Subject: [PATCH 4/4] update go mod Signed-off-by: Francesco Ilario --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 25f54a7d..3d6214dc 100644 --- a/go.mod +++ b/go.mod @@ -113,4 +113,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/codeready-toolchain/api => github.com/filariow/toolchain-api v0.0.0-20240322163859-f974f2dbbc8e +replace github.com/codeready-toolchain/api => github.com/filariow/toolchain-api v0.0.0-20240325174729-ac271dff1ebc diff --git a/go.sum b/go.sum index 5d5b61ef..b9b6c15d 100644 --- a/go.sum +++ b/go.sum @@ -166,8 +166,8 @@ github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwo github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/filariow/toolchain-api v0.0.0-20240322163859-f974f2dbbc8e h1:h+uO6jYovPD3j9VIo9JajpmTZIyl7x6wSap/4RjS6aw= -github.com/filariow/toolchain-api v0.0.0-20240322163859-f974f2dbbc8e/go.mod h1:cfNN6YPX4TORvhhZXMSjSPesqAHlB3nD/WAfGe4WLKQ= +github.com/filariow/toolchain-api v0.0.0-20240325174729-ac271dff1ebc h1:8zXVcHEShpnB7JMdj9S3UJR6DVwxOvkkeJRTJinr3YE= +github.com/filariow/toolchain-api v0.0.0-20240325174729-ac271dff1ebc/go.mod h1:cfNN6YPX4TORvhhZXMSjSPesqAHlB3nD/WAfGe4WLKQ= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=