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.

Sign up for GitHub

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

Multiaccount JWT #68

Merged
merged 7 commits into from
Jan 22, 2024
Merged

Multiaccount JWT #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
45c9452
UPdate catalog-manager to support multi account JWT
Carmendelope Dec 4, 2023
28197be
Remove unused function
Carmendelope Dec 5, 2023
94b2f56
alpine:3.18.5
Carmendelope Dec 5, 2023
cc1bd72
upgrade libs to fix dependabot alerts
Carmendelope Dec 5, 2023
54121bd
upgrade mockup generator
Carmendelope Jan 19, 2024
bbfa535
update njwt
Carmendelope Jan 22, 2024
dfc0ff6
Remove mockups-generator dependency
Carmendelope Jan 22, 2024
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Let's make the catalog better, check our [contribution](./CONTRIBUTING.md) guide

## License

Copyright 2020 Napptive
Copyright 2023 Napptive

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
3 changes: 2 additions & 1 deletion cmd/catalog-manager/commands/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2021 Napptive
* Copyright 2023 Napptive
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package commands

import (
Expand Down
2 changes: 1 addition & 1 deletion cmd/catalog-manager/commands/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2021 Napptive
* Copyright 2023 Napptive
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
3 changes: 1 addition & 2 deletions cmd/catalog-manager/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2020 Napptive
* Copyright 2023 Napptive
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -23,7 +23,6 @@ import (
"github.com/napptive/catalog-manager/internal/pkg/config"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"

"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/catalog-manager/commands/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2020 Napptive
* Copyright 2023 Napptive
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@ package commands
import (
"time"

catalog_manager "github.com/napptive/catalog-manager/internal/app/catalog-manager"
"github.com/napptive/catalog-manager/internal/app/catalog-manager"
"github.com/spf13/cobra"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/catalog-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2020 Napptive
* Copyright 2023 Napptive
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package main

import (
Expand Down
2 changes: 1 addition & 1 deletion docker/catalog-manager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.16.2
FROM alpine:3.18.5

WORKDIR /app

Expand Down
77 changes: 39 additions & 38 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
module github.com/napptive/catalog-manager

go 1.19
go 1.21

require (
github.com/doug-martin/goqu/v9 v9.18.0
github.com/doug-martin/goqu/v9 v9.19.0
github.com/elastic/go-elasticsearch/v7 v7.17.10
github.com/golang/mock v1.6.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1
github.com/napptive/analytics v1.1.0
github.com/napptive/grpc-catalog-common-go v0.2.0
github.com/napptive/grpc-catalog-go v0.28.0
github.com/napptive/grpc-jwt-go v0.1.0
github.com/napptive/grpc-playground-apps-go v0.34.0
github.com/napptive/grpc-playground-apps-go v0.45.0
github.com/napptive/mock-extensions v1.0.0
github.com/napptive/nerrors v1.1.0
github.com/napptive/njwt v1.8.0
github.com/napptive/njwt v1.8.1-0.20240119105957-cd28e5a47f2f
github.com/napptive/oam-utils v1.0.0
github.com/napptive/rdbms/v2 v2.4.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.8
github.com/onsi/gomega v1.30.0
github.com/rs/xid v1.5.0
github.com/rs/zerolog v1.29.1
github.com/spf13/cobra v1.7.0
golang.org/x/crypto v0.10.0
golang.org/x/net v0.11.0
google.golang.org/grpc v1.56.0
k8s.io/apimachinery v0.27.3
sigs.k8s.io/yaml v1.3.0
github.com/rs/zerolog v1.31.0
github.com/spf13/cobra v1.8.0
golang.org/x/crypto v0.16.0
golang.org/x/net v0.17.0
google.golang.org/grpc v1.59.0
k8s.io/apimachinery v0.28.2
sigs.k8s.io/yaml v1.4.0
syreclabs.com/go/faker v1.2.3
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/bigquery v1.50.0 // indirect
cloud.google.com/go/compute v1.19.1 // indirect
cloud.google.com/go v0.110.8 // indirect
cloud.google.com/go/bigquery v1.55.0 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/iam v1.1.2 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/apache/arrow/go/v11 v11.0.0 // indirect
github.com/apache/arrow/go/v12 v12.0.0 // indirect
github.com/apache/thrift v0.18.1 // indirect
github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
Expand All @@ -52,11 +52,12 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/flatbuffers v23.3.3+incompatible // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
github.com/google/s2a-go v0.1.5 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.14.0 // indirect
Expand All @@ -72,39 +73,39 @@ require (
github.com/klauspost/compress v1.16.3 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/napptive/grpc-common-go v0.8.0 // indirect
github.com/napptive/grpc-playground-common-go v0.6.0 // indirect
github.com/napptive/grpc-playground-environments-go v0.11.0 // indirect
github.com/napptive/grpc-playground-environments-go v0.17.0 // indirect
github.com/napptive/grpc-playground-oam3-go v0.5.0 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/tools v0.9.1 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.12.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.114.0 // indirect
google.golang.org/api v0.134.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Loading