Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion internal/services/storagemover/registration.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,12 @@ func (r Registration) EphemeralResources() []func() ephemeral.EphemeralResource
}

func (r Registration) ListResources() []sdk.FrameworkListWrappedResource {
return []sdk.FrameworkListWrappedResource{}
return []sdk.FrameworkListWrappedResource{
StorageMoverListResource{},
StorageMoverAgentListResource{},
StorageMoverSourceEndpointListResource{},
StorageMoverTargetEndpointListResource{},
StorageMoverProjectListResource{},
StorageMoverJobDefinitionListResource{},
}
}
44 changes: 32 additions & 12 deletions internal/services/storagemover/storage_mover_agent_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,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/resourceids"
"github.com/hashicorp/go-azure-sdk/resource-manager/storagemover/2023-03-01/agents"
"github.com/hashicorp/go-azure-sdk/resource-manager/storagemover/2023-03-01/storagemovers"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
Expand All @@ -18,6 +19,8 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
)

//go:generate go run ../../tools/generator-tests resourceidentity -resource-name storage_mover_agent -service-package-name storagemover -properties "name" -compare-values "subscription_id:storage_mover_id,resource_group_name:storage_mover_id,storage_mover_name:storage_mover_id"

type StorageMoverAgentResourceModel struct {
Name string `tfschema:"name"`
StorageMoverId string `tfschema:"storage_mover_id"`
Expand All @@ -28,7 +31,14 @@ type StorageMoverAgentResourceModel struct {

type StorageMoverAgentResource struct{}

var _ sdk.ResourceWithUpdate = StorageMoverAgentResource{}
var (
_ sdk.ResourceWithIdentity = StorageMoverAgentResource{}
_ sdk.ResourceWithUpdate = StorageMoverAgentResource{}
)

func (r StorageMoverAgentResource) Identity() resourceids.ResourceId {
return &agents.AgentId{}
}

func (r StorageMoverAgentResource) ResourceType() string {
return "azurerm_storage_mover_agent"
Expand Down Expand Up @@ -126,6 +136,9 @@ func (r StorageMoverAgentResource) Create() sdk.ResourceFunc {
}

metadata.SetID(id)
if err := pluginsdk.SetResourceIdentityData(metadata.ResourceData, &id); err != nil {
return err
}
return nil
},
}
Expand Down Expand Up @@ -189,21 +202,28 @@ func (r StorageMoverAgentResource) Read() sdk.ResourceFunc {
return fmt.Errorf("retrieving %s: %+v", *id, err)
}

state := StorageMoverAgentResourceModel{
Name: id.AgentName,
StorageMoverId: storagemovers.NewStorageMoverID(id.SubscriptionId, id.ResourceGroupName, id.StorageMoverName).ID(),
}
return r.flatten(metadata, id, resp.Model)
},
}
}

if model := resp.Model; model != nil {
state.ArcVmUuid = model.Properties.ArcVMUuid
state.ArcVirtualMachineId = model.Properties.ArcResourceId
func (r StorageMoverAgentResource) flatten(metadata sdk.ResourceMetaData, id *agents.AgentId, model *agents.Agent) error {
state := StorageMoverAgentResourceModel{
Name: id.AgentName,
StorageMoverId: storagemovers.NewStorageMoverID(id.SubscriptionId, id.ResourceGroupName, id.StorageMoverName).ID(),
}

state.Description = pointer.From(model.Properties.Description)
}
if model != nil {
state.ArcVmUuid = model.Properties.ArcVMUuid
state.ArcVirtualMachineId = model.Properties.ArcResourceId
state.Description = pointer.From(model.Properties.Description)
}

return metadata.Encode(&state)
},
if err := pluginsdk.SetResourceIdentityData(metadata.ResourceData, id); err != nil {
return err
}

return metadata.Encode(&state)
}

