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

Jump to bottom

v3.0.10 release #691

Merged
merged 9 commits into from
Apr 3, 2023
Merged

v3.0.10 release #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b846c78
chore: run go mod tidy
eneskaya Apr 3, 2023
ab39252
Merge pull request #688 from tailwarden/chore/go-mod-tidy
eneskaya Apr 3, 2023
d58607a
chore: docker, copy binary from dist
eneskaya Mar 31, 2023
a91678a
Merge pull request #686 from tailwarden/fix/docker-use-local-binary
eneskaya Apr 3, 2023
e8ab7a5
fix: properly handle kms error
eneskaya Apr 3, 2023
f0d88fa
fix: handling of query params setting filters
eneskaya Apr 3, 2023
d540dd2
Merge pull request #689 from tailwarden/feature/tech-1050
eneskaya Apr 3, 2023
a7f387e
Merge pull request #690 from tailwarden/feature/tech-1031
eneskaya Apr 3, 2023
bd23907
chore: bump version to v3.0.10
eneskaya Apr 3, 2023
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
5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ RUN echo "Running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log
ENV SEGMENT_WRITE_KEY $SEGMENT_WRITE_KEY
ENV VERSION $VERSION

RUN apk update && apk add curl
RUN curl -L https://cli.komiser.io/$VERSION/komiser_Linux_x86_64 -o /usr/bin/komiser && \
chmod +x /usr/bin/komiser && \
COPY komiser /usr/bin/komiser
RUN chmod +x /usr/bin/komiser && \
mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2

EXPOSE $PORT
Expand Down
2 changes: 1 addition & 1 deletion dashboard/components/inventory/components/filter/hooks/useFilterWizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function useFilterWizard({ router, setSkippedSearch }: InventoryFilterProps) {
}
}

if (router.asPath === '/inventory') {
if (router.asPath === '/inventory/') {
router.push(
`?${data.field === 'tag' ? `tag:${data.tagKey}` : data.field}:${
data.operator
Expand Down
2 changes: 1 addition & 1 deletion dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "komiser-dashboard",
"version": "3.0.9",
"version": "3.0.10",
"private": true,
"scripts": {
"dev": "next dev -p 3002",
Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ module github.com/tailwarden/komiser
go 1.18

require (
cloud.google.com/go/compute v1.18.0
cloud.google.com/go/monitoring v1.13.0
cloud.google.com/go/storage v1.30.0
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.3.1
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.1.0
Expand Down Expand Up @@ -39,6 +42,7 @@ require (
github.com/elazarl/go-bindata-assetfs v1.0.1
github.com/getsentry/sentry-go v0.18.0
github.com/go-co-op/gocron v1.18.0
github.com/golang/protobuf v1.5.2
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/hashicorp/go-version v1.6.0
Expand All @@ -64,17 +68,15 @@ require (
go.mongodb.org/atlas v0.23.1
golang.org/x/oauth2 v0.6.0
golang.org/x/text v0.8.0
google.golang.org/api v0.110.0
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.12.0 // indirect
cloud.google.com/go/monitoring v1.13.0 // indirect
cloud.google.com/go/storage v1.30.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v0.8.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.3 // indirect
Expand Down Expand Up @@ -103,7 +105,6 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
Expand Down Expand Up @@ -150,7 +151,6 @@ require (
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
golang.org/x/tools v0.6.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.110.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec // indirect
google.golang.org/grpc v1.53.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0=
cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY=
cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE=
cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
cloud.google.com/go/monitoring v1.13.0 h1:2qsrgXGVoRXpP7otZ14eE1I568zAa92sJSDPyOJvwjM=
cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw=
cloud.google.com/go/storage v1.30.0 h1:g1yrbxAWOrvg/594228pETWkOi00MLTrOWfh56veU5o=
Expand Down Expand Up @@ -221,6 +220,7 @@ github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
Expand Down
15 changes: 8 additions & 7 deletions providers/aws/kms/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,18 @@ func Keys(ctx context.Context, client ProviderClient) ([]Resource, error) {
}
}

monthlyCost := 0.0

keyOutput, err := kmsClient.DescribeKey(ctx, &kms.DescribeKeyInput{
KeyId: key.KeyId,
})
if err != nil {
log.WithError(err).Errorf("Error getting key %s", *key.KeyId)
}

monthlyCost := 0.0
// AWS Managed Keys are free
if keyOutput.KeyMetadata.KeyManager != types.KeyManagerTypeAws {
monthlyCost = 1.0
log.WithError(err).Warnf("Error getting key %s", *key.KeyId)
} else {
if keyOutput.KeyMetadata.KeyManager != types.KeyManagerTypeAws {
// AWS Managed Keys are free
monthlyCost = 1.0
}
}

resources = append(resources, Resource{
Expand Down