Skip to content

Fix Function.addEnvironment not updating on redeploy #6338

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

Open
vimtor wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −26
Open

Fix Function.addEnvironment not updating on redeploy #6338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 7 additions & 26 deletions pkg/server/resource/aws-function-environment-update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ type FunctionEnvironmentUpdateInputs struct {
Region string `json:"region"`
}

type FunctionEnvironmentUpdateOutputs struct {
Updated bool `json:"updated"`
}
type FunctionEnvironmentUpdateOutputs struct{}

func (r *FunctionEnvironmentUpdate) Create(input *FunctionEnvironmentUpdateInputs, output *CreateResult[FunctionEnvironmentUpdateOutputs]) error {
if err := r.updateEnvironment(input); err != nil {
Expand All @@ -27,9 +25,6 @@ func (r *FunctionEnvironmentUpdate) Create(input *FunctionEnvironmentUpdateInput

*output = CreateResult[FunctionEnvironmentUpdateOutputs]{
ID: input.FunctionName,
Outs: FunctionEnvironmentUpdateOutputs{
Updated: true,
},
}
return nil
}
Expand All @@ -39,27 +34,13 @@ func (r *FunctionEnvironmentUpdate) Update(input *UpdateInput[FunctionEnvironmen
return err
}

*output = UpdateResult[FunctionEnvironmentUpdateOutputs]{
Outs: FunctionEnvironmentUpdateOutputs{
Updated: true,
},
}
*output = UpdateResult[FunctionEnvironmentUpdateOutputs]{}
return nil
}

func (r *FunctionEnvironmentUpdate) Read(input *ReadInput[FunctionEnvironmentUpdateInputs], output *ReadResult[FunctionEnvironmentUpdateOutputs]) error {
*output = ReadResult[FunctionEnvironmentUpdateOutputs]{
ID: input.ID,
Outs: FunctionEnvironmentUpdateOutputs{
Updated: false,
},
}
return nil
}

func (r *FunctionEnvironmentUpdate) Diff(input *DiffInput[FunctionEnvironmentUpdateInputs, FunctionEnvironmentUpdateOutputs], output *DiffResult) error {
*output = DiffResult{
Changes: input.Olds.Updated != true,
}
return nil
}
Expand All @@ -74,7 +55,7 @@ func (r *FunctionEnvironmentUpdate) updateEnvironment(input *FunctionEnvironment
if input.Region != "" {
cfg.Region = input.Region
}

client := lambda.NewFromConfig(cfg)

// Get the current function configuration to preserve other settings
Expand All @@ -87,14 +68,14 @@ func (r *FunctionEnvironmentUpdate) updateEnvironment(input *FunctionEnvironment

// Create environment variables map
envVars := make(map[string]string)

// If the function already has environment variables, preserve them
if functionConfig.Environment != nil && functionConfig.Environment.Variables != nil {
for k, v := range functionConfig.Environment.Variables {
envVars[k] = v
}
}

// Add or update with the new environment variables
for k, v := range input.Environment {
envVars[k] = v
Expand All @@ -107,6 +88,6 @@ func (r *FunctionEnvironmentUpdate) updateEnvironment(input *FunctionEnvironment
Variables: envVars,
},
})

return err
}
}