Skip to content

Commit

Permalink
EC2 Auto Discover with SSM: add invocation url to audit log (#41689)
Browse files Browse the repository at this point in the history
This PR adds the invocation URL into the audit log when running the
teleport installer script during EC2 Auto Discover.
  • Loading branch information
marcoandredinis committed May 22, 2024
1 parent a5775dc commit 02d74d9
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 18 deletions.
9 changes: 9 additions & 0 deletions lib/srv/server/ssm_install.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,14 @@ func (si *SSMInstaller) getCommandStepStatusEvent(ctx context.Context, step *str
}
}

// Format for invocation url:
// https://<region>.console.aws.amazon.com/systems-manager/run-command/<command-id>/<instance-id>
// Example:
// https://eu-west-2.console.aws.amazon.com/systems-manager/run-command/3cb11aaa-11aa-1111-aaaa-2188108225de/i-0775091aa11111111
invocationURL := fmt.Sprintf("https://%s.console.aws.amazon.com/systems-manager/run-command/%s/%s",
req.Region, aws.StringValue(commandID), aws.StringValue(instanceID),
)

return &apievents.SSMRun{
Metadata: apievents.Metadata{
Type: libevents.SSMRunEvent,
Expand All @@ -355,5 +363,6 @@ func (si *SSMInstaller) getCommandStepStatusEvent(ctx context.Context, step *str
Status: status,
StandardOutput: aws.StringValue(stepResult.StandardOutputContent),
StandardError: aws.StringValue(stepResult.StandardErrorContent),
InvocationURL: invocationURL,
}, nil
}
41 changes: 23 additions & 18 deletions lib/srv/server/ssm_install_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,13 @@ func TestSSMInstaller(t *testing.T) {
Type: libevent.SSMRunEvent,
Code: libevent.SSMRunSuccessCode,
},
CommandID: "command-id-1",
InstanceID: "instance-id-1",
AccountID: "account-id",
Region: "eu-central-1",
ExitCode: 0,
Status: ssm.CommandStatusSuccess,
CommandID: "command-id-1",
InstanceID: "instance-id-1",
AccountID: "account-id",
Region: "eu-central-1",
ExitCode: 0,
Status: ssm.CommandStatusSuccess,
InvocationURL: "https://eu-central-1.console.aws.amazon.com/systems-manager/run-command/command-id-1/instance-id-1",
},
},
},
Expand Down Expand Up @@ -175,12 +176,13 @@ func TestSSMInstaller(t *testing.T) {
Type: libevent.SSMRunEvent,
Code: libevent.SSMRunSuccessCode,
},
CommandID: "command-id-1",
InstanceID: "instance-id-1",
AccountID: "account-id",
Region: "eu-central-1",
ExitCode: 0,
Status: ssm.CommandStatusSuccess,
CommandID: "command-id-1",
InstanceID: "instance-id-1",
AccountID: "account-id",
Region: "eu-central-1",
ExitCode: 0,
Status: ssm.CommandStatusSuccess,
InvocationURL: "https://eu-central-1.console.aws.amazon.com/systems-manager/run-command/command-id-1/instance-id-1",
},
},
},
Expand Down Expand Up @@ -225,6 +227,7 @@ func TestSSMInstaller(t *testing.T) {
Status: ssm.CommandStatusFailed,
StandardOutput: "",
StandardError: "timeout error",
InvocationURL: "https://eu-central-1.console.aws.amazon.com/systems-manager/run-command/command-id-1/instance-id-1",
},
},
},
Expand Down Expand Up @@ -275,6 +278,7 @@ func TestSSMInstaller(t *testing.T) {
Status: ssm.CommandStatusFailed,
StandardOutput: "",
StandardError: "timeout error",
InvocationURL: "https://eu-central-1.console.aws.amazon.com/systems-manager/run-command/command-id-1/instance-id-1",
},
},
},
Expand Down Expand Up @@ -335,12 +339,13 @@ func TestSSMInstaller(t *testing.T) {
Type: libevent.SSMRunEvent,
Code: libevent.SSMRunSuccessCode,
},
CommandID: "command-id-1",
InstanceID: "instance-id-1",
AccountID: "account-id",
Region: "eu-central-1",
ExitCode: 0,
Status: ssm.CommandStatusSuccess,
CommandID: "command-id-1",
InstanceID: "instance-id-1",
AccountID: "account-id",
Region: "eu-central-1",
ExitCode: 0,
Status: ssm.CommandStatusSuccess,
InvocationURL: "https://eu-central-1.console.aws.amazon.com/systems-manager/run-command/command-id-1/instance-id-1",
},
&events.SSMRun{
Metadata: events.Metadata{
Expand Down

0 comments on commit 02d74d9

Please sign in to comment.