Skip to content

Commit 843ce7e

Browse files
authored
Merge branch 'akitasoftware:main' into main (#6)
2 parents cc1fd38 + d9587d3 commit 843ce7e

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

util/util.go

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ func GetServiceIDByName(c rest.FrontClient, name string) (akid.ServiceID, error)
100100
func GetServiceNameByServiceID(c rest.FrontClient, serviceID akid.ServiceID) (string, error) {
101101
unexpectedErrMsg := "Something went wrong while starting the Agent. " +
102102
"Please contact Postman support (" + consts.SupportEmail + ") with the error details"
103-
failedToVerifyServiceErrMsg := "Failed to verify service for given serviceID: %s\n"
103+
failedToGetProjectErrMsg := "Failed to get project for given projectID: %s\n"
104104

105105
// Check if service is already verified and cached
106106
if service, found := serviceIDCache.Get(serviceID.String()); found {
107-
printer.Stderr.Debugf("Cached service %v for serviceID %s\n", service, akid.String(serviceID))
107+
printer.Stderr.Debugf("Cached project %v for projectID %s\n", service, akid.String(serviceID))
108108
return service.(rest.InsightsService).Name, nil
109109
}
110110

@@ -115,23 +115,23 @@ func GetServiceNameByServiceID(c rest.FrontClient, serviceID akid.ServiceID) (st
115115
if err != nil {
116116
httpErr, ok := err.(rest.HTTPError)
117117
if !ok {
118-
printer.Stderr.Debugf(failedToVerifyServiceErrMsg, err)
118+
printer.Stderr.Debugf(failedToGetProjectErrMsg, err)
119119
return "", errors.Wrap(err, unexpectedErrMsg)
120120
}
121121

122122
var errorResponse rest.ErrorResponse
123123
if err := json.Unmarshal(httpErr.Body, &errorResponse); err != nil {
124-
printer.Stderr.Debugf(failedToVerifyServiceErrMsg, err)
124+
printer.Stderr.Debugf(failedToGetProjectErrMsg, err)
125125
return "", errors.Wrap(err, unexpectedErrMsg)
126126
}
127127

128128
if httpErr.StatusCode == 404 {
129129
//lint:ignore ST1005 This is a user-facing error message
130-
return "", fmt.Errorf("There is no service with given ID %s. Ensure that your service ID is correct", serviceID)
130+
return "", fmt.Errorf("There is no project with given ID %s. Ensure that your projectID is correct", serviceID)
131131
} else if httpErr.StatusCode == 403 {
132132
//lint:ignore ST1005 This is a user-facing error message
133-
return "", fmt.Errorf("You cannot send traffic to the service with ID %s. "+
134-
"Ensure that your service ID is correct and that you have required permissions. "+
133+
return "", fmt.Errorf("You cannot send traffic to the project with ID %s. "+
134+
"Ensure that your projectID is correct and that you have required permissions. "+
135135
"If you do not have required permissions, please contact the workspace administrator", serviceID)
136136
}
137137

@@ -175,7 +175,7 @@ func GetOrCreateServiceIDByPostmanCollectionID(c rest.FrontClient, collectionID
175175
collectionID = strings.ToLower(collectionID)
176176
unexpectedErrMsg := "Something went wrong while starting the Agent. " +
177177
"Please contact Postman support (" + consts.SupportEmail + ") with the error details"
178-
failedToCreateServiceErrMsg := "Failed to create service for given collectionID: %s\n"
178+
failedToCreateProjectErrMsg := "Failed to create project for given collectionID: %s\n"
179179

180180
if id, found := postmanCollectionIDCache.Get(collectionID); found {
181181
printer.Stderr.Debugf("Cached collectionID %q is %q\n", collectionID, akid.String(id.(akid.ServiceID)))
@@ -188,47 +188,48 @@ func GetOrCreateServiceIDByPostmanCollectionID(c rest.FrontClient, collectionID
188188

189189
serviceID, err := GetServiceIDByPostmanCollectionID(c, ctx, collectionID)
190190
if err != nil {
191-
printer.Stderr.Debugf("Failed to get list of services associated with the API Key: %s\n", err)
191+
printer.Stderr.Debugf("Failed to get list of projects associated with the API Key: %s\n", err)
192192
return akid.ServiceID{}, errors.Wrap(err, unexpectedErrMsg)
193193
}
194194

195195
if (serviceID != akid.ServiceID{}) {
196-
printer.Stderr.Debugf("ServiceID for Postman collectionID %q is %q\n", collectionID, serviceID)
196+
printer.Stderr.Debugf("ProjectID for given Postman collectionID %q is %q\n", collectionID, serviceID)
197197
postmanCollectionIDCache.Set(collectionID, serviceID, cache.DefaultExpiration)
198198
return serviceID, nil
199199
}
200200

201201
name := postmanRandomName()
202-
printer.Debugf("Found no service for given collectionID: %s, creating a new service %q\n", collectionID, name)
202+
printer.Debugf("Found no project for given collectionID: %s, creating a new project %q\n", collectionID, name)
203203
// Create service for given postman collectionID
204204
resp, err := c.CreateService(ctx, name, collectionID)
205205
if err != nil {
206206
httpErr, ok := err.(rest.HTTPError)
207207
if !ok {
208-
printer.Stderr.Debugf(failedToCreateServiceErrMsg, err)
208+
printer.Stderr.Debugf(failedToCreateProjectErrMsg, err)
209209
return akid.ServiceID{}, errors.Wrap(err, unexpectedErrMsg)
210210
}
211211

212212
var errorResponse rest.ErrorResponse
213213
if err := json.Unmarshal(httpErr.Body, &errorResponse); err != nil {
214-
printer.Stderr.Debugf(failedToCreateServiceErrMsg, err)
214+
printer.Stderr.Debugf(failedToCreateProjectErrMsg, err)
215215
return akid.ServiceID{}, errors.Wrap(err, unexpectedErrMsg)
216216
}
217217

218218
if httpErr.StatusCode == 409 && errorResponse.Message == "collection_already_mapped" {
219219
serviceID, err := GetServiceIDByPostmanCollectionID(c, ctx, collectionID)
220220
if err != nil {
221-
printer.Stderr.Debugf(failedToCreateServiceErrMsg, err)
221+
printer.Stderr.Debugf(failedToCreateProjectErrMsg, err)
222222
return akid.ServiceID{}, errors.Wrap(err, unexpectedErrMsg)
223223
}
224224

225225
if (serviceID != akid.ServiceID{}) {
226-
printer.Stderr.Debugf("ServiceID for Postman collectionID %q is %q\n", collectionID, serviceID)
226+
printer.Stderr.Debugf("ProjectID for Postman collectionID %q is %q\n", collectionID, serviceID)
227227
postmanCollectionIDCache.Set(collectionID, serviceID, cache.DefaultExpiration)
228228
return serviceID, nil
229229
}
230230

231231
} else if httpErr.StatusCode == 403 {
232+
//lint:ignore ST1005 This is a user-facing error message
232233
error := fmt.Errorf("you cannot send traffic to the collection with ID %s. "+
233234
"Ensure that your collection ID is correct and that you have edit permissions on the collection. "+
234235
"If you do not have edit permissions, please contact the workspace administrator to add you as a collection editor.", collectionID)
@@ -238,7 +239,7 @@ func GetOrCreateServiceIDByPostmanCollectionID(c rest.FrontClient, collectionID
238239
return akid.ServiceID{}, errors.Wrap(err, unexpectedErrMsg)
239240
}
240241

241-
printer.Debugf("Got service ID %s\n", resp.ResourceID)
242+
printer.Debugf("Got projectID %s\n", resp.ResourceID)
242243
postmanCollectionIDCache.Set(collectionID, resp.ResourceID, cache.DefaultExpiration)
243244

244245
return resp.ResourceID, nil

0 commit comments

Comments
 (0)