Commit Graph

1292 Commits

Author SHA1 Message Date
Jacob Burroughs 55b3c879b5 Fix some rails 7.0 specs
[ignore-stage-results=Flakey Spec Catcher]

Change-Id: I969034adc9f70d7cec2e150e1e02676c0977e49a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/293321
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-06-07 21:39:33 +00:00
Ed Schiebel fd7e122969 Recurring events: add create series to calendar_events api
This commit adds code to calendar_events_api_controller#create
for parsing an rrule parameter to create an event series.

see https://icalendar.org/rrule-tool.html for help creating RRULEs

closes LS-2799
flag=calendar_series

test plan:
  - enable site admin flag calendar_series
  - POST to /api/v1/calendar_events and event including an rrule param
    for example:
    {"calendar_event":{"context_code":"course_84","title":"an event",
     "start_at":"2022-06-03T06:00:00-04:00",
     "end_at":"2022-06-03T06:30:00-04:00",
     "rrule":"RRULE:FREQ=WEEKLY;INTERVAL=1;COUNT=2"}}
  > expect a response with the first event in the series, plus the rest
    in the duplicates array.
  - try with errors
    - an RRULE with COUNT > 200
    - an RRULE with COUNT <= 0
    - an RRULE using UNTIL that creates > 200 events
    - an RRULE with no COUNT or UNTIL
    - an RRULE that's not valid
  > expect a 400 response

Change-Id: Ib7282bbe1b7ab0cb27ce3e351d0be4622208a212
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/293153
Reviewed-by: Robin Kuss <rkuss@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2022-06-07 14:07:41 +00:00
Ievgenii Matkivskyi b95dafe9b0 Add converter to utf-8 for imports
flag=none
Closes SOS-2428

Test plan:
 - Upload archive with Users.csv in ISO encoding
 - Upload archive with Users.csv in ASCII encoding

Change-Id: I680c0b343c3b0374fd7e207eb1f43e063b1c104a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287235
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Ievgenii Matkivskiy <ievgenii.matkivskiy@instructure.com>
Product-Review: Ievgenii Matkivskiy <ievgenii.matkivskiy@instructure.com>
Reviewed-by: August Thornton <august@instructure.com>
Reviewed-by: Balazs Komaromi <balazs.komaromi@instructure.com>
Reviewed-by: Tamas Nagy <tamas.nagy@instructure.com>
2022-06-07 09:54:21 +00:00
Jacob Burroughs 133165106b Boot on rails 7.0
Change-Id: I61d5ba9f6ef5e0837da2ec22b695b9a56b88acb5
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/293104
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: August Thornton <august@instructure.com>
Reviewed-by: Alex Slaughter <aslaughter@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-06-06 13:55:46 +00:00
Jackson Howe c3b1fef1d5 Pin multipart-post to 2.1.1
since v2.2.0 conflicts with our Multipart gem

closes CNVS-55656
flag = none

Test plan:
 - Attach a file as a comment in speedgrader
 - Expect it to work

Change-Id: Ifff1188b0fb802ecbe6a6d76821892d842504f85
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/293239
Reviewed-by: Ben Rinaca <brinaca@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Alex Slaughter <aslaughter@instructure.com>
Product-Review: Alex Slaughter <aslaughter@instructure.com>
2022-06-03 18:04:30 +00:00
Jacob Burroughs c7bf5fba48 Remove rails 6.0 support
Change-Id: I0df8f625c119b2622e358a5d663c158e2d7d7cb8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/292904
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Alex Slaughter <aslaughter@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-05-31 22:13:22 +00:00
Isaac Moore fd540f6f7c Update `inst-jobs` and `inst-jobs-statsd`
This will result in new `create` and `complete` statsd metrics being
emitted for jobs.

closes DE-1124
flag=none

test plan:
- ensure that Canvas boots correctly and jobs are queued/executed
correctly:
  - with a local statsd server running
  - without a local statsd server running

Change-Id: I4d451e61e3ddb397c371d46b0e2e0a34ae9295c5
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/292758
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
QA-Review: Isaac Moore <isaac.moore@instructure.com>
Product-Review: Isaac Moore <isaac.moore@instructure.com>
2022-05-31 17:51:25 +00:00
Jeremy Stanley c28a19bc45 requeue failed job
test plan:
 - create a job that will fail
   (e.g. `delay.raise "whoops"`)
 - find the failed job in /jobs_v2 and click its id
 - scroll down to the job details table and click the
   "requeue job" button
 - the job should be requeued and the id of the requeued
   job should appear in place of the button
 - search that id and you should find the newer failed_jobs
   entry (after the requeued job fails)

