Skip to content

Commit ff7c305

Browse files
dvaldiviadvaldivia
authored
Remove the last k8s import on restapi (#877)
* Remove the last k8s import on restapi Signed-off-by: Daniel Valdivia <[email protected]>
1 parent 2a6a6ca commit ff7c305

35 files changed

+289
-313
lines changed

‎operatorapi/error.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ var (
4040
errAccessDenied = errors.New("access denied")
4141
)
4242

43-
// PrepareError receives an error object and parse it against k8sErrors, returns the right error code paired with a generic error message
44-
func PrepareError(err ...error) *models.Error {
43+
// prepareError receives an error object and parse it against k8sErrors, returns the right error code paired with a generic error message
44+
func prepareError(err ...error) *models.Error {
4545
errorCode := int32(500)
4646
errorMessage := errorGeneric.Error()
4747
if len(err) > 0 {

‎operatorapi/operator_direct_csi.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import (
2222
"sort"
2323
"strings"
2424

25-
"github.com/minio/console/restapi"
26-
2725
"github.com/minio/console/operatorapi/operations/operator_api"
2826

2927
"github.com/minio/console/cluster"
@@ -153,12 +151,12 @@ func getDirectCSIDrivesListResponse(session *models.Principal) (*models.GetDirec
153151
ctx := context.Background()
154152
client, err := cluster.DirectCSIClient(session.STSSessionToken)
155153
if err != nil {
156-
return nil, restapi.PrepareError(err)
154+
return nil, prepareError(err)
157155
}
158156

159157
drives, err := getDirectCSIDriveList(ctx, client.DirectV1beta1())
160158
if err != nil {
161-
return nil, restapi.PrepareError(err)
159+
return nil, prepareError(err)
162160
}
163161
return drives, nil
164162
}
@@ -207,12 +205,12 @@ func getDirectCSIVolumesListResponse(session *models.Principal) (*models.GetDire
207205
ctx := context.Background()
208206
client, err := cluster.DirectCSIClient(session.STSSessionToken)
209207
if err != nil {
210-
return nil, restapi.PrepareError(err)
208+
return nil, prepareError(err)
211209
}
212210

213211
volumes, err := getDirectCSIVolumesList(ctx, client.DirectV1beta1())
214212
if err != nil {
215-
return nil, restapi.PrepareError(err)
213+
return nil, prepareError(err)
216214
}
217215
return volumes, nil
218216
}
@@ -308,12 +306,12 @@ func formatVolumesResponse(session *models.Principal, params operator_api.Direct
308306
ctx := context.Background()
309307
client, err := cluster.DirectCSIClient(session.STSSessionToken)
310308
if err != nil {
311-
return nil, restapi.PrepareError(err)
309+
return nil, prepareError(err)
312310
}
313311

314312
formatResult, errFormat := formatDrives(ctx, client.DirectV1beta1(), params.Body.Drives, *params.Body.Force)
315313
if errFormat != nil {
316-
return nil, restapi.PrepareError(errFormat)
314+
return nil, prepareError(errFormat)
317315
}
318316
return formatResult, nil
319317
}

‎operatorapi/operator_login.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ func getLoginResponse(lr *models.LoginRequest) (*models.LoginResponse, *models.E
163163
// prepare console credentials
164164
consolCreds, err := getConsoleCredentials(ctx, *lr.AccessKey, *lr.SecretKey)
165165
if err != nil {
166-
return nil, PrepareError(errInvalidCredentials, nil, err)
166+
return nil, prepareError(errInvalidCredentials, nil, err)
167167
}
168168
sessionID, err := login(consolCreds)
169169
if err != nil {
170-
return nil, PrepareError(errInvalidCredentials, nil, err)
170+
return nil, prepareError(errInvalidCredentials, nil, err)
171171
}
172172
// serialize output
173173
loginResponse := &models.LoginResponse{
@@ -188,7 +188,7 @@ func getLoginDetailsResponse() (*models.LoginDetails, *models.Error) {
188188
// initialize new oauth2 client
189189
oauth2Client, err := oauth2.NewOauth2ProviderClient(ctx, nil, restapi.GetConsoleSTSClient())
190190
if err != nil {
191-
return nil, PrepareError(err)
191+
return nil, prepareError(err)
192192
}
193193
// Validate user against IDP
194194
identityProvider := &auth.IdentityProvider{Client: oauth2Client}
@@ -208,12 +208,12 @@ func getLoginOauth2AuthResponse() (*models.LoginResponse, *models.Error) {
208208

209209
creds, err := restapi.NewConsoleCredentials("", getK8sSAToken(), "")
210210
if err != nil {
211-
return nil, PrepareError(err)
211+
return nil, prepareError(err)
212212
}
213213
credentials := restapi.ConsoleCredentials{ConsoleCredentials: creds, Actions: []string{}}
214214
token, err := login(credentials)
215215
if err != nil {
216-
return nil, PrepareError(errInvalidCredentials, nil, err)
216+
return nil, prepareError(errInvalidCredentials, nil, err)
217217
}
218218
// serialize output
219219
loginResponse := &models.LoginResponse{
@@ -226,12 +226,12 @@ func getLoginOauth2AuthResponse() (*models.LoginResponse, *models.Error) {
226226
func getLoginOperatorResponse(lmr *models.LoginOperatorRequest) (*models.LoginResponse, *models.Error) {
227227
creds, err := restapi.NewConsoleCredentials("", *lmr.Jwt, "")
228228
if err != nil {
229-
return nil, PrepareError(err)
229+
return nil, prepareError(err)
230230
}
231231
consoleCreds := restapi.ConsoleCredentials{ConsoleCredentials: creds, Actions: []string{}}
232232
token, err := login(consoleCreds)
233233
if err != nil {
234-
return nil, PrepareError(errInvalidCredentials, nil, err)
234+
return nil, prepareError(errInvalidCredentials, nil, err)
235235
}
236236
// serialize output
237237
loginResponse := &models.LoginResponse{

‎operatorapi/operator_namespaces.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"errors"
2222

2323
"github.com/minio/console/operatorapi/operations/operator_api"
24-
"github.com/minio/console/restapi"
2524

2625
"github.com/go-openapi/runtime/middleware"
2726
"github.com/minio/console/cluster"
@@ -50,15 +49,15 @@ func getNamespaceCreatedResponse(session *models.Principal, params operator_api.
5049
clientset, err := cluster.K8sClient(session.STSSessionToken)
5150

5251
if err != nil {
53-
return restapi.PrepareError(err)
52+
return prepareError(err)
5453
}
5554

5655
namespace := *params.Body.Name
5756

5857
errCreation := getNamespaceCreated(ctx, clientset.CoreV1(), namespace)
5958

6059
if errCreation != nil {
61-
return restapi.PrepareError(errCreation)
60+
return prepareError(errCreation)
6261
}
6362

6463
return nil

‎operatorapi/operator_nodes.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/minio/minio-go/v7/pkg/set"
2424

2525
"github.com/minio/console/operatorapi/operations/operator_api"
26-
"github.com/minio/console/restapi"
2726

2827
"github.com/minio/console/cluster"
2928

@@ -136,12 +135,12 @@ func min(x, y int64) int64 {
136135
func getMaxAllocatableMemoryResponse(ctx context.Context, session *models.Principal, numNodes int32) (*models.MaxAllocatableMemResponse, *models.Error) {
137136
client, err := cluster.K8sClient(session.STSSessionToken)
138137
if err != nil {
139-
return nil, restapi.PrepareError(err)
138+
return nil, prepareError(err)
140139
}
141140

142141
clusterResources, err := getMaxAllocatableMemory(ctx, client.CoreV1(), numNodes)
143142
if err != nil {
144-
return nil, restapi.PrepareError(err)
143+
return nil, prepareError(err)
145144
}
146145
return clusterResources, nil
147146
}
@@ -176,12 +175,12 @@ func getNodeLabels(ctx context.Context, clientset v1.CoreV1Interface) (*models.N
176175
func getNodeLabelsResponse(ctx context.Context, session *models.Principal) (*models.NodeLabels, *models.Error) {
177176
client, err := cluster.K8sClient(session.STSSessionToken)
178177
if err != nil {
179-
return nil, restapi.PrepareError(err)
178+
return nil, prepareError(err)
180179
}
181180

182181
clusterResources, err := getNodeLabels(ctx, client.CoreV1())
183182
if err != nil {
184-
return nil, restapi.PrepareError(err)
183+
return nil, prepareError(err)
185184
}
186185
return clusterResources, nil
187186
}

‎operatorapi/operator_parity.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func getParityResponse(params operator_api.GetParityParams) (models.ParityRespon
5656
parityValues, err := GetParityInfo(nodes, disksPerNode)
5757
if err != nil {
5858
restapi.LogError("error getting parity info: %v", err)
59-
return nil, restapi.PrepareError(err)
59+
return nil, prepareError(err)
6060
}
6161

6262
return parityValues, nil

‎operatorapi/operator_session.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func registerSessionHandlers(api *operations.OperatorAPI) {
3939
func getSessionResponse(session *models.Principal) (*models.SessionResponse, *models.Error) {
4040
// serialize output
4141
if session == nil {
42-
return nil, PrepareError(errorGenericInvalidSession)
42+
return nil, prepareError(errorGenericInvalidSession)
4343
}
4444
sessionResp := &models.SessionResponse{
4545
Pages: acl.GetAuthorizedEndpoints(session.Actions),

‎operatorapi/operator_subscription.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@ func getOperatorSubscriptionActivateResponse(session *models.Principal, namespac
8585
defer cancel()
8686
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
8787
if err != nil {
88-
return restapi.PrepareError(restapi.ErrorGeneric, nil, err)
88+
return prepareError(restapi.ErrorGeneric, nil, err)
8989
}
9090
clientSet, err := cluster.K8sClient(session.STSSessionToken)
9191
if err != nil {
92-
return restapi.PrepareError(restapi.ErrorGeneric, nil, err)
92+
return prepareError(restapi.ErrorGeneric, nil, err)
9393
}
9494
opClient := &operatorClient{
9595
client: opClientClientSet,
9696
}
9797
minTenant, err := getTenant(ctx, opClient, namespace, tenant)
9898
if err != nil {
99-
return restapi.PrepareError(err, restapi.ErrorGeneric)
99+
return prepareError(err, restapi.ErrorGeneric)
100100
}
101101
// If console is not deployed for this tenant return an error
102102
if minTenant.Spec.Console == nil {
103-
return restapi.PrepareError(restapi.ErrorGenericNotFound)
103+
return prepareError(restapi.ErrorGenericNotFound)
104104
}
105105

106106
// configure kubernetes client
@@ -110,11 +110,11 @@ func getOperatorSubscriptionActivateResponse(session *models.Principal, namespac
110110
// Get cluster subscription license
111111
license, err := getSubscriptionLicense(ctx, &k8sClient, cluster.Namespace, restapi.OperatorSubnetLicenseSecretName)
112112
if err != nil {
113-
return restapi.PrepareError(errInvalidCredentials, nil, err)
113+
return prepareError(errInvalidCredentials, nil, err)
114114
}
115115
// add subscription license to existing console Tenant
116116
if err = addSubscriptionLicenseToTenant(ctx, &k8sClient, license, namespace, tenant, minTenant.Spec.Console.ConsoleSecret.Name); err != nil {
117-
return restapi.PrepareError(err, restapi.ErrorGeneric)
117+
return prepareError(err, restapi.ErrorGeneric)
118118
}
119119
return nil
120120
}
@@ -228,35 +228,35 @@ func getSubscriptionRefreshResponse(session *models.Principal) (*models.License,
228228
}
229229
licenseKey, err := retrieveLicense(context.Background(), session.STSSessionToken)
230230
if err != nil {
231-
return nil, PrepareError(errLicenseNotFound, nil, err)
231+
return nil, prepareError(errLicenseNotFound, nil, err)
232232
}
233233
newLicenseInfo, licenseRaw, err := subscriptionRefresh(client, licenseKey)
234234
if err != nil {
235-
return nil, PrepareError(errLicenseNotFound, nil, err)
235+
return nil, prepareError(errLicenseNotFound, nil, err)
236236
}
237237
// configure kubernetes client
238238
clientSet, err := cluster.K8sClient(session.STSSessionToken)
239239
if err != nil {
240-
return nil, PrepareError(errLicenseNotFound, nil, err)
240+
return nil, prepareError(errLicenseNotFound, nil, err)
241241
}
242242
k8sClient := k8sClient{
243243
client: clientSet,
244244
}
245245
// save license key to k8s and restart all console pods
246246
if err = saveSubscriptionLicense(ctx, &k8sClient, licenseRaw); err != nil {
247-
return nil, PrepareError(restapi.ErrorGeneric, nil, err)
247+
return nil, prepareError(restapi.ErrorGeneric, nil, err)
248248
}
249249
// update license for all existing tenants
250250
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
251251
if err != nil {
252-
return nil, PrepareError(err)
252+
return nil, prepareError(err)
253253
}
254254
opClient := &operatorClient{
255255
client: opClientClientSet,
256256
}
257257
tenants, err := listTenants(ctx, opClient, "", nil)
258258
if err != nil {
259-
return nil, PrepareError(err)
259+
return nil, prepareError(err)
260260
}
261261
// iterate over all tenants, update console configuration and restart console pods
262262
for _, tenant := range tenants.Tenants {

0 commit comments

Comments
 (0)