@@ -302,8 +302,31 @@ func (r *OpenVSXServerReconciler) syncUserSetupJob(ctx *chetypes.DeployContext)
302302 envFromSecret ("OPENVSX_ADMIN_NAME" , secretName , "admin-name" ),
303303 envFromSecret ("OPENVSX_ADMIN_PAT" , secretName , "admin-token" ),
304304 ),
305- Command : []string {"sh" , "-c" ,
306- `psql -c "INSERT INTO user_data (id, login_name, role) VALUES (1001, '$OPENVSX_USER_NAME', 'privileged') ON CONFLICT (id) DO NOTHING; INSERT INTO personal_access_token (id, user_data, value, active, created_timestamp, accessed_timestamp, description, notified) VALUES (1001, 1001, '$OPENVSX_USER_PAT', true, current_timestamp, current_timestamp, 'extensions publisher', false) ON CONFLICT (id) DO NOTHING; INSERT INTO user_data (id, login_name, role) VALUES (1002, '$OPENVSX_ADMIN_NAME', 'admin') ON CONFLICT (id) DO NOTHING; INSERT INTO personal_access_token (id, user_data, value, active, created_timestamp, accessed_timestamp, description, notified) VALUES (1002, 1002, '$OPENVSX_ADMIN_PAT', true, current_timestamp, current_timestamp, 'Admin API Token', false) ON CONFLICT (id) DO NOTHING;"` ,
305+ Command : []string {"sh" , "-c" , `
306+ psql \
307+ -v user_name="$OPENVSX_USER_NAME" \
308+ -v user_pat="$OPENVSX_USER_PAT" \
309+ -v admin_name="$OPENVSX_ADMIN_NAME" \
310+ -v admin_pat="$OPENVSX_ADMIN_PAT" \
311+ <<'EOSQL'
312+ INSERT INTO user_data (id, login_name, role)
313+ VALUES (1001, :'user_name', 'privileged')
314+ ON CONFLICT (id) DO NOTHING;
315+
316+ INSERT INTO personal_access_token
317+ (id, user_data, value, active, created_timestamp, accessed_timestamp, description, notified)
318+ VALUES (1001, 1001, :'user_pat', true, current_timestamp, current_timestamp, 'extensions publisher', false)
319+ ON CONFLICT (id) DO NOTHING;
320+
321+ INSERT INTO user_data (id, login_name, role)
322+ VALUES (1002, :'admin_name', 'admin')
323+ ON CONFLICT (id) DO NOTHING;
324+
325+ INSERT INTO personal_access_token
326+ (id, user_data, value, active, created_timestamp, accessed_timestamp, description, notified)
327+ VALUES (1002, 1002, :'admin_pat', true, current_timestamp, current_timestamp, 'Admin API Token', false)
328+ ON CONFLICT (id) DO NOTHING;
329+ EOSQL` ,
307330 },
308331 },
309332 },
0 commit comments