fix: add name as an identification field (WORKBENCH-4488)

doc/wbctl cancel job-submission.md

@@ -1,5 +1,5 @@
 <pre>
-Cancels the Job-Submission resources identified by a list of resource ids. At least one id is required.
+Cancels the Job-Submission resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl cancel job-submission [flags]

doc/wbctl delete images.md

@@ -1,5 +1,5 @@
 <pre>
-Deletes the Image resources identified by a list of resource ids. At least one id is required.
+Deletes the Image resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl delete images [flags]

doc/wbctl delete job-submissions.md

@@ -1,5 +1,5 @@
 <pre>
-Deletes the Job-Submission resources identified by a list of resource ids. At least one id is required.
+Deletes the Job-Submission resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl delete job-submissions [flags]

doc/wbctl delete jobs.md

@@ -1,5 +1,5 @@
 <pre>
-Deletes the Job resources identified by a list of resource ids. At least one id is required.
+Deletes the Job resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl delete jobs [flags]

doc/wbctl delete snapshots.md

@@ -1,5 +1,5 @@
 <pre>
-Deletes the Snapshot resources identified by a list of resource ids. At least one id is required.
+Deletes the Snapshot resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl delete snapshots [flags]

doc/wbctl delete volumes.md

@@ -1,5 +1,5 @@
 <pre>
-Deletes the Volume resources identified by a list of resource ids. At least one id is required.
+Deletes the Volume resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl delete volumes [flags]

doc/wbctl delete workbenches.md

@@ -1,5 +1,5 @@
 <pre>
-Deletes the Workbench resources identified by a list of resource ids. At least one id is required.
+Deletes the Workbench resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl delete workbenches [flags]

doc/wbctl describe image-builds.md

@@ -1,5 +1,5 @@
 <pre>
-Print detailed information about the Image-Build resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print detailed information about the Image-Build resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl describe image-builds [flags]

doc/wbctl describe images.md

@@ -1,5 +1,5 @@
 <pre>
-Print detailed information about the Image resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print detailed information about the Image resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl describe images [flags]

doc/wbctl describe job-submissions.md

@@ -1,5 +1,5 @@
 <pre>
-Print detailed information about the Job-Submission resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print detailed information about the Job-Submission resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl describe job-submissions [flags]

doc/wbctl describe jobs.md

@@ -1,5 +1,5 @@
 <pre>
-Print detailed information about the Job resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print detailed information about the Job resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl describe jobs [flags]

doc/wbctl describe snapshots.md

@@ -1,5 +1,5 @@
 <pre>
-Print detailed information about the Snapshot resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print detailed information about the Snapshot resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl describe snapshots [flags]

doc/wbctl describe volumes.md

@@ -1,5 +1,5 @@
 <pre>
-Print detailed information about the Volume resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print detailed information about the Volume resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl describe volumes [flags]

doc/wbctl describe workbenches.md

@@ -1,5 +1,5 @@
 <pre>
-Print detailed information about the Workbench resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print detailed information about the Workbench resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl describe workbenches [flags]

doc/wbctl edit image.md

@@ -1,5 +1,5 @@
 <pre>
-Edit one Image resource identified by id. One and only one id is required.
+Edit one Image resource identified by id or name. One and only one id or name is required.
 
 Usage:
   wbctl edit image [flags]

doc/wbctl edit job.md

@@ -1,5 +1,5 @@
 <pre>
-Edit one Job resource identified by id. One and only one id is required.
+Edit one Job resource identified by id or name. One and only one id or name is required.
 
 Usage:
   wbctl edit job [flags]

doc/wbctl edit snapshot.md

@@ -1,5 +1,5 @@
 <pre>
-Edit one Snapshot resource identified by id. One and only one id is required.
+Edit one Snapshot resource identified by id or name. One and only one id or name is required.
 
 Usage:
   wbctl edit snapshot [flags]

doc/wbctl edit volume.md

