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.

Sign up for GitHub

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

Stop private and public dns namespace resources being replaced when the description is altered #32342

Merged
merged 7 commits into from
Jul 3, 2023
Merged

Stop private and public dns namespace resources being replaced when the description is altered #32342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3fa700
Stop a change in the description causing a replacement
pierskarsenbarg Jul 3, 2023
d7b824a
Updated changelog
pierskarsenbarg Jul 3, 2023
3f1648f
fixed changelog
pierskarsenbarg Jul 3, 2023
f393e82
Merge branch 'main' into b-aws_private_dns_namesspace-description-rep…
pierskarsenbarg Jul 3, 2023
72b7639
Add CHANGELOG entries.
ewbankkit Jul 3, 2023
3ef4672
r/aws_service_discovery_private_dns_namespace: Call 'UpdatePrivateDns…
ewbankkit Jul 3, 2023
dda67cb
r/aws_service_discovery_public_dns_namespace: Call 'UpdatePublicDnsNa…
ewbankkit Jul 3, 2023
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
7 changes: 7 additions & 0 deletions .changelog/32342.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_service_discovery_private_dns_namespace: Allow `description` to be updated in-place
```

```release-note:enhancement
resource/aws_service_discovery_public_dns_namespace: Allow `description` to be updated in-place
```
27 changes: 24 additions & 3 deletions internal/service/servicediscovery/private_dns_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func ResourcePrivateDNSNamespace() *schema.Resource {
"description": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"hosted_zone": {
Type: schema.TypeString,
Expand Down Expand Up @@ -87,7 +86,6 @@ func resourcePrivateDNSNamespaceCreate(ctx context.Context, d *schema.ResourceDa
input.Description = aws.String(v.(string))
}

log.Printf("[DEBUG] Creating Service Discovery Private DNS Namespace: %s", input)
output, err := conn.CreatePrivateDnsNamespaceWithContext(ctx, input)

if err != nil {
Expand Down Expand Up @@ -140,7 +138,30 @@ func resourcePrivateDNSNamespaceRead(ctx context.Context, d *schema.ResourceData
}

func resourcePrivateDNSNamespaceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
// Tags only.
conn := meta.(*conns.AWSClient).ServiceDiscoveryConn(ctx)

if d.HasChange("description") {
input := &servicediscovery.UpdatePrivateDnsNamespaceInput{
Id: aws.String(d.Id()),
Namespace: &servicediscovery.PrivateDnsNamespaceChange{
Description: aws.String(d.Get("description").(string)),
},
UpdaterRequestId: aws.String(id.UniqueId()),
}

output, err := conn.UpdatePrivateDnsNamespaceWithContext(ctx, input)

if err != nil {
return diag.Errorf("updating Service Discovery Private DNS Namespace (%s): %s", d.Id(), err)
}

if output != nil && output.OperationId != nil {
if _, err := WaitOperationSuccess(ctx, conn, aws.StringValue(output.OperationId)); err != nil {
return diag.Errorf("waiting for Service Discovery Private DNS Namespace (%s) update: %s", d.Id(), err)
}
}
}

return resourcePrivateDNSNamespaceRead(ctx, d, meta)
}

Expand Down
11 changes: 9 additions & 2 deletions internal/service/servicediscovery/private_dns_namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,17 @@ func TestAccServiceDiscoveryPrivateDNSNamespace_description(t *testing.T) {
CheckDestroy: testAccCheckPrivateDNSNamespaceDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccPrivateDNSNamespaceConfig_description(rName, "test"),
Config: testAccPrivateDNSNamespaceConfig_description(rName, "desc1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckPrivateDNSNamespaceExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "description", "test"),
resource.TestCheckResourceAttr(resourceName, "description", "desc1"),
),
},
{
Config: testAccPrivateDNSNamespaceConfig_description(rName, "desc2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckPrivateDNSNamespaceExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "description", "desc2"),
),
},
},
Expand Down
27 changes: 24 additions & 3 deletions internal/service/servicediscovery/public_dns_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ func ResourcePublicDNSNamespace() *schema.Resource {
"description": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"hosted_zone": {
Type: schema.TypeString,
Expand Down Expand Up @@ -71,7 +70,6 @@ func resourcePublicDNSNamespaceCreate(ctx context.Context, d *schema.ResourceDat
input.Description = aws.String(v.(string))
}

log.Printf("[DEBUG] Creating Service Discovery Public DNS Namespace: %s", input)
output, err := conn.CreatePublicDnsNamespaceWithContext(ctx, input)

if err != nil {
Expand Down Expand Up @@ -124,7 +122,30 @@ func resourcePublicDNSNamespaceRead(ctx context.Context, d *schema.ResourceData,
}

func resourcePublicDNSNamespaceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
// Tags only.
conn := meta.(*conns.AWSClient).ServiceDiscoveryConn(ctx)

if d.HasChange("description") {
input := &servicediscovery.UpdatePublicDnsNamespaceInput{
Id: aws.String(d.Id()),
Namespace: &servicediscovery.PublicDnsNamespaceChange{
Description: aws.String(d.Get("description").(string)),
},
UpdaterRequestId: aws.String(id.UniqueId()),
}

output, err := conn.UpdatePublicDnsNamespaceWithContext(ctx, input)

if err != nil {
return diag.Errorf("updating Service Discovery Public DNS Namespace (%s): %s", d.Id(), err)
}

if output != nil && output.OperationId != nil {
if _, err := WaitOperationSuccess(ctx, conn, aws.StringValue(output.OperationId)); err != nil {
return diag.Errorf("waiting for Service Discovery Public DNS Namespace (%s) update: %s", d.Id(), err)
}
}
}

return resourcePublicDNSNamespaceRead(ctx, d, meta)
}

Expand Down
11 changes: 9 additions & 2 deletions internal/service/servicediscovery/public_dns_namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,17 @@ func TestAccServiceDiscoveryPublicDNSNamespace_description(t *testing.T) {
CheckDestroy: testAccCheckPublicDNSNamespaceDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccPublicDNSNamespaceConfig_description(rName, "test"),
Config: testAccPublicDNSNamespaceConfig_description(rName, "desc1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckPublicDNSNamespaceExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "description", "test"),
resource.TestCheckResourceAttr(resourceName, "description", "desc1"),
),
},
{
Config: testAccPublicDNSNamespaceConfig_description(rName, "desc2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckPublicDNSNamespaceExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "description", "desc2"),
),
},
},
Expand Down