flag=jobs_v2
closes DE-1194

Change-Id: I33d637db616aad1ec431428e7c5c60c6253660aa
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/292334
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Isaac Moore <isaac.moore@instructure.com>
QA-Review: Isaac Moore <isaac.moore@instructure.com>
Migration-Review: Alex Slaughter <aslaughter@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2022-05-28 00:08:22 +00:00
Aaron Ogata 498d69b130 Revert "Update `inst-jobs` and `inst-jobs-statsd`"
This reverts commit 95963e668a.

Reason for revert: broke beta

Change-Id: I0c4b13e362f72f72db8e68d8c701354ab27d8868
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/292424
Reviewed-by: Isaac Moore <isaac.moore@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
Tested-by: Aaron Ogata <aogata@instructure.com>
2022-05-26 17:52:55 +00:00
Isaac Moore 95963e668a Update `inst-jobs` and `inst-jobs-statsd`
This will result in new `create` and `complete` statsd metrics being
emitted for jobs.

closes DE-1124
flag=none

test plan:
- ensure that Canvas boots correctly and jobs are queued/executed
  correctly:
    - with a local statsd server running
    - without a local statsd server running

Change-Id: Iaccf0c7094de1be8dae5571aaccbf5c301213978
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/292622
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: Isaac Moore <isaac.moore@instructure.com>
Product-Review: Isaac Moore <isaac.moore@instructure.com>
2022-05-25 19:25:40 +00:00
Jacob Burroughs 5ac72b3cc2 Bump guardrail
Change-Id: I558e18b97cee363f46a2536e06f693db11c8fd4c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/292311
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-05-20 18:56:01 +00:00
Evan Battaglia 9ee38b469b Convert newlines to CRLFs in params used in signature base strings
LTI 1 launches (and LTI 2 launches using the same OAuth 1 signature
method) use a form with hidden fields to send the parameters to the LTI
tool. Browsers always send newlines in hidden input fields (i.e. params
encoded as form data) as carriage return + line feed (%0D%0A = "\r\n").
As a result, if any launch parameters include newlines, the tool will
get "%0D%0A" in the query params for them.

