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_logic_app_workflow #1266

Merged
merged 13 commits into from
Jul 17, 2018
Merged
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
11 changes: 11 additions & 0 deletions azurerm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices"
keyVault "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault"
"github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault"
"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2016-06-01/logic"
"github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights"
"github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-04-01/network"
Expand Down Expand Up @@ -149,6 +150,9 @@ type ArmClient struct {
keyVaultClient keyvault.VaultsClient
keyVaultManagementClient keyVault.BaseClient

// Logic
logicWorkflowsClient logic.WorkflowsClient

// Monitor
monitorAlertRulesClient insights.AlertRulesClient

Expand Down Expand Up @@ -397,6 +401,7 @@ func getArmClient(c *authentication.Config) (*ArmClient, error) {
client.registerEventGridClients(endpoint, c.SubscriptionID, auth, sender)
client.registerEventHubClients(endpoint, c.SubscriptionID, auth, sender)
client.registerKeyVaultClients(endpoint, c.SubscriptionID, auth, keyVaultAuth, sender)
client.registerLogicClients(endpoint, c.SubscriptionID, auth, sender)
client.registerMonitorClients(endpoint, c.SubscriptionID, auth, sender)
client.registerNetworkingClients(endpoint, c.SubscriptionID, auth, sender)
client.registerOperationalInsightsClients(endpoint, c.SubscriptionID, auth, sender)
Expand Down Expand Up @@ -732,6 +737,12 @@ func (c *ArmClient) registerKeyVaultClients(endpoint, subscriptionId string, aut
c.keyVaultManagementClient = keyVaultManagementClient
}

func (c *ArmClient) registerLogicClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {
workflowsClient := logic.NewWorkflowsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&workflowsClient.Client, auth)
c.logicWorkflowsClient = workflowsClient
}

func (c *ArmClient) registerMonitorClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {
arc := insights.NewAlertRulesClientWithBaseURI(endpoint, subscriptionId)
setUserAgent(&arc.Client)
Expand Down
108 changes: 108 additions & 0 deletions azurerm/data_source_logic_app_workflow.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
package azurerm

import (
"fmt"

"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2016-06-01/logic"
"github.com/hashicorp/terraform/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

func dataSourceArmLogicAppWorkflow() *schema.Resource {
return &schema.Resource{
Read: dataSourceArmLogicAppWorkflowRead,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
},

"resource_group_name": resourceGroupNameForDataSourceSchema(),

"location": locationForDataSourceSchema(),

// TODO: should Parameters be split out into their own object to allow validation on the different sub-types?
"parameters": {
Type: schema.TypeMap,
Computed: true,
},

"workflow_schema": {
Type: schema.TypeString,
Computed: true,
},

"workflow_version": {
Type: schema.TypeString,
Computed: true,
},

"tags": tagsForDataSourceSchema(),

"access_endpoint": {
Type: schema.TypeString,
Computed: true,
},
},
}
}
func dataSourceArmLogicAppWorkflowRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).logicWorkflowsClient
ctx := meta.(*ArmClient).StopContext

name := d.Get("name").(string)
resourceGroup := d.Get("resource_group_name").(string)

resp, err := client.Get(ctx, resourceGroup, name)
if err != nil {
if utils.ResponseWasNotFound(resp.Response) {
return fmt.Errorf("Logic App Workflow %q was not found in Resource Group %q", name, resourceGroup)
}

return fmt.Errorf("[ERROR] Error making Read request on Logic App Workflow %q (Resource Group %q): %+v", name, resourceGroup, err)
}

d.SetId(*resp.ID)

if location := resp.Location; location != nil {
d.Set("location", azureRMNormalizeLocation(*location))
}

if props := resp.WorkflowProperties; props != nil {
parameters := flattenLogicAppDataSourceWorkflowParameters(props.Parameters)
if err := d.Set("parameters", parameters); err != nil {
return fmt.Errorf("Error flattening `parameters`: %+v", err)
}

d.Set("access_endpoint", props.AccessEndpoint)

if definition := props.Definition; definition != nil {
if v, ok := definition.(map[string]interface{}); ok {
schema := v["$schema"].(string)
version := v["contentVersion"].(string)
d.Set("workflow_schema", schema)
d.Set("workflow_version", version)
}
}
}

flattenAndSetTags(d, resp.Tags)

return nil
}

func flattenLogicAppDataSourceWorkflowParameters(input map[string]*logic.WorkflowParameter) map[string]interface{} {
output := make(map[string]interface{}, 0)

for k, v := range input {
if v != nil {
output[k] = v.Value.(string)
}
}

return output
}
80 changes: 80 additions & 0 deletions azurerm/data_source_logic_app_workflow_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package azurerm

import (
"fmt"
"testing"

"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
)

