Update `media` service v4.0 clean up #27195

magodo · 2024-08-26T07:06:43Z

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

#27096 has cleaned up the documents for the 4.0 breaking changes. In particular, it removes the deprecated resources' documents. While the media service is missed to do so.

Additionally, this PR enclose the AccountFilterResource to make it removed in v4.0.

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)

Change Log

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

azurerm_resource - support for the thing1 property [GH-00000]

This is a (please select all that apply):

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

Related Issue(s)

Fixes #0000

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

catriona-m

Thanks @magodo - I just left one comment about the use of the FourPointOh flag, but otherwise this is looking good. Thanks!

catriona-m · 2024-08-27T11:23:49Z

internal/services/media/registration.go

@@ -67,7 +67,10 @@ func (r Registration) DataSources() []sdk.DataSource {
 }

 func (r Registration) Resources() []sdk.Resource {
-	return []sdk.Resource{
-		AccountFilterResource{},
+	if !features.FourPointOhBeta() {


now that 4.0 has been released we can remove this completely without using the flag

I've checked some other resources and noticed they were still behind the flag (e.g. iottimeseriesinsights). I'd like to follow the current behavior, and expect a commit later to do a bulk delete. WDYT?

We shouldn't add 4.0 flags in now that 4.0 has been released. In this case we should probably leave this as it was given that the deprecated resource hasn't bene removed or add the 5.0 flag

Then do you want me to delete the same if check for the SupportedResources()? I'm afraid if all of them are deleted, then when the person who is gonna clean up those resources by inspecting the 4.0 flag will miss those resources.

the other if statement should be fine to remain because it was put in place before the 4.0 release

@catriona-m Done

catriona-m · 2024-08-29T10:46:56Z

internal/services/media/registration.go

-	return []sdk.Resource{
-		AccountFilterResource{},
-	}
+	return []sdk.Resource{}


sorry for the confusion @magodo , I think we need to leave this as it is for now and not remove it, since it wasn't feature flagged before 4.0 was released

@catriona-m Oh.. I see. That makes sense now. I've reverted it back.

This reverts commit 0daaa46.

catriona-m

Apologies for not noticing this on the previous review, but could you rebase this on main and run make again? The issue labeller script has been updated to not include labels without regexes in labeler-issue-triage.yml since this pr was opened. Thanks!

magodo · 2024-09-02T00:43:48Z

@catriona-m Sure, I've reverted the labeler yaml back now.

catriona-m

Thanks @magodo LGTM!

github-actions · 2024-10-03T02:14:18Z

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.

Update media service v4.0 clean up

d8ed6b2

magodo requested a review from stephybun August 26, 2024 07:06

github-actions bot added documentation service/media size/XL waiting-response labels Aug 26, 2024

pass ci

d3b2115

github-actions bot removed the waiting-response label Aug 26, 2024

catriona-m requested changes Aug 27, 2024

View reviewed changes

github-actions bot added the waiting-response label Aug 27, 2024

Removing the registration of account filter

0daaa46

github-actions bot added waiting-response and removed waiting-response labels Aug 29, 2024

catriona-m reviewed Aug 29, 2024

View reviewed changes

magodo added 2 commits August 30, 2024 08:40

Revert "Removing the registration of account filter"

b36dc48

This reverts commit 0daaa46.

keep the account filter resource

ebc3bcd

github-actions bot removed the waiting-response label Aug 30, 2024

catriona-m requested changes Aug 30, 2024

View reviewed changes

github-actions bot added the waiting-response label Aug 30, 2024

magodo added 2 commits September 2, 2024 08:36

Merge remote-tracking branch 'upstream/main' into media_4_cleaup

5fcdeff

Revert labeler issue

baf710d

github-actions bot removed the waiting-response label Sep 2, 2024

catriona-m approved these changes Sep 2, 2024

View reviewed changes

catriona-m merged commit b6e36fb into hashicorp:main Sep 2, 2024
7 checks passed

github-actions bot added this to the v4.1.0 milestone Sep 2, 2024

github-actions bot locked as resolved and limited conversation to collaborators Oct 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update `media` service v4.0 clean up #27195

Update `media` service v4.0 clean up #27195

magodo commented Aug 26, 2024 •

edited

Loading

catriona-m left a comment

catriona-m Aug 27, 2024

magodo Aug 27, 2024

catriona-m Aug 28, 2024

magodo Aug 28, 2024

catriona-m Aug 28, 2024

magodo Aug 29, 2024

catriona-m Aug 29, 2024

magodo Aug 30, 2024

catriona-m left a comment

magodo commented Sep 2, 2024

catriona-m left a comment

github-actions bot commented Oct 3, 2024

Update media service v4.0 clean up #27195

Update media service v4.0 clean up #27195

Conversation

magodo commented Aug 26, 2024 • edited Loading

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

catriona-m left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

catriona-m left a comment

Choose a reason for hiding this comment

magodo commented Sep 2, 2024

catriona-m left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 3, 2024

Update `media` service v4.0 clean up #27195

Update `media` service v4.0 clean up #27195

magodo commented Aug 26, 2024 •

edited

Loading