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

f/aws_verifiedaccess_endpoint set PolicyEnabled based on policy_document #38675

Merged
merged 8 commits into from
Aug 28, 2024
Merged

f/aws_verifiedaccess_endpoint set PolicyEnabled based on policy_document #38675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2979116
feat: update PolicyEnabled flag based on policy_document content
Dansyuqri Aug 3, 2024
1c70401
r/aws_elasticbeanstalk_environment: Simplify reading of settings.
ewbankkit Aug 26, 2024
284788b
elasticbeanstalk: Simplify 'hashSettingsValue'.
ewbankkit Aug 27, 2024
6f70bb5
Merge branch 'main' into HEAD
ewbankkit Aug 28, 2024
27fcdc9
Correct CHANGELOG entry file name.
ewbankkit Aug 28, 2024
38c603e
Tweak CHANGELOG entry.
ewbankkit Aug 28, 2024
c8d2ce9
Cosmetics.
ewbankkit Aug 28, 2024
33c30fa
Merge branch 'b-aws_elastic_beanstalk_environment.setting' into HEAD
ewbankkit Aug 28, 2024
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
3 changes: 3 additions & 0 deletions .changelog/38675.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_verifiedaccess_endpoint: Set PolicyEnabled flag to `false` on update if `policy_document` is empty
```
12 changes: 7 additions & 5 deletions internal/service/ec2/verifiedaccess_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ func resourceVerifiedAccessEndpoint() *schema.Resource {

func resourceVerifiedAccessEndpointCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
var diags diag.Diagnostics

conn := meta.(*conns.AWSClient).EC2Client(ctx)

input := &ec2.CreateVerifiedAccessEndpointInput{
Expand Down Expand Up @@ -242,7 +241,6 @@ func resourceVerifiedAccessEndpointCreate(ctx context.Context, d *schema.Resourc

func resourceVerifiedAccessEndpointRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
var diags diag.Diagnostics

conn := meta.(*conns.AWSClient).EC2Client(ctx)

ep, err := findVerifiedAccessEndpointByID(ctx, conn, d.Id())
Expand Down Expand Up @@ -331,11 +329,16 @@ func resourceVerifiedAccessEndpointUpdate(ctx context.Context, d *schema.Resourc

if d.HasChange("policy_document") {
input := &ec2.ModifyVerifiedAccessEndpointPolicyInput{
PolicyDocument: aws.String(d.Get("policy_document").(string)),
PolicyEnabled: aws.Bool(true),
VerifiedAccessEndpointId: aws.String(d.Id()),
}

if v := d.Get("policy_document").(string); v != "" {
input.PolicyEnabled = aws.Bool(true)
input.PolicyDocument = aws.String(v)
} else {
input.PolicyEnabled = aws.Bool(false)
}

_, err := conn.ModifyVerifiedAccessEndpointPolicy(ctx, input)

if err != nil {
Expand All @@ -348,7 +351,6 @@ func resourceVerifiedAccessEndpointUpdate(ctx context.Context, d *schema.Resourc

func resourceVerifiedAccessEndpointDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
var diags diag.Diagnostics

conn := meta.(*conns.AWSClient).EC2Client(ctx)

log.Printf("[INFO] Deleting Verified Access Endpoint: %s", d.Id())
Expand Down
6 changes: 6 additions & 0 deletions internal/service/ec2/verifiedaccess_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,12 @@ func testAccVerifiedAccessEndpoint_policyDocument(t *testing.T, semaphore tfsync
resource.TestCheckResourceAttr(resourceName, "policy_document", policyDoc),
),
},
{
Config: testAccVerifiedAccessEndpointConfig_policyBase(rName, acctest.TLSPEMEscapeNewlines(key), acctest.TLSPEMEscapeNewlines(certificate)),
Check: resource.ComposeTestCheckFunc(
testAccCheckVerifiedAccessEndpointExists(ctx, resourceName, &v),
),
},
},
})
}
Expand Down
6 changes: 3 additions & 3 deletions internal/service/elasticbeanstalk/configuration_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func resourceConfigurationTemplate() *schema.Resource {
Optional: true,
Computed: true,
Elem: settingSchema(),
Set: optionSettingValueHash,
Set: hashSettingsValue,
},
"solution_stack_name": {
Type: schema.TypeString,
Expand Down Expand Up @@ -85,7 +85,7 @@ func resourceConfigurationTemplateCreate(ctx context.Context, d *schema.Resource
}

if v, ok := d.GetOk("setting"); ok && v.(*schema.Set).Len() > 0 {
input.OptionSettings = expandConfigurationOptionSettings(v.(*schema.Set))
input.OptionSettings = expandConfigurationOptionSettings(v.(*schema.Set).List())
}

if attr, ok := d.GetOk("solution_stack_name"); ok {
Expand Down Expand Up @@ -148,7 +148,7 @@ func resourceConfigurationTemplateUpdate(ctx context.Context, d *schema.Resource
if d.HasChange("setting") {
o, n := d.GetChange("setting")
os, ns := o.(*schema.Set), n.(*schema.Set)
add, del := expandConfigurationOptionSettings(ns.Difference(os)), expandConfigurationOptionSettings(os.Difference(ns))
add, del := expandConfigurationOptionSettings(ns.Difference(os).List()), expandConfigurationOptionSettings(os.Difference(ns).List())

// Additions and removals of options are done in a single API call, so we
// can't do our normal "remove these" and then later "add these", re-adding
Expand Down
Loading
Loading