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

Adding Tags to SeedFarmer Roles #585

Merged
merged 1 commit into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch

### New
- adding support for S3 to store bundles
- adding seedfarmer version tag to toolchain and deployment roles

### Changes
- adding local path of manifests that fail to load to the actual final string printed
Expand Down
11 changes: 8 additions & 3 deletions seedfarmer/commands/_bootstrap_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from jinja2 import Template

import seedfarmer.errors
from seedfarmer import CLI_ROOT
from seedfarmer import CLI_ROOT, __version__
from seedfarmer.services import create_new_session, get_region, get_sts_identity_info
from seedfarmer.services._iam import get_role
from seedfarmer.utils import get_deployment_role_name, get_toolchain_role_arn, get_toolchain_role_name, valid_qualifier
Expand All @@ -48,7 +48,7 @@ def get_toolchain_template(
if permissions_boundary_arn:
role["Resources"]["ToolchainRole"]["Properties"]["PermissionsBoundary"] = permissions_boundary_arn
template = Template(json.dumps(role))
t = template.render({"project_name": project_name, "role_name": role_name})
t = template.render({"project_name": project_name, "role_name": role_name, "seedfarmer_version": __version__})
return dict(json.loads(t))


Expand All @@ -67,7 +67,12 @@ def get_deployment_template(
role["Resources"]["DeploymentRole"]["Properties"]["ManagedPolicyArns"] = policy_arns
template = Template(json.dumps(role))
t = template.render(
{"toolchain_role_arn": toolchain_role_arn, "project_name": project_name, "role_name": role_name}
{
"toolchain_role_arn": toolchain_role_arn,
"project_name": project_name,
"role_name": role_name,
"seedfarmer_version": __version__,
}
)
return dict(json.loads(t))

Expand Down
3 changes: 3 additions & 0 deletions seedfarmer/resources/deployment_role.template
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,7 @@ Resources:
- Fn::Sub: "arn:${AWS::Partition}:codeartifact:*:${AWS::AccountId}:domain/aws-codeseeder-{{ project_name }}"
- Fn::Sub: "arn:${AWS::Partition}:codeartifact:*:${AWS::AccountId}:repository/aws-codeseeder-{{ project_name }}*"
RoleName: "{{ role_name }}"
Tags:
- Key: "seedfarmer"
Value: "{{ seedfarmer_version }}"
Type: AWS::IAM::Role
3 changes: 3 additions & 0 deletions seedfarmer/resources/toolchain_role.template
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,7 @@ Resources:
Resource:
Fn::Sub: "arn:${AWS::Partition}:ssm:*:${AWS::AccountId}:*"
RoleName: "{{ role_name }}"
Tags:
- Key: "seedfarmer"
Value: "{{ seedfarmer_version }}"
Type: AWS::IAM::Role