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.

Sign up for GitHub

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

DEVPROD-13614 Remove EC2 Keys for ec2.assume_role from agent config #8567

Merged
merged 3 commits into from
Dec 19, 2024
Merged

DEVPROD-13614 Remove EC2 Keys for ec2.assume_role from agent config #8567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8330dc3
feat: remove EC2 keys
ZackarySantana Dec 18, 2024
4cafd3e
ci: agent version
ZackarySantana Dec 19, 2024
51bb193
Merge branch 'main' into DEVPROD-13614
ZackarySantana Dec 19, 2024
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: 0 additions & 1 deletion agent/internal/task_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ type TaskConfig struct {
Timeout Timeout
TaskOutput evergreen.S3Credentials
TaskSync evergreen.S3Credentials
EC2Keys []evergreen.EC2Key
ModulePaths map[string]string
CedarTestResultsID string
TaskGroup *model.TaskGroup
Expand Down
1 change: 0 additions & 1 deletion agent/task_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@ func (a *Agent) makeTaskConfig(ctx context.Context, tc *taskContext) (*internal.
}
taskConfig.TaskOutput = a.opts.SetupData.TaskOutput
taskConfig.TaskSync = a.opts.SetupData.TaskSync
taskConfig.EC2Keys = a.opts.SetupData.EC2Keys
taskConfig.MaxExecTimeoutSecs = a.opts.SetupData.MaxExecTimeoutSecs

// Set AWS credentials for task output buckets.
Expand Down
1 change: 0 additions & 1 deletion apimodels/agent_models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ type AgentSetupData struct {
SplunkChannel string `json:"splunk_channel"`
TaskSync evergreen.S3Credentials `json:"task_sync"`
TaskOutput evergreen.S3Credentials `json:"task_output"`
EC2Keys []evergreen.EC2Key `json:"ec2_keys"`
TraceCollectorEndpoint string `json:"trace_collector_endpoint"`
MaxExecTimeoutSecs int `json:"max_exec_timeout_secs"`
}
Expand Down
1 change: 0 additions & 1 deletion rest/route/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ func (h *agentSetup) Run(ctx context.Context) gimlet.Responder {
SplunkChannel: h.settings.Splunk.SplunkConnectionInfo.Channel,
TaskOutput: h.settings.Buckets.Credentials,
TaskSync: h.settings.Providers.AWS.TaskSync,
EC2Keys: h.settings.Providers.AWS.EC2Keys,
MaxExecTimeoutSecs: h.settings.TaskLimits.MaxExecTimeoutSecs,
}
if h.settings.Tracer.Enabled {
Expand Down
1 change: 0 additions & 1 deletion rest/route/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@ func TestAgentSetup(t *testing.T) {
assert.Equal(t, data.SplunkClientToken, s.Splunk.SplunkConnectionInfo.Token)
assert.Equal(t, data.SplunkChannel, s.Splunk.SplunkConnectionInfo.Channel)
assert.Equal(t, data.TaskSync, s.Providers.AWS.TaskSync)
assert.Equal(t, data.EC2Keys, s.Providers.AWS.EC2Keys)
assert.Equal(t, data.MaxExecTimeoutSecs, s.TaskLimits.MaxExecTimeoutSecs)
},
"ReturnsEmpty": func(ctx context.Context, t *testing.T, rh *agentSetup, s *evergreen.Settings) {
Expand Down
Loading