Skip to content

Commit 4e82726

Browse files
lint issues fixed
1 parent adab9c2 commit 4e82726

4 files changed

Lines changed: 11 additions & 8 deletions

File tree

internal/services/applications.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,18 @@ func findApplicationAndUpdate(applicationName string, applicationsWrapper wrappe
8787
applicationModel.Tags = applicationResp.Tags
8888
newApplicationRule.Type = ApplicationRuleType
8989
newApplicationRule.Value = projectName
90-
applicationModel.Rules = append(applicationResp.Rules, newApplicationRule)
90+
combinedRules := append(applicationResp.Rules, newApplicationRule)
91+
applicationModel.Rules = combinedRules
9192
applicationID = applicationResp.ID
9293

93-
err = updateApplication(applicationModel, applicationsWrapper, applicationID)
94+
err = updateApplication(&applicationModel, applicationsWrapper, applicationID)
9495
if err != nil {
9596
return err
9697
}
9798
return nil
9899
}
99100

100-
func updateApplication(applicationModel wrappers.ApplicationConfiguration, applicationWrapper wrappers.ApplicationsWrapper, applicationID string) error {
101+
func updateApplication(applicationModel *wrappers.ApplicationConfiguration, applicationWrapper wrappers.ApplicationsWrapper, applicationID string) error {
101102
errorModel, err := applicationWrapper.Update(applicationID, applicationModel)
102103
if errorModel != nil {
103104
err = errors.Errorf(ErrorCodeFormat, "failed to update application", errorModel.Code, errorModel.Message)

internal/wrappers/application-http.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func NewApplicationsHTTPWrapper(path string) ApplicationsWrapper {
2222
}
2323
}
2424

25-
func (a *ApplicationsHTTPWrapper) Update(applicationID string, applicationBody ApplicationConfiguration) (*ErrorModel, error) {
25+
func (a *ApplicationsHTTPWrapper) Update(applicationID string, applicationBody *ApplicationConfiguration) (*ErrorModel, error) {
2626
clientTimeout := viper.GetUint(commonParams.ClientTimeoutKey)
2727
jsonBytes, err := json.Marshal(applicationBody)
2828
updatePath := fmt.Sprintf("%s/%s", a.path, applicationID)
@@ -34,6 +34,10 @@ func (a *ApplicationsHTTPWrapper) Update(applicationID string, applicationBody A
3434
return nil, err
3535
}
3636
decoder := json.NewDecoder(resp.Body)
37+
defer func() {
38+
_ = resp.Body.Close()
39+
}()
40+
3741
switch resp.StatusCode {
3842
case http.StatusBadRequest:
3943
errorModel := ErrorModel{}

internal/wrappers/application.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ type Rule struct {
3838

3939
type ApplicationsWrapper interface {
4040
Get(params map[string]string) (*ApplicationsResponseModel, error)
41-
Update(applicationID string, applicationBody ApplicationConfiguration) (*ErrorModel, error)
41+
Update(applicationID string, applicationBody *ApplicationConfiguration) (*ErrorModel, error)
4242
}

internal/wrappers/mock/application-mock.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,16 @@ func (a ApplicationsMockWrapper) Get(params map[string]string) (*wrappers.Applic
5050
response.TotalCount = 0
5151
response.Applications = []wrappers.Application{}
5252
}
53-
5453
return response, nil
5554
}
5655

57-
func (a ApplicationsMockWrapper) Update(applicationID string, applicationBody wrappers.ApplicationConfiguration) (*wrappers.ErrorModel, error) {
56+
func (a ApplicationsMockWrapper) Update(applicationID string, applicationBody *wrappers.ApplicationConfiguration) (*wrappers.ErrorModel, error) {
5857
fmt.Println("called Update project")
5958
if applicationID == FakeForbidden403 {
6059
return nil, errors.Errorf(errorConstants.NoPermissionToUpdateApplication)
6160
}
6261
if applicationID == FakeUnauthorized401 {
6362
return nil, errors.Errorf(errorConstants.StatusUnauthorized)
6463
}
65-
6664
return nil, nil
6765
}

0 commit comments

Comments
 (0)