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.

Sign up for GitHub

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

azurerm_cdn_endpoint - Standardize the resource ID to be case sensitive #8237

Merged
merged 10 commits into from
Sep 2, 2020
Merged

azurerm_cdn_endpoint - Standardize the resource ID to be case sensitive #8237

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e5701a2
`azurerm_cnd_endpoint` - Standardize the resource ID to be case sensi…
magodo Aug 25, 2020
8aa6298
conform to the Formatter style
magodo Aug 25, 2020
ab8a159
add migration logic to cdn profile/endpoint, both managed and data re…
magodo Aug 25, 2020
99fab3d
remove migration from data source and resolve a self reference
magodo Aug 25, 2020
0fd7b9d
fix build error...
magodo Aug 25, 2020
94505f1
PIT copy paste the v0 schema
magodo Aug 26, 2020
2129111
lint error
magodo Aug 26, 2020
cc631d1
PIT C/P cdn profile schema & expand all function and remove validatio…
magodo Aug 27, 2020
5ddc3d5
rename param for `subscriptionId` to be consistent
magodo Aug 31, 2020
dff6dac
fixing the build
tombuildsstuff Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion azurerm/internal/services/cdn/cdn_endpoint_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"log"
"time"

"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/cdn/migration"

"github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2019-04-15/cdn"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
Expand Down Expand Up @@ -201,10 +203,20 @@ func resourceArmCdnEndpoint() *schema.Resource {

"tags": tags.Schema(),
},

SchemaVersion: 1,
StateUpgraders: []schema.StateUpgrader{
{
Type: migration.CdnEndpointV0Schema().CoreConfigSchema().ImpliedType(),
Upgrade: migration.CdnEndpointV0ToV1,
Version: 0,
},
},
}
}

func resourceArmCdnEndpointCreate(d *schema.ResourceData, meta interface{}) error {
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
endpointsClient := meta.(*clients.Client).Cdn.EndpointsClient
profilesClient := meta.(*clients.Client).Cdn.ProfilesClient
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
Expand Down Expand Up @@ -303,7 +315,12 @@ func resourceArmCdnEndpointCreate(d *schema.ResourceData, meta interface{}) erro
return fmt.Errorf("Error retrieving CDN Endpoint %q (Profile %q / Resource Group %q): %+v", name, profileName, resourceGroup, err)
}

d.SetId(*read.ID)
id, err := parse.CdnEndpointID(*read.ID)
if err != nil {
return err
}

d.SetId(id.ID(subscriptionId))

return resourceArmCdnEndpointRead(d, meta)
}
Expand Down
10 changes: 9 additions & 1 deletion azurerm/internal/services/cdn/cdn_profile_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"fmt"
"time"

"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/cdn/parse"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down Expand Up @@ -41,6 +43,7 @@ func dataSourceArmCdnProfile() *schema.Resource {
}

func dataSourceArmCdnProfileRead(d *schema.ResourceData, meta interface{}) error {
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
client := meta.(*clients.Client).Cdn.ProfilesClient
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()
Expand All @@ -56,7 +59,12 @@ func dataSourceArmCdnProfileRead(d *schema.ResourceData, meta interface{}) error
return fmt.Errorf("Error making Read request on Azure CDN Profile %q (Resource Group %q): %+v", name, resourceGroup, err)
}

d.SetId(*resp.ID)
id, err := parse.CdnProfileID(*resp.ID)
if err != nil {
return err
}

d.SetId(id.ID(subscriptionId))

d.Set("name", name)
d.Set("resource_group_name", resourceGroup)
Expand Down
19 changes: 18 additions & 1 deletion azurerm/internal/services/cdn/cdn_profile_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"log"
"time"

"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/cdn/migration"

"github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2019-04-15/cdn"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
Expand Down Expand Up @@ -66,10 +68,20 @@ func resourceArmCdnProfile() *schema.Resource {

"tags": tags.Schema(),
},

SchemaVersion: 1,
StateUpgraders: []schema.StateUpgrader{
{
Type: migration.CdnProfileV0Schema().CoreConfigSchema().ImpliedType(),
Upgrade: migration.CdnProfileV0ToV1,
Version: 0,
},
},
}
}

func resourceArmCdnProfileCreate(d *schema.ResourceData, meta interface{}) error {
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
client := meta.(*clients.Client).Cdn.ProfilesClient
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
defer cancel()
Expand Down Expand Up @@ -121,7 +133,12 @@ func resourceArmCdnProfileCreate(d *schema.ResourceData, meta interface{}) error
return fmt.Errorf("Cannot read CDN Profile %s (resource group %s) ID", name, resGroup)
}

d.SetId(*read.ID)
id, err := parse.CdnProfileID(*read.ID)
if err != nil {
return err
}

d.SetId(id.ID(subscriptionId))

return resourceArmCdnProfileRead(d, meta)
}
Expand Down
Loading