Skip to content

Commit e5f7a03

Browse files
reivaj05reivaj05
authored
Remove unused code in marketplace API (#2124)
1 parent a024a13 commit e5f7a03

File tree

5 files changed

+7
-253
lines changed

5 files changed

+7
-253
lines changed

‎operatorapi/embedded_spec.go

Lines changed: 0 additions & 92 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎operatorapi/marketplace.go

Lines changed: 4 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,6 @@ func registerMarketplaceHandlers(api *operations.OperatorAPI) {
5454
}
5555
return operator_api.NewPostMPIntegrationCreated()
5656
})
57-
58-
api.OperatorAPIPatchMPIntegrationHandler = operator_api.PatchMPIntegrationHandlerFunc(func(params operator_api.PatchMPIntegrationParams, session *models.Principal) middleware.Responder {
59-
err := patchMPIntegrationResponse(session, params)
60-
if err != nil {
61-
return operator_api.NewPatchMPIntegrationDefault(int(err.Code)).WithPayload(err)
62-
}
63-
return operator_api.NewPatchMPIntegrationOK()
64-
})
65-
66-
api.OperatorAPIDeleteMPIntegrationHandler = operator_api.DeleteMPIntegrationHandlerFunc(func(params operator_api.DeleteMPIntegrationParams, session *models.Principal) middleware.Responder {
67-
if err := deleteMPIntegrationResponse(session, params); err != nil {
68-
return operator_api.NewDeleteMPIntegrationDefault(int(err.Code)).WithPayload(err)
69-
}
70-
return operator_api.NewDeleteMPIntegrationNoContent()
71-
})
7257
}
7358