@@ -1,5 +1,5 @@
 <pre>
-Edit one Volume resource identified by id. One and only one id is required.
+Edit one Volume resource identified by id or name. One and only one id or name is required.
 
 Usage:
   wbctl edit volume [flags]

doc/wbctl edit workbench.md

@@ -1,5 +1,5 @@
 <pre>
-Edit one Workbench resource identified by id. One and only one id is required.
+Edit one Workbench resource identified by id or name. One and only one id or name is required.
 
 Usage:
   wbctl edit workbench [flags]

doc/wbctl get image-builds.md

@@ -1,5 +1,5 @@
 <pre>
-Print a table of basic information about the Image-Build resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print a table of basic information about the Image-Build resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl get image-builds [flags]

doc/wbctl get images.md

@@ -1,5 +1,5 @@
 <pre>
-Print a table of basic information about the Image resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print a table of basic information about the Image resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl get images [flags]

doc/wbctl get job-submissions.md

@@ -1,5 +1,5 @@
 <pre>
-Print a table of basic information about the Job-Submission resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print a table of basic information about the Job-Submission resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl get job-submissions [flags]

doc/wbctl get jobs.md

@@ -1,5 +1,5 @@
 <pre>
-Print a table of basic information about the Job resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print a table of basic information about the Job resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl get jobs [flags]

doc/wbctl get snapshots.md

@@ -1,5 +1,5 @@
 <pre>
-Print a table of basic information about the Snapshot resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print a table of basic information about the Snapshot resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl get snapshots [flags]

doc/wbctl get volumes.md

@@ -1,5 +1,5 @@
 <pre>
-Print a table of basic information about the Volume resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print a table of basic information about the Volume resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl get volumes [flags]

doc/wbctl get workbenches.md

@@ -1,5 +1,5 @@
 <pre>
-Print a table of basic information about the Workbench resources identified by an optional list of resource ids. All resources printed if no ids provided.
+Print a table of basic information about the Workbench resources identified by an optional list of resource ids or names. All resources printed if no ids or names provided.
 
 Usage:
   wbctl get workbenches [flags]

doc/wbctl logs image-builds.md

@@ -1,5 +1,5 @@
 <pre>
-Print the log of the Image-Build resources identified a list of resource ids. At least one id is required.
+Print the log of the Image-Build resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl logs image-builds [flags]

doc/wbctl logs job-submissions.md

@@ -1,5 +1,5 @@
 <pre>
-Print the log of the Job-Submission resources identified a list of resource ids. At least one id is required.
+Print the log of the Job-Submission resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl logs job-submissions [flags]

doc/wbctl rebuild images.md

@@ -1,5 +1,5 @@
 <pre>
-Rebuild the Image resources identified by a list of resource ids. At least one id is required.
+Rebuild the Image resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl rebuild images [flags]

doc/wbctl start jobs.md

@@ -1,5 +1,5 @@
 <pre>
-Start the Job-Submission resources identified by a list of resource ids. At least one id is required.
+Start the Job-Submission resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl start jobs [flags]

doc/wbctl start workbenches.md

@@ -1,5 +1,5 @@
 <pre>
-Start the Workbench resources identified by a list of resource ids. At least one id is required.
+Start the Workbench resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl start workbenches [flags]

doc/wbctl stop job-submission.md

@@ -1,5 +1,5 @@
 <pre>
-Cancels the Job-Submission resources identified by a list of resource ids. At least one id is required.
+Cancels the Job-Submission resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl stop job-submission [flags]

doc/wbctl stop workbenches.md

@@ -1,5 +1,5 @@
 <pre>
-Stop the Workbench resources identified by a list of resource ids. At least one id is required.
+Stop the Workbench resources identified by a list of resource ids or names. At least one id or name is required.
 
 Usage:
   wbctl stop workbenches [flags]

doc/wbctl update images.md

@@ -1,5 +1,5 @@
 <pre>
