Upgrade to avo 3 #4342

segiddins · 2024-01-10T06:56:44Z

No description provided.

codecov · 2024-01-10T06:58:27Z

Codecov Report

Attention: Patch coverage is 89.59459% with 77 lines in your changes missing coverage. Please review.

Project coverage is 96.02%. Comparing base (8021e2e) to head (56325b1).
Report is 4 commits behind head on master.

Files with missing lines	Patch %	Lines
app/avo/resources/api_key.rb	19.35%	25 Missing ⚠️
app/avo/resources/ip_address.rb	38.46%	8 Missing ⚠️
app/avo/resources/geoip_info.rb	30.00%	7 Missing ⚠️
app/avo/resources/oidc_api_key_role.rb	70.83%	7 Missing ⚠️
app/avo/resources/dependency.rb	33.33%	6 Missing ⚠️
app/avo/resources/gem_typo_exception.rb	54.54%	5 Missing ⚠️
app/avo/resources/organization.rb	61.53%	5 Missing ⚠️
app/avo/resources/membership.rb	55.55%	4 Missing ⚠️
app/avo/resources/api_key_rubygem_scope.rb	57.14%	3 Missing ⚠️
app/avo/actions/application_action.rb	90.47%	2 Missing ⚠️
... and 4 more

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4342      +/-   ##
==========================================
- Coverage   96.97%   96.02%   -0.95%     
==========================================
  Files         424      424              
  Lines        8892     8942      +50     
==========================================
- Hits         8623     8587      -36     
- Misses        269      355      +86

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

segiddins · 2024-09-20T22:48:28Z

app/avo/resources/concerns/avo_auditable_resource.rb

+          help: "A comment explaining why this action was taken.<br>Will be saved in the audit log.<br>Must be more than 10 characters."
+  end
+
+  # Would be nice if there was a way to force a field to show up as visible


cc @adrianthedev this seems to be something where avo3 is stricter than avo2, and it would be nice if there was a way to force a field to be visible even if avoiding thinks it shouldn't be

Hey @segiddins. Can you please share what is the problem? Maybe I can figure out an easier fix for your use case and remove this monkeypatch.

we have fields that we need to show up in forms, even though Avo considers them "computed" (because the underlying record has no setter for them)

segiddins · 2024-09-28T17:13:36Z

@adrianthedev @simi this should be ready to review! Only thing is it would be nice to point to a release of avo that removes the activestorage dependency instead of pointing to a git commit

segiddins · 2024-10-02T01:02:04Z

This is green and ready to ship, @simi please review

simi · 2024-10-02T08:02:27Z

👀

adrianthedev · 2024-10-02T08:11:55Z

@adrianthedev @simi this should be ready to review! Only thing is it would be nice to point to a release of avo that removes the activestorage dependency instead of pointing to a git commit

The latest release should have the AS dependency removed.

In the next release we will remove literal types altogether so we'll have less problems like those.

indirect

Looks good, a couple minor things that seem like they need to be cleaned up. Thanks for making this happen!

indirect · 2024-10-09T20:58:22Z

Gemfile

@@ -62,12 +62,20 @@ gem "faraday-multipart", "~> 1.0"
 gem "timescaledb", "~> 0.3"

 # Admin dashboard
-gem "avo", "~> 2.53"
+# github needed until https://github.com/avo-hq/avo/pull/3215 is released


it was released 😅

indirect · 2024-10-09T20:59:30Z

Rakefile

+# TODO: remove this when we point back to a release version of Avo
+namespace :assets do
+  task precompile: "avo:build-assets"
+end


this PR is back on an Avo release now right?

indirect · 2024-10-09T21:02:55Z

test/test_helper.rb

+  # if avo_request_pattern.matches?(request)
+  #   { status: 200, body: { id: :pro, valid: true, payload: {} }.to_json,
+  #     headers: { "Content-Type" => "application/json" } }
+  # end


Do we need the comment? I’d rather remove things that don’t run if we can

adrianthedev · 2024-10-09T23:09:19Z

I still have eyes on this PR, so feel free to ping me if I can help.

segiddins · 2024-10-13T18:34:30Z

@simi @colby-swandale just waiting on y'all to review to ship this, it needs a rebase almost every time we update deps

colby-swandale · 2024-10-14T12:12:20Z

config/application.rb

+# allow dotenv to specify RAILS_GROUPS
+if defined?(Dotenv::Rails)
+  Dotenv::Rails.load
+  Bundler.require(*Rails.groups)


Any chance we can move the duplicate Bundler.require or is this required for Dotenv?

It's required to allow .Env to control the rails groups

colby-swandale · 2024-10-14T12:14:17Z

@segiddins apologies, I've been a bit under the weather the past few days. I merged #4883 today, so you will need to rebase once again, apologies 🙇🏻

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

