Skip to content

Commit 54130dc

Browse files
authoredDec 2, 2024··
fix(misconf): wrap AWS EnvVar to iac types (#7407)
Signed-off-by: nikpivkin <nikita.pivkin@smartforce.io>
1 parent a16270c commit 54130dc

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed
 

‎pkg/iac/adapters/cloudformation/aws/ecs/ecs_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ Resources:
7474
Privileged: types.BoolTest(true),
7575
Environment: []ecs.EnvVar{
7676
{
77-
Name: "entryPoint",
78-
Value: "sh, -c",
77+
Name: types.StringTest("entryPoint"),
78+
Value: types.StringTest("sh, -c"),
7979
},
8080
},
8181
},

‎pkg/iac/adapters/cloudformation/aws/ecs/task_definition.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func getContainerDefinitions(r *parser.Resource) ([]ecs.ContainerDefinition, err
3636
if envVarsList.IsNotNil() && envVarsList.IsList() {
3737
for _, envVar := range envVarsList.AsList() {
3838
envVars = append(envVars, ecs.EnvVar{
39-
Name: envVar.GetStringProperty("Name").Value(),
40-
Value: envVar.GetStringProperty("Value").Value(),
39+
Name: envVar.GetStringProperty("Name"),
40+
Value: envVar.GetStringProperty("Value"),
4141
})
4242
}
4343
}

‎pkg/iac/adapters/terraform/aws/ecs/adapt_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ func Test_adaptTaskDefinitionResource(t *testing.T) {
131131
Privileged: iacTypes.Bool(false, iacTypes.NewTestMetadata()),
132132
Environment: []ecs.EnvVar{
133133
{
134-
Name: "ENVIRONMENT",
135-
Value: "development",
134+
Name: iacTypes.StringTest("ENVIRONMENT"),
135+
Value: iacTypes.StringTest("development"),
136136
},
137137
},
138138
},

‎pkg/iac/providers/aws/ecs/ecs.go

+8-3
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,15 @@ func (j containerDefinitionJSON) convert(metadata iacTypes.Metadata) ContainerDe
6969
HostPort: iacTypes.Int(jMapping.HostPort, metadata),
7070
})
7171
}
72+
7273
var envVars []EnvVar
7374
for _, env := range j.EnvVars {
74-
envVars = append(envVars, EnvVar(env))
75+
envVars = append(envVars, EnvVar{
76+
Name: iacTypes.String(env.Name, metadata),
77+
Value: iacTypes.String(env.Value, metadata),
78+
})
7579
}
80+
7681
return ContainerDefinition{
7782
Metadata: metadata,
7883
Name: iacTypes.String(j.Name, metadata),
@@ -99,8 +104,8 @@ type ContainerDefinition struct {
99104
}
100105

101106
type EnvVar struct {
102-
Name string
103-
Value string
107+
Name iacTypes.StringValue
108+
Value iacTypes.StringValue
104109
}
105110

106111
type PortMapping struct {

0 commit comments

Comments
 (0)
Please sign in to comment.