Currently, though, we calculate the base string as if the newlines in
the parameters are just "%0A". This commit changes the newlines to CRLF
before-hand to simulate what browsers do. (I then use the CRLF'd version
for the actual parameters ... this eliminates any possibility of any
differences due to weird mixed LF and CRLF endings or anything, and
browsers don't add extra CRs if endings are already CRLF.)

refs INTEROP-7387
flag=none

Test plan:
** SETUP **
- on line 210 of app/controllers/lti/message_controller.rb, right before
  the end of the lti2_basic_launch method, add the following line:
    Lti::Logging.lti_1_launch_generated(message.message_authenticator.base_string)
- have the following LTI tools installed:
 - an LTI 2 tool with the Canvas.placements.similarityDetection
   placement (that should be in the MessageHandler's 'capabilities')
 - an LTI 1 tool with extension_setting "oauth_compliant"
 - an LTI 1 tool without extension_setting "oauth_compliant" (and
   double-check sure disable_lti_post_only "Don't Move LTI Query Params
   to POST Body" feature flag is off)
- For the LTI 2 tool, add "ResourceLink.description" to the
  MessageHandler's "capabilities".
- For the LTI 1 tools, have a custom parameter
  with the value "$ResourceLink.description" (there might be a way to
  sent this as resourcelink_description instead of a custom parameter, I
  don't know what it is) and give it the similarity_detection placement
- Open the copyasfetch_verify_oauth_signature.rb script (attached to the
  ticket). Find the secrets for your LTI 1 and LTI 2 tools as described
  in the script. Adjust the `secret_for_url()` method there for your
  tools.

** LAUNCHING AND TESTING **
- Launch the tools in the following ways in a browser that supports
  "copy as fetch" (Chrome and Firefox do). (Note that you don't need the
  tools running / working, we just need to look at the launch.)
  - for the LTI 2 tools and LTI 1 tools, create a new assignment. In the
    text field add some bullet points. Under Submission Type choose
    Online -> Text Entry. Then choose the tool in the Similarity
    Detection dropdown. The tool will launch.
  - For the LTI 1 tools, also make assignments with the description with
    bullet points but of type LTI assignment by choosing the tool. Then
    launch the assignment.
- For each launch, verify the base string for the launch as follows.
  - In the logs, the base string is logged:
      grep base.string log/development.log
    Check that newlines are encoded as %0D%0A (which when double-encoded
    in the base string is %250D%250A). If you want, to unencode one
    level you can use:
      ruby -e 'require "cgi"; puts CGI.unescape(ARGF.read.split("&").last)'
  - Go to dev tools, find the launch in the Network tab, right click and
    choose "copy as fetch". Save to a file and pipe into the
    copyasfetch_verify_oauth_signature.rb script. It will tell you if
    the expected signature matches the one used in the launch. Also
    verify that the base string used includes CRLFs, i.e. "%250D%250A".

Change-Id: I7d70f7740612ad25cb3ff61940d05e97a5a87aea
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/290806
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Alexis Nast <alexis.nast@instructure.com>
Reviewed-by: Xander Moffatt <xmoffatt@instructure.com>
QA-Review: Xander Moffatt <xmoffatt@instructure.com>
2022-05-17 17:20:23 +00:00
Jacob Burroughs 20acf8163e Bump switchman
Change-Id: I23b290ecc89fb3c563e9df615aa7d1435b31cc8b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/290725
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-04-28 17:24:53 +00:00
Jacob Burroughs 9ca9d4d455 Bump switchman
Change-Id: I10c13d1d8e394c9400bc22cfdf8cc02ad2f209bb
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/290399
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Alex Slaughter <aslaughter@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-04-25 21:08:40 +00:00
Jacob Burroughs f6121de2d4 Bump switchman
Change-Id: If14b7962f3b386fcfc097503394d27d8f58cbace
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/289192
Reviewed-by: Alex Slaughter <aslaughter@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-04-07 17:38:26 +00:00
Jacob Burroughs 7ad5108c4c Bump switchman, again
Change-Id: Id3f440266486296f58b4501d3c7398e2d3ea7437
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/289044
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-04-06 19:17:46 +00:00
Jacob Burroughs 080a769f3c Bump switchman
Change-Id: I06feda486092452eeb7cd648a504ae4797a5a5af
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/289028
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-04-06 16:30:10 +00:00
Jacob Burroughs f11caf4435 Bump switchman
Change-Id: I1ddb2a45c15bf7c245dc01dc8a006d8e18237c9e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/289009
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-04-06 14:13:18 +00:00
Aaron Ogata 72e3428da7 add job context to short log format
refs DE-1125

Change-Id: I606f8d3ff61f27f658c744287b43183205469a9f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/288950
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-04-05 19:48:54 +00:00
Jacob Burroughs e8ae65f4c8 Bump switchman
Change-Id: I7744ed7392a4b9a5dfb0b12b25dda6a01ac31e68
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/288941
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-04-05 19:18:12 +00:00
Aaron Ogata a5cb130154 add rails version to Gemfile.lock
refs DE-523

Previously, the current version would be represented by Gemfile.lock and the next version by Gemfile.lock.next. Replace both with a common format of Gemfile.rails<version>.lock to be able to iterate over the files in a cleaner way.

Change-Id: I35aef3a14e726eb35db8aebc808af4a925552c01
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/288563
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-03-31 17:01:45 +00:00
Aaron Ogata 682e2c54f2 automatically delete failed jobs after n months
refs DE-1120

Change-Id: I39aa0a1afa4c8aa505cddf101fe8d78a909374da
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/288528
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-03-30 22:48:32 +00:00
Jacob Burroughs 282d6e3692 Bump switchman
Change-Id: If0ce6d8005dcbd1f6786a67db49b67fa6caab5ba
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/288247
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
2022-03-28 15:27:34 +00:00
Jacob Burroughs 6f373aa3c7 Bump parallel
Change-Id: I79cbfabf43ecdb9e0247343bdab951baf32ae986
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287964
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
2022-03-24 20:39:33 +00:00
Jacob Burroughs f4be7b34bb Bump rails
Change-Id: Ic0e73e43b78ffd5b02c435facf80eb89b08bf876
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287946
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Charley Kline <ckline@instructure.com>
QA-Review: Charley Kline <ckline@instructure.com>
Product-Review: Charley Kline <ckline@instructure.com>
2022-03-24 19:17:49 +00:00
Jacob Burroughs bfb87b7efc Bump switchman
Change-Id: I3dc1f153d8d635bad50b7b77826d7044679ceba8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287956
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-03-24 18:59:09 +00:00
Aaron Ogata 0e13f0d033 replace CANVAS_RAILS6_x variables with CANVAS_RAILS
refs DE-523

Test Plan

1. Ensure CANVAS_RAILS override works
2. Ensure file override works
3. Ensure consul override works

Change-Id: I6eea63bba5c401428c02179a3d6187c8265ce33e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287849
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-03-24 18:14:52 +00:00
Jacob Burroughs 2092be993f Bump switchman
Change-Id: Icbb684949a9c8fb2b472ce6f9fddc0d2833b1ec2
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287846
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-03-23 21:03:32 +00:00
Aaron Ogata b9ad4f562c bump switchman
Change-Id: I7e50b01c94f420447e0e52ccbff8a9db1b3e3351
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287805
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2022-03-23 16:33:13 +00:00
Jacob Burroughs b97f29ba03 Remove CANVAS_ZEITWERK
Change-Id: Ia83164d6f145af4d60303e139a13bd2e68d6e7eb
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287703
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
2022-03-22 22:51:19 +00:00
Jacob Burroughs ca5473f2b1 Bump switchman
Change-Id: I2c82c7514d067dde79ebb2b8a737b6f26ef3498f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287715
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-03-22 21:52:29 +00:00
Jacob Burroughs 2ee5122f0f Patch the cache namespace earlier in boot
And bump switchman to patch the pg adapter earlier in boot

Change-Id: I88baa87b0894e7252229109f2e0b89af10754ca9
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287663
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-03-22 19:36:32 +00:00
Jacob Burroughs a057114f43 Bump switchman
Change-Id: I6bcce0e81b6a79dc5e0a693d3fc4669437643d8a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287546
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
2022-03-21 16:05:30 +00:00
Brian Watson 1145a30d2e Upgrade stormbreaker to 0.0.8
flag=none

Test-plan:
- axe build still passes

Change-Id: I28fd178a0704fe1ba0e3b39d7a58f67862bd7e40
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/286678
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kyle Rosenbaum <krosenbaum@instructure.com>
QA-Review: Brian Watson <bwatson@instructure.com>
Product-Review: Brian Watson <bwatson@instructure.com>
2022-03-11 22:58:37 +00:00
Ed Schiebel 2636d96e21 Update canvas_connect gem
This gets the gem update from pull request
https://github.com/instructure/canvas_connect/pull/15

closes LS-3032
flag=none

test plan:  it was tested in github, but if you want to again
  - in /plugins select AdobeConnect,
  - set domain and meeting folder to http://your.ip.address/, login id and password to anything
  - in /calendar, create a calendar event with an adobe connect webconference
  - refresh the calendar
  > expect the calendar_evens api call to return the event with web_conference data
  > expect the event to show up
  > expect an error logged in your console
  - If you want to prove it still works if there is an adobe, I have a perl script webserver and data file that mocks Adobe Connect

Change-Id: I58770baeb7006d65681431f032894209e04c259d
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/286812
Reviewed-by: Eric Saupe <eric.saupe@instructure.com>
QA-Review: Eric Saupe <eric.saupe@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2022-03-10 21:07:13 +00:00
Aaron Ogata eac76c6c71 bump switchman to 3.x
refs FOO-2746

Change-Id: I494ceed28f06049267f0d58b6f3800885e64cecb
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/286727
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-03-10 13:04:53 +00:00
Aaron Ogata a1cf1ed6d3 bump switchman to latest 2.x branch
refs FOO-2746

[skip-crystalball]

Change-Id: I47bc4228b6012a985dbb176f173142879d91458c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/286599
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-03-09 18:15:37 +00:00
Brian Watson 2f2a27d91b Upgrade to Selenium 4
Switches from standalone containers to explicit node+hub config

Selenium 4 has some differences in handling stale elements that we
should be aware of moving forward

closes OUT-4988
flag=none
[skip-stages=Flakey Spec Catcher]

Test-plan:
- make sure screenshots can happen for failures
- retrigger a few times and make sure things pass
- verify build summaries are intact
- verify FSC can still run seleniums
- verify local selenium running still works
  - firefox / chrome / edge where applicable
- verify docker selenium running still works
  - firefox / chrome / edge where applicable

Change-Id: I8f2fe5a34d712b5ccd7191bae7a9aeeb6f1f473d
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/284811
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Brian Watson <bwatson@instructure.com>
2022-03-09 15:28:31 +00:00
Aaron Ogata a7f3197352 support pinning commonly modified gems to specific versions
Change-Id: I1bb63c1c1af144678236cd1a7ea63d1e10c666a4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/286541
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2022-03-08 17:33:30 +00:00
Jacob Burroughs 7d0d80bdc8 Stop leaking siteadmin ids from spec setup
Change-Id: I9370a96eb9eb0fde8c11f0243dc0785489002a55
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/285831
Reviewed-by: August Thornton <august@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
Migration-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-02-25 23:11:11 +00:00
Aaron Ogata 77732bfb7e bump inst-jobs
Change-Id: Idf67d8968dbe22b7442328d3ffbc2ba1bd882889
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/285852
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-02-23 19:51:27 +00:00
Aaron Ogata b70b8fa918 bump inst-jobs for job migrator race condition fix
refs DE-923

Change-Id: Id1ba0c3cb87b543077d69f0d87353327f3b42617
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/285790
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-02-23 15:11:31 +00:00
Isaac Moore 8530016136 Update Sentry Ruby SDKs to 5.1.0
This version update includes several bug fixes and new features.

flag=none
closes DE-1054, DE-1033

test plan:
- verify errors and transactions are still captured
- verify that traces which have a parent transaction abide by the parent
  transaction's sample decision (if the trace ID ends in `1`, the trace
  is sampled; if it ends in `0`, it is not sampled)

Change-Id: I0763239e8b9ba962306d81de4987769ca32ef000
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/285105
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: Isaac Moore <isaac.moore@instructure.com>
Product-Review: Isaac Moore <isaac.moore@instructure.com>
2022-02-16 22:36:45 +00:00
Jacob Burroughs 209cea8027 Rails 6.1 basic spec functionality
Change-Id: I89129633731a68c38a5026b6b26318d1f3699a2a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/284968
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: August Thornton <august@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
Migration-Review: Jacob Burroughs <jburroughs@instructure.com>
2022-02-16 17:31:11 +00:00
Jeremy Stanley 9960127819 remove unused gem testingbot
it's not compatible with ruby 3 and it hasn't been used since
we stopped running selenium specs on internet explorer

Change-Id: Iad79eeb57b4ce7a1f972e223278accef79966a99
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/285262
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2022-02-15 23:33:40 +00:00
Aaron Ogata 12b16265e9 bump inst-jobs and switchman-inst-jobs
refs DE-923

Change-Id: I3720242a11053fe7a6b3e539e159af1df5478686
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/284446
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
Migration-Review: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2022-02-04 18:35:30 +00:00
Isaac Moore 3982a41bb8 Update Sentry Ruby SDKs to latest version
Sentry recently dropped the `faraday` requirement from their Ruby SDKs,
which means we no longer need to use our fork which set the dependency to
an older version.

flag=none
closes DE-1012

test plan:
- verify Canvas starts successfully
- verify exceptions are reported to Sentry correctly
- verify APM transactions are reported to Sentry correctly

Change-Id: Ifc9a290c21b0fdb5cb15b4ec542d467fa562cdd9
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/284270
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
QA-Review: Isaac Moore <isaac.moore@instructure.com>
Product-Review: Isaac Moore <isaac.moore@instructure.com>
2022-02-03 17:58:26 +00:00
Jonathan Guardado 45e50601c4 Fix wordcount in attachments being slow in large courses
This PS uses most of the work done in the previous implementation.
The main difference is the moment when the word count is calculated,
a new column was created to store this value at the moment of
saving the file, this will avoid requesting the AWS s3 bucket for
each file when loading the speed grader

flag=word_count_in_speed_grader
fixes LS-2922
test plan:
- Enable word count in speed grader flag
- In a course that has many attachments in speedgrader
- Create an assignment that requires submissions
- Submit a PDF, RTF, TXT, and DOCX file
- In speed grader, verify the word counts are present when
selecting the different files

Change-Id: I7262afe43787ffdf7859fbf2d10cd16a52521996
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/283607
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Migration-Review: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Eric Saupe <eric.saupe@instructure.com>
QA-Review: Eric Saupe <eric.saupe@instructure.com>
Product-Review: Jonathan Guardado <jonathan.guardado@instructure.com>
2022-02-03 17:37:11 +00:00
James Butters 0ca63f7991 use most recent rspecq version to get specific build times
rather than trying to calculate the build times, use the new rspecq
version that now adds the buildTimes to redis.

flag = none

Change-Id: I40544859e2be2831f140fa45387922036af8cd8c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/284181
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Bobby Buten <bobby.buten@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
2022-02-02 19:07:07 +00:00
August Thornton 9ed779733e bump ffi to resolve build error on Ubuntu
flag = none

Test plan:
• run `bundle install`
• run `bundle exec rails canvas:compile_assets
• verify no errors related to commit message

Change-Id: Ifff4a6c32bf517b35a6981bb14a17b159368ff9b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/284109
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: August Thornton <august@instructure.com>
2022-02-01 20:27:12 +00:00