adrianthedev · 2024-10-16T17:18:35Z

Awesome @segiddins!
Thanks for putting in the work to make this upgrade happen.

segiddins force-pushed the segiddins/avo-3 branch from 4653038 to b160f51 Compare January 10, 2024 07:04

segiddins force-pushed the segiddins/avo-3 branch from b160f51 to 2641e91 Compare September 2, 2024 21:03

segiddins requested a review from simi September 2, 2024 21:03

segiddins force-pushed the segiddins/avo-3 branch 2 times, most recently from 360e348 to 18877eb Compare September 11, 2024 02:11

segiddins commented Sep 20, 2024

View reviewed changes

segiddins force-pushed the segiddins/avo-3 branch 3 times, most recently from bd5bf10 to 7e74bc8 Compare September 23, 2024 18:51

segiddins marked this pull request as ready for review September 23, 2024 22:03

segiddins requested a review from adrianthedev September 23, 2024 22:03

segiddins changed the title ~~[WIP] Upgrade to avo 3~~ Upgrade to avo 3 Sep 23, 2024

segiddins force-pushed the segiddins/avo-3 branch from 84efb82 to 321a6c2 Compare October 1, 2024 23:56

indirect approved these changes Oct 9, 2024

View reviewed changes

colby-swandale requested review from colby-swandale and removed request for adrianthedev October 10, 2024 13:20

segiddins force-pushed the segiddins/avo-3 branch from 321a6c2 to 32f18c6 Compare October 13, 2024 18:33

colby-swandale approved these changes Oct 14, 2024

View reviewed changes

segiddins added 4 commits October 14, 2024 16:22

Add avo-advanced v3 to gemfile

68c6423

[WIP] Upgrade to avo 3

f2dab44

Avo working?

c0b114b

Ensure avo advanced when responding to requests in prod/staging

846b771

segiddins added 23 commits October 14, 2024 16:23

More tests work without avo pro

ebb2e0b

Better skip

d28c886

More avo tests passing

2c05af3

Hacks migrated to avo 3

d9a8090

Avo pro test fixes

abec4d7

Fix docker builds with avo 3

36667a3

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Fix policy tests

0b1321d

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Bundle install

4eeec10

Remove manual editing of oidc api key roles

c885b82

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Fix avo job ruby version

0a86c37

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Fix new action

fe8c6bf

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Update for no manual editing

d041f72

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Fix docker building on CI

7a6b5a6

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Use avo main for actionstorage fix

51e6828

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Add missing env

3ef0600

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Build avo assets

4948425

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Add git in builder

8e95444

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Fix deleting js sourcemaps in dockerfile

653c333

Skip avo pro in that CI job

ac0f3b2

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Fix checking for REQUIRE_AVO_PRO

8cf4d90

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Fix finding comment field when avo pro is missing

1fddf31

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Avo 3.13

068834f

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

Remove outdated comments

56325b1

Signed-off-by: Samuel Giddins <segiddins@segiddins.me>

segiddins force-pushed the segiddins/avo-3 branch from 32f18c6 to 56325b1 Compare October 14, 2024 21:23

segiddins enabled auto-merge (squash) October 14, 2024 21:24

segiddins merged commit 4b369c0 into master Oct 14, 2024
17 of 19 checks passed

segiddins deleted the segiddins/avo-3 branch October 14, 2024 21:30

colby-swandale mentioned this pull request Oct 18, 2024

Update the Avo license for v3 #5142

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to avo 3 #4342

Upgrade to avo 3 #4342

segiddins commented Jan 10, 2024

codecov bot commented Jan 10, 2024 •

edited

Loading

segiddins Sep 20, 2024

adrianthedev Sep 22, 2024

segiddins Sep 23, 2024

segiddins commented Sep 28, 2024

segiddins commented Oct 2, 2024

simi commented Oct 2, 2024

adrianthedev commented Oct 2, 2024

indirect left a comment

indirect Oct 9, 2024

indirect Oct 9, 2024

indirect Oct 9, 2024

adrianthedev commented Oct 9, 2024

segiddins commented Oct 13, 2024

colby-swandale Oct 14, 2024

segiddins Oct 14, 2024

colby-swandale commented Oct 14, 2024

adrianthedev commented Oct 16, 2024

Upgrade to avo 3 #4342

Upgrade to avo 3 #4342

Conversation

segiddins commented Jan 10, 2024

codecov bot commented Jan 10, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

segiddins commented Sep 28, 2024

segiddins commented Oct 2, 2024

simi commented Oct 2, 2024

adrianthedev commented Oct 2, 2024

indirect left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adrianthedev commented Oct 9, 2024

segiddins commented Oct 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

colby-swandale commented Oct 14, 2024

adrianthedev commented Oct 16, 2024

codecov bot commented Jan 10, 2024 •

edited

Loading