-Updates all the Image resources identified by a list of ids with the options provided.
+Updates all the Image resources identified by a list of ids or names with the options provided.
 
 Usage:
   wbctl update images [flags]

doc/wbctl update jobs.md

@@ -1,5 +1,5 @@
 <pre>
-Updates all the Job resources identified by a list of ids with the options provided.
+Updates all the Job resources identified by a list of ids or names with the options provided.
 
 Usage:
   wbctl update jobs [flags]

doc/wbctl update snapshots.md

@@ -1,5 +1,5 @@
 <pre>
-Updates all the Snapshot resources identified by a list of ids with the options provided.
+Updates all the Snapshot resources identified by a list of ids or names with the options provided.
 
 Usage:
   wbctl update snapshots [flags]

doc/wbctl update volumes.md

@@ -1,5 +1,5 @@
 <pre>
-Updates all the Volume resources identified by a list of ids with the options provided.
+Updates all the Volume resources identified by a list of ids or names with the options provided.
 
 Usage:
   wbctl update volumes [flags]

doc/wbctl update workbenches.md

@@ -1,5 +1,5 @@
 <pre>
-Updates all the Workbench resources identified by a list of ids with the options provided.
+Updates all the Workbench resources identified by a list of ids or names with the options provided.
 
 Usage:
   wbctl update workbenches [flags]

internal/cmd/cancel/cancel_test.go

