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

octavia-cli: Added flag to control whether to reset the streams or not #18337

Merged

Conversation

marcelopio
Copy link
Contributor

@marcelopio marcelopio commented Oct 23, 2022

What

Fixes #17968

How

Added an already existing flag on the API to be available to octavia-cli.

Recommended reading order

  1. octavia-cli/octavia_cli/generate/templates/connection.yaml.j2
  2. octavia-cli/octavia_cli/apply/resources.py

🚨 User Impact 🚨

N/A

Pre-merge Checklist

Expand the relevant checklist and delete the others.

New Connector

Community member or Airbyter

  • Community member? Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
    • docs/integrations/README.md
    • airbyte-integrations/builds.md
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub by running the /publish command described here
  • After the connector is published, connector added to connector index as described here
  • Seed specs have been re-generated by building the platform and committing the changes to the seed spec files, as described here
Updating a connector

Community member or Airbyter

  • Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • Changelog updated in docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub and connector version bumped by running the /publish command described here
Connector Generator
  • Issue acceptance criteria met
  • PR name follows PR naming conventions
  • If adding a new generator, add it to the list of scaffold modules being tested
  • The generator test modules (all connectors with -scaffold in their name) have been updated with the latest scaffold by running ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates then checking in your changes
  • Documentation which references the generator is updated as needed

Tests

Unit

Put your unit tests output here.

Integration

Put your integration tests output here.

Acceptance

Put your acceptance tests output here.

@github-actions github-actions bot added area/platform issues related to the platform area/server labels Oct 23, 2022
@marcelopio marcelopio changed the title Added flag on octavia to control wheter to reset the streams or not octavia-cli: Added flag to control wheter to reset the streams or not Oct 23, 2022
Copy link
Contributor

@terencecho terencecho left a comment

Choose a reason for hiding this comment

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

Looks pretty good! The main change we want before merging this in is to keep the default behavior the same.

@marcosmarxm
Copy link
Member

Hello 👋, first thank you for this amazing contribution.

We really appreciate the effort you've made to improve the project.
We ask you patience for the code review. Last month our team was focused on Hacktoberfest event and that probably left some PR without the proper feedback. And this week, due to the Thanksgiving US Holiday, most our team is out of office with their families. Another important piece of information why code won't be merge this week is: as a safety measure the core team has decided to freeze merging code to main branch to keep the release stable. Next week we'll return to you with the proper code review and update the status of your contribution.

If you have any questions feel free to send me a message in Slack!
Thanks!

@octavia-squidington-iv octavia-squidington-iv removed area/server area/platform issues related to the platform labels Nov 28, 2022
@terencecho terencecho changed the title octavia-cli: Added flag to control wheter to reset the streams or not octavia-cli: Added flag to control whether to reset the streams or not Nov 28, 2022
@terencecho
Copy link
Contributor

@marcosmarxm i'll let you handle the process of merging this commit. feel free to ping me if you need anything!

@terencecho
Copy link
Contributor

Everything looks good for merging! Thank you for your contribution and your patience. It's contributors like you that help make our open source community so great!

@terencecho terencecho merged commit 4f9b660 into airbytehq:master Dec 5, 2022
@terencecho
Copy link
Contributor

Slight oversight on my end. I think because this field is set to required, it is failing some of the other integration tests. I can put up a fix for this (either making the field optional or updating the integration tests). In the meantime I will revert this PR so the builds are able to pass.

I will update this PR and the corresponding issues with my progress.

terencecho added a commit that referenced this pull request Dec 5, 2022
terencecho added a commit that referenced this pull request Dec 5, 2022
@terencecho
Copy link
Contributor

Fix for the failing integration tests: #20093

terencecho added a commit that referenced this pull request Dec 5, 2022
#20093)

* Revert "Revert "octavia-cli: Added flag to control whether to reset the streams or not (#18337)""

This reverts commit da0d9a7.

* Update octavia cli integration tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Octavia CLI: allow disabling stream reset when applying changes
5 participants