Skip to content

Commit

Permalink
Merge pull request #20956 from teowa/upgrade_media_encoding_api_versi…
Browse files Browse the repository at this point in the history 
…on_2022-07-01

`azurerm_media_transform`, `azurerm_media_job` - upgrade from 2021-11-01 to 2022-07-01
  • Loading branch information
@tombuildsstuff
tombuildsstuff authored Mar 20, 2023
2 parents c3151b6 + e90cbba commit e2ef3a3
Show file tree
Hide file tree
Showing 89 changed files with 5,682 additions and 13 deletions.
10 changes: 10 additions & 0 deletions internal/services/media/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ import (
"fmt"

mediaV20211101 "github.com/hashicorp/go-azure-sdk/resource-manager/media/2021-11-01"
mediaV20220701 "github.com/hashicorp/go-azure-sdk/resource-manager/media/2022-07-01"
mediaV20220801 "github.com/hashicorp/go-azure-sdk/resource-manager/media/2022-08-01"
"github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

type Client struct {
V20211101Client *mediaV20211101.Client
V20220701Client *mediaV20220701.Client
V20220801Client *mediaV20220801.Client
}

Expand All @@ -22,6 +24,13 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
return nil, fmt.Errorf("building 2021-11-01 client: %+v", err)
}

v20220701Client, err := mediaV20220701.NewClientWithBaseURI(o.Environment.ResourceManager, func(c *resourcemanager.Client) {
o.Configure(c, o.Authorizers.ResourceManager)
})
if err != nil {
return nil, fmt.Errorf("building 2022-07-01 client: %+v", err)
}

v20220801Client, err := mediaV20220801.NewClientWithBaseURI(o.Environment.ResourceManager, func(c *resourcemanager.Client) {
o.Configure(c, o.Authorizers.ResourceManager)
})
Expand All @@ -31,6 +40,7 @@ func NewClient(o *common.ClientOptions) (*Client, error) {

return &Client{
V20211101Client: v20211101Client,
V20220701Client: v20220701Client,
V20220801Client: v20220801Client,
}, nil
}
10 changes: 5 additions & 5 deletions internal/services/media/media_job_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-sdk/resource-manager/media/2021-11-01/encodings"
"github.com/hashicorp/go-azure-sdk/resource-manager/media/2022-07-01/encodings"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/media/migration"
Expand Down Expand Up @@ -150,7 +150,7 @@ func resourceMediaJob() *pluginsdk.Resource {
}

func resourceMediaJobCreate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Media.V20211101Client.Encodings
client := meta.(*clients.Client).Media.V20220701Client.Encodings
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
defer cancel()
Expand Down Expand Up @@ -201,7 +201,7 @@ func resourceMediaJobCreate(d *pluginsdk.ResourceData, meta interface{}) error {
}

func resourceMediaJobRead(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Media.V20211101Client.Encodings
client := meta.(*clients.Client).Media.V20220701Client.Encodings
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand Down Expand Up @@ -257,7 +257,7 @@ func resourceMediaJobRead(d *pluginsdk.ResourceData, meta interface{}) error {
}

func resourceMediaJobUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Media.V20211101Client.Encodings
client := meta.(*clients.Client).Media.V20220701Client.Encodings
ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand Down Expand Up @@ -298,7 +298,7 @@ func resourceMediaJobUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
}

func resourceMediaJobDelete(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Media.V20211101Client.Encodings
client := meta.(*clients.Client).Media.V20220701Client.Encodings
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand Down
4 changes: 2 additions & 2 deletions internal/services/media/media_job_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/media/2021-11-01/encodings"
"github.com/hashicorp/go-azure-sdk/resource-manager/media/2022-07-01/encodings"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down Expand Up @@ -109,7 +109,7 @@ func (MediaJobResource) Exists(ctx context.Context, clients *clients.Client, sta
return nil, err
}

resp, err := clients.Media.V20211101Client.Encodings.JobsGet(ctx, *id)
resp, err := clients.Media.V20220701Client.Encodings.JobsGet(ctx, *id)
if err != nil {
return nil, fmt.Errorf("retrieving %s: %+v", *id, err)
}
Expand Down
8 changes: 4 additions & 4 deletions internal/services/media/media_transform_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-sdk/resource-manager/media/2021-11-01/encodings"
"github.com/hashicorp/go-azure-sdk/resource-manager/media/2022-07-01/encodings"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/media/migration"
Expand Down Expand Up @@ -206,7 +206,7 @@ func resourceMediaTransform() *pluginsdk.Resource {
}

func resourceMediaTransformCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Media.V20211101Client.Encodings
client := meta.(*clients.Client).Media.V20220701Client.Encodings
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()
Expand Down Expand Up @@ -248,7 +248,7 @@ func resourceMediaTransformCreateUpdate(d *pluginsdk.ResourceData, meta interfac
}

func resourceMediaTransformRead(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Media.V20211101Client.Encodings
client := meta.(*clients.Client).Media.V20220701Client.Encodings
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand Down Expand Up @@ -287,7 +287,7 @@ func resourceMediaTransformRead(d *pluginsdk.ResourceData, meta interface{}) err
}

func resourceMediaTransformDelete(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Media.V20211101Client.Encodings
client := meta.(*clients.Client).Media.V20220701Client.Encodings
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand Down
4 changes: 2 additions & 2 deletions internal/services/media/media_transform_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/media/2021-11-01/encodings"
"github.com/hashicorp/go-azure-sdk/resource-manager/media/2022-07-01/encodings"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down Expand Up @@ -104,7 +104,7 @@ func (r MediaTransformResource) Exists(ctx context.Context, clients *clients.Cli
return nil, err
}

resp, err := clients.Media.V20211101Client.Encodings.TransformsGet(ctx, *id)
resp, err := clients.Media.V20220701Client.Encodings.TransformsGet(ctx, *id)
if err != nil {
return nil, fmt.Errorf("retrieving %s: %+v", *id, err)
}
Expand Down
28 changes: 28 additions & 0 deletions vendor/github.com/hashicorp/go-azure-sdk/resource-manager/media/2022-07-01/client.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e2ef3a3

Please sign in to comment.