Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ api:
.PHONY: config
# generate config proto
config:
cd ./internal/credentials/api && buf generate
cd ./pkg/credentials/api && buf generate
make -C ./app/controlplane config
make -C ./app/artifact-cas config

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/cmd/wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func wireApp(*conf.Bootstrap, credentials.ReaderWriter, log.Logger, sdk.Availabl
wire.Bind(new(biz.CASClient), new(*biz.CASClientUseCase)),
serviceOpts,
wire.Value([]biz.CASClientOpts{}),
wire.FieldsOf(new(*conf.Bootstrap), "Server", "Auth", "Data", "CasServer", "ReferrerSharedIndex"),
wire.FieldsOf(new(*conf.Bootstrap), "Server", "Auth", "Data", "CasServer", "ReferrerSharedIndex", "Onboarding"),
wire.FieldsOf(new(*conf.Data), "Database"),
dispatcher.New,
authz.NewDatabaseEnforcer,
Expand Down
48 changes: 25 additions & 23 deletions app/controlplane/cmd/wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/controlplane/configs/config.devel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ auth:
# enabled: true
# allowed_orgs:
# - deadbeef

8 changes: 7 additions & 1 deletion app/controlplane/configs/samples/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,10 @@ credentials_service:
referrer_shared_index:
enabled: true
allowed_orgs:
- deadbeef
- deadbeef

onboarding:
- name: "read-only-demo"
role: "viewer"
- name: "read-write-demo"
role: "owner"
8 changes: 6 additions & 2 deletions app/controlplane/internal/conf/buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ deps:
- remote: buf.build
owner: bufbuild
repository: protovalidate
commit: b983156c5e994cc9892e0ce3e64e17e0
commit: 46a4cf4ba1094a34bcd89a6c67163b4b
- remote: buf.build
owner: googleapis
repository: googleapis
commit: 7a6bc1e3207144b38e9066861e1de0ff
commit: f0e53af8f2fc4556b94f482688b57223
- remote: buf.build
owner: kratos-go
repository: kratos
commit: e1d52e944e3845c6862a566db322432d
1 change: 1 addition & 0 deletions app/controlplane/internal/conf/buf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ breaking:
deps:
- buf.build/googleapis/googleapis
- buf.build/bufbuild/protovalidate
- buf.build/kratos-go/kratos
lint:
use:
- DEFAULT
Expand Down
Loading