@@ -35,7 +35,8 @@ const (
 	cancelTestControllerID1        = "controller-1"
 	cancelTestControllerID2        = "controller-2"
 	cancelTestGetJobSubmissionsErr = "" +
-		"GET ${URL}/postgrest/job_runs?controller_id=in.%28controller-1%2Ccontroller-2%29 failed" +
+		"GET ${URL}/postgrest/job_runs?or=%28controller_id.in.%28controller-1%2Ccontroller-2%29" +
+		"%2Cjob_name.in.%28controller-1%2Ccontroller-2%29%29 failed" +
 		"\n Caused by:" +
 		"\n\t* unexpected EOF"
 	cancelTestBulkCancelErr = "" +
@@ -51,7 +52,8 @@ const (
 	expectedInvalidEndpointErr              = "failed to get device token" +
 		"\n Caused by:" +
 		"\n\t* parse \"a\\nb\": net/url: invalid control character in URL"
-	cancelExpectedGetQuery = "controller_id=in.(controller-1,controller-2)"
+	cancelExpectedGetQuery = "or=(controller_id.in.(controller-1,controller-2)," +
+		"job_name.in.(controller-1,controller-2))"
 )
 
 var cancelExpectedDisplaysStoppedIDs = []string{

internal/cmd/create/image/image_test.go

@@ -56,6 +56,8 @@ const (
 	expectedCreateImageServerErr         = "POST ${URL}/postgrest/rpc/image_create failed\n" +
 		" Caused by:\n" +
 		"\t* 401 unauthorized"
+	expectedResolveImagesQueryOne   = `or=(controller_id.in.(img-cli-1),name.in.(img-cli-1))`
+	expectedResolveImagesQueryTwo   = `or=(controller_id.in.(img-cli-1,img-cli-2),name.in.(img-cli-1,img-cli-2))`
 	expectedUpdateImageDryRunOutput = `{
     "ids": [
         "img-cli-1",
@@ -120,7 +122,7 @@ const (
 	expectedInvalidEndpointErr = "failed to get device token" +
 		"\n Caused by:" +
 		"\n\t* parse \"a\\nb\": net/url: invalid control character in URL"
-	expectedInvlidDataplaneErr = "GET ${URL}/postgrest/dataplanes?id=in.%28invalid%29 failed" +
+	expectedInvalidDataplaneErr = "GET ${URL}/postgrest/dataplanes?id=in.%28invalid%29 failed" +
 		"\n Caused by:" +
 		"\n\t* 400 error"
 	expectedInvalidSpecErr            = "invalid character 'i' looking for beginning of value"
@@ -374,7 +376,7 @@ func TestCreateImageCommand(t *testing.T) {
 				dataplanesResponseBody:   `error`,
 			}),
 			expected: createExpected{
-				err:            expectedInvlidDataplaneErr,
+				err:            expectedInvalidDataplaneErr,
 				displays:       []string{stubs.ExpectedDeviceAuthDisplay},
 				dataplaneCalls: 1,
 			},
@@ -546,6 +548,8 @@ func TestUpdateImageCommand(t *testing.T) {
 			name:  "update success prints IDs only",
 			input: updateInput{args: []string{"img-cli-1"}},
 			mockEndpoints: getUpdateImageEndpoints(
+				expectedResolveImagesQueryOne,
+				`[{"id":"img-cli-1"}]`,
 				expectedUpdateImageRequestBodyIDsOnly,
 				http.StatusOK,
 				`[{"id":"img-a"},{"id":"img-b"}]`,
@@ -559,6 +563,8 @@ func TestUpdateImageCommand(t *testing.T) {
 			name:  "server error",
 			input: updateInput{args: []string{"img-cli-1"}},
 			mockEndpoints: getUpdateImageEndpoints(
+				expectedResolveImagesQueryOne,
+				`[{"id":"img-cli-1"}]`,
 				expectedUpdateImageRequestBodyIDsOnly,
 				http.StatusUnauthorized,
 				`unauthorized`,
@@ -594,6 +600,8 @@ func TestUpdateImageCommand(t *testing.T) {
 			name:  "ids only with empty body accepted",
 			input: updateInput{args: []string{"img-cli-1"}},
 			mockEndpoints: getUpdateImageEndpoints(
+				expectedResolveImagesQueryOne,
+				`[{"id":"img-cli-1"}]`,
 				expectedUpdateImageRequestBodyIDsOnly,
 				http.StatusOK,
 				`[{"id":"img-cli-1"}]`,
@@ -614,6 +622,8 @@ func TestUpdateImageCommand(t *testing.T) {
 				args:        []string{"img-cli-1", "img-cli-2"},
 			},
 			mockEndpoints: getUpdateImageEndpoints(
+				expectedResolveImagesQueryTwo,
+				`[{"id":"img-cli-1"},{"id":"img-cli-2"}]`,
 				expectedUpdateImageRequestBodyMapping,
 				http.StatusOK,
 				`[{"id":"img-cli-1"},{"id":"img-cli-2"}]`,
@@ -636,6 +646,8 @@ func TestUpdateImageCommand(t *testing.T) {
 				args:        []string{"img-cli-1"},
 			},
 			mockEndpoints: getUpdateImageEndpoints(
+				expectedResolveImagesQueryOne,
+				`[{"id":"img-cli-1"}]`,
 				expectedUpdateImageRequestBodyAllFlags,
 				http.StatusOK,
 				`[{"id":"img-cli-1"}]`,
@@ -806,12 +818,26 @@ func getUpdateArgs(
 }
 
 func getUpdateImageEndpoints(
+	expectedQuery string,
+	resolveResponseBody string,
 	expectedRequestBody string,
 	responseStatus int,
 	responseBody string,
 ) []stubs.StubHTTPEndpoint {
 	return append(stubs.GetStubAuthEndpoints(),
 		[]stubs.StubHTTPEndpoint{
+			{
+				Request: stubs.StubHTTPRequest{
+					Method:          http.MethodGet,
+					URL:             postgrest.Endpoint(constants.WorkbenchEndpointImages),
+					ExpectedHeaders: stubs.StubAuthHeaders,
+					ExpectedQuery:   expectedQuery,
+				},
+				Response: stubs.StubHTTPResponse{
+					Status: http.StatusOK,
+					Body:   resolveResponseBody,
+				},
+			},
 			{
 				Request: stubs.StubHTTPRequest{
 					Method:          http.MethodPost,