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

Deprecate distinct_entities and nont_entity_tokens #27830

Merged
merged 3 commits into from
Jul 23, 2024

Conversation

divyaac
Copy link
Contributor

@divyaac divyaac commented Jul 22, 2024

Description

OSS changes for the ENT PR: https://github.com/hashicorp/vault-enterprise/pull/6056/files#diff-1f4207e699cd95fe7169925fd5b032560c07a1e73005a085e661dac1064dbacf

Removes the deprecated distinct_entities and non_entity_tokens field from code. As seen in the code and in documentation distinct_entities = entity_clients now, and non_entity_tokens=non_entity_clients.

We will also need to remove references to these values from the UI.

TODO only if you're a HashiCorp employee

  • Labels: If this PR is the CE portion of an ENT change, and that ENT change is
    getting backported to N-2, use the new style backport/ent/x.x.x+ent labels
    instead of the old style backport/x.x.x labels.
  • Labels: If this PR is a CE only change, it can only be backported to N, so use
    the normal backport/x.x.x label (there should be only 1).
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jul 22, 2024
@divyaac divyaac added this to the 1.18.0-rc milestone Jul 22, 2024
Copy link

github-actions bot commented Jul 22, 2024

Build Results:
All builds succeeded! ✅

Copy link

github-actions bot commented Jul 22, 2024

CI Results:
All Go tests succeeded! ✅

@divyaac divyaac changed the title OSS changes Deprecate distinct_entities and nont_entity_tokens Jul 22, 2024
@divyaac divyaac force-pushed the VAULT-20032_Remove_Entitiy_Count_Fields_Update_Docs branch from 9955c17 to d53c1d0 Compare July 22, 2024 19:58
@divyaac divyaac added ui and removed ui labels Jul 22, 2024
@miagilepner
Copy link
Contributor

@divyaac can you fix the build? Once that's resolved I'll approve!

Copy link
Contributor

@miagilepner miagilepner left a comment

Choose a reason for hiding this comment

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

LGTM!

@divyaac divyaac enabled auto-merge (squash) July 23, 2024 17:50
@divyaac divyaac merged commit b32231a into main Jul 23, 2024
83 checks passed
@divyaac divyaac deleted the VAULT-20032_Remove_Entitiy_Count_Fields_Update_Docs branch July 23, 2024 20:57
Monkeychip pushed a commit that referenced this pull request Jul 24, 2024
* OSS Changes

* Added changelog

* Fix build errors
Monkeychip pushed a commit that referenced this pull request Jul 24, 2024
* OSS Changes

* Added changelog

* Fix build errors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants