Skip to content

Commit

Permalink
Conflict resolution (#1299)
Browse files Browse the repository at this point in the history 
* v3.1.6 release 🚀 (#1265)

* fix(1205): Resource fetching performance improvement for OVH

* Update civo.mdx

update to test mintlify workflow

* fix: Resource fetching performance improvement for Scaleway (#1212)

Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* [KOM-38]: Resource fetching performance improvement for CIVO, DigitalOcean, OCI, Linode, K8s, Tencent (#1215)

* making fetching resources parallelized for all providers

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>

* updating fetching resources for civo and tencent

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>

---------

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>
Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* fix: no OVH in docs (#1218)

Signed-off-by: Azanul <azanulhaque@gmail.com>

* Update hello-to-new-contributors.yml

* [FEAT-1092]: Update color names and box-shadows to match Design-System (#1143)

* feat: update colors in tailwind config

* fix: update color class-names to match new palette

* fix: update primary & secondary color class-names to match new palette

* fix: update box-shadows to match design system

* fix: update tailwind config and class-names

* feat: add aws codebuild resource (#1216)

Co-authored-by: amal richwin <richwin@munat.Dlink>
Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* feat: add aws codedeploy resource (#1228)

* Fix accidental loop capture (#1252)

* chore: remove dot import

Signed-off-by: Azanul <azanulhaque@gmail.com>

* fix: capture of the loop variable

Signed-off-by: Azanul <azanulhaque@gmail.com>

* chore: remove duplicate import

Signed-off-by: Azanul <azanulhaque@gmail.com>

---------

Signed-off-by: Azanul <azanulhaque@gmail.com>

* feat: add aws codecommit resource (#1229)

* feat: add aws codecommit resource

* chore: remove unused code

* chore: remove commented code

---------

Co-authored-by: amal richwin <richwin@munat.Dlink>

* Check for nil VpcId and SubnetId before use (#1254)

Fixes #1250

Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* Migration Nextjs 13 to 14 (#1217)

* Migration Nextjs 13 to 14

* fix: next export

* add output export property

---------

Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* Rebase to master (#1268)

* fix(1205): Resource fetching performance improvement for OVH

* Update civo.mdx

update to test mintlify workflow

* fix: Resource fetching performance improvement for Scaleway (#1212)

Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* [KOM-38]: Resource fetching performance improvement for CIVO, DigitalOcean, OCI, Linode, K8s, Tencent (#1215)

* making fetching resources parallelized for all providers

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>

* updating fetching resources for civo and tencent

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>

---------

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>
Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* fix: no OVH in docs (#1218)

Signed-off-by: Azanul <azanulhaque@gmail.com>

* Update hello-to-new-contributors.yml

* [FEAT-1092]: Update color names and box-shadows to match Design-System (#1143)

* feat: update colors in tailwind config

* fix: update color class-names to match new palette

* fix: update primary & secondary color class-names to match new palette

* fix: update box-shadows to match design system

* fix: update tailwind config and class-names

* feat: add aws codebuild resource (#1216)

Co-authored-by: amal richwin <richwin@munat.Dlink>
Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* feat: add aws codedeploy resource (#1228)

* Fix accidental loop capture (#1252)

* chore: remove dot import

Signed-off-by: Azanul <azanulhaque@gmail.com>

* fix: capture of the loop variable

Signed-off-by: Azanul <azanulhaque@gmail.com>

* chore: remove duplicate import

Signed-off-by: Azanul <azanulhaque@gmail.com>

---------

Signed-off-by: Azanul <azanulhaque@gmail.com>

* feat: add aws codecommit resource (#1229)

* feat: add aws codecommit resource

* chore: remove unused code

* chore: remove commented code

---------

Co-authored-by: amal richwin <richwin@munat.Dlink>

* Check for nil VpcId and SubnetId before use (#1254)

Fixes #1250

Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

* Migration Nextjs 13 to 14 (#1217)

* Migration Nextjs 13 to 14

* fix: next export

* add output export property

---------

Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com>

---------

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>
Signed-off-by: Azanul <azanulhaque@gmail.com>
Co-authored-by: LABOUARDY Mohamed <mohamed@labouardy.com>
Co-authored-by: tanbirali <tanbirali2004@gmail.com>
Co-authored-by: Jake Page <38757612+jakepage91@users.noreply.github.com>
Co-authored-by: Tanbir Ali <124070023+tanbirali@users.noreply.github.com>
Co-authored-by: Bishal Das <70086051+bishal7679@users.noreply.github.com>
Co-authored-by: Avinesh Tripathi <73980067+AvineshTripathi@users.noreply.github.com>
Co-authored-by: Umar Abid <75561750+umrkhn@users.noreply.github.com>
Co-authored-by: Richwin <39644816+AmalRichwin@users.noreply.github.com>
Co-authored-by: amal richwin <richwin@munat.Dlink>
Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com>
Co-authored-by: Josh VanderLinden <codekoala@users.noreply.github.com>
Co-authored-by: Shivam Sharma <meshivam81@gmail.com>

* fix: wrong slack guide url (#1264)

This commit fixes #1259

Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com>

---------

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>
Signed-off-by: Azanul <azanulhaque@gmail.com>
Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com>
Co-authored-by: tanbirali <tanbirali2004@gmail.com>
Co-authored-by: LABOUARDY Mohamed <mohamed@labouardy.com>
Co-authored-by: Jake Page <38757612+jakepage91@users.noreply.github.com>
Co-authored-by: Tanbir Ali <124070023+tanbirali@users.noreply.github.com>
Co-authored-by: Bishal Das <70086051+bishal7679@users.noreply.github.com>
Co-authored-by: Avinesh Tripathi <73980067+AvineshTripathi@users.noreply.github.com>
Co-authored-by: Umar Abid <75561750+umrkhn@users.noreply.github.com>
Co-authored-by: Richwin <39644816+AmalRichwin@users.noreply.github.com>
Co-authored-by: amal richwin <richwin@munat.Dlink>
Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com>
Co-authored-by: Josh VanderLinden <codekoala@users.noreply.github.com>
Co-authored-by: Shivam Sharma <meshivam81@gmail.com>
Co-authored-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com>

* merge: rebase

Signed-off-by: Azanul <azanulhaque@gmail.com>

* lint: unused

Signed-off-by: Azanul <azanulhaque@gmail.com>

---------

Signed-off-by: bishal7679 <bishalhnj127@gmail.com>
Signed-off-by: Azanul <azanulhaque@gmail.com>
Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com>
Co-authored-by: tanbirali <tanbirali2004@gmail.com>
Co-authored-by: LABOUARDY Mohamed <mohamed@labouardy.com>
Co-authored-by: Jake Page <38757612+jakepage91@users.noreply.github.com>
Co-authored-by: Tanbir Ali <124070023+tanbirali@users.noreply.github.com>
Co-authored-by: Bishal Das <70086051+bishal7679@users.noreply.github.com>
Co-authored-by: Avinesh Tripathi <73980067+AvineshTripathi@users.noreply.github.com>
Co-authored-by: Umar Abid <75561750+umrkhn@users.noreply.github.com>
Co-authored-by: Richwin <39644816+AmalRichwin@users.noreply.github.com>
Co-authored-by: amal richwin <richwin@munat.Dlink>
Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com>
Co-authored-by: Josh VanderLinden <codekoala@users.noreply.github.com>
Co-authored-by: Shivam Sharma <meshivam81@gmail.com>
Co-authored-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com>
  • Loading branch information
@Azanul @tanbirali
@mlabouardy @jakepage91 @bishal7679 @AvineshTripathi @umrkhn @AmalRichwin @VanshulB @codekoala @shivam-sharma7 @shikharvashistha
14 people authored Dec 27, 2023
1 parent f2f9519 commit 6ec5074
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 12 deletions.
30 changes: 25 additions & 5 deletions dashboard/package-lock.json
View file

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

2 changes: 1 addition & 1 deletion providers/aws/aws.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/tailwarden/komiser/providers/aws/apigateway"
"github.com/tailwarden/komiser/providers/aws/cloudfront"
"github.com/tailwarden/komiser/providers/aws/cloudwatch"
"github.com/tailwarden/komiser/providers/aws/codecommit"
"github.com/tailwarden/komiser/providers/aws/codebuild"
"github.com/tailwarden/komiser/providers/aws/codecommit"
"github.com/tailwarden/komiser/providers/aws/codedeploy"
"github.com/tailwarden/komiser/providers/aws/dynamodb"
"github.com/tailwarden/komiser/providers/aws/ec2"
Expand Down
8 changes: 4 additions & 4 deletions providers/aws/codebuild/projects.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func BuildProjects(ctx context.Context, client providers.ProviderClient) ([]mode
for _, project := range output.Projects {
resourceArn := fmt.Sprintf("arn:aws:codebuild:%s:%s:project/%s", client.AWSClient.Region, *accountId, project)
tags := make([]models.Tag, 0)

resources = append(resources, models.Resource{
Provider: "AWS",
Account: client.Name,
Expand All @@ -52,9 +52,9 @@ func BuildProjects(ctx context.Context, client providers.ProviderClient) ([]mode
Metadata: map[string]string{
"serviceCost": fmt.Sprint(serviceCost),
},
Tags: tags,
FetchedAt: time.Now(),
Link: fmt.Sprintf("https://%s.console.aws.amazon.com/codesuite/codebuild/%s/projects/%s/details?region=%s", client.AWSClient.Region, *accountId, project, client.AWSClient.Region),
Tags: tags,
FetchedAt: time.Now(),
Link: fmt.Sprintf("https://%s.console.aws.amazon.com/codesuite/codebuild/%s/projects/%s/details?region=%s", client.AWSClient.Region, *accountId, project, client.AWSClient.Region),
})
}
if aws.ToString(output.NextToken) == "" {
Expand Down
4 changes: 2 additions & 2 deletions providers/aws/codedeploy/deployment_groups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ func DeploymentGroups(ctx context.Context, client providers.ProviderClient) ([]m
Metadata: map[string]string{
"serviceCost": fmt.Sprint(serviceCost),
},
Tags: tags,
FetchedAt: time.Now(),
Tags: tags,
FetchedAt: time.Now(),
})
}
if aws.ToString(listDeploymentGroupOutput.NextToken) == "" {
Expand Down

0 comments on commit 6ec5074

Please sign in to comment.