From 03f7c3ef3f11df78be740892346816648919a628 Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Mon, 10 May 2021 16:13:47 -0600 Subject: [PATCH 1/2] Update documentation for using role_arn --- packages/aws/_dev/build/docs/README.md | 12 ++++++++---- packages/aws/docs/README.md | 12 ++++++++---- packages/aws/manifest.yml | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/packages/aws/_dev/build/docs/README.md b/packages/aws/_dev/build/docs/README.md index b6e720c3ab8..1220caf5eea 100644 --- a/packages/aws/_dev/build/docs/README.md +++ b/packages/aws/_dev/build/docs/README.md @@ -61,10 +61,14 @@ temporary credentials. Please see for more details. ### Supported Formats -1. Use `access_key_id`, `secret_access_key` and/or `session_token` directly -2. Use `role_arn`: If `access_key_id` and `secret_access_key` are not given, -then the package will check for `role_arn`. `role_arn` is used to specify which - AWS IAM role to assume for generating temporary credentials. +1. Use access keys: Access keys include `access_key_id`, `secret_access_key` +and/or `session_token`. +2. Use `role_arn`: `role_arn` is used to specify which AWS IAM role to assume +for generating temporary credentials. If `role_arn` is given, the package will +check if access keys are given. If not, the package will check for credential +profile name. If neither is given, default credential profile will be used. +Please make sure credentials are given under either a credential profile or +access keys. 3. Use `credential_profile_name` and/or `shared_credential_file`: If `access_key_id`, `secret_access_key` and `role_arn` are all not given, then the package will check for `credential_profile_name`. If you use different diff --git a/packages/aws/docs/README.md b/packages/aws/docs/README.md index b97176e623b..039c56cd10b 100644 --- a/packages/aws/docs/README.md +++ b/packages/aws/docs/README.md @@ -61,10 +61,14 @@ temporary credentials. Please see for more details. ### Supported Formats -1. Use `access_key_id`, `secret_access_key` and/or `session_token` directly -2. Use `role_arn`: If `access_key_id` and `secret_access_key` are not given, -then the package will check for `role_arn`. `role_arn` is used to specify which - AWS IAM role to assume for generating temporary credentials. +1. Use access keys: Access keys include `access_key_id`, `secret_access_key` +and/or `session_token`. +2. Use `role_arn`: `role_arn` is used to specify which AWS IAM role to assume +for generating temporary credentials. If `role_arn` is given, the package will +check if access keys are given. If not, the package will check for credential +profile name. If neither is given, default credential profile will be used. +Please make sure credentials are given under either a credential profile or +access keys. 3. Use `credential_profile_name` and/or `shared_credential_file`: If `access_key_id`, `secret_access_key` and `role_arn` are all not given, then the package will check for `credential_profile_name`. If you use different diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml index b28c6e96a94..3f39fc82350 100644 --- a/packages/aws/manifest.yml +++ b/packages/aws/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: aws title: AWS -version: 0.5.4 +version: 0.5.5 license: basic description: AWS Integration type: integration From 364e5e645484a4035f4b9ae85ae5888a3d65cb03 Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Mon, 10 May 2021 16:21:20 -0600 Subject: [PATCH 2/2] add changelog --- packages/aws/changelog.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml index 4e7fb118c25..2cb2ceddebc 100644 --- a/packages/aws/changelog.yml +++ b/packages/aws/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "0.5.5" + changes: + - description: Allow role_arn work with access keys for AWS + type: enhancement # can be one of: enhancement, bugfix, breaking-change + link: https://github.com/elastic/integrations/pull/979 - version: "0.5.4" changes: - description: Rename s3 input to aws-s3.