7459
func getMPIntegrationResponse(session *models.Principal, params operator_api.GetMPIntegrationParams) (*models.MpIntegration, *models.Error) {
@@ -108,37 +93,21 @@ func postMPIntegrationResponse(session *models.Principal, params operator_api.Po
10893
if err != nil {
10994
return errors.ErrorWithContext(ctx, err)
11095
}
111-
return setMPIntegration(ctx, params.Body.Email, false, &k8sClient{client: clientSet})
112-
}
113-
114-
func patchMPIntegrationResponse(session *models.Principal, params operator_api.PatchMPIntegrationParams) *models.Error {
115-
if true { // This block will be removed once service to register emails is deployed
116-
return &models.Error{Code: 501}
117-
}
118-
clientSet, err := cluster.K8sClient(session.STSSessionToken)
119-
ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
120-
defer cancel()
121-
if err != nil {
122-
return errors.ErrorWithContext(ctx, err)
123-
}
124-
return setMPIntegration(ctx, params.Body.Email, true, &k8sClient{client: clientSet})
96+
return setMPIntegration(ctx, params.Body.Email, &k8sClient{client: clientSet})
12597
}
12698

127-
func setMPIntegration(ctx context.Context, email string, override bool, clientSet K8sClientI) *models.Error {
99+
func setMPIntegration(ctx context.Context, email string, clientSet K8sClientI) *models.Error {
128100
if email == "" {
129101
return errors.ErrorWithContext(ctx, errors.ErrBadRequest, fmt.Errorf(emailNotSetMsg))
130102
}
131-
if _, err := setMPEmail(ctx, email, override, clientSet); err != nil {
103+
if _, err := setMPEmail(ctx, email, clientSet); err != nil {
132104
return errors.ErrorWithContext(ctx, err)
133105
}
134106
return nil
135107
}
136108

137-
func setMPEmail(ctx context.Context, email string, override bool, clientSet K8sClientI) (*corev1.ConfigMap, error) {
109+
func setMPEmail(ctx context.Context, email string, clientSet K8sClientI) (*corev1.ConfigMap, error) {
138110
cm := createCM(email)
139-
if override {
140-
return clientSet.updateConfigMap(ctx, "default", cm, metav1.UpdateOptions{})
141-
}
142111
return clientSet.createConfigMap(ctx, "default", cm, metav1.CreateOptions{})
143112
}
144113

@@ -156,26 +125,6 @@ func createCM(email string) *corev1.ConfigMap {
156125
}
157126
}
158127

159-
func deleteMPIntegrationResponse(session *models.Principal, params operator_api.DeleteMPIntegrationParams) *models.Error {
160-
if true { // This block will be removed once service to register emails is deployed
161-
return &models.Error{Code: 501}
162-
}
163-
clientSet, err := cluster.K8sClient(session.STSSessionToken)
164-
ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
165-
defer cancel()
166-
if err != nil {
167-
return errors.ErrorWithContext(ctx, err)
168-
}
169-
return deleteMPIntegration(ctx, &k8sClient{client: clientSet})
170-
}
171-
172-
func deleteMPIntegration(ctx context.Context, clientSet K8sClientI) *models.Error {
173-
if err := clientSet.deleteConfigMap(ctx, "default", getMPConfigMapKey(mpConfigMapKey), metav1.DeleteOptions{}); err != nil {
174-
return errors.ErrorWithContext(ctx, err)
175-
}
176-
return nil
177-
}
178-
179128
func getMPConfigMapKey(envVar string) string {
180129
if mp := os.Getenv(envVar); mp != "" {
181130
return mp

‎operatorapi/marketplace_test.go

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,9 @@ func (suite *MarketplaceTestSuite) TestRegisterMarketplaceHandlers() {
110110
api := &operations.OperatorAPI{}
111111
suite.assert.Nil(api.OperatorAPIGetMPIntegrationHandler)
112112
suite.assert.Nil(api.OperatorAPIPostMPIntegrationHandler)
113-
suite.assert.Nil(api.OperatorAPIPatchMPIntegrationHandler)
114-
suite.assert.Nil(api.OperatorAPIDeleteMPIntegrationHandler)
115113
registerMarketplaceHandlers(api)
116114
suite.assert.NotNil(api.OperatorAPIGetMPIntegrationHandler)
117115
suite.assert.NotNil(api.OperatorAPIPostMPIntegrationHandler)
118-
suite.assert.NotNil(api.OperatorAPIPatchMPIntegrationHandler)
119-
suite.assert.NotNil(api.OperatorAPIDeleteMPIntegrationHandler)
120116
}
121117

122118
// TODO
@@ -134,27 +130,6 @@ func (suite *MarketplaceTestSuite) TestGetMPIntegrationHandlerWithError() {
134130
suite.assert.True(ok)
135131
}
136132

137-
func (suite *MarketplaceTestSuite) TestPatchMPIntegrationHandlerWithError() {
138-
api := &operations.OperatorAPI{}
139-
registerMarketplaceHandlers(api)
140-
params := operator_api.NewPatchMPIntegrationParams()
141-
params.HTTPRequest = &http.Request{}
142-
params.Body = &models.MpIntegration{Email: "mock@mock.com"}
143-
response := api.OperatorAPIPatchMPIntegrationHandler.Handle(params, &models.Principal{})
144-
_, ok := response.(*operator_api.PatchMPIntegrationDefault)
145-
suite.assert.True(ok)
146-
}
147-
148-
func (suite *MarketplaceTestSuite) TestDeleteMPIntegrationHandlerWithError() {
149-
api := &operations.OperatorAPI{}
150-
registerMarketplaceHandlers(api)
151-
params := operator_api.NewDeleteMPIntegrationParams()
152-
params.HTTPRequest = &http.Request{}
153-
response := api.OperatorAPIDeleteMPIntegrationHandler.Handle(params, &models.Principal{})
154-
_, ok := response.(*operator_api.DeleteMPIntegrationDefault)
155-
suite.assert.True(ok)
156-
}
157-
158133
func (suite *MarketplaceTestSuite) TestGetMPEmailWithError() {
159134
testWithError = true
160135
ctx, cancel := context.WithCancel(context.Background())
@@ -176,47 +151,23 @@ func (suite *MarketplaceTestSuite) TestGetMPEmailNoError() {
176151
func (suite *MarketplaceTestSuite) TestSetMPIntegrationNoEmail() {
177152
ctx, cancel := context.WithCancel(context.Background())
178153
defer cancel()
179-
err := setMPIntegration(ctx, "", false, &suite.kClient)
154+
err := setMPIntegration(ctx, "", &suite.kClient)
180155
suite.assert.NotNil(err)
181156
}
182157

183158
func (suite *MarketplaceTestSuite) TestSetMPIntegrationWithError() {
184159
testWithError = true
185160
ctx, cancel := context.WithCancel(context.Background())
186161
defer cancel()
187-
err := setMPIntegration(ctx, "mock@mock.com", false, &suite.kClient)
162+
err := setMPIntegration(ctx, "mock@mock.com", &suite.kClient)
188163
suite.assert.NotNil(err)
189164
}
190165

191166
func (suite *MarketplaceTestSuite) TestSetMPIntegrationNoError() {
192167
testWithError = false
193168
ctx, cancel := context.WithCancel(context.Background())
194169
defer cancel()
195-
err := setMPIntegration(ctx, "mock@mock.com", false, &suite.kClient)
196-
suite.assert.Nil(err)
197-
}
198-
199-
func (suite *MarketplaceTestSuite) TestSetMPIntegrationOverrideNoError() {
200-
testWithError = false
201-
ctx, cancel := context.WithCancel(context.Background())
202-
defer cancel()
203-
err := setMPIntegration(ctx, "mock@mock.com", true, &suite.kClient)
204-
suite.assert.Nil(err)
205-
}
206-
207-
func (suite *MarketplaceTestSuite) TestDeleteMPIntegrationWithError() {
208-
testWithError = true
209-
ctx, cancel := context.WithCancel(context.Background())
210-
defer cancel()
211-
err := deleteMPIntegration(ctx, &suite.kClient)
212-
suite.assert.NotNil(err)
213-
}
214-
215-
func (suite *MarketplaceTestSuite) TestDeleteMPIntegrationNoError() {
216-
testWithError = false
217-
ctx, cancel := context.WithCancel(context.Background())
218-
defer cancel()
219-
err := deleteMPIntegration(ctx, &suite.kClient)
170+
err := setMPIntegration(ctx, "mock@mock.com", &suite.kClient)
220171
suite.assert.Nil(err)
221172
}
222173

‎operatorapi/operations/operator_api.go

Lines changed: 0 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)