From 6ec50740062a8e8d29897bd183fc01672490b15b Mon Sep 17 00:00:00 2001 From: Azanul Haque <42029519+Azanul@users.noreply.github.com> Date: Thu, 28 Dec 2023 00:13:17 +0530 Subject: [PATCH] Conflict resolution (#1299) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * updating fetching resources for civo and tencent Signed-off-by: bishal7679 --------- Signed-off-by: bishal7679 Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * fix: no OVH in docs (#1218) Signed-off-by: Azanul * 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 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 * fix: capture of the loop variable Signed-off-by: Azanul * chore: remove duplicate import Signed-off-by: Azanul --------- Signed-off-by: Azanul * feat: add aws codecommit resource (#1229) * feat: add aws codecommit resource * chore: remove unused code * chore: remove commented code --------- Co-authored-by: amal richwin * 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 * updating fetching resources for civo and tencent Signed-off-by: bishal7679 --------- Signed-off-by: bishal7679 Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * fix: no OVH in docs (#1218) Signed-off-by: Azanul * 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 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 * fix: capture of the loop variable Signed-off-by: Azanul * chore: remove duplicate import Signed-off-by: Azanul --------- Signed-off-by: Azanul * feat: add aws codecommit resource (#1229) * feat: add aws codecommit resource * chore: remove unused code * chore: remove commented code --------- Co-authored-by: amal richwin * 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 Signed-off-by: Azanul Co-authored-by: LABOUARDY Mohamed Co-authored-by: tanbirali 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 Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com> Co-authored-by: Josh VanderLinden Co-authored-by: Shivam Sharma * 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 Signed-off-by: Azanul Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> Co-authored-by: tanbirali Co-authored-by: LABOUARDY Mohamed 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 Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com> Co-authored-by: Josh VanderLinden Co-authored-by: Shivam Sharma Co-authored-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> * merge: rebase Signed-off-by: Azanul * lint: unused Signed-off-by: Azanul --------- Signed-off-by: bishal7679 Signed-off-by: Azanul Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> Co-authored-by: tanbirali Co-authored-by: LABOUARDY Mohamed 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 Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com> Co-authored-by: Josh VanderLinden Co-authored-by: Shivam Sharma Co-authored-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> --- dashboard/package-lock.json | 30 +++++++++++++++---- providers/aws/aws.go | 2 +- providers/aws/codebuild/projects.go | 8 ++--- providers/aws/codedeploy/deployment_groups.go | 4 +-- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index 0c8bb67bb..0eb939fe7 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -102,6 +102,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", + "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -202,6 +203,7 @@ "version": "7.22.20", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -210,6 +212,7 @@ "version": "7.22.20", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz", "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==", + "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", @@ -238,12 +241,14 @@ "node_modules/@babel/core/node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, "bin": { "semver": "bin/semver.js" } @@ -289,6 +294,7 @@ "version": "7.22.15", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", + "dev": true, "dependencies": { "@babel/compat-data": "^7.22.9", "@babel/helper-validator-option": "^7.22.15", @@ -304,6 +310,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, "bin": { "semver": "bin/semver.js" } @@ -440,6 +447,7 @@ "version": "7.22.20", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz", "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==", + "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -512,6 +520,7 @@ "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "dev": true, "dependencies": { "@babel/types": "^7.22.5" }, @@ -562,6 +571,7 @@ "version": "7.22.15", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -584,6 +594,7 @@ "version": "7.22.15", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz", "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==", + "dev": true, "dependencies": { "@babel/template": "^7.22.15", "@babel/traverse": "^7.22.15", @@ -9968,7 +9979,7 @@ "version": "3.19.11", "resolved": "https://registry.npmjs.org/@types/cytoscape/-/cytoscape-3.19.11.tgz", "integrity": "sha512-ny4i4BOoZxdc9DrSa9RrasXHPRFgt0PeINgj/CegzKu7CJO+UQP0KnjebYJ+KoLymyUbCX86vmqz5B3LK10w5Q==", - "devOptional": true + "dev": true }, "node_modules/@types/cytoscape-popper": { "version": "2.0.3", @@ -12046,6 +12057,7 @@ "version": "4.21.10", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "dev": true, "funding": [ { "type": "opencollective", @@ -14203,7 +14215,8 @@ "node_modules/electron-to-chromium": { "version": "1.4.525", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz", - "integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA==" + "integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA==", + "dev": true }, "node_modules/elliptic": { "version": "6.5.4", @@ -14536,6 +14549,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, "engines": { "node": ">=6" } @@ -16045,6 +16059,7 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -18939,6 +18954,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -19249,6 +19265,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, "dependencies": { "yallist": "^3.0.2" } @@ -19891,7 +19908,8 @@ "node_modules/node-releases": { "version": "2.0.13", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==" + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", + "dev": true }, "node_modules/normalize-package-data": { "version": "3.0.3", @@ -24339,6 +24357,7 @@ "version": "1.0.11", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "dev": true, "funding": [ { "type": "opencollective", @@ -25086,7 +25105,8 @@ "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true }, "node_modules/yaml": { "version": "2.3.2", diff --git a/providers/aws/aws.go b/providers/aws/aws.go index 2af4d122c..5217c3bf5 100644 --- a/providers/aws/aws.go +++ b/providers/aws/aws.go @@ -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" diff --git a/providers/aws/codebuild/projects.go b/providers/aws/codebuild/projects.go index 98e45bc4a..2d31f4c93 100644 --- a/providers/aws/codebuild/projects.go +++ b/providers/aws/codebuild/projects.go @@ -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, @@ -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) == "" { diff --git a/providers/aws/codedeploy/deployment_groups.go b/providers/aws/codedeploy/deployment_groups.go index a4ae8a9ee..52744beb7 100644 --- a/providers/aws/codedeploy/deployment_groups.go +++ b/providers/aws/codedeploy/deployment_groups.go @@ -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) == "" {