Updates API routes to use plural 'groups' for credential group endpoints (145acb2c) · Commits · NDIP / Galaxy

client/src/api/schema/schema.ts

+5 −5

Original line number	Diff line number	Diff line
		@@ -5211,7 +5211,7 @@ export interface paths {
		patch?: never;
		trace?: never;
		};
		"/api/users/{user_id}/credentials/{user_credentials_id}/group/{group_id}": {
		"/api/users/{user_id}/credentials/{user_credentials_id}/groups/{group_id}": {
		parameters: {
		query?: never;
		header?: never;
		@@ -5220,10 +5220,10 @@ export interface paths {
		};
		get?: never;
		/** Updates user credentials */
		put: operations["update_user_credentials_api_users__user_id__credentials__user_credentials_id__group__group_id__put"];
		put: operations["update_user_credentials_api_users__user_id__credentials__user_credentials_id__groups__group_id__put"];
		post?: never;
		/** Deletes a specific credential group */
		delete: operations["delete_credentials_api_users__user_id__credentials__user_credentials_id__group__group_id__delete"];
		delete: operations["delete_credentials_api_users__user_id__credentials__user_credentials_id__groups__group_id__delete"];
		options?: never;
		head?: never;
		patch?: never;
		@@ -40498,7 +40498,7 @@ export interface operations {
		};
		};
		};
		update_user_credentials_api_users__user_id__credentials__user_credentials_id__group__group_id__put: {
		update_user_credentials_api_users__user_id__credentials__user_credentials_id__groups__group_id__put: {
		parameters: {
		query?: never;
		header?: {
		@@ -40547,7 +40547,7 @@ export interface operations {
		};
		};
		};
		delete_credentials_api_users__user_id__credentials__user_credentials_id__group__group_id__delete: {
		delete_credentials_api_users__user_id__credentials__user_credentials_id__groups__group_id__delete: {
		parameters: {
		query?: never;
		header?: {

client/src/composables/userToolCredentials.test.ts

+2 −2

Original line number	Diff line number	Diff line
		@@ -185,14 +185,14 @@ describe("useUserToolCredentials", () => {
		return response(200).json(TEST_CREDENTIALS_GROUP);
		}),

		http.put("/api/users/{user_id}/credentials/{user_credentials_id}/group/{group_id}", ({ response }) => {
		http.put("/api/users/{user_id}/credentials/{user_credentials_id}/groups/{group_id}", ({ response }) => {
		return response(200).json({
		...TEST_CREDENTIALS_GROUP,
		variables: [{ name: "bucket_name", value: "updated-bucket" }],
		});
		}),

		http.delete("/api/users/{user_id}/credentials/{user_credentials_id}/group/{group_id}", ({ response }) => {
		http.delete("/api/users/{user_id}/credentials/{user_credentials_id}/groups/{group_id}", ({ response }) => {
		return response(204).empty();
		}),

client/src/stores/userToolsServiceCredentialsStore.ts

+2 −2

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@ export const useUserToolsServiceCredentialsStore = defineStore("userToolsService

		try {
		const { data, error } = await GalaxyApi().PUT(
		"/api/users/{user_id}/credentials/{user_credentials_id}/group/{group_id}",
		"/api/users/{user_id}/credentials/{user_credentials_id}/groups/{group_id}",
		{
		params: {
		path: { user_id: userId, user_credentials_id: toolServicesId, group_id: groupId },
		@@ -454,7 +454,7 @@ export const useUserToolsServiceCredentialsStore = defineStore("userToolsService

		try {
		const { error } = await GalaxyApi().DELETE(
		"/api/users/{user_id}/credentials/{user_credentials_id}/group/{group_id}",
		"/api/users/{user_id}/credentials/{user_credentials_id}/groups/{group_id}",
		{
		params: {
		path: { user_id: userId, user_credentials_id: toolServicesId, group_id: groupId },

lib/galaxy/webapps/galaxy/api/credentials.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ class FastAPICredentials:
		return self.service.provide_credential(trans, user_id, payload)

		@router.put(
		"/api/users/{user_id}/credentials/{user_credentials_id}/group/{group_id}",
		"/api/users/{user_id}/credentials/{user_credentials_id}/groups/{group_id}",
		summary="Updates user credentials",
		)
		def update_user_credentials(
		@@ -126,7 +126,7 @@ class FastAPICredentials:
		return Response(status_code=status.HTTP_204_NO_CONTENT)

		@router.delete(
		"/api/users/{user_id}/credentials/{user_credentials_id}/group/{group_id}",
		"/api/users/{user_id}/credentials/{user_credentials_id}/groups/{group_id}",
		summary="Deletes a specific credential group",
		status_code=status.HTTP_204_NO_CONTENT,
		)

test/integration/test_credentials.py

+5 −5

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ class TestCredentialsApi(integration_util.IntegrationTestCase, integration_util.
		assert list_user_credentials[0]["current_group_id"] == target_group_id

		# Delete the group
		response = self._delete(f"/api/users/current/credentials/{user_credentials_id}/group/{target_group_id}")
		response = self._delete(f"/api/users/current/credentials/{user_credentials_id}/groups/{target_group_id}")
		self._assert_status_code_is(response, 204)

		# Check group is deleted - should only have our initial group left
		@@ -330,7 +330,7 @@ class TestCredentialsApi(integration_util.IntegrationTestCase, integration_util.
		self._assert_status_code_is(response, 400)

		def test_delete_nonexistent_credentials_group(self):
		response = self._delete("/api/users/current/credentials/f2db41e1fa331b3e/group/f2db41e1fa331b3e")
		response = self._delete("/api/users/current/credentials/f2db41e1fa331b3e/groups/f2db41e1fa331b3e")
		self._assert_status_code_is(response, 400)

		@skip_without_tool(CREDENTIALS_TEST_TOOL)
		@@ -343,7 +343,7 @@ class TestCredentialsApi(integration_util.IntegrationTestCase, integration_util.
		user_credentials_list = self._check_credentials_exist()
		user_credentials_id = user_credentials_list[0]["id"]

		response = self._delete(f"/api/users/current/credentials/{user_credentials_id}/group/{group_id}")
		response = self._delete(f"/api/users/current/credentials/{user_credentials_id}/groups/{group_id}")
		self._assert_status_code_is(response, 204)

		@skip_without_tool(CREDENTIALS_TEST_TOOL)
		@@ -450,7 +450,7 @@ class TestCredentialsApi(integration_util.IntegrationTestCase, integration_util.
		# Delete the credentials group
		user_credentials_id = credentials_list[0]["id"]
		group_id = group["id"]
		response = self._delete(f"/api/users/current/credentials/{user_credentials_id}/group/{group_id}")
		response = self._delete(f"/api/users/current/credentials/{user_credentials_id}/groups/{group_id}")
		self._assert_status_code_is(response, 204)

		# Check that secrets are removed from the vault
		@@ -497,7 +497,7 @@ class TestCredentialsApi(integration_util.IntegrationTestCase, integration_util.
		def _update_credentials(self, user_credentials_id, group_id, payload=None, status_code=200):
		payload = payload or self._build_update_credentials_payload()
		response = self._put(
		f"/api/users/current/credentials/{user_credentials_id}/group/{group_id}", data=payload, json=True
		f"/api/users/current/credentials/{user_credentials_id}/groups/{group_id}", data=payload, json=True
		)
		self._assert_status_code_is(response, status_code)
		return response.json()