Skip to content

[9.4](backport #7183) [Cloud Asset Inventory] Add extra resource fields #2 (EKS & Route 53) #7236

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

Open
mergify wants to merge 1 commit into
base: 9.4
Choose a base branch
from
Open

[9.4](backport #7183) [Cloud Asset Inventory] Add extra resource fields #2 (EKS & Route 53) #7236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 46 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ require (
github.com/aquasecurity/trivy v0.71.0
github.com/aquasecurity/trivy-db v0.0.0-20260528104838-11b0c9f9e5e4
github.com/aws/aws-sdk-go-v2 v1.42.1
<<<<<<< HEAD
github.com/aws/aws-sdk-go-v2/config v1.32.27
github.com/aws/aws-sdk-go-v2/credentials v1.19.26
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.30
Expand All @@ -47,6 +48,31 @@ require (
github.com/aws/aws-sdk-go-v2/service/securityhub v1.71.9
github.com/aws/aws-sdk-go-v2/service/sns v1.40.3
github.com/aws/aws-sdk-go-v2/service/sts v1.43.5
=======
github.com/aws/aws-sdk-go-v2/config v1.32.25
github.com/aws/aws-sdk-go-v2/credentials v1.19.24
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.49.5
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.67.4
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.72.1
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.56.4
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.59.0
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.78.0
github.com/aws/aws-sdk-go-v2/service/configservice v1.64.1
github.com/aws/aws-sdk-go-v2/service/ec2 v1.308.0
github.com/aws/aws-sdk-go-v2/service/ecr v1.58.4
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.34.6
github.com/aws/aws-sdk-go-v2/service/iam v1.54.5
github.com/aws/aws-sdk-go-v2/service/kms v1.53.4
github.com/aws/aws-sdk-go-v2/service/lambda v1.93.0
github.com/aws/aws-sdk-go-v2/service/organizations v1.51.10
github.com/aws/aws-sdk-go-v2/service/rds v1.119.3
github.com/aws/aws-sdk-go-v2/service/s3 v1.104.0
github.com/aws/aws-sdk-go-v2/service/s3control v1.71.5
github.com/aws/aws-sdk-go-v2/service/securityhub v1.71.7
github.com/aws/aws-sdk-go-v2/service/sns v1.40.1
github.com/aws/aws-sdk-go-v2/service/sts v1.43.3
>>>>>>> 74745e63 ([Cloud Asset Inventory] Add extra resource fields #2 (EKS & Route 53) (#7183))
github.com/aws/smithy-go v1.27.3
github.com/dgraph-io/ristretto/v2 v2.4.1
github.com/djherbis/times v1.6.0
Expand Down Expand Up @@ -115,6 +141,11 @@ require (
modernc.org/sqlite v1.53.0
)

require (
github.com/aws/aws-sdk-go-v2/service/eks v1.88.1
github.com/aws/aws-sdk-go-v2/service/route53 v1.62.5
)

require (
cel.dev/expr v0.25.2 // indirect
cloud.google.com/go/auth v0.20.0 // indirect
Expand Down Expand Up @@ -358,6 +389,7 @@ require (
github.com/aquasecurity/trivy-java-db v0.0.0-20260513130532-ec095357db14 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
<<<<<<< HEAD
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 // indirect
Expand All @@ -370,6 +402,20 @@ require (
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.31 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.31.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.8 // indirect
=======
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 // indirect
github.com/aws/aws-sdk-go-v2/service/ebs v1.34.7 // indirect
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.55.4
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.22 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.29 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.31.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 // indirect
>>>>>>> 74745e63 ([Cloud Asset Inventory] Add extra resource fields #2 (EKS & Route 53) (#7183))
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bmatcuk/doublestar/v4 v4.10.0 // indirect
Expand Down
64 changes: 64 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/aws/aws-sdk-go-v2 v1.42.1 h1:9eOTgu1z/dVtYpNZ3/8/XbbaX0x/BqE3HUzAzs6K0ek=
github.com/aws/aws-sdk-go-v2 v1.42.1/go.mod h1:5pKeft2eJj+gElQ38Jqg4ibCqh+/AK33/0X3hip7IjM=
<<<<<<< HEAD
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 h1:3IZY0XAJquT3aHzbkHfPzy4ACPcEjVG0x87KOwtpqGY=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14/go.mod h1:zwM6veDkhGgQFqkBy+uT28AAYpLu+uFMlPl+rCg/73E=
github.com/aws/aws-sdk-go-v2/config v1.32.27 h1:SJwJ9Q4kM7v5QVSYYyXj3znRr6lNyZEhSgAXmXXcVbI=
Expand All @@ -223,10 +224,21 @@ github.com/aws/aws-sdk-go-v2/credentials v1.19.26 h1:Si8kk1kyJnuJWCEgiwpBtTdtgSd
github.com/aws/aws-sdk-go-v2/credentials v1.19.26/go.mod h1:lBckz+W9SAdNtSDw3pYgQUJDJFcBBWry0GSzw+bK0TY=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.30 h1:/hi1JADLEW9YYryEz1w4GQu0EtP23pP553Cf9KgsDV4=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.30/go.mod h1:/3AOgy4K17Dm4ucMZVC/MJkzy5kmfKUcINRHZyo0koQ=
=======
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13 h1:p1BBrg/Hhp6uK7zpejeI8QFXHJeC/mynzi04Sl03k9g=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13/go.mod h1:8cIfkE9MDhkRZGpQ22aV6/lkYeYSozpz16Smrs5x4Ls=
github.com/aws/aws-sdk-go-v2/config v1.32.25 h1:ACCejvStYoilgwrfegSt5ZntCbPrk52qfwyNcnl3omM=
github.com/aws/aws-sdk-go-v2/config v1.32.25/go.mod h1:LJyU8sDRbXUxFn8xMJIGP+v9QYYwveNLI8a/giAOiAs=
github.com/aws/aws-sdk-go-v2/credentials v1.19.24 h1:2hQqYCV9yqyePQ9o6dCrZc/zO8U3TwPr9mIKlZnPu/I=
github.com/aws/aws-sdk-go-v2/credentials v1.19.24/go.mod h1:IDwpACtwqHLISdzfwUUNq4P9DsB/h5BLg4FwJPNfqFY=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29 h1:r6qZHbT+wxgWO/e9vYNUEtg7lv5+UN3pRqKhLXvnArg=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29/go.mod h1:QRnaRcTVGKPGRy8w78HMQtKUGRYcnMZAANATkeVA6Mo=
>>>>>>> 74745e63 ([Cloud Asset Inventory] Add extra resource fields #2 (EKS & Route 53) (#7183))
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30 h1:xM/Is9cKMHa8Jj8zkvWhvrFkZsXJV9E+BB4g0HW0duQ=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30/go.mod h1:WueJeNDZvK1fMYEWJIkcivBfEzUkTpBhzlrUKKY8EuA=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 h1:jn46zC9LdsVR/ZpMIJqMqb8hHv31BlLx3ulVqNspUOk=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30/go.mod h1:1hTMsAgbdS/AtUi4bw8+gUuh1pceo+eXRLfpSuSQj3M=
<<<<<<< HEAD
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.31 h1:3GUprIsfmGcC5SACIyB0e7E0BM1O1b3Erl5CePYIAeQ=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.31/go.mod h1:7PuV1yl5e2xnUbm+RqvVg5i2iBM8EyijZNoI9wsOoOc=
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.49.7 h1:0K5Pj48ZMiXkdozajvr+gMIyqPv1oWdFYyCRoeUcm98=
Expand Down Expand Up @@ -275,6 +287,58 @@ github.com/aws/aws-sdk-go-v2/service/organizations v1.51.12 h1:Jdm3qi2mCGoZTZVyN
github.com/aws/aws-sdk-go-v2/service/organizations v1.51.12/go.mod h1:2ibX1FoyhvTXbIR4TP/Vf6BB6Tc3YW9jWbvNflSOcUM=
github.com/aws/aws-sdk-go-v2/service/rds v1.119.5 h1:1/qGMaWmjbeOTaufLLqjLnrjhemH1eM74iVWVWWg+Zc=
github.com/aws/aws-sdk-go-v2/service/rds v1.119.5/go.mod h1:Ve7qHa8jBmStKNz/oaxs2yBuFnwyvN0k/8PpPZVxkEY=
=======
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 h1:VTGy885W5DKBxWRUJbym9hytNaYzsyaPkCHGRRMAOhU=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30/go.mod h1:AS0HycUvJRFvTt613AYDOgO2jzw+00cVSMny8XB3yMY=
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.49.5 h1:YRmgSZDK5hzQGr3WD/tUVFCwVsnELDbTui7yhEgzy7g=
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.49.5/go.mod h1:4v0AkcAcWguJx3gOcZTvunFMbVeJ1e0jiUZPkaDPbhI=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.67.4 h1:5xDkTDvStSuTO4qdQfgfmIgQNTjS3kp7CPXHQ3CnqMQ=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.67.4/go.mod h1:rvzjcotoLfbMIVBpxSl0b6rCQsuty5V2aNL0LalDBr8=
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.72.1 h1:vI/iCtlKp8LscUuwiWfTNID18w+naIGXKyWiY5odsZU=
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.72.1/go.mod h1:67kQqAVkI9zNMo9kj1ca5RQvsDczK6xKCXrXn7ObZA8=
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.56.4 h1:vbwtZFqiHIXnOrBDp3B6efVnQKHMI8SiUYCIc74YHI0=
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.56.4/go.mod h1:LouyoQcaBYLDjRpqIKNJbWquIWVgnPLDEi/9o4Uf5+s=
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.59.0 h1:JOrwHweL6IzRjbDxdjup2YI2QjWa8/h0PGexR8MZpKw=
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.59.0/go.mod h1:tsfAcBcMTF2G9UirQTP1In3DrkNO16SyUU527NPLPhs=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.78.0 h1:6r+3E3bDRGiPm2x5t0eKy5jkAtWtgpwdCHi2dMaZy1c=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.78.0/go.mod h1:N336OxQ6TvRbb6V1esVE8PtQFU86YvYaS+lVjsJTmP0=
github.com/aws/aws-sdk-go-v2/service/configservice v1.64.1 h1:CJ6YcGJiXPJIz6ICOcGBumi2TcUSldUESHeF243WvVo=
github.com/aws/aws-sdk-go-v2/service/configservice v1.64.1/go.mod h1:oqVF/7XFqk3GY0/zlvY3Dj2+42ynOx4x/Sp875yKcxE=
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.59.0 h1:S1qETDbdXKZMYVveuxACCKuRqnAt2NlnmYnlq5SeuMY=
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.59.0/go.mod h1:jLkDwIDBkCIpiENQhAOjAR2L9jwj56mZgVEvuro4gUE=
github.com/aws/aws-sdk-go-v2/service/ebs v1.34.7 h1:8cSeObfW/xr+s2Hra2kArFisWz05pMrgIV/ZskUeYLw=
github.com/aws/aws-sdk-go-v2/service/ebs v1.34.7/go.mod h1:u+YbhSelj9tbG7rWdjRbRnUi6izHK5hjZnxxA9dtCvQ=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.308.0 h1:xBP+yWpveXD/PxK7HRMcoG6yj1vdOjSahAg4qPomF+0=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.308.0/go.mod h1:8mrDF7OtbuL0QpwP4YCvLuoOE4/5lL7D33MXgp069/Y=
github.com/aws/aws-sdk-go-v2/service/ecr v1.58.4 h1:fo6cmbxkKq/OtKUG0sK70fDsYjtKuSkjIQZUJwt24YM=
github.com/aws/aws-sdk-go-v2/service/ecr v1.58.4/go.mod h1:7VJFM2lSPHz2I1rRb0a+lbphoOp7hXIgYjGhSTOLY7k=
github.com/aws/aws-sdk-go-v2/service/eks v1.88.1 h1:Z05Ct9QXAZXKbC1wNLQln0/6FDzTcWPqI1YTWqs/pRY=
github.com/aws/aws-sdk-go-v2/service/eks v1.88.1/go.mod h1:MSAmCaKIo6Ph/yg73tj8/HZnILwyk4Px2tXfL4PO/HQ=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.34.6 h1:bucMsYP3fQIJvyNCzb4EAFZFYAwidWsFTGUKpJUTi3M=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.34.6/go.mod h1:uhWp16djmWOwENzHggk29rZ331UcOpfcLciIBdFCkm8=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.55.4 h1:M/98mES2pXpnSYtBSdBZx/zo3CaT/oSxTXsYk1vYd8A=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.55.4/go.mod h1:sUBnPF4iTc3KaCTIbLTr8xXjsnw8J0kXwr0nPCaAK3I=
github.com/aws/aws-sdk-go-v2/service/iam v1.54.5 h1:a/gAOhIOi+vHYeRU224WIXlJrLXs4Z1Qbm92vfX64jc=
github.com/aws/aws-sdk-go-v2/service/iam v1.54.5/go.mod h1:tMNzI+fYFCk4cIdZ7FEybLzShwnmWkfxQw85ED1b4ng=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 h1:ZD2+BSw9vFsNlKYIasSNt3uDbjqqXIBcM13UJv/Lx2k=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12/go.mod h1:Ms4zlcVBbXbiP7EVLhl+lgjvA/a7YphqQ3Ih3174EmI=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.22 h1:V51LGlOq/1VsDsHUdoklAQi7rMmx4qQubvFYAlP2254=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.22/go.mod h1:4Pzhyz8hJOm2bepgl+NjvRx8vlUFAIIvJnZ/MkcNPpU=
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.12.6 h1:Bs2OwYq0HBgHYwfGmUwYIPtTNaGMGAHkRje4jmW2VoI=
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.12.6/go.mod h1:OTctu4cW8t7/TRlTKPLT6akzyOkfceMWhtEHqtYDIQQ=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 h1:DRebniUGZ2MqiiIVmQJ04vIXr918hubdHMnarSLEWyU=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29/go.mod h1:LfRkPCD8YHDM2E5eTkos2UpwYeZnBcVarTa8L59bJHA=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.29 h1:hiME6pBzC7OTl9LMtlyTWBuEl1f4QBcUmFDKC7MLXtc=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.29/go.mod h1:G7RP+uhagpKtKhd1BM9N6JQqjCcGEU47K5lBVZQyRQw=
github.com/aws/aws-sdk-go-v2/service/kms v1.53.4 h1:PEgVSsWtR8NNxsDxFL2Ywisi7R+1EFQARGsT4q3mWwI=
github.com/aws/aws-sdk-go-v2/service/kms v1.53.4/go.mod h1:3EeKyDGPGSCEphG2OolwNGNF45RvQIfm27AYYpfEWrw=
github.com/aws/aws-sdk-go-v2/service/lambda v1.93.0 h1:uEB7hBZO61H63g+rtUbJ5fjkxLw369wukdr4hCtaZ+M=
github.com/aws/aws-sdk-go-v2/service/lambda v1.93.0/go.mod h1:3bF6WydfupDwCv8Q3g/Flt89341w/+NObn+KdQmLA60=
github.com/aws/aws-sdk-go-v2/service/organizations v1.51.10 h1:k/1HG7/z3Ujtcq5+JDSSjp5GG8PzoPuY08Objd2oryI=
github.com/aws/aws-sdk-go-v2/service/organizations v1.51.10/go.mod h1:PRk/TRj/93nQOVYKHCuBNCOBBLaH4lKhaKW5EB/ZR50=
github.com/aws/aws-sdk-go-v2/service/rds v1.119.3 h1:SIGdk+wA+xGXgN+L7Jr3Ot83Mjh3jpjyJIwZd3DqAnU=
github.com/aws/aws-sdk-go-v2/service/rds v1.119.3/go.mod h1:zCRPUdp05FEZG3OO7LmJq9xkSDjMEhkiVrZV0oJs2a0=
>>>>>>> 74745e63 ([Cloud Asset Inventory] Add extra resource fields #2 (EKS & Route 53) (#7183))
github.com/aws/aws-sdk-go-v2/service/route53 v1.62.5 h1:Z+/OLsb85Kpq7TVLCspskqePaf68Tdv6GfmJP4kH6i0=
github.com/aws/aws-sdk-go-v2/service/route53 v1.62.5/go.mod h1:TmxGowuBYwjmHFOsEDxaZdsQE62JJzOmtiWafTi/czg=
github.com/aws/aws-sdk-go-v2/service/s3 v1.104.2 h1:bAY6O/TDv1HQnvylh9E247IyIKsUWUt2G965S7qX110=
Expand Down
9 changes: 5 additions & 4 deletions internal/inventory/ASSETS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
## AWS Resources

**Progress: 24% (21/85)**
**Progress: 27% (23/85)**
Access Management: 50% (1/2)
Database: 100% (1/1)
FaaS: 100% (3/3)
Firewall: 100% (1/1)
Gateway: 100% (4/4)
Host: 100% (1/1)
Identity: 11% (1/9)
Infrastructure: 0% (0/55)
Infrastructure: 1% (1/54)
Load Balancer: 100% (2/2)
Messaging Service: 100% (1/1)
Networking: 100% (4/4)
Orchestrator: 100% (1/1)
Service Account: 100% (1/1)
Storage Bucket: 100% (1/1)

Expand Down Expand Up @@ -44,6 +45,7 @@ Storage Bucket: 100% (1/1)
| Infrastructure | API Gateway REST API | | No ❌ |
| Infrastructure | API Gateway Stage | | No ❌ |
| Infrastructure | Auto Scaling Group | | No ❌ |
| Infrastructure | Route53 DNS Record | AWS Route53 DNS Record | Yes ✅ |
| Infrastructure | Cloud Service Provider Account | | No ❌ |
| Infrastructure | Config Configuration Recorder | | No ❌ |
| Infrastructure | Config Delivery Channel | | No ❌ |
Expand All @@ -65,7 +67,6 @@ Storage Bucket: 100% (1/1)
| Infrastructure | ECS Service | | No ❌ |
| Infrastructure | ECS Task | | No ❌ |
| Infrastructure | ECS Task Definition | | No ❌ |
| Infrastructure | EKS Cluster | | No ❌ |
| Infrastructure | ELBv2 Listener | | No ❌ |
| Infrastructure | Elastic IP | | No ❌ |
| Infrastructure | Elasticsearch Domain | | No ❌ |
Expand All @@ -85,7 +86,6 @@ Storage Bucket: 100% (1/1)
| Infrastructure | RDS Cluster | | No ❌ |
| Infrastructure | RDS Snapshot | | No ❌ |
| Infrastructure | Redshift Cluster | | No ❌ |
| Infrastructure | Route53 DNS Record | | No ❌ |
| Infrastructure | Route53 DNS Zone | | No ❌ |
| Infrastructure | Secrets Manager Secret | | No ❌ |
| Infrastructure | Security Hub | | No ❌ |
Expand All @@ -102,6 +102,7 @@ Storage Bucket: 100% (1/1)
| Networking | EC2 Subnet | AWS EC2 Subnet | Yes ✅ |
| Networking | VPC | AWS VPC | Yes ✅ |
| Networking | VPC Peering Connection | AWS VPC Peering Connection | Yes ✅ |
| Orchestrator | EKS Cluster | AWS EKS Cluster | Yes ✅ |
| Service Account | IAM Role | AWS IAM Role | Yes ✅ |
| Storage Bucket | S3 Bucket | AWS S3 Bucket | Yes ✅ |

Expand Down
2 changes: 2 additions & 0 deletions internal/inventory/asset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ type AssetClassification struct {
var (
// AWS
AssetClassificationAwsEc2Instance = AssetClassification{CategoryHost, "AWS EC2 Instance"}
AssetClassificationAwsEksCluster = AssetClassification{CategoryOrchestrator, "AWS EKS Cluster"}
AssetClassificationAwsElbV1 = AssetClassification{CategoryLoadBalancer, "AWS Elastic Load Balancer"}
AssetClassificationAwsElbV2 = AssetClassification{CategoryLoadBalancer, "AWS Elastic Load Balancer v2"}
AssetClassificationAwsIamPolicy = AssetClassification{CategoryAccessManagement, "AWS IAM Policy"}
Expand All @@ -95,6 +96,7 @@ var (
AssetClassificationAwsVpcPeeringConnection = AssetClassification{CategoryNetworking, "AWS VPC Peering Connection"}
AssetClassificationAwsVpc = AssetClassification{CategoryNetworking, "AWS VPC"}
AssetClassificationAwsRds = AssetClassification{CategoryDatabase, "AWS RDS Instance"}
AssetClassificationAwsRoute53Record = AssetClassification{CategoryInfrastructure, "AWS Route53 DNS Record"}
AssetClassificationAwsS3Bucket = AssetClassification{CategoryStorageBucket, "AWS S3 Bucket"}
AssetClassificationAwsSnsTopic = AssetClassification{CategoryMessagingService, "AWS SNS Topic"}

Expand Down
10 changes: 10 additions & 0 deletions internal/inventory/awsfetcher/awsfetchers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,35 +27,45 @@ import (
"github.com/elastic/cloudbeat/internal/inventory"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/ec2"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/eks"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/elb"
elbv2 "github.com/elastic/cloudbeat/internal/resources/providers/awslib/elb_v2"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/iam"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/lambda"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/rds"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/route53"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/s3"
"github.com/elastic/cloudbeat/internal/resources/providers/awslib/sns"
"github.com/elastic/cloudbeat/internal/statushandler"
)

func New(ctx context.Context, logger *clog.Logger, identity *cloud.Identity, cfg aws.Config, statusHandler statushandler.StatusHandlerAPI) []inventory.AssetFetcher {
ec2Provider := ec2.NewEC2Provider(ctx, logger, identity.Account, cfg, &awslib.MultiRegionClientFactory[ec2.Client]{})
eksProvider := eks.NewProvider(ctx, logger, cfg, &awslib.MultiRegionClientFactory[eks.Client]{})
elbProvider := elb.NewElbProvider(ctx, logger, identity.Account, cfg, &awslib.MultiRegionClientFactory[elb.Client]{})
elbv2Provider := elbv2.NewElbV2Provider(ctx, logger, cfg, &awslib.MultiRegionClientFactory[elbv2.Client]{})
iamProvider := iam.NewIAMProvider(ctx, logger, cfg, &awslib.MultiRegionClientFactory[iam.AccessAnalyzerClient]{})
lambdaProvider := lambda.NewLambdaProvider(ctx, logger, cfg, &awslib.MultiRegionClientFactory[lambda.Client]{})
rdsProvider := rds.NewProvider(ctx, logger, cfg, &awslib.MultiRegionClientFactory[rds.Client]{}, ec2Provider)
route53Provider := route53.NewProvider(logger, cfg)
s3Provider := s3.NewProvider(ctx, logger, cfg, &awslib.MultiRegionClientFactory[s3.Client]{}, identity.Account)
snsProvider := sns.NewSNSProvider(ctx, logger, cfg, &awslib.MultiRegionClientFactory[sns.Client]{})

return []inventory.AssetFetcher{
<<<<<<< HEAD
newEc2InstancesFetcher(logger, identity, ec2Provider, statusHandler),
=======
newEc2InstancesFetcher(logger, identity, ec2Provider, iamProvider, statusHandler),
newEKSFetcher(logger, identity, eksProvider, statusHandler),
>>>>>>> 74745e63 ([Cloud Asset Inventory] Add extra resource fields #2 (EKS & Route 53) (#7183))
newElbFetcher(logger, identity, elbProvider, elbv2Provider, statusHandler),
newIamPolicyFetcher(logger, identity, iamProvider, statusHandler),
newIamRoleFetcher(logger, identity, iamProvider, statusHandler),
newIamUserFetcher(logger, identity, iamProvider, statusHandler),
newLambdaFetcher(logger, identity, lambdaProvider, statusHandler),
newNetworkingFetcher(logger, identity, ec2Provider, statusHandler),
newRDSFetcher(logger, identity, rdsProvider, statusHandler),
newRoute53Fetcher(logger, identity, route53Provider, statusHandler),
newS3BucketFetcher(logger, identity, s3Provider, statusHandler),
newSNSFetcher(logger, identity, snsProvider, statusHandler),
}
Expand Down
Loading
Loading