Skip to content

Commit 6e6eaa3

Browse files
iamhopaul123iamhopaul123
authored
chore: remove duplicated manifest validation (#2883)
<!-- Provide summary of changes --> Part of #2818 <!-- Issue number, if available. E.g. "Fixes #31", "Addresses #42, 77" --> By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the Apache 2.0 License.
1 parent e97c4ec commit 6e6eaa3

File tree

18 files changed

+225
-1990
lines changed

18 files changed

+225
-1990
lines changed

‎internal/pkg/deploy/cloudformation/stack/backend_svc.go‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,16 @@ func (s *BackendService) Template() (string, error) {
8080
if err != nil {
8181
return "", err
8282
}
83-
convSidecarOpts := convertSidecarOpts{
84-
sidecarConfig: s.manifest.Sidecars,
85-
imageConfig: &s.manifest.ImageConfig.Image,
86-
workloadName: aws.StringValue(s.manifest.Name),
87-
}
88-
sidecars, err := convertSidecar(convSidecarOpts)
83+
sidecars, err := convertSidecar(s.manifest.Sidecars)
8984
if err != nil {
9085
return "", fmt.Errorf("convert the sidecar configuration for service %s: %w", s.name, err)
9186
}
92-
dependencies, err := convertImageDependsOn(convSidecarOpts)
93-
if err != nil {
94-
return "", fmt.Errorf("convert the container dependency for service %s: %w", s.name, err)
95-
}
9687
publishers, err := convertPublish(s.manifest.Publish(), s.rc.AccountID, s.rc.Region, s.app, s.env, s.name)
9788
if err != nil {
9889
return "", fmt.Errorf(`convert "publish" field for service %s: %w`, s.name, err)
9990
}
10091

101-
advancedCount, err := convertAdvancedCount(&s.manifest.Count.AdvancedCount)
92+
advancedCount, err := convertAdvancedCount(s.manifest.Count.AdvancedCount)
10293
if err != nil {
10394
return "", fmt.Errorf("convert the advanced count configuration for service %s: %w", s.name, err)
10495
}
@@ -112,10 +103,6 @@ func (s *BackendService) Template() (string, error) {
112103
desiredCountOnSpot = advancedCount.Spot
113104
capacityProviders = advancedCount.Cps
114105
}
115-
storage, err := convertStorageOpts(s.manifest.Name, s.manifest.Storage)
116-
if err != nil {
117-
return "", fmt.Errorf("convert storage options for service %s: %w", s.name, err)
118-
}
119106
entrypoint, err := convertEntryPoint(s.manifest.EntryPoint)
120107
if err != nil {
121108
return "", err
@@ -139,11 +126,11 @@ func (s *BackendService) Template() (string, error) {
139126
DockerLabels: s.manifest.ImageConfig.Image.DockerLabels,
140127
DesiredCountLambda: desiredCountLambda.String(),
141128
EnvControllerLambda: envControllerLambda.String(),
142-
Storage: storage,
129+
Storage: convertStorageOpts(s.manifest.Name, s.manifest.Storage),
143130
Network: convertNetworkConfig(s.manifest.Network),
144131
EntryPoint: entrypoint,
145132
Command: command,
146-
DependsOn: dependencies,
133+
DependsOn: convertDependsOn(s.manifest.ImageConfig.Image.DependsOn),
147134
CredentialsParameter: aws.StringValue(s.manifest.ImageConfig.Image.Credentials),
148135
ServiceDiscoveryEndpoint: s.rc.ServiceDiscoveryEndpoint,
149136
Publish: publishers,

‎internal/pkg/deploy/cloudformation/stack/lb_web_svc.go‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -105,25 +105,16 @@ func (s *LoadBalancedWebService) Template() (string, error) {
105105
if err != nil {
106106
return "", err
107107
}
108-
convSidecarOpts := convertSidecarOpts{
109-
sidecarConfig: s.manifest.Sidecars,
110-
imageConfig: &s.manifest.ImageConfig.Image,
111-
workloadName: aws.StringValue(s.manifest.Name),
112-
}
113-
sidecars, err := convertSidecar(convSidecarOpts)
108+
sidecars, err := convertSidecar(s.manifest.Sidecars)
114109
if err != nil {
115110
return "", fmt.Errorf("convert the sidecar configuration for service %s: %w", s.name, err)
116111
}
117-
dependencies, err := convertImageDependsOn(convSidecarOpts)
118-
if err != nil {
119-
return "", fmt.Errorf("convert the container dependency for service %s: %w", s.name, err)
120-
}
121112
publishers, err := convertPublish(s.manifest.Publish(), s.rc.AccountID, s.rc.Region, s.app, s.env, s.name)
122113
if err != nil {
123114
return "", fmt.Errorf(`convert "publish" field for service %s: %w`, s.name, err)
124115
}
125116

126-
advancedCount, err := convertAdvancedCount(&s.manifest.Count.AdvancedCount)
117+
advancedCount, err := convertAdvancedCount(s.manifest.Count.AdvancedCount)
127118
if err != nil {
128119
return "", fmt.Errorf("convert the advanced count configuration for service %s: %w", s.name, err)
129120
}
@@ -138,10 +129,6 @@ func (s *LoadBalancedWebService) Template() (string, error) {
138129
capacityProviders = advancedCount.Cps
139130
}
140131

141-
storage, err := convertStorageOpts(s.manifest.Name, s.manifest.Storage)
142-
if err != nil {
143-
return "", fmt.Errorf("convert storage options for service %s: %w", s.name, err)
144-
}
145132
entrypoint, err := convertEntryPoint(s.manifest.EntryPoint)
146133
if err != nil {
147134
return "", err
@@ -187,11 +174,11 @@ func (s *LoadBalancedWebService) Template() (string, error) {
187174
RulePriorityLambda: rulePriorityLambda.String(),
188175
DesiredCountLambda: desiredCountLambda.String(),
189176
EnvControllerLambda: envControllerLambda.String(),
190-
Storage: storage,
177+
Storage: convertStorageOpts(s.manifest.Name, s.manifest.Storage),
191178
Network: convertNetworkConfig(s.manifest.Network),
192179
EntryPoint: entrypoint,
193180
Command: command,
194-
DependsOn: dependencies,
181+
DependsOn: convertDependsOn(s.manifest.ImageConfig.Image.DependsOn),
195182
CredentialsParameter: aws.StringValue(s.manifest.ImageConfig.Image.Credentials),
196183
ServiceDiscoveryEndpoint: s.rc.ServiceDiscoveryEndpoint,
197184
Publish: publishers,

‎internal/pkg/deploy/cloudformation/stack/scheduled_job.go‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,10 @@ func (j *ScheduledJob) Template() (string, error) {
123123
if err != nil {
124124
return "", err
125125
}
126-
convSidecarOpts := convertSidecarOpts{
127-
sidecarConfig: j.manifest.Sidecars,
128-
imageConfig: &j.manifest.ImageConfig.Image,
129-
workloadName: aws.StringValue(j.manifest.Name),
130-
}
131-
sidecars, err := convertSidecar(convSidecarOpts)
126+
sidecars, err := convertSidecar(j.manifest.Sidecars)
132127
if err != nil {
133128
return "", fmt.Errorf("convert the sidecar configuration for job %s: %w", j.name, err)
134129
}
135-
dependencies, err := convertImageDependsOn(convSidecarOpts)
136-
if err != nil {
137-
return "", fmt.Errorf("convert container dependency for job %s: %w", j.name, err)
138-
}
139130
publishers, err := convertPublish(j.manifest.Publish(), j.rc.AccountID, j.rc.Region, j.app, j.env, j.name)
140131
if err != nil {
141132
return "", fmt.Errorf(`convert "publish" field for job %s: %w`, j.name, err)
@@ -144,22 +135,14 @@ func (j *ScheduledJob) Template() (string, error) {
144135
if err != nil {
145136
return "", fmt.Errorf("convert schedule for job %s: %w", j.name, err)
146137
}
147-
148138
stateMachine, err := j.stateMachineOpts()
149139
if err != nil {
150140
return "", fmt.Errorf("convert retry/timeout config for job %s: %w", j.name, err)
151141
}
152-
153-
storage, err := convertStorageOpts(j.manifest.Name, j.manifest.Storage)
154-
if err != nil {
155-
return "", fmt.Errorf("convert storage options for job %s: %w", j.name, err)
156-
}
157-
158142
envControllerLambda, err := j.parser.Read(envControllerPath)
159143
if err != nil {
160144
return "", fmt.Errorf("read env controller lambda: %w", err)
161145
}
162-
163146
entrypoint, err := convertEntryPoint(j.manifest.EntryPoint)
164147
if err != nil {
165148
return "", err
@@ -179,11 +162,11 @@ func (j *ScheduledJob) Template() (string, error) {
179162
HealthCheck: convertContainerHealthCheck(j.manifest.ImageConfig.HealthCheck),
180163
LogConfig: convertLogging(j.manifest.Logging),
181164
DockerLabels: j.manifest.ImageConfig.Image.DockerLabels,
182-
Storage: storage,
165+
Storage: convertStorageOpts(j.manifest.Name, j.manifest.Storage),
183166
Network: convertNetworkConfig(j.manifest.Network),
184167
EntryPoint: entrypoint,
185168
Command: command,
186-
DependsOn: dependencies,
169+
DependsOn: convertDependsOn(j.manifest.ImageConfig.Image.DependsOn),
187170
CredentialsParameter: aws.StringValue(j.manifest.ImageConfig.Image.Credentials),
188171
ServiceDiscoveryEndpoint: j.rc.ServiceDiscoveryEndpoint,
189172
Publish: publishers,

0 commit comments

Comments
 (0)