Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

Fixing Hashi Vault integration test #2098

Merged
merged 1 commit into from
Nov 20, 2020
Merged

Conversation

draychev
Copy link
Contributor

Two recent PRs introduced a compilation error, which is failing on main. This was caused by a semantic merge conflict, which did not break on the individual PRs.

  1. Introduced a change to a type: https://github.com/openservicemesh/osm/pull/2074/files#diff-e7b3046705df4aa3c3cf672ccbb4860037655b8bb52d87adbdd53383d9ac0a64R23
  2. Introduced a new test using the old type: https://github.com/openservicemesh/osm/pull/2069/files#diff-a262c8109d371baa7fc9661024a7d4b8099a24d4954efccc8862dd4d3501c515R112

The PR here fixes the test (2), which must use the new type (1).


Affected area:

  • New Functionality [ ]
  • Documentation [ ]
  • Install [ ]
  • Control Plane [ ]
  • CLI Tool [ ]
  • Certificate Management [ ]
  • Networking [ ]
  • Metrics [ ]
  • SMI Policy [ ]
  • Security [ ]
  • Tests [ ]
  • CI System [ ]
  • Performance [ ]
  • Other [ ]

Please answer the following questions with yes/no.

  • Does this change contain code from or inspired by another project? If so, did you notify the maintainers and provide attribution?

@draychev draychev requested a review from a team as a code owner November 20, 2020 18:17
Signed-off-by: Delyan Raychev <delyan.raychev@microsoft.com>
@shashankram shashankram merged commit b58a44f into openservicemesh:main Nov 20, 2020
@draychev draychev deleted the tests branch November 20, 2020 18:42
draychev added a commit to draychev/osm that referenced this pull request Dec 14, 2020
Signed-off-by: Delyan Raychev <delyan.raychev@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants