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

New Resource: azurerm_arc_machine #26647

Merged
merged 7 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
2 changes: 1 addition & 1 deletion .github/labeler-issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ service/hsm:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_dedicated_hardware_security_module((.|\n)*)###'

service/hybrid-compute:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(arc_machine\W+|arc_machine_extension\W+|arc_private_link_scope\W+|hybrid_compute_machine)((.|\n)*)###'
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(arc_machine\W+|arc_machine\W+|arc_machine_extension\W+|arc_private_link_scope\W+|hybrid_compute_machine)((.|\n)*)###'

service/iot-central:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_iotcentral_((.|\n)*)###'
Expand Down
158 changes: 158 additions & 0 deletions internal/services/hybridcompute/arc_machine_resource.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package hybridcompute

import (
"context"
"fmt"
"time"

"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-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-sdk/resource-manager/hybridcompute/2024-05-20-preview/machines"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
)

type ArcMachineResourceModel struct {
Name string `tfschema:"name"`
ResourceGroupName string `tfschema:"resource_group_name"`
Location string `tfschema:"location"`
Kind string `tfschema:"kind"`
}

type ArcMachineResource struct{}

func (r ArcMachineResource) ResourceType() string {
return "azurerm_arc_machine"
}

func (r ArcMachineResource) ModelObject() interface{} {
return &ArcMachineResourceModel{}
}

func (r ArcMachineResource) IDValidationFunc() pluginsdk.SchemaValidateFunc {
return machines.ValidateMachineID
}

func (r ArcMachineResource) Arguments() map[string]*pluginsdk.Schema {
return map[string]*pluginsdk.Schema{
"name": {
Type: pluginsdk.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringIsNotEmpty,
neil-yechenwei marked this conversation as resolved.
Show resolved Hide resolved
},

"resource_group_name": commonschema.ResourceGroupName(),

"location": commonschema.Location(),

"kind": {
Type: pluginsdk.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice(machines.PossibleValuesForArcKindEnum(), false),
},
}
}

func (r ArcMachineResource) Attributes() map[string]*pluginsdk.Schema {
return map[string]*pluginsdk.Schema{}
}

func (r ArcMachineResource) Create() sdk.ResourceFunc {
return sdk.ResourceFunc{
Timeout: 30 * time.Minute,
Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
subscriptionId := metadata.Client.Account.SubscriptionId
client := metadata.Client.HybridCompute.HybridComputeClient_v2024_05_20_preview.Machines

var model ArcMachineResourceModel
if err := metadata.Decode(&model); err != nil {
return fmt.Errorf("decoding: %+v", err)
}

id := machines.NewMachineID(subscriptionId, model.ResourceGroupName, model.Name)

existing, err := client.Get(ctx, id, machines.DefaultGetOperationOptions())
if err != nil {
if !response.WasNotFound(existing.HttpResponse) {
return fmt.Errorf("checking for the presence of an existing %s: %+v", id, err)
}
}
if !response.WasNotFound(existing.HttpResponse) {
return metadata.ResourceRequiresImport(r.ResourceType(), id)
}

parameters := machines.Machine{
Location: location.Normalize(model.Location),
Kind: pointer.To(machines.ArcKindEnum(model.Kind)),
}

if _, err := client.CreateOrUpdate(ctx, id, parameters, machines.DefaultCreateOrUpdateOperationOptions()); err != nil {
return fmt.Errorf("creating %s: %+v", id, err)
}

metadata.SetID(id)
return nil
},
}
}

func (r ArcMachineResource) Read() sdk.ResourceFunc {
return sdk.ResourceFunc{
Timeout: 5 * time.Minute,
Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
client := metadata.Client.HybridCompute.HybridComputeClient_v2024_05_20_preview.Machines

id, err := machines.ParseMachineID(metadata.ResourceData.Id())
if err != nil {
return err
}

resp, err := client.Get(ctx, *id, machines.DefaultGetOperationOptions())
if err != nil {
if response.WasNotFound(resp.HttpResponse) {
return metadata.MarkAsGone(*id)
}
return fmt.Errorf("retrieving %s: %+v", *id, err)
}

state := ArcMachineResourceModel{
Name: id.MachineName,
ResourceGroupName: id.ResourceGroupName,
}
if model := resp.Model; model != nil {
state.Location = location.Normalize(model.Location)
state.Kind = string(pointer.From(model.Kind))
}

return metadata.Encode(&state)
},
}
}

func (r ArcMachineResource) Delete() sdk.ResourceFunc {
return sdk.ResourceFunc{
Timeout: 30 * time.Minute,
Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
client := metadata.Client.HybridCompute.HybridComputeClient_v2024_05_20_preview.Machines

id, err := machines.ParseMachineID(metadata.ResourceData.Id())
if err != nil {
return err
}

if _, err := client.Delete(ctx, *id); err != nil {
return fmt.Errorf("deleting %s: %+v", *id, err)
}

return nil
},
}
}
102 changes: 102 additions & 0 deletions internal/services/hybridcompute/arc_machine_resource_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package hybridcompute_test

import (
"context"
"fmt"
"testing"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/hybridcompute/2024-05-20-preview/machines"
"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"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
)

type ArcMachineResource struct{}

func TestAccArcMachineResource_basic(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_arc_machine", "test")
r := ArcMachineResource{}

data.ResourceSequentialTest(t, r, []acceptance.TestStep{
{
Config: r.basic(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccArcMachineResource_requiresImport(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_arc_machine", "test")
r := ArcMachineResource{}

data.ResourceSequentialTest(t, r, []acceptance.TestStep{
{
Config: r.basic(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.RequiresImportErrorStep(r.requiresImport),
})
}

func (r ArcMachineResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := machines.ParseMachineID(state.ID)
if err != nil {
return nil, err
}

resp, err := clients.HybridCompute.HybridComputeClient_v2024_05_20_preview.Machines.Get(ctx, *id, machines.DefaultGetOperationOptions())
if err != nil {
return nil, fmt.Errorf("retrieving %s: %+v", *id, err)
}

return pointer.To(resp.Model != nil), nil
}

func (r ArcMachineResource) basic(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

provider "azurerm" {
features {}
}

resource "azurerm_arc_machine" "test" {
name = "acctest-hcm-%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
kind = "SCVMM"
}
`, r.template(data), data.RandomInteger)
}

func (r ArcMachineResource) requiresImport(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

resource "azurerm_arc_machine" "import" {
name = azurerm_arc_machine.test.name
resource_group_name = azurerm_arc_machine.test.resource_group_name
location = azurerm_arc_machine.test.location
kind = azurerm_arc_machine.test.kind
}
`, r.basic(data))
}

func (r ArcMachineResource) template(data acceptance.TestData) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestrg-hcm-%d"
location = "%s"
}
`, data.RandomInteger, data.Locations.Primary)
}
27 changes: 19 additions & 8 deletions internal/services/hybridcompute/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,27 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/hybridcompute/2022-11-10/machines"
"github.com/hashicorp/go-azure-sdk/resource-manager/hybridcompute/2022-11-10/privateendpointconnections"
"github.com/hashicorp/go-azure-sdk/resource-manager/hybridcompute/2022-11-10/privatelinkscopes"
hybridcompute_v2024_05_20_preview "github.com/hashicorp/go-azure-sdk/resource-manager/hybridcompute/2024-05-20-preview"
"github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

type Client struct {
MachineExtensionsClient *machineextensions.MachineExtensionsClient
MachinesClient *machines.MachinesClient
PrivateEndpointConnectionsClient *privateendpointconnections.PrivateEndpointConnectionsClient
PrivateLinkScopesClient *privatelinkscopes.PrivateLinkScopesClient
HybridComputeClient_v2024_05_20_preview *hybridcompute_v2024_05_20_preview.Client
MachineExtensionsClient *machineextensions.MachineExtensionsClient
MachinesClient *machines.MachinesClient
PrivateEndpointConnectionsClient *privateendpointconnections.PrivateEndpointConnectionsClient
PrivateLinkScopesClient *privatelinkscopes.PrivateLinkScopesClient
}

func NewClient(o *common.ClientOptions) (*Client, error) {
hybridComputeClient_v2024_05_20_preview, err := hybridcompute_v2024_05_20_preview.NewClientWithBaseURI(o.Environment.ResourceManager, func(c *resourcemanager.Client) {
o.Configure(c, o.Authorizers.ResourceManager)
})
if err != nil {
return nil, fmt.Errorf("building Hybrid Compute client: %+v", err)
}

machineExtensionsClient, err := machineextensions.NewMachineExtensionsClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building MachineExtensions client: %+v", err)
Expand All @@ -46,9 +56,10 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
o.Configure(privateLinkScopesClient.Client, o.Authorizers.ResourceManager)

return &Client{
MachineExtensionsClient: machineExtensionsClient,
MachinesClient: machinesClient,
PrivateEndpointConnectionsClient: privateEndpointConnectionsClient,
PrivateLinkScopesClient: privateLinkScopesClient,
HybridComputeClient_v2024_05_20_preview: hybridComputeClient_v2024_05_20_preview,
MachineExtensionsClient: machineExtensionsClient,
MachinesClient: machinesClient,
PrivateEndpointConnectionsClient: privateEndpointConnectionsClient,
PrivateLinkScopesClient: privateLinkScopesClient,
}, nil
}
1 change: 1 addition & 0 deletions internal/services/hybridcompute/registration.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func (r Registration) DataSources() []sdk.DataSource {
// Resources returns a list of Resources supported by this Service
func (r Registration) Resources() []sdk.Resource {
return []sdk.Resource{
ArcMachineResource{},
ArcMachineExtensionResource{},
ArcPrivateLinkScopeResource{},
}
Expand Down

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

Loading
Loading