func TestAccDataSourceAzureRMLogicAppWorkflow_basic(t *testing.T) {
dataSourceName := "data.azurerm_logic_app_workflow.test"
ri := acctest.RandInt()
location := testLocation()
config := testAccDataSourceAzureRMLogicAppWorkflow_basic(ri, location)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLogicAppWorkflowDestroy,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLogicAppWorkflowExists(dataSourceName),
resource.TestCheckResourceAttr(dataSourceName, "parameters.%", "0"),
resource.TestCheckResourceAttr(dataSourceName, "tags.%", "0"),
),
},
},
})
}

func TestAccDataSourceAzureRMLogicAppWorkflow_tags(t *testing.T) {
dataSourceName := "data.azurerm_logic_app_workflow.test"
ri := acctest.RandInt()
location := testLocation()
config := testAccDataSourceAzureRMLogicAppWorkflow_tags(ri, location)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLogicAppWorkflowDestroy,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLogicAppWorkflowExists(dataSourceName),
resource.TestCheckResourceAttr(dataSourceName, "parameters.%", "0"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nitpick: should we use resource.TestCheckResourceAttrPair() for these rather than hardcoding the expectations?

Copy link
Contributor Author

@tombuildsstuff tombuildsstuff Jul 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's an enhancement we should make, but across all resources (since a lot of tests follow this pattern); going to skip this for now.

resource.TestCheckResourceAttr(dataSourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(dataSourceName, "tags.Source", "AcceptanceTests"),
),
},
},
})
}

func testAccDataSourceAzureRMLogicAppWorkflow_basic(rInt int, location string) string {
resource := testAccAzureRMLogicAppWorkflow_empty(rInt, location)
return fmt.Sprintf(`
%s

data "azurerm_logic_app_workflow" "test" {
name = "${azurerm_logic_app_workflow.test.name}"
resource_group_name = "${azurerm_logic_app_workflow.test.resource_group_name}"
}
`, resource)
}

func testAccDataSourceAzureRMLogicAppWorkflow_tags(rInt int, location string) string {
resource := testAccAzureRMLogicAppWorkflow_tags(rInt, location)
return fmt.Sprintf(`
%s

data "azurerm_logic_app_workflow" "test" {
name = "${azurerm_logic_app_workflow.test.name}"
resource_group_name = "${azurerm_logic_app_workflow.test.resource_group_name}"
}
`, resource)
}
29 changes: 29 additions & 0 deletions azurerm/import_arm_logic_app_action_custom_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package azurerm

import (
"testing"

"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
)

func TestAccAzureRMLogicAppActionCustom_importBasic(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Point for consideration: In AWS-land, we've been adding the import TestStep directly to the pertinent acceptance tests to reduce:

  • Indirection/missed tests with having a separate test file
  • File sprawl (relating to above)
  • Creating 2x the same resources for testing (potentially more false positives)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not opposed to that approach (we've started doing it for some resources) - but I think that's a larger project outside the scope of this PR - so I'm going to skip this for now.

ri := acctest.RandInt()
config := testAccAzureRMLogicAppActionCustom_basic(ri, testLocation())

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLogicAppWorkflowDestroy,
Steps: []resource.TestStep{
{
Config: config,
},
{
ResourceName: "azurerm_logic_app_action_custom.test",
ImportState: true,
ImportStateVerify: true,
},
},
})
}
50 changes: 50 additions & 0 deletions azurerm/import_arm_logic_app_action_http_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package azurerm

import (
"testing"

"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
)

func TestAccAzureRMLogicAppActionHttp_importBasic(t *testing.T) {
ri := acctest.RandInt()
config := testAccAzureRMLogicAppActionHttp_basic(ri, testLocation())

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLogicAppWorkflowDestroy,
Steps: []resource.TestStep{
{
Config: config,
},
{
ResourceName: "azurerm_logic_app_action_http.test",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAzureRMLogicAppActionHttp_importHeaders(t *testing.T) {
ri := acctest.RandInt()
config := testAccAzureRMLogicAppActionHttp_headers(ri, testLocation())

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLogicAppWorkflowDestroy,
Steps: []resource.TestStep{
{
Config: config,
},
{
ResourceName: "azurerm_logic_app_action_http.test",
ImportState: true,
ImportStateVerify: true,
},
},
})
}
29 changes: 29 additions & 0 deletions azurerm/import_arm_logic_app_trigger_custom_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package azurerm

import (
"testing"

"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
)

func TestAccAzureRMLogicAppTriggerCustom_importBasic(t *testing.T) {
ri := acctest.RandInt()
config := testAccAzureRMLogicAppTriggerCustom_basic(ri, testLocation())

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLogicAppWorkflowDestroy,
Steps: []resource.TestStep{
{
Config: config,
},
{
ResourceName: "azurerm_logic_app_trigger_custom.test",
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Loading