-
Notifications
You must be signed in to change notification settings - Fork 4.6k
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_application_security_group
#905
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| package azurerm | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" | ||
| "github.com/hashicorp/terraform/helper/schema" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" | ||
| ) | ||
|
|
||
| func resourceArmApplicationSecurityGroup() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceArmApplicationSecurityGroupCreateUpdate, | ||
| Read: resourceArmApplicationSecurityGroupRead, | ||
| Update: resourceArmApplicationSecurityGroupCreateUpdate, | ||
| Delete: resourceArmApplicationSecurityGroupDelete, | ||
| Importer: &schema.ResourceImporter{ | ||
| State: schema.ImportStatePassthrough, | ||
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
|
|
||
| "location": locationSchema(), | ||
|
|
||
| "resource_group_name": resourceGroupNameSchema(), | ||
|
|
||
| "tags": tagsSchema(), | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceArmApplicationSecurityGroupCreateUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*ArmClient).applicationSecurityGroupsClient | ||
| ctx := meta.(*ArmClient).StopContext | ||
|
|
||
| resourceGroup := d.Get("resource_group_name").(string) | ||
| name := d.Get("name").(string) | ||
| location := d.Get("location").(string) | ||
| tags := d.Get("tags").(map[string]interface{}) | ||
|
|
||
| securityGroup := network.ApplicationSecurityGroup{ | ||
| Location: utils.String(location), | ||
| Tags: expandTags(tags), | ||
| } | ||
| future, err := client.CreateOrUpdate(ctx, resourceGroup, name, securityGroup) | ||
| if err != nil { | ||
| return fmt.Errorf("Error creating Application Security Group %q (Resource Group %q): %+v", name, resourceGroup, err) | ||
| } | ||
|
|
||
| err = future.WaitForCompletion(ctx, client.Client) | ||
| if err != nil { | ||
| return fmt.Errorf("Error waiting for the Application Security Group %q (Resource Group %q) to finish creating: %+v", name, resourceGroup, err) | ||
| } | ||
|
|
||
| read, err := client.Get(ctx, resourceGroup, name) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if read.ID == nil { | ||
| return fmt.Errorf("Cannot read Application Security Group %q (Resource Group %q) ID", name, resourceGroup) | ||
| } | ||
|
|
||
| d.SetId(*read.ID) | ||
|
|
||
| return resourceArmApplicationSecurityGroupRead(d, meta) | ||
| } | ||
|
|
||
| func resourceArmApplicationSecurityGroupRead(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*ArmClient).applicationSecurityGroupsClient | ||
| ctx := meta.(*ArmClient).StopContext | ||
|
|
||
| id, err := parseAzureResourceID(d.Id()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| resourceGroup := id.ResourceGroup | ||
| name := id.Path["applicationSecurityGroups"] | ||
|
|
||
| resp, err := client.Get(ctx, resourceGroup, name) | ||
| if err != nil { | ||
| if utils.ResponseWasNotFound(resp.Response) { | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
|
|
||
| return fmt.Errorf("Error making Read request on Application Security Group %q (Resource Group %q): %+v", name, resourceGroup, err) | ||
| } | ||
|
|
||
| d.Set("name", resp.Name) | ||
| d.Set("location", azureRMNormalizeLocation(*resp.Location)) | ||
| d.Set("resource_group_name", resourceGroup) | ||
| flattenAndSetTags(d, resp.Tags) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceArmApplicationSecurityGroupDelete(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*ArmClient).applicationSecurityGroupsClient | ||
| ctx := meta.(*ArmClient).StopContext | ||
|
|
||
| id, err := parseAzureResourceID(d.Id()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| resourceGroup := id.ResourceGroup | ||
| name := id.Path["applicationSecurityGroups"] | ||
|
|
||
| log.Printf("[DEBUG] Deleting Application Security Group %q (resource group %q)", name, resourceGroup) | ||
|
|
||
| future, err := client.Delete(ctx, resourceGroup, name) | ||
| if err != nil { | ||
| if !response.WasNotFound(future.Response()) { | ||
| return fmt.Errorf("Error issuing delete request for Application Security Group %q (Resource Group %q): %+v", name, resourceGroup, err) | ||
| } | ||
| } | ||
|
|
||
| err = future.WaitForCompletion(ctx, client.Client) | ||
| if err != nil { | ||
| if !response.WasNotFound(future.Response()) { | ||
| return fmt.Errorf("Error waiting for deletion of Application Security Group %q (Resource Group %q): %+v", name, resourceGroup, err) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } |
174 changes: 174 additions & 0 deletions
174
azurerm/resource_arm_application_security_group_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| package azurerm | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/terraform/helper/acctest" | ||
| "github.com/hashicorp/terraform/helper/resource" | ||
| "github.com/hashicorp/terraform/terraform" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" | ||
| ) | ||
|
|
||
| func TestAccAzureRMApplicationSecurityGroup_basic(t *testing.T) { | ||
| ri := acctest.RandInt() | ||
| resourceName := "azurerm_application_security_group.test" | ||
| config := testAccAzureRMApplicationSecurityGroup_basic(ri, testLocation()) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testCheckAzureRMApplicationSecurityGroupDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: config, | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testCheckAzureRMApplicationSecurityGroupExists(resourceName), | ||
| resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAzureRMApplicationSecurityGroup_complete(t *testing.T) { | ||
| ri := acctest.RandInt() | ||
| resourceName := "azurerm_application_security_group.test" | ||
| config := testAccAzureRMApplicationSecurityGroup_complete(ri, testLocation()) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testCheckAzureRMApplicationSecurityGroupDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: config, | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testCheckAzureRMApplicationSecurityGroupExists(resourceName), | ||
| resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), | ||
| resource.TestCheckResourceAttr(resourceName, "tags.Hello", "World"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAzureRMApplicationSecurityGroup_update(t *testing.T) { | ||
| ri := acctest.RandInt() | ||
| location := testLocation() | ||
| resourceName := "azurerm_application_security_group.test" | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testCheckAzureRMApplicationSecurityGroupDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAzureRMApplicationSecurityGroup_basic(ri, location), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testCheckAzureRMApplicationSecurityGroupExists(resourceName), | ||
| resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), | ||
| ), | ||
| }, | ||
| { | ||
| Config: testAccAzureRMApplicationSecurityGroup_complete(ri, location), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testCheckAzureRMApplicationSecurityGroupExists(resourceName), | ||
| resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), | ||
| resource.TestCheckResourceAttr(resourceName, "tags.Hello", "World"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func testCheckAzureRMApplicationSecurityGroupDestroy(s *terraform.State) error { | ||
| for _, rs := range s.RootModule().Resources { | ||
| if rs.Type != "azurerm_application_security_group" { | ||
| continue | ||
| } | ||
|
|
||
| name := rs.Primary.Attributes["name"] | ||
| resourceGroup := rs.Primary.Attributes["resource_group_name"] | ||
|
|
||
| client := testAccProvider.Meta().(*ArmClient).applicationSecurityGroupsClient | ||
| ctx := testAccProvider.Meta().(*ArmClient).StopContext | ||
|
|
||
| resp, err := client.Get(ctx, resourceGroup, name) | ||
|
|
||
| if err != nil { | ||
| if utils.ResponseWasNotFound(resp.Response) { | ||
| return nil | ||
| } | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| return fmt.Errorf("Applicaton Security Group still exists:\n%#v", resp) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func testCheckAzureRMApplicationSecurityGroupExists(name string) resource.TestCheckFunc { | ||
| return func(s *terraform.State) error { | ||
| // Ensure we have enough information in state to look up in API | ||
| rs, ok := s.RootModule().Resources[name] | ||
| if !ok { | ||
| return fmt.Errorf("Not found: %q", name) | ||
| } | ||
|
|
||
| name := rs.Primary.Attributes["name"] | ||
| resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] | ||
| if !hasResourceGroup { | ||
| return fmt.Errorf("Bad: no resource group found in state for Application Security Group: %q", name) | ||
| } | ||
|
|
||
| client := testAccProvider.Meta().(*ArmClient).applicationSecurityGroupsClient | ||
| ctx := testAccProvider.Meta().(*ArmClient).StopContext | ||
| resp, err := client.Get(ctx, resourceGroup, name) | ||
|
|
||
| if err != nil { | ||
| if utils.ResponseWasNotFound(resp.Response) { | ||
| return fmt.Errorf("Application Security Group %q (resource group: %q) was not found: %+v", name, resourceGroup, err) | ||
| } | ||
|
|
||
| return fmt.Errorf("Bad: Get on applicationSecurityGroupsClient: %+v", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func testAccAzureRMApplicationSecurityGroup_basic(rInt int, location string) string { | ||
| return fmt.Sprintf(` | ||
| resource "azurerm_resource_group" "test" { | ||
| name = "acctestRG-%d" | ||
| location = "%s" | ||
| } | ||
|
|
||
| resource "azurerm_application_security_group" "test" { | ||
| name = "acctest-%d" | ||
| location = "${azurerm_resource_group.test.location}" | ||
| resource_group_name = "${azurerm_resource_group.test.name}" | ||
| } | ||
| `, rInt, location, rInt) | ||
| } | ||
|
|
||
| func testAccAzureRMApplicationSecurityGroup_complete(rInt int, location string) string { | ||
| return fmt.Sprintf(` | ||
| resource "azurerm_resource_group" "test" { | ||
| name = "acctestRG-%d" | ||
| location = "%s" | ||
| } | ||
|
|
||
| resource "azurerm_application_security_group" "test" { | ||
| name = "acctest-%d" | ||
| location = "${azurerm_resource_group.test.location}" | ||
| resource_group_name = "${azurerm_resource_group.test.name}" | ||
| tags { | ||
| "Hello" = "World" | ||
| } | ||
| } | ||
| `, rInt, location, rInt) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm at a loss as to why this was removed as it seems unrelated?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So this is actually being registered twice in master at the moment (due to a previous merge conflict):
https://github.com/terraform-providers/terraform-provider-azurerm/blob/f76c05bc2cc04e0a1974d0182497abc07abeba18/azurerm/config.go#L331
https://github.com/terraform-providers/terraform-provider-azurerm/blob/f76c05bc2cc04e0a1974d0182497abc07abeba18/azurerm/config.go#L503
this consolidates this into one