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

Update the Cognitive SDK to use API Version 2024-10-01 from 2023-05-01 #27851

Merged
merged 8 commits into from
Nov 8, 2024

Conversation

liuwuliuyun
Copy link
Contributor

@liuwuliuyun liuwuliuyun commented Nov 1, 2024

Community Note

  • Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
  • Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

PR Checklist

  • I have followed the guidelines in our Contributing Documentation.
  • I have checked to ensure there aren't other open Pull Requests for the same update/change.
  • I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
  • I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
  • I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
    For example: “resource_name_here - description of change e.g. adding property new_property_name_here

Changes to existing Resource / Data Source

  • I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
  • I have written new tests for my resource or datasource changes & updated any relevent documentation.
  • I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
  • (For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

  • My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)
image

These tests also failed in main branch, I will try to fix them in seperate PRs.

For state migrations please test the changes locally and provide details here, such as the versions involved in testing the migration path. For further details on testing state migration changes please see our guide on state migrations in the contributor documentation. -->

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

@stephybun
Copy link
Member

Hey @liuwuliuyun, is this ready to be reviewed?

@liuwuliuyun
Copy link
Contributor Author

Hi @stephybun, I'm currently addressing the issue with 3 new acceptance tests failing. I'll set it as ready for review as soon as I resolve these issues.

@liuwuliuyun liuwuliuyun marked this pull request as ready for review November 6, 2024 09:27
@liuwuliuyun liuwuliuyun requested review from katbyte and a team as code owners November 6, 2024 09:27
Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks @liuwuliuyun, it looks like this upgrade contains a breaking change albeit a minor one. I'm going to mark this with the breaking change label for awareness and will check with the team whether we can proceed with this.

Comment on lines +583 to +595
if localAuthEnabled {
keys, err := client.AccountsListKeys(ctx, *id)
if err != nil {
// note for the resource we shouldn't gracefully fail since we have permission to CRUD it
return fmt.Errorf("listing the Keys for %s: %+v", *id, err)
}

if model := keys.Model; model != nil {
d.Set("primary_access_key", model.Key1)
d.Set("secondary_access_key", model.Key2)
}
}

Copy link
Member

Choose a reason for hiding this comment

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

Technically a breaking change since these were being populated when using 2023-05-01 even when local_authentication_enabled = false

Whether those keys were actually useful though is another question. Pointing this out for awareness.

Comment on lines +421 to +431
if localAuthEnabled {
keys, err := client.AccountsListKeys(ctx, *id)
if err != nil {
return fmt.Errorf("listing the Keys for %s: %+v", id, err)
}

if model := keys.Model; model != nil {
state.PrimaryAccessKey = pointer.From(model.Key1)
state.SecondaryAccessKey = pointer.From(model.Key2)
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Can you please update the documentation with a note below these properties with the explanation that these are only available if location_authentication_enabled is true

Comment on lines +583 to +594
if localAuthEnabled {
keys, err := client.AccountsListKeys(ctx, *id)
if err != nil {
// note for the resource we shouldn't gracefully fail since we have permission to CRUD it
return fmt.Errorf("listing the Keys for %s: %+v", *id, err)
}

if model := keys.Model; model != nil {
d.Set("primary_access_key", model.Key1)
d.Set("secondary_access_key", model.Key2)
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Can you please update the documentation with a note below these properties with the explanation that these are only available if location_auth_enabled is true

@liuwuliuyun
Copy link
Contributor Author

HI @stephybun , thanks for the review. I've updated the documentation to include reminders that the primary_access_key and secondary_access_key attributes are accessible only when location_auth_enabled is enabled. Additionally, I've made corresponding updates in the datasource. Could you please review these changes as well?

@liuwuliuyun
Copy link
Contributor Author

New testing results on datasource:
image
image

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks @liuwuliuyun, could you fix up the wording on the notes in the documentation? Once that's done this should be good to go.

website/docs/d/cognitive_account.html.markdown Outdated Show resolved Hide resolved
website/docs/r/ai_services.html.markdown Outdated Show resolved Hide resolved
website/docs/r/cognitive_account.html.markdown Outdated Show resolved Hide resolved
liuwuliuyun and others added 3 commits November 8, 2024 13:40
Co-authored-by: stephybun <steph@hashicorp.com>
Co-authored-by: stephybun <steph@hashicorp.com>
Co-authored-by: stephybun <steph@hashicorp.com>
Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks @liuwuliuyun LGTM 👍

@stephybun stephybun merged commit 5bcbf40 into hashicorp:main Nov 8, 2024
33 checks passed
@github-actions github-actions bot added this to the v4.10.0 milestone Nov 8, 2024
stephybun added a commit that referenced this pull request Nov 8, 2024
@liuwuliuyun liuwuliuyun deleted the cog-sdk-update branch November 8, 2024 07:45
Copy link

github-actions bot commented Dec 9, 2024

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants