Skip to content
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.

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

cloud/amazon: support external ID in AWS assume role #91040

Merged
merged 1 commit into from
Nov 30, 2022

Conversation

rhu713
Copy link
Contributor

@rhu713 rhu713 commented Nov 1, 2022

Support passing in the optional external ID when assuming a role. This is done by extending the values of the comma-separated string value of the ASSUME_ROLE parameter to the format <role>;external_id=<id>. Users can still use the previous format of just <role> to specify a role without any external ID.

When using role chaining, each role in the chain can be associated with a different external ID. For example:
ASSUME_ROLE=<roleA>;external_id=<idA>,<roleB>;external_id=<idB>,<roleC> will use external ID <idA> to assume delegate <roleA>, then use external ID <idB> to assume delegate <roleB>, and finally no external ID to assume the final role <roleC>.

Additional documentation about external IDs can be found here: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html

Release note (enterprise change): Support passing in the optional external ID when assuming a role. This is done by extending the values of the comma-separated string value of the ASSUME_ROLE parameter to the format <role>;external_id=<id>. Users can still use the previous format of just <role> to specify a role without any external ID.

When using role chaining, each role in the chain can be associated with a different external ID. For example:
ASSUME_ROLE=<roleA>;external_id=<idA>,<roleB>;external_id=<idB>,<roleC> will use external ID <idA> to assume delegate <roleA>, then use external ID <idB> to assume delegate <roleB>, and finally no external ID to assume the final role <roleC>.

Addresses #90239

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rhu713 rhu713 force-pushed the external-id branch 5 times, most recently from a815df0 to 9bf09d2 Compare November 1, 2022 02:56
@rhu713 rhu713 marked this pull request as ready for review November 1, 2022 16:36
@rhu713 rhu713 requested a review from a team as a code owner November 1, 2022 16:36
@rhu713 rhu713 requested review from benbardin and adityamaru and removed request for a team November 1, 2022 16:36
pkg/cloud/cloudpb/external_storage.proto Show resolved Hide resolved
pkg/cloud/amazon/s3_storage.go Show resolved Hide resolved
pkg/cloud/amazon/s3_storage.go Show resolved Hide resolved
pkg/cloud/cloudpb/external_storage.go Show resolved Hide resolved
pkg/cloud/cloudpb/external_storage.proto Show resolved Hide resolved
@adityamaru
Copy link
Contributor

adityamaru commented Nov 3, 2022

Largely LGTM! I just have some nits and questions. Also if we could give the nightly a run once to make sure it all works as expected.

@adityamaru adityamaru self-requested a review November 3, 2022 01:49
Support passing in the optional external ID when assuming a role.
This is done by extending the values of the comma-separated string value of the
ASSUME_ROLE parameter to the format `<role>;external_id=<id>`. Users can still
use the previous format of just `<role>` to specify a role without any external
ID.

When using role chaining, each role in the chain can be associated with a
different external ID. For example:
`ASSUME_ROLE=<roleA>;external_id=<idA>,<roleB>;external_id=<idB>,<roleC>`
will use external ID `<idA>` to assume delegate `<roleA>`, then use external
ID `<idB>` to assume delegate `<roleB>`, and finally no external ID to assume
the final role `<roleC>`.

Additional documentation about external IDs can be found here:
https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html

Release note (enterprise change): Support passing in the optional external ID
when assuming a role. This is done by extending the values of the
comma-separated string value of the ASSUME_ROLE parameter to the format
`<role>;external_id=<id>`. Users can still use the previous format of just
`<role>` to specify a role without any external ID.

When using role chaining, each role in the chain can be associated with a
different external ID. For example:
`ASSUME_ROLE=<roleA>;external_id=<idA>,<roleB>;external_id=<idB>,<roleC>`
will use external ID `<idA>` to assume delegate `<roleA>`, then use external
ID `<idB>` to assume delegate `<roleB>`, and finally no external ID to assume
the final role `<roleC>`.
Copy link
Contributor

@adityamaru adityamaru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay on this! Just wanted to confirm the nightly is chugging along as expected?

@rhu713
Copy link
Contributor Author

rhu713 commented Nov 29, 2022

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 30, 2022

Build succeeded:

@craig craig bot merged commit b21fd88 into cockroachdb:master Nov 30, 2022
@blathers-crl
Copy link

blathers-crl bot commented Nov 30, 2022

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 48e1076 to blathers/backport-release-22.2-91040: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants