Allow auth by role in aws

debeando · Feb 28, 2023 · ed8271e · ed8271e
1 parent 7eab095
commit ed8271e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/command/example/example.go b/command/example/example.go
@@ -6,8 +6,6 @@ general:
  interval: 10 # Seconds
  debug: true
  aws_region: ${AWS_REGION}
- aws_access_key_id: ${AWS_ACCESS_KEY_ID}
- aws_secret_access_key: ${AWS_SECRET_ACCESS_KEY}
 
 parser:
  mysql:

diff --git a/config/structure.go b/config/structure.go
@@ -9,12 +9,10 @@ type Config struct {
  Path string
  IPAddress string
  General struct {
- Hostname string `yaml:"hostname"`
- Interval time.Duration `yaml:"interval"`
- Debug bool `yaml:"debug"`
- AWSRegion string `yaml:"aws_region"`
- AWSAccessKeyID string `yaml:"aws_access_key_id"`
- AWSSecretAccessKey string `yaml:"aws_secret_access_key"`
+ Hostname string `yaml:"hostname"`
+ Interval time.Duration `yaml:"interval"`
+ Debug bool `yaml:"debug"`
+ AWSRegion string `yaml:"aws_region"`
  }
  Parser struct {
  MySQL struct {

diff --git a/plugins/inputs/aws/aws.go b/plugins/inputs/aws/aws.go
@@ -9,7 +9,6 @@ import (
  "github.com/debeando/zenit/plugins/inputs"
 
  "github.com/aws/aws-sdk-go/aws"
- "github.com/aws/aws-sdk-go/aws/credentials"
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/rds"
 )
@@ -50,25 +49,10 @@ func (l *InputAWSDiscover) Collect() {
  return
  }
 
- if len(config.File.General.AWSAccessKeyID) == 0 {
- log.Info("InputAWSDiscover", map[string]interface{}{"message": "Require to define aws_access_key_id"})
- return
- }
-
- if len(config.File.General.AWSSecretAccessKey) == 0 {
- log.Info("InputAWSDiscover", map[string]interface{}{"message": "Require to define aws_secret_access_key"})
- return
- }
-
  sess, err := session.NewSession(&aws.Config{
  Region: aws.String(config.File.General.AWSRegion),
- Credentials: credentials.NewStaticCredentials(
- config.File.General.AWSAccessKeyID,
- config.File.General.AWSSecretAccessKey,
- "",
- ),
- },
- )
+ })
+
  if err != nil {
  log.Error("InputAWSDiscover", map[string]interface{}{"error": err})
  return