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

Attentive fix #5319

Merged
merged 19 commits into from
Oct 1, 2024
Merged

Attentive fix #5319

merged 19 commits into from
Oct 1, 2024

Conversation

Vagoasdf
Copy link
Contributor

@Vagoasdf Vagoasdf commented Sep 23, 2024

Description Of Changes

Currently we have the Attentive email integration as a high level connection type category, and that was causing conflict with lower level connection types, such as the new SaaS Attentive configuration. Since we are transitioning into using SaaS we've updated the reference to attentive_email, in order to avoid name collisions

Ideally, the Attentive Email integration should be a generic email integration. That should be the next step on the transition

Note: We Should check our strategy of communication with our clients before updating this, to avoid any breakage

Code Changes

  • Updated connectionType and connectionConfig attentive references
  • Migration for connectionType Attentive

Steps to Confirm

  • Check that the Attentive Email Integration Works by creating a system for Attentive Email Integration
  • Check that the Attentive Saas Integration Works by creating a system for Attentive Saas Integration. See 1Password for the API KEY

Pre-Merge Checklist

  • All CI Pipelines Succeeded
  • Issue Requirements are Met
  • Update CHANGELOG.md
  • If there are any database migrations:
    • Ensure that your downrev is up to date with the latest revision on main
    • Ensure that your downgrade() migration is correct and works
      • If a downgrade migration is not possible for this change, please call this out in the PR description!

@Vagoasdf Vagoasdf requested a review from a team as a code owner September 23, 2024 19:50
Copy link

vercel bot commented Sep 23, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Skipped Deployment
Name Status Preview Comments Updated (UTC)
fides-plus-nightly ⬜️ Ignored (Inspect) Visit Preview Sep 30, 2024 6:04pm

Copy link

cypress bot commented Sep 23, 2024

fides    Run #10226

Run Properties:  status check passed Passed #10226  •  git commit 3181c55908 ℹ️: Merge dc608c4fdd23dc4686f418a81d61f47b3a1d5903 into a6510c126e548353bfa0c6dcde66...
Project fides
Branch Review refs/pull/5319/merge
Run status status check passed Passed #10226
Run duration 00m 39s
Commit git commit 3181c55908 ℹ️: Merge dc608c4fdd23dc4686f418a81d61f47b3a1d5903 into a6510c126e548353bfa0c6dcde66...
Committer Bruno Gutierrez Rios
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 4
⚠️ You've recorded test results over your free plan limit.
Upgrade your plan to view test results.
View all changes introduced in this branch ↗︎

Copy link
Contributor

@galvana galvana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this change has some unwanted change (74 files changed 😬). Can you try fixing or recreating the feature branch to only include the relevant changes?

@Vagoasdf
Copy link
Contributor Author

Looks like something happened with git and it decided to include everything on the main branch that was changed on the previous weeks. Rebased and cleaned it up, it should be ok now

Copy link
Contributor

@galvana galvana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change looks good! I tested it locally and the upgrade/downgrade worked as expected. I just updated the down revision to be up to date with main and made some small formatting/label changes in the attentive_config.yml but the rest looks solid

Copy link
Contributor

@galvana galvana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Redacting my approval, it looks like we have some failing tests. Let's fix those before we can merge this in

Copy link
Contributor

@galvana galvana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing the tests, this looks good to me!

@Vagoasdf Vagoasdf merged commit 1e34790 into main Oct 1, 2024
42 of 43 checks passed
@Vagoasdf Vagoasdf deleted the AttentiveFix branch October 1, 2024 18:35
Copy link

cypress bot commented Oct 1, 2024

fides    Run #10243

Run Properties:  status check passed Passed #10243  •  git commit 1e347901db: Attentive fix (#5319)
Project fides
Branch Review main
Run status status check passed Passed #10243
Run duration 00m 40s
Commit git commit 1e347901db: Attentive fix (#5319)
Committer Bruno Gutierrez Rios
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 4
View all changes introduced in this branch ↗︎

adamsachs pushed a commit that referenced this pull request Oct 1, 2024
Co-authored-by: Adrian Galvan <[email protected]>
Kelsey-Ethyca pushed a commit that referenced this pull request Oct 3, 2024
Co-authored-by: Adrian Galvan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants