Skip to content

Commit 7d5538b

Browse files
efekarakusefekarakus
authored
chore: delete no longer used inlined ZipFiles (#3677)
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 1591d75 commit 7d5538b

File tree

18 files changed

+131
-793
lines changed

18 files changed

+131
-793
lines changed

‎internal/pkg/cli/deploy/deploy.go

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ func NewJobDeployer(in *WorkloadDeployerInput) (*jobDeployer, error) {
410410

411411
type rdwsDeployer struct {
412412
*svcDeployer
413-
customResourceUploader customResourcesUploader
414413
customResourceS3Client uploader
415414
appVersionGetter versionGetter
416415
rdwsMft *manifest.RequestDrivenWebService
@@ -438,7 +437,6 @@ func NewRDWSDeployer(in *WorkloadDeployerInput) (*rdwsDeployer, error) {
438437
}
439438
return &rdwsDeployer{
440439
svcDeployer: svcDeployer,
441-
customResourceUploader: template.New(),
442440
customResourceS3Client: s3.New(svcDeployer.defaultSessWithEnvRegion),
443441
appVersionGetter: versionGetter,
444442
rdwsMft: rdwsMft,
@@ -1071,11 +1069,11 @@ func (d *rdwsDeployer) stackConfiguration(in *StackRuntimeConfiguration) (*rdwsS
10711069
Domain: d.app.Domain,
10721070
AccountPrincipalARN: in.RootUserARN,
10731071
}
1072+
conf, err := stack.NewRequestDrivenWebService(d.rdwsMft, d.env.Name, appInfo, *rc)
1073+
if err != nil {
1074+
return nil, fmt.Errorf("create stack configuration: %w", err)
1075+
}
10741076
if d.rdwsMft.Alias == nil {
1075-
conf, err := stack.NewRequestDrivenWebService(d.rdwsMft, d.env.Name, appInfo, *rc)
1076-
if err != nil {
1077-
return nil, fmt.Errorf("create stack configuration: %w", err)
1078-
}
10791077
return &rdwsStackConfigurationOutput{
10801078
svcStackConfigurationOutput: svcStackConfigurationOutput{
10811079
conf: conf,
@@ -1090,18 +1088,6 @@ func (d *rdwsDeployer) stackConfiguration(in *StackRuntimeConfiguration) (*rdwsS
10901088
aws.StringValue(d.rdwsMft.Alias), d.env.Name, d.app, d.appVersionGetter); err != nil {
10911089
return nil, err
10921090
}
1093-
var urls map[string]string
1094-
if urls, err = uploadRDWSCustomResources(&uploadRDWSCustomResourcesInput{
1095-
customResourceUploader: d.customResourceUploader,
1096-
s3Uploader: d.customResourceS3Client,
1097-
s3Bucket: d.resources.S3Bucket,
1098-
}); err != nil {
1099-
return nil, err
1100-
}
1101-
conf, err := stack.NewRequestDrivenWebServiceWithAlias(d.rdwsMft, d.env.Name, appInfo, *rc, urls)
1102-
if err != nil {
1103-
return nil, fmt.Errorf("create stack configuration: %w", err)
1104-
}
11051091
return &rdwsStackConfigurationOutput{
11061092
svcStackConfigurationOutput: svcStackConfigurationOutput{
11071093
conf: conf,
@@ -1234,23 +1220,6 @@ func contains(s string, items []string) bool {
12341220
return false
12351221
}
12361222

1237-
type uploadRDWSCustomResourcesInput struct {
1238-
customResourceUploader customResourcesUploader
1239-
s3Uploader uploader
1240-
s3Bucket string
1241-
}
1242-
1243-
func uploadRDWSCustomResources(in *uploadRDWSCustomResourcesInput) (map[string]string, error) {
1244-
urls, err := in.customResourceUploader.UploadRequestDrivenWebServiceCustomResources(func(key string, objects ...s3.NamedBinary) (string, error) {
1245-
return in.s3Uploader.ZipAndUpload(in.s3Bucket, key, objects...)
1246-
})
1247-
if err != nil {
1248-
return nil, fmt.Errorf("upload custom resources to bucket %s: %w", in.s3Bucket, err)
1249-
}
1250-
1251-
return urls, nil
1252-
}
1253-
12541223
func validateRDSvcAliasAndAppVersion(svcName, alias, envName string, app *config.Application, appVersionGetter versionGetter) error {
12551224
if alias == "" {
12561225
return nil

‎internal/pkg/cli/deploy/deploy_test.go

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,24 +1021,6 @@ func TestSvcDeployOpts_rdWebServiceStackConfiguration(t *testing.T) {
10211021

10221022
wantErr: fmt.Errorf("mockDomain is a root domain alias, which is not supported yet"),
10231023
},
1024-
"fail to upload custom resource scripts": {
1025-
inAlias: "v1.mockDomain",
1026-
inEnvironment: &config.Environment{
1027-
Name: mockEnvName,
1028-
Region: "us-west-2",
1029-
},
1030-
inApp: &config.Application{
1031-
Name: mockAppName,
1032-
Domain: "mockDomain",
1033-
},
1034-
mock: func(m *deployRDSvcMocks) {
1035-
m.mockVersionGetter.EXPECT().Version().Return("v1.0.0", nil)
1036-
m.mockEndpointGetter.EXPECT().ServiceDiscoveryEndpoint().Return("mockApp.local", nil)
1037-
m.mockUploader.EXPECT().UploadRequestDrivenWebServiceCustomResources(gomock.Any()).Return(nil, errors.New("some error"))
1038-
},
1039-
1040-
wantErr: fmt.Errorf("upload custom resources to bucket mockBucket: some error"),
1041-
},
10421024
"success": {
10431025
inAlias: "v1.mockDomain",
10441026
inEnvironment: &config.Environment{
@@ -1052,9 +1034,6 @@ func TestSvcDeployOpts_rdWebServiceStackConfiguration(t *testing.T) {
10521034
mock: func(m *deployRDSvcMocks) {
10531035
m.mockVersionGetter.EXPECT().Version().Return("v1.0.0", nil)
10541036
m.mockEndpointGetter.EXPECT().ServiceDiscoveryEndpoint().Return("mockApp.local", nil)
1055-
m.mockUploader.EXPECT().UploadRequestDrivenWebServiceCustomResources(gomock.Any()).Return(map[string]string{
1056-
"mockResource2": "mockURL2",
1057-
}, nil)
10581037
},
10591038
wantAlias: "v1.mockDomain",
10601039
},
@@ -1068,7 +1047,6 @@ func TestSvcDeployOpts_rdWebServiceStackConfiguration(t *testing.T) {
10681047
m := &deployRDSvcMocks{
10691048
mockVersionGetter: mocks.NewMockversionGetter(ctrl),
10701049
mockEndpointGetter: mocks.NewMockendpointGetter(ctrl),
1071-
mockUploader: mocks.NewMockcustomResourcesUploader(ctrl),
10721050
}
10731051
tc.mock(m)
10741052

@@ -1085,8 +1063,7 @@ func TestSvcDeployOpts_rdWebServiceStackConfiguration(t *testing.T) {
10851063
return nil
10861064
},
10871065
},
1088-
customResourceUploader: m.mockUploader,
1089-
appVersionGetter: m.mockVersionGetter,
1066+
appVersionGetter: m.mockVersionGetter,
10901067
rdwsMft: &manifest.RequestDrivenWebService{
10911068
Workload: manifest.Workload{
10921069
Name: aws.String(mockName),

‎internal/pkg/cli/interfaces.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,6 @@ type uploader interface {
316316

317317
type customResourcesUploader interface {
318318
UploadEnvironmentCustomResources(upload s3.CompressAndUploadFunc) (map[string]string, error)
319-
UploadRequestDrivenWebServiceCustomResources(upload s3.CompressAndUploadFunc) (map[string]string, error)
320-
UploadNetworkLoadBalancedWebServiceCustomResources(upload s3.CompressAndUploadFunc) (map[string]string, error)
321319
}
322320

323321
type bucketEmptier interface {

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,6 @@ func (s *BackendService) Template() (string, error) {
8787
if err != nil {
8888
return "", err
8989
}
90-
rulePriorityLambda, err := s.parser.Read(albRulePriorityGeneratorPath)
91-
if err != nil {
92-
return "", fmt.Errorf("read rule priority lambda: %w", err)
93-
}
94-
desiredCountLambda, err := s.parser.Read(desiredCountGeneratorPath)
95-
if err != nil {
96-
return "", fmt.Errorf("read desired count lambda: %w", err)
97-
}
98-
envControllerLambda, err := s.parser.Read(envControllerPath)
99-
if err != nil {
100-
return "", fmt.Errorf("read env controller lambda: %w", err)
101-
}
10290
addonsParams, err := s.addonsParameters()
10391
if err != nil {
10492
return "", err
@@ -179,11 +167,8 @@ func (s *BackendService) Template() (string, error) {
179167
DeregistrationDelay: deregistrationDelay,
180168
AllowedSourceIps: allowedSourceIPs,
181169
CustomResources: crs,
182-
RulePriorityLambda: rulePriorityLambda.String(),
183170
LogConfig: convertLogging(s.manifest.Logging),
184171
DockerLabels: s.manifest.ImageConfig.Image.DockerLabels,
185-
DesiredCountLambda: desiredCountLambda.String(),
186-
EnvControllerLambda: envControllerLambda.String(),
187172
Storage: convertStorageOpts(s.manifest.Name, s.manifest.Storage),
188173
Network: convertNetworkConfig(s.manifest.Network),
189174
DeploymentConfiguration: convertDeploymentConfig(s.manifest.DeployConfig),

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

Lines changed: 26 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -52,54 +52,14 @@ func TestBackendService_Template(t *testing.T) {
5252
wantedTemplate string
5353
wantedErr error
5454
}{
55-
"unavailable rule priority lambda template": {
56-
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
57-
m := mocks.NewMockbackendSvcReadParser(ctrl)
58-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(nil, errors.New("some error"))
59-
svc.parser = m
60-
},
61-
wantedTemplate: "",
62-
wantedErr: fmt.Errorf("read rule priority lambda: some error"),
63-
},
64-
"unavailable desired count lambda template": {
65-
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
66-
m := mocks.NewMockbackendSvcReadParser(ctrl)
67-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
68-
m.EXPECT().Read(desiredCountGeneratorPath).Return(nil, errors.New("some error"))
69-
svc.parser = m
70-
},
71-
wantedTemplate: "",
72-
wantedErr: fmt.Errorf("read desired count lambda: some error"),
73-
},
74-
"unavailable env controller lambda template": {
75-
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
76-
m := mocks.NewMockbackendSvcReadParser(ctrl)
77-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
78-
m.EXPECT().Read(desiredCountGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
79-
m.EXPECT().Read(envControllerPath).Return(nil, errors.New("some error"))
80-
svc.parser = m
81-
},
82-
wantedTemplate: "",
83-
wantedErr: fmt.Errorf("read env controller lambda: some error"),
84-
},
8555
"unexpected addons parsing error": {
8656
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
87-
m := mocks.NewMockbackendSvcReadParser(ctrl)
88-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
89-
m.EXPECT().Read(desiredCountGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
90-
m.EXPECT().Read(envControllerPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
91-
svc.parser = m
9257
svc.addons = mockAddons{tplErr: errors.New("some error")}
9358
},
9459
wantedErr: fmt.Errorf("generate addons template for %s: %w", testServiceName, errors.New("some error")),
9560
},
9661
"unexpected addons parameter parsing error": {
9762
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
98-
m := mocks.NewMockbackendSvcReadParser(ctrl)
99-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
100-
m.EXPECT().Read(desiredCountGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
101-
m.EXPECT().Read(envControllerPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
102-
svc.parser = m
10363
svc.addons = mockAddons{paramsErr: errors.New("some error")}
10464
},
10565
wantedErr: fmt.Errorf("parse addons parameters for %s: %w", testServiceName, errors.New("some error")),
@@ -116,9 +76,6 @@ func TestBackendService_Template(t *testing.T) {
11676
},
11777
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
11878
m := mocks.NewMockbackendSvcReadParser(ctrl)
119-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
120-
m.EXPECT().Read(desiredCountGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
121-
m.EXPECT().Read(envControllerPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
12279
svc.parser = m
12380
svc.addons = mockAddons{
12481
tpl: `
@@ -145,9 +102,6 @@ Outputs:
145102
},
146103
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
147104
m := mocks.NewMockbackendSvcReadParser(ctrl)
148-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
149-
m.EXPECT().Read(desiredCountGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
150-
m.EXPECT().Read(envControllerPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
151105
svc.parser = m
152106
svc.addons = mockAddons{
153107
tpl: `
@@ -167,9 +121,6 @@ Outputs:
167121
},
168122
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
169123
m := mocks.NewMockbackendSvcReadParser(ctrl)
170-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
171-
m.EXPECT().Read(desiredCountGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
172-
m.EXPECT().Read(envControllerPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
173124
m.EXPECT().ParseBackendService(gomock.Any()).Return(nil, errors.New("some error"))
174125
svc.parser = m
175126
svc.addons = mockAddons{
@@ -215,9 +166,6 @@ Outputs:
215166
},
216167
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
217168
m := mocks.NewMockbackendSvcReadParser(ctrl)
218-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
219-
m.EXPECT().Read(desiredCountGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
220-
m.EXPECT().Read(envControllerPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
221169
m.EXPECT().ParseBackendService(gomock.Any()).DoAndReturn(func(actual template.WorkloadOpts) (*template.Content, error) {
222170
require.Equal(t, template.WorkloadOpts{
223171
AppName: "phonetool",
@@ -237,11 +185,17 @@ Outputs:
237185
GracePeriod: aws.Int64(manifest.DefaultHealthCheckGracePeriod),
238186
},
239187
DeregistrationDelay: aws.Int64(60), // defaults to 60
240-
CustomResources: make(map[string]template.S3ObjectLocation),
241-
RulePriorityLambda: "something",
242-
DesiredCountLambda: "something",
243-
EnvControllerLambda: "something",
244-
ExecuteCommand: &template.ExecuteCommandOpts{},
188+
CustomResources: map[string]template.S3ObjectLocation{
189+
"EnvControllerFunction": {
190+
Bucket: "my-bucket",
191+
Key: "sha1/envcontroller.zip",
192+
},
193+
"DynamicDesiredCountFunction": {
194+
Bucket: "my-bucket",
195+
Key: "sha2/count.zip",
196+
},
197+
},
198+
ExecuteCommand: &template.ExecuteCommandOpts{},
245199
NestedStack: &template.WorkloadNestedStackOpts{
246200
StackName: addon.StackName,
247201
VariableOutputs: []string{"MyTable"},
@@ -324,9 +278,6 @@ Outputs:
324278
},
325279
mockDependencies: func(t *testing.T, ctrl *gomock.Controller, svc *BackendService) {
326280
m := mocks.NewMockbackendSvcReadParser(ctrl)
327-
m.EXPECT().Read(albRulePriorityGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
328-
m.EXPECT().Read(desiredCountGeneratorPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
329-
m.EXPECT().Read(envControllerPath).Return(&template.Content{Buffer: bytes.NewBufferString("something")}, nil)
330281
m.EXPECT().ParseBackendService(gomock.Any()).DoAndReturn(func(actual template.WorkloadOpts) (*template.Content, error) {
331282
require.Equal(t, template.WorkloadOpts{
332283
AppName: "phonetool",
@@ -353,11 +304,17 @@ Outputs:
353304
HostedZoneAliases: make(template.AliasesForHostedZone),
354305
DeregistrationDelay: aws.Int64(59),
355306
AllowedSourceIps: []string{"10.0.1.0/24"},
356-
CustomResources: make(map[string]template.S3ObjectLocation),
357-
RulePriorityLambda: "something",
358-
DesiredCountLambda: "something",
359-
EnvControllerLambda: "something",
360-
ExecuteCommand: &template.ExecuteCommandOpts{},
307+
CustomResources: map[string]template.S3ObjectLocation{
308+
"EnvControllerFunction": {
309+
Bucket: "my-bucket",
310+
Key: "sha1/envcontroller.zip",
311+
},
312+
"DynamicDesiredCountFunction": {
313+
Bucket: "my-bucket",
314+
Key: "sha2/count.zip",
315+
},
316+
},
317+
ExecuteCommand: &template.ExecuteCommandOpts{},
361318
NestedStack: &template.WorkloadNestedStackOpts{
362319
StackName: addon.StackName,
363320
VariableOutputs: []string{"MyTable"},
@@ -409,6 +366,10 @@ Outputs:
409366
RepoURL: testImageRepoURL,
410367
ImageTag: testImageTag,
411368
},
369+
CustomResourcesURL: map[string]string{
370+
"EnvControllerFunction": "https://my-bucket.s3.Region.amazonaws.com/sha1/envcontroller.zip",
371+
"DynamicDesiredCountFunction": "https://my-bucket.s3.Region.amazonaws.com/sha2/count.zip",
372+
},
412373
},
413374
},
414375
taskDefOverrideFunc: mockCloudFormationOverrideFunc,
@@ -603,9 +564,6 @@ func TestBackendService_TemplateAndParamsGeneration(t *testing.T) {
603564
// mock parser for lambda functions
604565
realParser := serializer.parser
605566
mockParser := mocks.NewMockbackendSvcReadParser(ctrl)
606-
mockParser.EXPECT().Read(albRulePriorityGeneratorPath).Return(templateContent("albRulePriorityGenerator"), nil)
607-
mockParser.EXPECT().Read(desiredCountGeneratorPath).Return(templateContent("desiredCountGenerator"), nil)
608-
mockParser.EXPECT().Read(envControllerPath).Return(templateContent("envController"), nil)
609567
mockParser.EXPECT().ParseBackendService(gomock.Any()).DoAndReturn(func(data template.WorkloadOpts) (*template.Content, error) {
610568
// pass call to real parser
611569
return realParser.ParseBackendService(data)
@@ -647,9 +605,3 @@ func TestBackendService_TemplateAndParamsGeneration(t *testing.T) {
647605
})
648606
}
649607
}
650-
651-
func templateContent(str string) *template.Content {
652-
return &template.Content{
653-
Buffer: bytes.NewBuffer([]byte(str)),
654-
}
655-
}

0 commit comments

Comments
 (0)