Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AIP-84 Post variable #42948

Merged
merged 1 commit into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions airflow/api_connexion/endpoints/variable_endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def patch_variable(
return variable_schema.dump(variable)


@mark_fastapi_migration_done
@security.requires_access_variable("POST")
@action_logging(
event=action_event_from_permission(
Expand Down
38 changes: 38 additions & 0 deletions airflow/api_fastapi/openapi/v1-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,44 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/public/variables/:
post:
tags:
- Variable
summary: Post Variable
description: Create a variable.
operationId: post_variable
requestBody:
content:
application/json:
schema:
$ref: '#/components/schemas/VariableBody'
required: true
responses:
'201':
description: Successful Response
content:
application/json:
schema:
$ref: '#/components/schemas/VariableResponse'
'401':
description: Unauthorized
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
'403':
description: Forbidden
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/public/dags/{dag_id}/dagRuns/{dag_run_id}:
get:
tags:
Expand Down
17 changes: 15 additions & 2 deletions airflow/api_fastapi/views/public/variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,23 @@ async def patch_variable(
if not variable:
raise HTTPException(404, f"The Variable with key: `{variable_key}` was not found")
if update_mask:
data = patch_body.dict(include=set(update_mask) - non_update_fields)
data = patch_body.model_dump(include=set(update_mask) - non_update_fields)
else:
data = patch_body.dict(exclude=non_update_fields)
data = patch_body.model_dump(exclude=non_update_fields)
for key, val in data.items():
setattr(variable, key, val)
session.add(variable)
return variable


@variables_router.post("/", status_code=201, responses=create_openapi_http_exception_doc([401, 403]))
async def post_variable(
post_body: VariableBody,
session: Annotated[Session, Depends(get_session)],
) -> VariableResponse:
"""Create a variable."""
Variable.set(**post_body.model_dump(), session=session)

variable = session.scalar(select(Variable).where(Variable.key == post_body.key).limit(1))

return VariableResponse.model_validate(variable, from_attributes=True)
3 changes: 3 additions & 0 deletions airflow/ui/openapi-gen/queries/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ export const UseDagRunServiceGetDagRunKeyFn = (
},
queryKey?: Array<unknown>,
) => [useDagRunServiceGetDagRunKey, ...(queryKey ?? [{ dagId, dagRunId }])];
export type VariableServicePostVariableMutationResult = Awaited<
ReturnType<typeof VariableService.postVariable>
>;
export type DagServicePatchDagsMutationResult = Awaited<
ReturnType<typeof DagService.patchDags>
>;
Expand Down
39 changes: 39 additions & 0 deletions airflow/ui/openapi-gen/queries/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,45 @@ export const useDagRunServiceGetDagRun = <
queryFn: () => DagRunService.getDagRun({ dagId, dagRunId }) as TData,
...options,
});
/**
* Post Variable
* Create a variable.
* @param data The data for the request.
* @param data.requestBody
* @returns VariableResponse Successful Response
* @throws ApiError
*/
export const useVariableServicePostVariable = <
TData = Common.VariableServicePostVariableMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
requestBody: VariableBody;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
requestBody: VariableBody;
},
TContext
>({
mutationFn: ({ requestBody }) =>
VariableService.postVariable({
requestBody,
}) as unknown as Promise<TData>,
...options,
});
/**
* Patch Dags
* Patch multiple DAGs.
Expand Down
26 changes: 26 additions & 0 deletions airflow/ui/openapi-gen/requests/services.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import type {
GetVariableResponse,
PatchVariableData,
PatchVariableResponse,
PostVariableData,
PostVariableResponse,
GetDagRunData,
GetDagRunResponse,
DeleteDagRunData,
Expand Down Expand Up @@ -400,6 +402,30 @@ export class VariableService {
},
});
}

/**
* Post Variable
* Create a variable.
* @param data The data for the request.
* @param data.requestBody
* @returns VariableResponse Successful Response
* @throws ApiError
*/
public static postVariable(
data: PostVariableData,
): CancelablePromise<PostVariableResponse> {
return __request(OpenAPI, {
method: "POST",
url: "/public/variables/",
body: data.requestBody,
mediaType: "application/json",
errors: {
401: "Unauthorized",
403: "Forbidden",
422: "Validation Error",
},
});
}
}

export class DagRunService {
Expand Down
29 changes: 29 additions & 0 deletions airflow/ui/openapi-gen/requests/types.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,12 @@ export type PatchVariableData = {

export type PatchVariableResponse = VariableResponse;

export type PostVariableData = {
requestBody: VariableBody;
};

export type PostVariableResponse = VariableResponse;

export type GetDagRunData = {
dagId: string;
dagRunId: string;
Expand Down Expand Up @@ -684,6 +690,29 @@ export type $OpenApiTs = {
};
};
};
"/public/variables/": {
post: {
req: PostVariableData;
res: {
/**
* Successful Response
*/
201: VariableResponse;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/public/dags/{dag_id}/dagRuns/{dag_run_id}": {
get: {
req: GetDagRunData;
Expand Down
50 changes: 50 additions & 0 deletions tests/api_fastapi/views/public/test_variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,53 @@ def test_patch_should_respond_404(self, test_client):
assert response.status_code == 404
body = response.json()
assert f"The Variable with key: `{TEST_VARIABLE_KEY}` was not found" == body["detail"]


class TestPostVariable(TestVariableEndpoint):
@pytest.mark.enable_redact
@pytest.mark.parametrize(
"body, expected_response",
[
(
{
"key": "new variable key",
"value": "new variable value",
"description": "new variable description",
},
{
"key": "new variable key",
"value": "new variable value",
"description": "new variable description",
},
),
(
{
"key": "another_password",
"value": "password_value",
"description": "another password",
},
{
"key": "another_password",
"value": "***",
"description": "another password",
},
),
(
{
"key": "another value with sensitive information",
"value": '{"password": "new_password"}',
"description": "some description",
},
{
"key": "another value with sensitive information",
"value": '{"password": "***"}',
"description": "some description",
},
),
],
)
def test_post_should_respond_201(self, test_client, session, body, expected_response):
self.create_variable()
response = test_client.post("/public/variables/", json=body)
assert response.status_code == 201
assert response.json() == expected_response