func (r StorageMoverAgentResource) Delete() sdk.ResourceFunc {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Copyright IBM Corp. 2014, 2025
// SPDX-License-Identifier: MPL-2.0

package storagemover_test

import (
"testing"

"github.com/hashicorp/terraform-plugin-testing/statecheck"
"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
customstatecheck "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/statecheck"
)

func TestAccStorageMoverAgent_resourceIdentity(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_storage_mover_agent", "test")
r := StorageMoverAgentResource{}

checkedFields := map[string]struct{}{
"name": {},
"resource_group_name": {},
"storage_mover_name": {},
"subscription_id": {},
}

data.ResourceIdentityTest(t, []acceptance.TestStep{
{
Config: r.basic(data),
ConfigStateChecks: []statecheck.StateCheck{
customstatecheck.ExpectAllIdentityFieldsAreChecked("azurerm_storage_mover_agent.test", checkedFields),
statecheck.ExpectIdentityValueMatchesStateAtPath("azurerm_storage_mover_agent.test", tfjsonpath.New("name"), tfjsonpath.New("name")),
customstatecheck.ExpectStateContainsIdentityValueAtPath("azurerm_storage_mover_agent.test", tfjsonpath.New("resource_group_name"), tfjsonpath.New("storage_mover_id")),
customstatecheck.ExpectStateContainsIdentityValueAtPath("azurerm_storage_mover_agent.test", tfjsonpath.New("storage_mover_name"), tfjsonpath.New("storage_mover_id")),
customstatecheck.ExpectStateContainsIdentityValueAtPath("azurerm_storage_mover_agent.test", tfjsonpath.New("subscription_id"), tfjsonpath.New("storage_mover_id")),
},
},
data.ImportBlockWithResourceIdentityStep(false),
data.ImportBlockWithIDStep(false),
}, false)
}
105 changes: 105 additions & 0 deletions internal/services/storagemover/storage_mover_agent_resource_list.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
// Copyright IBM Corp. 2014, 2026
// SPDX-License-Identifier: MPL-2.0

package storagemover

import (
"context"
"fmt"

"github.com/hashicorp/go-azure-helpers/framework/typehelpers"
"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/storagemover/2023-03-01/agents"
"github.com/hashicorp/go-azure-sdk/resource-manager/storagemover/2023-03-01/storagemovers"
"github.com/hashicorp/terraform-plugin-framework/list"
"github.com/hashicorp/terraform-plugin-framework/list/schema"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
)

type StorageMoverAgentListResource struct{}

type StorageMoverAgentListModel struct {
StorageMoverId types.String `tfsdk:"storage_mover_id"`
}

var _ sdk.FrameworkListWrappedResource = new(StorageMoverAgentListResource)

func (StorageMoverAgentListResource) Metadata(_ context.Context, _ resource.MetadataRequest, response *resource.MetadataResponse) {
response.TypeName = StorageMoverAgentResource{}.ResourceType()
}

func (StorageMoverAgentListResource) ResourceFunc() *pluginsdk.Resource {
return sdk.WrappedResource(StorageMoverAgentResource{})
}

func (StorageMoverAgentListResource) ListResourceConfigSchema(_ context.Context, _ list.ListResourceSchemaRequest, response *list.ListResourceSchemaResponse) {
response.Schema = schema.Schema{
Attributes: map[string]schema.Attribute{
"storage_mover_id": schema.StringAttribute{
Required: true,
Validators: []validator.String{
typehelpers.WrappedStringValidator{Func: storagemovers.ValidateStorageMoverID},
},
},
},
}
}

func (StorageMoverAgentListResource) List(ctx context.Context, request list.ListRequest, stream *list.ListResultsStream, metadata sdk.ResourceMetadata) {
client := metadata.Client.StorageMover.AgentsClient

var data StorageMoverAgentListModel
diags := request.Config.Get(ctx, &data)
if diags.HasError() {
stream.Results = list.ListResultsStreamDiagnostics(diags)
return
}

storageMoverID, err := storagemovers.ParseStorageMoverID(data.StorageMoverId.ValueString())
if err != nil {
sdk.SetResponseErrorDiagnostic(stream, fmt.Sprintf("parsing Storage Mover ID for `%s`", StorageMoverAgentResource{}.ResourceType()), err)
return
}

resp, err := client.ListComplete(ctx, agents.NewStorageMoverID(storageMoverID.SubscriptionId, storageMoverID.ResourceGroupName, storageMoverID.StorageMoverName))
if err != nil {
sdk.SetResponseErrorDiagnostic(stream, fmt.Sprintf("listing `%s`", StorageMoverAgentResource{}.ResourceType()), err)
return
}

resource := StorageMoverAgentResource{}
stream.Results = func(push func(list.ListResult) bool) {
for _, item := range resp.Items {
result := request.NewListResult(ctx)
result.DisplayName = pointer.From(item.Name)

id, err := agents.ParseAgentIDInsensitively(pointer.From(item.Id))
if err != nil {
sdk.SetErrorDiagnosticAndPushListResult(result, push, "parsing Storage Mover Agent ID", err)
return
}

meta := sdk.NewResourceMetaData(metadata.Client, resource)
meta.SetID(id)

if err := resource.flatten(meta, id, &item); err != nil {
sdk.SetErrorDiagnosticAndPushListResult(result, push, fmt.Sprintf("encoding `%s` resource data", resource.ResourceType()), err)
return
}

sdk.EncodeListResult(ctx, meta.ResourceData, &result)
if result.Diagnostics.HasError() {
push(result)
return
}

if !push(result) {
return
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// Copyright IBM Corp. 2014, 2026
// SPDX-License-Identifier: MPL-2.0

package storagemover_test

import (
"context"
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/knownvalue"
"github.com/hashicorp/terraform-plugin-testing/querycheck"
"github.com/hashicorp/terraform-plugin-testing/tfversion"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/provider/framework"
)

func TestAccStorageMoverAgent_list(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_storage_mover_agent", "testlist")
r := StorageMoverAgentResource{}
resourceName := fmt.Sprintf("acctest-sa-%d", data.RandomInteger)
storageMoverName := fmt.Sprintf("acctest-ssm-%d", data.RandomInteger)
resourceGroupName := fmt.Sprintf("acctestRG-%d", data.RandomInteger)

resource.Test(t, resource.TestCase{
TerraformVersionChecks: []tfversion.TerraformVersionCheck{
tfversion.SkipBelow(tfversion.Version1_14_0),
},
ProtoV5ProviderFactories: framework.ProtoV5ProviderFactoriesInit(context.Background(), "azurerm"),
Steps: []resource.TestStep{
{Config: r.basic(data)},
{
Query: true,
Config: r.listQuery(),
QueryResultChecks: []querycheck.QueryResultCheck{
querycheck.ExpectLength("azurerm_storage_mover_agent.list", 1),
querycheck.ExpectIdentity("azurerm_storage_mover_agent.list", map[string]knownvalue.Check{
"name": knownvalue.StringExact(resourceName),
"resource_group_name": knownvalue.StringExact(resourceGroupName),
"storage_mover_name": knownvalue.StringExact(storageMoverName),
"subscription_id": knownvalue.StringExact(data.Subscriptions.Primary),
}),
},
},
},
})
}

func (r StorageMoverAgentResource) listQuery() string {
return `
list "azurerm_storage_mover_agent" "list" {
provider = azurerm
config {
storage_mover_id = azurerm_storage_mover.test.id
}
}
`
}
Loading
Loading