feat: add has-ai-task filters to the /workspaces and /templates endpoints #18387
Conversation
fb3b8ec to
d32f3e4
Compare
41eebab to
31aa2b2
Compare
| @@ -25,7 +25,7 @@ func userACLMatcher(m sqltypes.VariableMatcher) sqltypes.VariableMatcher { | |||
| func TemplateConverter() *sqltypes.VariableConverter { | |||
| matcher := sqltypes.NewVariableConverter().RegisterMatcher( | |||
| resourceIDMatcher(), | |||
| organizationOwnerMatcher(), | |||
| sqltypes.StringVarMatcher("t.organization_id :: text", []string{"input", "object", "org_owner"}), | |||
There was a problem hiding this comment.
Is this the only case where we need to update the organization_id alias?
There was a problem hiding this comment.
Oh, sorry about that - yes, that's the only place. Only the SQL filter of the GetTemplates query is affected, and TemplateConverter is only used for GetTemplates.
eaae6a8 to
0adf1f2
Compare
0adf1f2 to
32cc427
Compare
| return false, xerrors.Errorf("get workspace build parameters: %w", err) | ||
| } | ||
| for _, param := range parameters { | ||
| if param.Name == "AI Prompt" && param.Value != "" { |
There was a problem hiding this comment.
TODO: this should use the const I'm introducing in the provider: https://github.com/coder/terraform-provider-coder/blob/dk/coder-ai-task-res/provider/ai_task.go#L22
| SELECT 1 | ||
| FROM workspace_build_parameters | ||
| WHERE workspace_build_parameters.workspace_build_id = latest_build.id | ||
| AND workspace_build_parameters.name = 'AI Prompt' |
There was a problem hiding this comment.
Hmm we may want to accept this name as an arg, but could get tricky since this is used in a few places.
There was a problem hiding this comment.
If we want to enforce that this constant matches the constant in go code, I'd rather define a helper function:
CREATE FUNCTION ai_prompt_param_name() RETURNS TEXT AS $$
BEGIN
RETURN 'AI Prompt';
END;
$$ LANGUAGE plpgsql IMMUTABLE;Then use that function in the query, and add a test that checks if the result of that function matches the constant in go code.
| @@ -25,7 +25,7 @@ func userACLMatcher(m sqltypes.VariableMatcher) sqltypes.VariableMatcher { | |||
| func TemplateConverter() *sqltypes.VariableConverter { | |||
| matcher := sqltypes.NewVariableConverter().RegisterMatcher( | |||
| resourceIDMatcher(), | |||
| organizationOwnerMatcher(), | |||
| sqltypes.StringVarMatcher("t.organization_id :: text", []string{"input", "object", "org_owner"}), | |||
|
related to #18158 |
This PR allows filtering templates and workspaces with the
has-ai-taskfilter as described in the Coder Tasks RFC.