Skip to content

Commit

Permalink
[create-vm-agent-env-adxt-84] Go implem
Browse files Browse the repository at this point in the history
  • Loading branch information
CelianR committed Jan 17, 2025
1 parent 9ef996c commit a7ed04e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion common/config/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const (
DDAgentDualShipping = "dualshipping"
DDAgentSite = "site"
DDAgentMajorVersion = "majorVersion"
DDAgentExtraEnvVars = "extraEnvVars" // extraEnvVars is expected in the format: <key1>=<value1>,<key2>=<value2>,...
DDAgentExtraEnvVars = "extraEnvVars" // expected in the format: <key1>=<value1>,<key2>=<value2>,...
DDAgentJMX = "jmx"
DDAgentFIPS = "fips"

Expand Down
4 changes: 4 additions & 0 deletions components/datadog/dockeragentparams/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ func NewParams(e config.Env, options ...Option) (*Params, error) {
EnvironmentVariables: pulumi.StringMap{},
}

for k, v := range e.AgentExtraEnvVars() {
version.AgentServiceEnvironment[k] = pulumi.String(v)
}

if e.PipelineID() != "" && e.CommitSHA() != "" {
options = append(options,
WithFullImagePath(utils.BuildDockerImagePath(
Expand Down

0 comments on commit a7ed04e

Please sign in to comment.