r/aws_licensemanager: Final tweaks to aws_licensemanager_license_conf…

…iguration
hashicorp · Dec 14, 2018 · b32e414 · b32e414
1 parent 8ce85f7
commit b32e414
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/aws/resource_aws_licensemanager_license_configuration.go b/aws/resource_aws_licensemanager_license_configuration.go
@@ -151,20 +151,14 @@ func resourceAwsLicenseManagerLicenseConfigurationUpdate(d *schema.ResourceData,
 	opts := &licensemanager.UpdateLicenseConfigurationInput{
 		LicenseConfigurationArn: aws.String(d.Id()),
 		Name:                    aws.String(d.Get("name").(string)),
-	}
-
-	if v, ok := d.GetOk("description"); ok {
-		opts.Description = aws.String(v.(string))
+		Description:             aws.String(d.Get("description").(string)),
+		LicenseCountHardLimit:   aws.Bool(d.Get("license_count_hard_limit").(bool)),
 	}
 
 	if v, ok := d.GetOk("license_count"); ok {
 		opts.LicenseCount = aws.Int64(int64(v.(int)))
 	}
 
-	if v, ok := d.GetOk("license_count_hard_limit"); ok {
-		opts.LicenseCountHardLimit = aws.Bool(v.(bool))
-	}
-
 	log.Printf("[DEBUG] License Manager license configuration: %s", opts)
 
 	_, err := conn.UpdateLicenseConfiguration(opts)

diff --git a/aws/resource_aws_licensemanager_license_configuration_test.go b/aws/resource_aws_licensemanager_license_configuration_test.go
@@ -112,8 +112,8 @@ func TestAccAWSLicenseManagerLicenseConfiguration_update(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckLicenseManagerLicenseConfigurationExists(resourceName, &licenseConfiguration),
 					resource.TestCheckResourceAttr(resourceName, "name", "NewName"),
-					resource.TestCheckResourceAttr(resourceName, "description", "NewDescription"),
-					resource.TestCheckResourceAttr(resourceName, "license_count", ""),
+					resource.TestCheckResourceAttr(resourceName, "description", ""),
+					resource.TestCheckResourceAttr(resourceName, "license_count", "123"),
 					resource.TestCheckResourceAttr(resourceName, "license_count_hard_limit", "false"),
 					resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
 					resource.TestCheckResourceAttr(resourceName, "tags.test", "test"),
@@ -204,9 +204,7 @@ resource "aws_licensemanager_license_configuration" "example" {
 const testAccLicenseManagerLicenseConfigurationConfig_update = `
 resource "aws_licensemanager_license_configuration" "example" {
   name                     = "NewName"
-  description              = "NewDescription"
-  # license_count            = 99
-  license_count_hard_limit = false
+  license_count            = 123
   license_counting_type    = "Socket"
 
   license_rules = [

diff --git a/website/docs/r/licensemanager_license_configuration.markdown b/website/docs/r/licensemanager_license_configuration.markdown
@@ -10,6 +10,8 @@ description: |-
 
 Provides a License Manager license configuration resource.
 
+~> **Note:** Removing the `license_count` attribute is not supported by the License Manager API - use `terraform taint aws_licensemanager_license_configuration.<id>` to recreate the resource instead.
+
 ## Example Usage
 
 ```hcl